Author: bentmann
Date: Sat Mar 21 16:05:43 2009
New Revision: 756961
URL: http://svn.apache.org/viewvc?rev=756961&view=rev
Log:
o Fixed distribution management processing
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/pom.xml
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java?rev=756961&r1=756960&r2=756961&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java
Sat Mar 21 16:05:43 2009
@@ -87,6 +87,7 @@
target.setRepository( new DeploymentRepository() );
copyRepository( source.getRepository(), target.getRepository() );
}
+
if ( target.getSnapshotRepository() == null &&
source.getSnapshotRepository() != null )
{
target.setSnapshotRepository( new DeploymentRepository() );
@@ -112,10 +113,17 @@
target.setLayout( source.getLayout() );
}
- if ( target.getName() == null )
+ if ( target.getUrl() == null )
{
target.setUrl( source.getUrl() );
}
+
+ if ( target.getName() == null )
+ {
+ target.setName( source.getName() );
+ }
+
+ target.setUniqueVersion( source.isUniqueVersion() );
}
private static void copySite( Site source, Site target, boolean isChild,
String artifactId )
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=756961&r1=756960&r2=756961&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
Sat Mar 21 16:05:43 2009
@@ -1014,6 +1014,40 @@
assertEquals( "http://project.url/scm";, pom.getValue( "scm/connection"
) );
assertEquals( "https://project.url/scm";, pom.getValue(
"scm/developerConnection" ) );
assertEquals( "TAG", pom.getValue( "scm/tag" ) );
+
+ assertEquals( "issues", pom.getValue( "issueManagement/system" ) );
+ assertEquals( "http://project.url/issues";, pom.getValue(
"issueManagement/url" ) );
+
+ assertEquals( "ci", pom.getValue( "ciManagement/system" ) );
+ assertEquals( "http://project.url/ci";, pom.getValue(
"ciManagement/url" ) );
+ assertEquals( 1, ( (List<?>) pom.getValue( "ciManagement/notifiers" )
).size() );
+ assertEquals( "irc", pom.getValue( "ciManagement/notifiers[1]/type" )
);
+ assertEquals( "ci@", pom.getValue( "ciManagement/notifiers[1]/address"
) );
+ assertEquals( Boolean.TRUE, pom.getValue(
"ciManagement/notifiers[1]/sendOnError" ) );
+ assertEquals( Boolean.FALSE, pom.getValue(
"ciManagement/notifiers[1]/sendOnFailure" ) );
+ assertEquals( Boolean.FALSE, pom.getValue(
"ciManagement/notifiers[1]/sendOnWarning" ) );
+ assertEquals( Boolean.FALSE, pom.getValue(
"ciManagement/notifiers[1]/sendOnSuccess" ) );
+ assertEquals( "ci", pom.getValue(
"ciManagement/notifiers[1]/configuration/ciProp" ) );
+
+ assertEquals( "project.distros", pom.getValue(
"distributionManagement/repository/id" ) );
+ assertEquals( "distros", pom.getValue(
"distributionManagement/repository/name" ) );
+ assertEquals( "http://project.url/dist";, pom.getValue(
"distributionManagement/repository/url" ) );
+ assertEquals( Boolean.TRUE, pom.getValue(
"distributionManagement/repository/uniqueVersion" ) );
+
+ assertEquals( "project.snaps", pom.getValue(
"distributionManagement/snapshotRepository/id" ) );
+ assertEquals( "snaps", pom.getValue(
"distributionManagement/snapshotRepository/name" ) );
+ assertEquals( "http://project.url/snaps";, pom.getValue(
"distributionManagement/snapshotRepository/url" ) );
+ assertEquals( Boolean.FALSE, pom.getValue(
"distributionManagement/snapshotRepository/uniqueVersion" ) );
+
+ assertEquals( "project.site", pom.getValue(
"distributionManagement/site/id" ) );
+ assertEquals( "docs", pom.getValue( "distributionManagement/site/name"
) );
+ assertEquals( "http://project.url/site";, pom.getValue(
"distributionManagement/site/url" ) );
+
+ assertEquals( "http://project.url/download";, pom.getValue(
"distributionManagement/downloadUrl" ) );
+ assertEquals( "reloc-gid", pom.getValue(
"distributionManagement/relocation/groupId" ) );
+ assertEquals( "reloc-aid", pom.getValue(
"distributionManagement/relocation/artifactId" ) );
+ assertEquals( "reloc-version", pom.getValue(
"distributionManagement/relocation/version" ) );
+ assertEquals( "project-reloc-msg", pom.getValue(
"distributionManagement/relocation/message" ) );
}
Modified:
maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/pom.xml?rev=756961&r1=756960&r2=756961&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/pom.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/pom.xml
Sat Mar 21 16:05:43 2009
@@ -110,7 +110,7 @@
<url>http://project.url/ci</url>
<notifiers>
<notifier>
- <type>email</type>
+ <type>irc</type>
<address>ci@</address>
<sendOnError>true</sendOnError>
<sendOnFailure>false</sendOnFailure>
