Author: sisbell
Date: Tue Mar 24 19:14:42 2009
New Revision: 757965
URL: http://svn.apache.org/viewvc?rev=757965&view=rev
Log:
Fixed some problems with inheritance of resources.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=757965&r1=757964&r2=757965&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Tue Mar 24 19:14:42 2009
@@ -145,18 +145,7 @@
setBuildOutputDirectoryOnParent( project );
hm.put( ArtifactUtils.artifactId( project.getGroupId(),
project.getArtifactId(), "pom", project.getVersion() ), project );
- try
- {
- if("maven-project-builder".equals(
project.getModel().getArtifactId())){
- System.out.println(convertToDomainModel(project.getModel(),
true).asString());
- }
-
- }
- catch ( IOException e )
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+
return project;
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java?rev=757965&r1=757964&r2=757965&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java
Tue Mar 24 19:14:42 2009
@@ -65,10 +65,11 @@
copy(p.getBuild(), t.getBuild(), isProfile);
copy(build, t.getBuild(), isProfile);
-
- copyResources(build, t.getBuild());
- copyResources(p.getBuild(), t.getBuild());
+ copyResources(build, t.getBuild());
+ copyResources(p.getBuild(), t.getBuild());
+
+
pluginsProcessor.process( p.getBuild().getPlugins(),
build.getPlugins(), t.getBuild().getPlugins(), isChildMostSpecialized );
inheritManagement(p.getBuild().getPluginManagement(),
build.getPluginManagement(), t.getBuild());
}
@@ -109,35 +110,7 @@
private static void copyResources(BuildBase source, Build target)
{
- if(target.getResources().isEmpty())
- {
- for(Resource resource : source.getResources())
- {
- Resource r = new Resource();
- r.setDirectory( resource.getDirectory());
- r.setFiltering( resource.isFiltering() );
- r.setMergeId( resource.getMergeId() );
- r.setTargetPath( resource.getTargetPath() );
- r.setExcludes( new ArrayList<String>(resource.getExcludes()) );
- r.setIncludes( new ArrayList<String>(resource.getIncludes()) );
- target.getResources().add( r );
- }
- }
-
- if(target.getTestResources().isEmpty())
- {
- for(Resource resource : source.getTestResources())
- {
- Resource r = new Resource();
- r.setDirectory( resource.getDirectory());
- r.setFiltering( resource.isFiltering() );
- r.setMergeId( resource.getMergeId() );
- r.setTargetPath( resource.getTargetPath() );
- r.setExcludes( new ArrayList<String>(resource.getExcludes()) );
- r.setIncludes( new ArrayList<String>(resource.getIncludes()) );
- target.getTestResources().add( r );
- }
- }
+
List<String> filters = new ArrayList<String>(target.getFilters());
for(String filter : source.getFilters())
@@ -170,8 +143,41 @@
if(source.getDirectory() != null)
{
target.setDirectory( source.getDirectory() );
- }
-
+ }
+
+ if(!source.getResources().isEmpty())
+ {
+ List<Resource> resources = new ArrayList<Resource>();
+ for(Resource resource : source.getResources())
+ {
+ Resource r = new Resource();
+ r.setDirectory( resource.getDirectory());
+ r.setFiltering( resource.isFiltering() );
+ r.setMergeId( resource.getMergeId() );
+ r.setTargetPath( resource.getTargetPath() );
+ r.setExcludes( new ArrayList<String>(resource.getExcludes()) );
+ r.setIncludes( new ArrayList<String>(resource.getIncludes()) );
+ resources.add( r );
+ }
+ target.setResources( resources );
+ }
+
+ if(!source.getTestResources().isEmpty())
+ {
+ List<Resource> resources = new ArrayList<Resource>();
+ for(Resource resource : source.getTestResources())
+ {
+ Resource r = new Resource();
+ r.setDirectory( resource.getDirectory());
+ r.setFiltering( resource.isFiltering() );
+ r.setMergeId( resource.getMergeId() );
+ r.setTargetPath( resource.getTargetPath() );
+ r.setExcludes( new ArrayList<String>(resource.getExcludes()) );
+ r.setIncludes( new ArrayList<String>(resource.getIncludes()) );
+ resources.add( r );
+ }
+ target.setTestResources( resources );
+ }
if(!isProfile)
{
copyBuild((Build) source, target);
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=757965&r1=757964&r2=757965&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Tue Mar 24 19:14:42 2009
@@ -960,7 +960,7 @@
testCompleteModel( pom );
}
- /* FIXME
+ /* FIXME*/
public void testCompleteModelWithParent()
throws Exception
{
