svn commit: r773184 - in /maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules: doxia-module-apt/src/test/resources/test/macro.apt doxia-module-xdoc/src/test/resources/macro.xml

2009-05-09 Thread ltheussl
Author: ltheussl
Date: Sat May  9 09:13:03 2009
New Revision: 773184

URL: http://svn.apache.org/viewvc?rev=773184view=rev
Log:
Update test resource location to fix test failures

Modified:

maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-apt/src/test/resources/test/macro.apt

maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-xdoc/src/test/resources/macro.xml

Modified: 
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-apt/src/test/resources/test/macro.apt
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-apt/src/test/resources/test/macro.apt?rev=773184r1=773183r2=773184view=diff
==
--- 
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-apt/src/test/resources/test/macro.apt
 (original)
+++ 
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-apt/src/test/resources/test/macro.apt
 Sat May  9 09:13:03 2009
@@ -6,4 +6,4 @@
 
 Test DOXIA-77
 
-%{snippet|id=superpom|url=http://svn.apache.org/repos/asf/maven/components/trunk/maven-project-builder/src/main/resources/org/apache/maven/project/pom-4.0.0.xml}
+%{snippet|id=superpom|url=http://svn.apache.org/repos/asf/maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/pom-4.0.0.xml}

Modified: 
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-xdoc/src/test/resources/macro.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-xdoc/src/test/resources/macro.xml?rev=773184r1=773183r2=773184view=diff
==
--- 
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-xdoc/src/test/resources/macro.xml
 (original)
+++ 
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-xdoc/src/test/resources/macro.xml
 Sat May  9 09:13:03 2009
@@ -29,7 +29,7 @@
   /p
   macro name=snippet
 param name=id value=superpom/
-param name=url 
value=http://svn.apache.org/repos/asf/maven/components/trunk/maven-project-builder/src/main/resources/org/apache/maven/project/pom-4.0.0.xml/
+param name=url 
value=http://svn.apache.org/repos/asf/maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/pom-4.0.0.xml/
   /macro
   /body
 /document




svn commit: r773210 - in /maven/doxia: site/pom.xml trunks/pom.xml

2009-05-09 Thread vsiveton
Author: vsiveton
Date: Sat May  9 11:39:04 2009
New Revision: 773210

URL: http://svn.apache.org/viewvc?rev=773210view=rev
Log:
o Used http://maven.apache.org/xsd/* for schema location

Modified:
maven/doxia/site/pom.xml
maven/doxia/trunks/pom.xml

Modified: maven/doxia/site/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?rev=773210r1=773209r2=773210view=diff
==
--- maven/doxia/site/pom.xml (original)
+++ maven/doxia/site/pom.xml Sat May  9 11:39:04 2009
@@ -19,7 +19,7 @@
 under the License.
 --
 
-project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;
   modelVersion4.0.0/modelVersion
 
   parent

Modified: maven/doxia/trunks/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/trunks/pom.xml?rev=773210r1=773209r2=773210view=diff
==
--- maven/doxia/trunks/pom.xml (original)
+++ maven/doxia/trunks/pom.xml Sat May  9 11:39:04 2009
@@ -19,7 +19,7 @@
 under the License.
 --
 
-project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;
   modelVersion4.0.0/modelVersion
 
   groupIdorg.apache.maven.doxia/groupId




svn commit: r773198 - /maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo

2009-05-09 Thread bentmann
Author: bentmann
Date: Sat May  9 10:47:59 2009
New Revision: 773198

URL: http://svn.apache.org/viewvc?rev=773198view=rev
Log:
o Added boolean accessors for inherited field of plugin execution

Modified:
maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo

Modified: maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo?rev=773198r1=773197r2=773198view=diff
==
--- maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo 
(original)
+++ maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo Sat 
May  9 10:47:59 2009
@@ -2588,6 +2588,16 @@
   version4.0.0/version
   code
 ![CDATA[
+public boolean isInherited()
+{
+return ( inherited != null ) ? Boolean.parseBoolean( inherited ) : 
true;
+}
+
+public void setInherited( boolean inherited )
+{
+this.inherited = String.valueOf( inherited );
+}
+
 private boolean inheritanceApplied = true;
 
 public void unsetInheritanceApplied()




svn commit: r773203 - in /maven/plugins/trunk/maven-pdf-plugin/src/main: java/org/apache/maven/plugins/pdf/PdfMojo.java resources/META-INF/

2009-05-09 Thread vsiveton
Author: vsiveton
Date: Sat May  9 11:17:05 2009
New Revision: 773203

URL: http://svn.apache.org/viewvc?rev=773203view=rev
Log:
o removed Plexus conf due to r773202

Removed:
maven/plugins/trunk/maven-pdf-plugin/src/main/resources/META-INF/
Modified:

maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java

Modified: 
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java?rev=773203r1=773202r2=773203view=diff
==
--- 
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
 Sat May  9 11:17:05 2009
@@ -34,6 +34,7 @@
 
 import org.apache.maven.doxia.docrenderer.DocumentRenderer;
 import org.apache.maven.doxia.docrenderer.DocumentRendererException;
+import org.apache.maven.doxia.docrenderer.pdf.PdfRenderer;
 import org.apache.maven.doxia.document.DocumentCover;
 import org.apache.maven.doxia.document.DocumentMeta;
 import org.apache.maven.doxia.document.DocumentModel;
@@ -126,14 +127,14 @@
  *
  * @component role-hint=fo
  */
-private DocumentRenderer foRenderer;
+private PdfRenderer foRenderer;
 
 /**
  * IText Document Renderer.
  *
  * @component role-hint=itext
  */
-private DocumentRenderer itextRenderer;
+private PdfRenderer itextRenderer;
 
 /**
  * Document Renderer.




svn commit: r773212 - /maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java

2009-05-09 Thread bentmann
Author: bentmann
Date: Sat May  9 12:15:26 2009
New Revision: 773212

URL: http://svn.apache.org/viewvc?rev=773212view=rev
Log:
o Fixed merging of plugin executions

Modified:

maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java

Modified: 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java?rev=773212r1=773211r2=773212view=diff
==
--- 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
 Sat May  9 12:15:26 2009
@@ -474,14 +474,14 @@
 MapObject, PluginExecution merged =
 new LinkedHashMapObject, PluginExecution( ( src.size() + 
tgt.size() ) * 2 );
 
-// FIXME: This needs to consider the inherited flag. If this is 
not detected by a UT/IT, we might want to
-// create one...
-
 for ( IteratorPluginExecution it = src.iterator(); it.hasNext(); 
)
 {
 PluginExecution element = it.next();
-Object key = getPluginExecutionKey( element );
-merged.put( key, element );
+if ( sourceDominant || ( source.isInherited()  
element.isInherited() ) )
+{
+Object key = getPluginExecutionKey( element );
+merged.put( key, element );
+}
 }
 
 for ( IteratorPluginExecution it = tgt.iterator(); it.hasNext(); 
)




svn commit: r773213 - in /maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project: DefaultMavenProjectBuilder.java artifact/MavenMetadataSource.java

2009-05-09 Thread bentmann
Author: bentmann
Date: Sat May  9 12:17:06 2009
New Revision: 773213

URL: http://svn.apache.org/viewvc?rev=773213view=rev
Log:
o Fixed resolution of project dependencies

Modified:

maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java

Modified: 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=773213r1=773212r2=773213view=diff
==
--- 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Sat May  9 12:17:06 2009
@@ -306,7 +306,7 @@
 Artifact pomArtifact = repositorySystem.createProjectArtifact( 
project.getGroupId(), project.getArtifactId(), project.getVersion() );
 pomArtifact.setFile( pomFile );
 
-ArtifactResolutionRequest request = new 
ArtifactResolutionRequest().setArtifact( pomArtifact ).setArtifactDependencies( 
project.getDependencyArtifacts() )
+ArtifactResolutionRequest request = new 
ArtifactResolutionRequest().setArtifact( pomArtifact ).setResolveTransitively( 
true ).setArtifactDependencies( project.getDependencyArtifacts() )
 .setLocalRepository( configuration.getLocalRepository() 
).setRemoteRepostories( project.getRemoteArtifactRepositories() 
).setManagedVersionMap( project.getManagedVersionMap() );
 
 ArtifactResolutionResult result = repositorySystem.resolve( request );

Modified: 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=773213r1=773212r2=773213view=diff
==
--- 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
 Sat May  9 12:17:06 2009
@@ -65,6 +65,11 @@
 {
 Artifact pomArtifact = repositorySystem.createProjectArtifact( 
artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() );
 
+if ( pom.equals( artifact.getType() ) )
+{
+pomArtifact.setFile( artifact.getFile() );
+}
+
 SetArtifact artifacts = Collections.emptySet();
 
 ProjectBuilderConfiguration configuration = new 
DefaultProjectBuilderConfiguration();
@@ -79,7 +84,15 @@
 
 if ( !artifact.getArtifactHandler().isIncludesDependencies() )
 {
-ArtifactFilter filter = new ScopeArtifactFilter( 
artifact.getScope() ); 
+ArtifactFilter filter;
+if ( artifact.getScope() == null )
+{
+filter = null;
+}
+else
+{
+filter = new ScopeArtifactFilter( artifact.getScope() );
+}
 
 artifacts = project.createArtifacts( filter );
 




svn commit: r773219 - in /maven/components/branches/MNG-2766/maven-core/src: main/java/org/apache/maven/project/ test/java/org/apache/maven/project/inheritance/t04/ test/java/org/apache/maven/project/

2009-05-09 Thread bentmann
Author: bentmann
Date: Sat May  9 13:02:06 2009
New Revision: 773219

URL: http://svn.apache.org/viewvc?rev=773219view=rev
Log:
o Excluded POM artifact from dependency artifacts

Modified:

maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java

maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java

maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java

maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java

Modified: 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=773219r1=773218r2=773219view=diff
==
--- 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Sat May  9 13:02:06 2009
@@ -320,6 +320,7 @@
 }
 
 project.setArtifacts( result.getArtifacts() );
+project.getArtifacts().remove( pomArtifact );
 
 return new MavenProjectBuildingResult( project, result );
 }

Modified: 
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java?rev=773219r1=773218r2=773219view=diff
==
--- 
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
 Sat May  9 13:02:06 2009
@@ -69,7 +69,7 @@
 Set set = project1.getArtifacts();
 assertNotNull(No artifacts, set);
 assertTrue(No Artifacts, set.size()  0);
-assertTrue(Set size should be 4, is  + set.size(), set.size() == 4);
+assertTrue(Set size should be 3, is  + set.size(), set.size() == 3);
 
 Iterator iter = set.iterator();
 while (iter.hasNext()) {

Modified: 
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java?rev=773219r1=773218r2=773219view=diff
==
--- 
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
 Sat May  9 13:02:06 2009
@@ -66,7 +66,7 @@
 assertNotNull(No artifacts, set);
 assertTrue(No Artifacts, set.size()  0);
 Iterator iter = set.iterator();
-assertTrue(Set size should be 5, is  + set.size(), set.size() == 5);
+assertTrue(Set size should be 4, is  + set.size(), set.size() == 4);
 
 while (iter.hasNext())
 {

Modified: 
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java?rev=773219r1=773218r2=773219view=diff
==
--- 
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
 Sat May  9 13:02:06 2009
@@ -67,7 +67,7 @@
 assertNotNull(No artifacts, set);
 assertTrue(No Artifacts, set.size()  0);
 Iterator iter = set.iterator();
-assertTrue(Set size should be 5, is  + set.size(), set.size() == 5);
+assertTrue(Set size should be 4, is  + set.size(), set.size() == 4);
 
 while 

svn commit: r773221 - /maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java

2009-05-09 Thread bentmann
Author: bentmann
Date: Sat May  9 13:19:11 2009
New Revision: 773221

URL: http://svn.apache.org/viewvc?rev=773221view=rev
Log:
o Excluded POM artifact from dependency artifacts

Modified:

maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java

Modified: 
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java?rev=773221r1=773220r2=773221view=diff
==
--- 
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
 Sat May  9 13:19:11 2009
@@ -110,7 +110,7 @@
 Map map = project2.getArtifactMap();
 assertNotNull( No artifacts, map );
 assertTrue( No Artifacts, map.size()  0 );
-assertTrue( Set size should be 5, is  + map.size(), map.size() == 5 
);
+assertTrue( Set size should be 4, is  + map.size(), map.size() == 4 
);
 
 assertTrue( maven-test:t09-a is not in the project, map.containsKey( 
maven-test:t09-a ) );
 assertTrue( maven-test:t09-b is not in the project, map.containsKey( 
maven-test:t09-b ) );




svn commit: r773226 - /maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java

2009-05-09 Thread bentmann
Author: bentmann
Date: Sat May  9 14:48:50 2009
New Revision: 773226

URL: http://svn.apache.org/viewvc?rev=773226view=rev
Log:
o Added some logging

Modified:

maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java

Modified: 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=773226r1=773225r2=773226view=diff
==
--- 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
 Sat May  9 14:48:50 2009
@@ -42,6 +42,7 @@
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
+import org.codehaus.plexus.logging.Logger;
 
 /**
  * @author Jason van Zyl
@@ -60,6 +61,9 @@
 @Requirement
 private MavenProjectBuilder projectBuilder;
 
+@Requirement
+private Logger logger;
+
 public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository 
localRepository, ListArtifactRepository remoteRepositories )
 throws ArtifactMetadataRetrievalException
 {
@@ -104,6 +108,7 @@
 // When this happens we have a Maven 1.x POM, or some invalid POM. 
There is still a pile of
 // shit in the Maven 2.x repository that should have never found 
its way into the repository
 // but it did.
+logger.debug( Failed to resolve artifact dependencies:  + 
e.getMessage() );
 }
 
 return new ResolutionGroup( pomArtifact, artifacts, remoteRepositories 
);




svn commit: r773258 - in /maven/components/branches/MNG-2766: maven-compat/src/main/java/org/apache/maven/artifact/resolver/ maven-core/src/main/java/org/apache/maven/project/artifact/ maven-core/src/

2009-05-09 Thread bentmann
Author: bentmann
Date: Sat May  9 18:33:08 2009
New Revision: 773258

URL: http://svn.apache.org/viewvc?rev=773258view=rev
Log:
o Fixed scope handling during transitive dependency resolution

Added:

maven/components/branches/MNG-2766/maven-core/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
   (with props)
Modified:

maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java

maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java

maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java

maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java

Modified: 
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=773258r1=773257r2=773258view=diff
==
--- 
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
 Sat May  9 18:33:08 2009
@@ -382,7 +382,7 @@
 }
 catch ( ComponentLookupException e )
 {
-// Won't happen
+throw new IllegalStateException( Failed to lookup metadata 
source implementation, e );
 }
 }
 

Modified: 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=773258r1=773257r2=773258view=diff
==
--- 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
 Sat May  9 18:33:08 2009
@@ -17,6 +17,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -30,10 +31,9 @@
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
 import 
org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.apache.maven.model.Dependency;
 import org.apache.maven.project.DefaultProjectBuilderConfiguration;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
@@ -87,20 +87,22 @@
 project = projectBuilder.buildFromRepository( pomArtifact, 
configuration );
 
 if ( !artifact.getArtifactHandler().isIncludesDependencies() )
-{
-ArtifactFilter filter;
-if ( artifact.getScope() == null )
-{
-filter = null;
-}
-else
+{
+artifacts = new LinkedHashSetArtifact();
+
+for ( Dependency d : project.getDependencies() )
 {
-filter = new ScopeArtifactFilter( artifact.getScope() );
+String effectiveScope = getEffectiveScope( d.getScope(), 
artifact.getScope() );
+
+if ( effectiveScope != null )
+{
+Artifact dependencyArtifact =
+repositorySystem.createArtifact( d.getGroupId(), 
d.getArtifactId(), d.getVersion(),
+ effectiveScope, 
d.getType() );
+
+artifacts.add( dependencyArtifact );
+}
 }
-
-artifacts = project.createArtifacts( filter );
-
-project.setArtifacts( artifacts );
 }
 }
 catch ( ProjectBuildingException e )
@@ -114,6 +116,47 @@
 return new ResolutionGroup( pomArtifact, artifacts, remoteRepositories 
);
 }
 
+

svn commit: r773266 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

2009-05-09 Thread carlos
Author: carlos
Date: Sat May  9 19:58:28 2009
New Revision: 773266

URL: http://svn.apache.org/viewvc?rev=773266view=rev
Log:
Add junit sync

Modified:
maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
URL: 
http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=773266r1=773265r2=773266view=diff
==
--- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original)
+++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Sat May  
9 19:58:28 2009
@@ -81,6 +81,7 @@
 
javassist,jvan...@people.apache.org:/home/nicolas/rsync-to-central,rsync_ssh,Nicolas
 De Loof,nico...@apache.org,,
 
javax.portlet,jvan...@people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository,rsync_ssh
 
javax.jdo,jvan...@people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository,rsync_ssh,Craig
 Russell,craig.russ...@sun.com,,
+junit,jvan...@people.apache.org:/home/ptahchiev/maven-repo,rsync_ssh,Petar
 Tahchiev,ptahch...@apache.org,,
 
log4j,jvan...@people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository,rsync_ssh
 net.databinder,ma...@databinder.net:/var/dbwww/maven,rsync_ssh,Nathan 
Hamblen,nat...@technically.us,,
 net.fckeditor,rsync://java.fckeditor.net/m2repo,rsync,Michael 
Osipov,michae...@users.sourceforge.net,,




svn commit: r773267 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

2009-05-09 Thread carlos
Author: carlos
Date: Sat May  9 20:02:15 2009
New Revision: 773267

URL: http://svn.apache.org/viewvc?rev=773267view=rev
Log:
[MAVENUPLOAD-2413][MAVENUPLOAD-2424]

Modified:
maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
URL: 
http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=773267r1=773266r2=773267view=diff
==
--- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original)
+++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Sat May  
9 20:02:15 2009
@@ -124,7 +124,9 @@
 
net.sf.jsignature,mavens...@web.sourceforge.net:/home/groups/j/js/jsignature/htdocs/maven2,rsync_ssh,Simonetti
 Davide,dvd.s...@gmail.com,,
 
net.sf.json-lib,mavens...@web.sourceforge.net:/home/groups/j/js/json-lib/htdocs/m2/repo/release,rsync_ssh,Andres
 Almiray,aalmi...@users.sourceforge.net,,
 
net.sf.jsptest,mavens...@web.sourceforge.net:/home/groups/j/js/jsptest/htdocs/maven2,rsync_ssh,Lasse
 Koskela,lasse.kosk...@gmail.com,,
+net.sf.jsr107cache,mavens...@web.sourceforge.net:/home/groups/e/eh/ehcache/htdocs/repository,rsync_ssh,Greg
 Luck,gl...@gregluck.com,,
 
net.sf.jtreemap,mavens...@web.sourceforge.net:/home/groups/o/ob/objectlabkit/htdocs/m2-repo,rsync_ssh,Marcin
 Jekot,mar...@users.sourceforge.net,,
+net.sf.jung,mavens...@web.sourceforge.net:/home/groups/j/ju/jung/htdocs/maven2,rsync_ssh,Tom
 Nelson,thomas.a.nel...@gmail.com,,
 
net.sf.jxls,mavens...@web.sourceforge.net:/home/groups/j/jx/jxls/htdocs/repository/releases,rsync_ssh,Leonid
 Vysochyn,leonid.vysoc...@gmail.com,,
 
net.sf.jyntax,mavens...@web.sourceforge.net:/home/groups/j/jy/jyntax/htdocs/m2repo,rsync_ssh,Clemens
 Renner,clemensren...@users.sourceforge.net,,
 
net.sf.locale4j,mavens...@web.sourceforge.net:/home/groups/l/lo/locale4j/maven/upload-repo,rsync_ssh,,tom.c...@state.vt.us,,




svn commit: r773268 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

2009-05-09 Thread carlos
Author: carlos
Date: Sat May  9 20:16:26 2009
New Revision: 773268

URL: http://svn.apache.org/viewvc?rev=773268view=rev
Log:
[MAVENUPLOAD-2402][MAVENUPLOAD-2405][MAVENUPLOAD-2453][MAVENUPLOAD-2454][MAVENUPLOAD-2450][MAVENUPLOAD-2449]

Modified:
maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
URL: 
http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=773268r1=773267r2=773268view=diff
==
--- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original)
+++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Sat May  
9 20:16:26 2009
@@ -86,7 +86,9 @@
 net.databinder,ma...@databinder.net:/var/dbwww/maven,rsync_ssh,Nathan 
Hamblen,nat...@technically.us,,
 net.fckeditor,rsync://java.fckeditor.net/m2repo,rsync,Michael 
Osipov,michae...@users.sourceforge.net,,
 
net.homeip.yusuke,mavens...@yusuke.homeip.net:/Users/mavensync/maven2,rsync_ssh,Yusuke
 Yamamoto,yus...@mac.com,,
+net.incongru,mavens...@repo.magnolia-cms.com:synched-hosted-3rdparty-to-central,rsync_ssh,Grégory
 Joseph,greg@gmail.com,,
 net.israfil,ibib...@repo.israfil.net:maven2,rsync_ssh,Christian 
Gruber,cgru...@israfil.net,-l ibiblio,
+net.java.dev.jets3t,mavens...@web.sourceforge.net:/home/groups/j/je/jets3t/htdocs/maven2/,rsync_ssh,James
 Murty,jmu...@dev.java.net,,
 
net.java.dev.jvyaml,mavens...@web.sourceforge.net:/home/users/o/ou/ouaibsky/maven/m2repo,rsync_ssh,Ouaibsky,ouaib...@free.fr,,
 
net.jcip,jvan...@people.apache.org:/home/nicolas/rsync-to-central,rsync_ssh,Nicolas
 De Loof,nico...@apache.org,,
 
net.objectlab.kit.datecalc,mavens...@web.sourceforge.net:/home/groups/o/ob/objectlabkit/htdocs/m2-repo,rsync_ssh,Marcin
 Jekot,mar...@users.sourceforge.net,,
@@ -158,6 +160,8 @@
 
net.sourceforge.chopchophttpclient,mavens...@web.sourceforge.net:/home/groups/c/ch/chop-chophttpcl/htdocs/maven2,rsync_ssh,Rodney
 Beede,sourceforge+mavencent...@rodneybeede.com
 
net.sourceforge.ckjm,mavens...@web.sourceforge.net:/home/groups/c/ck/ckjm/htdocs/m2repo,rsync_ssh,Nicolas
 Dordet,dorde...@gmail.com,,
 
net.sourceforge.cssparser,mavens...@web.sourceforge.net:/home/groups/c/cs/cssparser/htdocs/m2-repo,rsync_ssh,Daniel
 Gredler,sda...@users.sourceforge.net,,
+net.sourceforge.cobertura,mavens...@web.sourceforge.net:/home/groups/c/co/cobertura/htdocs/m2repo,rsync_ssh,John
 Lewis,lew...@users.sourceforge.net,,
+net.sourceforge.expectj,mavens...@web.sourceforge.net:/home/groups/e/ex/expectj/htdocs/m2repo,rsync_ssh,Johan
 Walles,johan.wal...@gmail.com,,
 
net.sourceforge.fmpp,mavens...@web.sourceforge.net:/home/groups/f/fm/fmpp/htdocs/maven2,rsync_ssh,Daniel
 Dekany,ddek...@freemail.hu,,
 
net.sourceforge.htmlunit,mavens...@web.sourceforge.net:/home/groups/h/ht/htmlunit/htdocs/m2-repo,rsync_ssh,Marc
 Guillemot,mguil...@users.sourceforge.net,,
 
net.sourceforge.jdatepicker,mavens...@web.sourceforge.net:/home/groups/j/jd/jdatepicker/htdocs/repo,rsync_ssh,Juan
 Heyns,j...@pepperbytes.net,,
@@ -199,6 +203,7 @@
 
org.dspace,mavens...@maven.dspace.org:/var/maven/release,rsync_ssh,DSpace
 Developers,dspace-de...@lists.sourceforge.net,,
 
org.duineframework,mavens...@web.sourceforge.net:/home/groups/d/du/duine/htdocs/m2repo,rsync_ssh,Peter
 Fennema,peter.fenn...@telin.nl,,
 
org.easymock,mavens...@web.sourceforge.net:/home/groups/e/ea/easymock/htdocs/maven/repository,rsync_ssh,Henri
 Tremblay,henri.tremb...@gmail.com,,
+org.efaps,,svn,Jan 
Moxter,jan.mox...@efaps.org,,http://efaps.googlecode.com/svn/repo/released/;
 
org.extrema-sistemas.loom,mavens...@web.sourceforge.net:/home/groups/l/lo/loom/htdocs/repository,rsync_ssh,ignacio
 coloma,icol...@gmail.com,,
 org.freecompany,rs...@www.freecompany.org:maven,rsync_ssh,Craig 
Blake,craigwbl...@freecompany.org,,
 
org.freemarker,mavens...@web.sourceforge.net:/home/groups/f/fr/freemarker/htdocs/maven2,rsync_ssh,Daniel
 Dekany,ddek...@freemail.hu,,
@@ -211,6 +216,7 @@
 org.jdtaus,rsync://repository.jdtaus.org/repository,rsync,Christian 
Schulte,c...@jdtaus.org,,
 
org.jframework,mavens...@web.sourceforge.net:/home/groups/j/jf/jframework/repository,rsync_ssh,Misha
 Gridnev,mish...@users.sourceforge.net,,
 
org.jibx,mavens...@web.sourceforge.net:/home/groups/j/ji/jibx/htdocs/maven2,rsync_ssh,Jerome
 Bernard,jerome.bern...@gmail.com,,
+org.jitr,mavens...@web.sourceforge.net:/home/groups/j/ji/jitr/htdocs/repositories/release,rsync_ssh,Josh
 Devins,i...@joshdevins.net,,
 
org.jlibrary,mavens...@web.sourceforge.net:/home/groups/j/jl/jlibrary/htdocs/m2repo,rsync_ssh,Roman
 Puchkovskiy,roman.puchkovs...@blandware.com,,
 
org.jmonit,mavens...@web.sourceforge.net:/home/groups/j/jm/jmonit/htdocs/releases,rsync_ssh,Nicolas
 De Loof,nicolas.del...@gmail.com,,
 
org.jsdoctoolkit,jvan...@people.apache.org:/home/nicolas/rsync-to-central,rsync_ssh,Nicolas
 De Loof,nico...@apache.org,,




svn commit: r773269 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

2009-05-09 Thread carlos
Author: carlos
Date: Sat May  9 20:24:37 2009
New Revision: 773269

URL: http://svn.apache.org/viewvc?rev=773269view=rev
Log:
[MAVENUPLOAD-2442]

Modified:
maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
URL: 
http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=773269r1=773268r2=773269view=diff
==
--- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original)
+++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Sat May  
9 20:24:37 2009
@@ -202,6 +202,7 @@
 
org.domdrides,mavens...@web.sourceforge.net:/home/groups/d/do/domdrides/htdocs/m2repo/releases,rsync_ssh,James
 Carman,ja...@carmanconsulting.com,,
 
org.dspace,mavens...@maven.dspace.org:/var/maven/release,rsync_ssh,DSpace
 Developers,dspace-de...@lists.sourceforge.net,,
 
org.duineframework,mavens...@web.sourceforge.net:/home/groups/d/du/duine/htdocs/m2repo,rsync_ssh,Peter
 Fennema,peter.fenn...@telin.nl,,
+org.easyb,ma...@easyb.org:/var/maven/repo/release,rsync_ssh,Rod 
Coffin,r...@rodcoffin.com,,
 
org.easymock,mavens...@web.sourceforge.net:/home/groups/e/ea/easymock/htdocs/maven/repository,rsync_ssh,Henri
 Tremblay,henri.tremb...@gmail.com,,
 org.efaps,,svn,Jan 
Moxter,jan.mox...@efaps.org,,http://efaps.googlecode.com/svn/repo/released/;
 
org.extrema-sistemas.loom,mavens...@web.sourceforge.net:/home/groups/l/lo/loom/htdocs/repository,rsync_ssh,ignacio
 coloma,icol...@gmail.com,,




svn commit: r773270 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

2009-05-09 Thread carlos
Author: carlos
Date: Sat May  9 20:33:55 2009
New Revision: 773270

URL: http://svn.apache.org/viewvc?rev=773270view=rev
Log:
[MAVENUPLOAD-2440][MAVENUPLOAD-2436][MAVENUPLOAD-2433]

Modified:
maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
URL: 
http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=773270r1=773269r2=773270view=diff
==
--- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original)
+++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Sat May  
9 20:33:55 2009
@@ -192,6 +192,7 @@
 
org.apithefire,nob...@apithefire.org:/var/www/apithefire.org/m2repo,rsync_ssh,Chew
 Boon Aik,apithef...@gmail.com,,
 
org.appfuse,mavens...@static.appfuse.org:/var/www/appfuse-releases,rsync_ssh,,mrai...@dev.java.net,,
 org.appspy,rs...@nexus.appspy.org:m2repo/releases,rsync_ssh,Olivier 
HEDIN,oliv...@appspy.org,,
+org.aspectj,rs...@simonegianni.it:/home/mavenrsync/repo,rsync_ssh,Simone
 Gianni,simo...@apache.org,,
 
org.bluestemsoftware,arch...@alakai.org:/var/archiva/data/repositories/internal,rsync_ssh,Todd
 Wolff,two...@bluestemsoftware.com,,
 
org.compass-project,ma...@repo.compass-project.org:/var/www/domains/compass-project.org/repo/htdocs,rsync-ssh,Shay
 Banon,kim...@gmail.com,,
 
org.concordion,/home/maven/repository-staging/to-ibiblio/maven-svn,svn,Jose
 M 
Beas,jose.m.b...@gmail.com,,http://concordion.googlecode.com/svn/repos/releases/;
@@ -200,6 +201,7 @@
 
org.databene,mavens...@web.sourceforge.net:/home/groups/b/be/benerator/htdocs/m2/repository,rsync_ssh,Volker
 Bergmann,vol...@databene.org,,
 
org.dbunit,mavens...@web.sourceforge.net:/home/groups/d/db/dbunit/htdocs/m2repo,rsync_ssh,Roberto
 Lo Giacco,rlogia...@users.sourceforge.net,,
 
org.domdrides,mavens...@web.sourceforge.net:/home/groups/d/do/domdrides/htdocs/m2repo/releases,rsync_ssh,James
 Carman,ja...@carmanconsulting.com,,
+org.drizzle.jdbc,mavens...@jdbc.drizzle.org:mavenrepo/releases,rsync_ssh,Marcus
 Eriksson,krum...@gmail.com,,
 
org.dspace,mavens...@maven.dspace.org:/var/maven/release,rsync_ssh,DSpace
 Developers,dspace-de...@lists.sourceforge.net,,
 
org.duineframework,mavens...@web.sourceforge.net:/home/groups/d/du/duine/htdocs/m2repo,rsync_ssh,Peter
 Fennema,peter.fenn...@telin.nl,,
 org.easyb,ma...@easyb.org:/var/maven/repo/release,rsync_ssh,Rod 
Coffin,r...@rodcoffin.com,,
@@ -211,6 +213,7 @@
 
org.gamio,mavens...@web.sourceforge.net:/home/groups/g/ga/gamio/htdocs/m2repo,rsync_ssh,Agemo
 Cui,agemo...@gmail.com,,
 org.gmock,rs...@gmock.org:/home/rsync/gmock/releases,rsync_ssh,Julien 
Gagnet,julien.gag...@gmail.com,,
 
org.hdiv,mavens...@web.sourceforge.net:/home/groups/h/hd/hdiv/htdocs/repository,rsync_ssh,Roberto
 Velasco,robe...@hdiv.org,,
+org.hsqldb,dedm...@hsqldb.org:m2repo,rsync_ssh,Blaine 
Simpson,blaine.simp...@admc.com,,
 
org.ini4j,mavens...@web.sourceforge.net:/home/groups/i/in/ini4j/repository/release,rsync_ssh,Ivan
 Szkiba,szk...@users.sourceforge.net,,
 
org.jacex,mavens...@web.sourceforge.net:/home/groups/j/ja/jacex/htdocs/maven,rsync_ssh,Alexey
 Noskov,alexey.nos...@gmail.com,,
 
org.jasig,mavens...@web.sourceforge.net:/home/groups/a/ac/acegisecurity/htdocs/repository/releases,rsync_ssh,Carlos
 Sanchez,car...@apache.org,,




svn commit: r773271 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

2009-05-09 Thread carlos
Author: carlos
Date: Sat May  9 20:36:23 2009
New Revision: 773271

URL: http://svn.apache.org/viewvc?rev=773271view=rev
Log:
[MAVENUPLOAD-2434]

Modified:
maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
URL: 
http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=773271r1=773270r2=773271view=diff
==
--- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original)
+++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Sat May  
9 20:36:23 2009
@@ -2,6 +2,7 @@
 
,mavens...@repository.codehaus.org:/repository,rsync_ssh,,repo-maintain...@maven.apache.org,-i
 $HOME/.ssh/new-id_dsa,
 
ant-contrib,mavens...@web.sourceforge.net:/home/groups/a/an/ant-contrib/htdocs/m2-repo,rsync_ssh,Curt
 Arnold,carn...@apache.org,,
 
asm,ma...@forge.objectweb.org:../../groups/maven/htdocs/maven2,rsync_ssh,EugeneKuleshov,e...@javatx.org,,
+be.roam.hue,mavens...@web.sourceforge.net:/home/groups/h/hu/hue/htdocs/m2-repo,rsync_ssh,Kevin
 Wetzels,ke...@roam.be,,
 
br.com.caelum.seleniumdsl,mavens...@web.sourceforge.net:/home/groups/s/se/seleniumdsl/htdocs/maven,rsync_ssh,Caue
 Guerra,caue.gue...@caelum.com.br,,
 
br.com.caelum.stella,mavens...@web.sourceforge.net:/home/groups/c/ca/caelum-stella/htdocs/maven,rsync_ssh,Caue
 Guerra,caue.gue...@caelum.com.br,,
 
br.com.caelum.tubaina,mavens...@web.sourceforge.net:/home/groups/t/tu/tubaina/htdocs/maven,rsync_ssh,Luiz
 Real,luiz.r...@caelum.com.br,,




svn commit: r773283 - /maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo

2009-05-09 Thread bentmann
Author: bentmann
Date: Sat May  9 22:58:36 2009
New Revision: 773283

URL: http://svn.apache.org/viewvc?rev=773283view=rev
Log:
o Changed boolean field to String to enable both filtering and three-valued 
logic for proper merging

Modified:
maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo

Modified: maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo?rev=773283r1=773282r2=773283view=diff
==
--- maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo 
(original)
+++ maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo Sat 
May  9 22:58:36 2009
@@ -1356,11 +1356,16 @@
 field
   nameoptional/name
   version4.0.0/version
-  descriptionIndicates the dependency is optional for use of this 
library. While the
+  description
+![CDATA[
+Indicates the dependency is optional for use of this library. 
While the
 version of the dependency will be taken into account for 
dependency calculation if the
-library is used elsewhere, it will not be passed on 
transitively./description
-  typeboolean/type
-  defaultValuefalse/defaultValue
+library is used elsewhere, it will not be passed on transitively. 
Note: While the type
+of this field is codeString/code for technical reasons, the 
semantic type is actually
+codeBoolean/code. Default value is codefalse/code.
+]]
+  /description
+  typeString/type
 /field
   /fields
   codeSegments
@@ -1382,6 +1387,16 @@
   version4.0.0/version
   code
 ![CDATA[
+public boolean isOptional()
+{
+return ( optional != null ) ? Boolean.parseBoolean( optional ) : false;
+}
+
+public void setOptional( boolean optional )
+{
+this.optional = String.valueOf( optional );
+}
+
 /**
  * @see java.lang.Object#toString()
  */




svn commit: r773301 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

2009-05-09 Thread brianf
Author: brianf
Date: Sun May 10 03:12:19 2009
New Revision: 773301

URL: http://svn.apache.org/viewvc?rev=773301view=rev
Log:
this is in oss.sonatype.org now.

Modified:
maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
URL: 
http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=773301r1=773300r2=773301view=diff
==
--- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original)
+++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Sun May 
10 03:12:19 2009
@@ -127,7 +127,6 @@
 
net.sf.jsignature,mavens...@web.sourceforge.net:/home/groups/j/js/jsignature/htdocs/maven2,rsync_ssh,Simonetti
 Davide,dvd.s...@gmail.com,,
 
net.sf.json-lib,mavens...@web.sourceforge.net:/home/groups/j/js/json-lib/htdocs/m2/repo/release,rsync_ssh,Andres
 Almiray,aalmi...@users.sourceforge.net,,
 
net.sf.jsptest,mavens...@web.sourceforge.net:/home/groups/j/js/jsptest/htdocs/maven2,rsync_ssh,Lasse
 Koskela,lasse.kosk...@gmail.com,,
-net.sf.jsr107cache,mavens...@web.sourceforge.net:/home/groups/e/eh/ehcache/htdocs/repository,rsync_ssh,Greg
 Luck,gl...@gregluck.com,,
 
net.sf.jtreemap,mavens...@web.sourceforge.net:/home/groups/o/ob/objectlabkit/htdocs/m2-repo,rsync_ssh,Marcin
 Jekot,mar...@users.sourceforge.net,,
 
net.sf.jung,mavens...@web.sourceforge.net:/home/groups/j/ju/jung/htdocs/maven2,rsync_ssh,Tom
 Nelson,thomas.a.nel...@gmail.com,,
 
net.sf.jxls,mavens...@web.sourceforge.net:/home/groups/j/jx/jxls/htdocs/repository/releases,rsync_ssh,Leonid
 Vysochyn,leonid.vysoc...@gmail.com,,