You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by br...@apache.org on 2005/02/24 05:15:47 UTC
cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance DefaultModelInheritanceAssemblerTest.java
brett 2005/02/23 20:15:47
Modified: maven-core/src/main/java/org/apache/maven/project/inheritance
DefaultModelInheritanceAssembler.java
maven-core/src/main/java/org/apache/maven/project/path
DefaultPathTranslator.java
maven-core/src/test/java/org/apache/maven/project/inheritance
DefaultModelInheritanceAssemblerTest.java
Log:
removed unused source directories
Revision Changes Path
1.17 +0 -5 maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Index: DefaultModelInheritanceAssembler.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultModelInheritanceAssembler.java 23 Feb 2005 03:26:59 -0000 1.16
+++ DefaultModelInheritanceAssembler.java 24 Feb 2005 04:15:47 -0000 1.17
@@ -218,11 +218,6 @@
child.getBuild().setUnitTestSourceDirectory( parent.getBuild().getUnitTestSourceDirectory() );
}
- if ( child.getBuild().getAspectSourceDirectory() == null )
- {
- child.getBuild().setAspectSourceDirectory( parent.getBuild().getAspectSourceDirectory() );
- }
-
if ( child.getBuild().getOutput() == null )
{
child.getBuild().setOutput( parent.getBuild().getOutput() );
1.5 +0 -7 maven-components/maven-core/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
Index: DefaultPathTranslator.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultPathTranslator.java 25 Dec 2004 16:26:25 -0000 1.4
+++ DefaultPathTranslator.java 24 Feb 2005 04:15:47 -0000 1.5
@@ -67,13 +67,6 @@
build.setUnitTestSourceDirectory( new File( projectFile.getParentFile(), s ).getPath() );
}
- s = stripBasedirToken( build.getAspectSourceDirectory() );
-
- if ( requiresBaseDirectoryAlignment( s ) )
- {
- build.setAspectSourceDirectory( new File( projectFile.getParentFile(), s ).getPath() );
- }
-
List buildResources = build.getResources();
for ( Iterator i = buildResources.iterator(); i.hasNext(); )
1.9 +3 -7 maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
Index: DefaultModelInheritanceAssemblerTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultModelInheritanceAssemblerTest.java 5 Dec 2004 04:16:05 -0000 1.8
+++ DefaultModelInheritanceAssemblerTest.java 24 Feb 2005 04:15:47 -0000 1.9
@@ -16,11 +16,7 @@
* limitations under the License.
*/
-import java.util.Arrays;
-import java.util.List;
-
import junit.framework.TestCase;
-
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.PostGoal;
@@ -29,6 +25,9 @@
import org.apache.maven.model.Scm;
import org.apache.maven.model.UnitTest;
+import java.util.Arrays;
+import java.util.List;
+
/**
* @author jdcasey
*/
@@ -48,7 +47,6 @@
Build parentBuild = new Build();
parentBuild.setSourceDirectory( "src/main/java" );
- parentBuild.setAspectSourceDirectory( "src/main/aspects" );
parentBuild.setUnitTestSourceDirectory( "src/test/java" );
Resource parentResource = new Resource();
@@ -108,8 +106,6 @@
assertEquals( "source directory should be from parent", "src/main/java", child.getBuild().getSourceDirectory() );
assertEquals( "unit test source directory should be from parent", "src/test/java", child.getBuild()
.getUnitTestSourceDirectory() );
- assertEquals( "aspect source directory should be from parent", "src/main/aspects", child.getBuild()
- .getAspectSourceDirectory() );
List childExcludesTest = child.getBuild().getUnitTest().getExcludes();