Author: sisbell
Date: Mon Mar 9 22:47:17 2009
New Revision: 751892
URL: http://svn.apache.org/viewvc?rev=751892&view=rev
Log:
Dependencies processor and DependencyManagement processor now share same
classes.
Removed:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/DependenciesProcessorTest.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java?rev=751892&r1=751891&r2=751892&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java
Mon Mar 9 22:47:17 2009
@@ -14,30 +14,31 @@
public void process( Object parent, Object child, Object target, boolean
isChildMostSpecialized )
{
super.process( parent, child, target, isChildMostSpecialized );
- Model c = (Model) child;
- Model p = null;
+ List<Dependency> c = (child != null) ? (List<Dependency>) child : new
ArrayList<Dependency>() ;
+ List<Dependency> p = null;
+
if ( parent != null )
{
- p = (Model) parent;
+ p = (List<Dependency>) parent;
}
List<Dependency> dependencies = ( (Model) target ).getDependencies();
DependencyProcessor processor = new DependencyProcessor();
- if ( ( p == null || p.getDependencies().isEmpty() ) &&
!c.getDependencies().isEmpty() )
+ if ( ( p == null || p.isEmpty() ) && !c.isEmpty() )
{
- for ( Dependency dependency : c.getDependencies() )
+ for ( Dependency dependency : c )
{
processor.process( null, dependency, dependencies,
isChildMostSpecialized );
}
}
else
{
- if ( !c.getDependencies().isEmpty() )
+ if ( !c.isEmpty() )
{
List<Dependency> parentDependencies = new
ArrayList<Dependency>();
- for ( Dependency d1 : c.getDependencies() )
+ for ( Dependency d1 : c)
{
- for ( Dependency d2 : p.getDependencies() )
+ for ( Dependency d2 : p)
{
if ( match( d1, d2 ) )
{
@@ -56,9 +57,9 @@
processor.process( d2, null, dependencies,
isChildMostSpecialized );
}
}
- else
+ else if( p != null)
{
- for ( Dependency d2 : p.getDependencies() )
+ for ( Dependency d2 : p )
{
processor.process( d2, null, dependencies,
isChildMostSpecialized );
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java?rev=751892&r1=751891&r2=751892&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java
Mon Mar 9 22:47:17 2009
@@ -72,5 +72,12 @@
{
t.setInceptionYear( p.getInceptionYear() );
}
+
+ DependenciesProcessor dependenciesProcessor = new
DependenciesProcessor();
+ dependenciesProcessor.process( (p != null) ? p.getDependencies() :
null, c.getDependencies(), t, isChildMostSpecialized );
+
+ dependenciesProcessor.process( (p != null &&
p.getDependencyManagement() != null) ?
p.getDependencyManagement().getDependencies(): null,
+ (c.getDependencyManagement() != null) ?
c.getDependencyManagement().getDependencies(): null, t, isChildMostSpecialized
);
+
}
}
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/DependenciesProcessorTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/DependenciesProcessorTest.java?rev=751892&r1=751891&r2=751892&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/DependenciesProcessorTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/DependenciesProcessorTest.java
Mon Mar 9 22:47:17 2009
@@ -1,5 +1,9 @@
package org.apache.maven.project.processor;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
@@ -13,8 +17,7 @@
Dependency dependency = new Dependency();
dependency.setArtifactId( "aid" );
- Model child = new Model();
- child.addDependency( dependency );
+ List<Dependency> child = Arrays.asList( dependency );
Model target = new Model();
@@ -30,10 +33,9 @@
Dependency dependency = new Dependency();
dependency.setArtifactId( "aid" );
- Model child = new Model();
+ List<Dependency> child = new ArrayList<Dependency>();
- Model parent = new Model();
- parent.addDependency( dependency );
+ List<Dependency> parent = Arrays.asList( dependency );
Model target = new Model();
@@ -48,13 +50,11 @@
{
Dependency dependency1 = new Dependency();
dependency1.setArtifactId( "aid1" );
- Model child = new Model();
- child.addDependency( dependency1 );
+ List<Dependency> child = Arrays.asList( dependency1 );
Dependency dependency = new Dependency();
dependency.setArtifactId( "aid" );
- Model parent = new Model();
- parent.addDependency( dependency );
+ List<Dependency> parent = Arrays.asList( dependency );
Model target = new Model();
@@ -72,16 +72,14 @@
dependency1.setArtifactId( "aid-c" );
dependency1.setGroupId( "gid-c" );
- Model child = new Model();
- child.addDependency( dependency1 );
+ List<Dependency> child = Arrays.asList( dependency1 );
Dependency dependency = new Dependency();
dependency.setArtifactId( "aid-c" );
dependency.setGroupId( "gid-c" );
dependency.setSystemPath( "sp" );
- Model parent = new Model();
- parent.addDependency( dependency );
+ List<Dependency> parent= Arrays.asList( dependency );
Model target = new Model();
@@ -99,8 +97,7 @@
dependency1.setGroupId( "gid-c" );
dependency1.setVersion( "1.0" );
dependency1.setType( "jar" );
- Model child = new Model();
- child.addDependency( dependency1 );
+ List<Dependency> child = Arrays.asList( dependency1 );
Dependency dependency = new Dependency();
dependency.setArtifactId( "aid-c" );
@@ -108,8 +105,7 @@
dependency.setVersion( "1.0" );
dependency.setSystemPath( "sp" );
- Model parent = new Model();
- parent.addDependency( dependency );
+ List<Dependency> parent = Arrays.asList( dependency );
Model target = new Model();
@@ -128,8 +124,7 @@
dependency1.setVersion( "1.0" );
dependency1.setClassifier( "c1" );
- Model child = new Model();
- child.addDependency( dependency1 );
+ List<Dependency> child = Arrays.asList( dependency1 );
Dependency dependency = new Dependency();
dependency.setArtifactId( "aid-c" );
@@ -137,8 +132,7 @@
dependency.setVersion( "1.0" );
dependency1.setClassifier( "c2" );
- Model parent = new Model();
- parent.addDependency( dependency );
+ List<Dependency> parent = Arrays.asList( dependency );
Model target = new Model();
@@ -155,16 +149,14 @@
dependency1.setGroupId( "gid-c" );
dependency1.setVersion( "1.1" );
- Model child = new Model();
- child.addDependency( dependency1 );
+ List<Dependency> child = Arrays.asList( dependency1 );
Dependency dependency = new Dependency();
dependency.setArtifactId( "aid-c" );
dependency.setGroupId( "gid-c" );
dependency.setVersion( "1.0" );
- Model parent = new Model();
- parent.addDependency( dependency );
+ List<Dependency> parent = Arrays.asList( dependency );
Model target = new Model();
