svn commit: r676573 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main: java/org/apache/maven/report/projectinfo/ resources/

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 05:42:54 2008
New Revision: 676573

URL: http://svn.apache.org/viewvc?rev=676573view=rev
Log:
o removed todo and changed canGenerateReport() impl
o be sure that plugin's version comes from repo
o updated getPluginRow()
o removed report.pluginManagement.nolist key

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_tr.properties

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java?rev=676573r1=676572r2=676573view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
 Mon Jul 14 05:42:54 2008
@@ -39,6 +39,7 @@
 import org.apache.maven.report.projectinfo.dependencies.ArtifactUtils;
 import org.apache.maven.reporting.AbstractMavenReportRenderer;
 import org.codehaus.plexus.i18n.I18N;
+import org.codehaus.plexus.util.StringUtils;
 
 /**
  * Generates the Project Plugin Management report.
@@ -105,7 +106,8 @@
 /** [EMAIL PROTECTED] */
 public boolean canGenerateReport()
 {
-return project.getPluginManagement() != null;
+return project.getPluginManagement() != null  
project.getPluginManagement().getPlugins() != null
+ !project.getPluginManagement().getPlugins().isEmpty();
 }
 
 // --
@@ -120,11 +122,11 @@
 protected static class PluginManagementRenderer
 extends AbstractMavenReportRenderer
 {
-private List plugins;
+private final List pluginManagement;
 
 private final Locale locale;
 
-private I18N i18n;
+private final I18N i18n;
 
 private final MavenProject project;
 
@@ -154,7 +156,7 @@
 
 this.locale = locale;
 
-this.plugins = plugins;
+this.pluginManagement = plugins;
 
 this.i18n = i18n;
 
@@ -181,21 +183,7 @@
 /** [EMAIL PROTECTED] */
 public void renderBody()
 {
-// Dependencies report
-
-if ( plugins.isEmpty() )
-{
-startSection( getTitle() );
-
-// TODO: should the report just be excluded?
-paragraph( getReportString( report.pluginManagement.nolist ) 
);
-
-endSection();
-
-return;
-}
-
-// === Section: Project Dependencies.
+// === Section: Project PluginManagement.
 renderSectionPluginManagement();
 }
 
@@ -205,50 +193,48 @@
 
 startSection( getTitle() );
 
-if ( plugins != null )
-{
-// can't use straight artifact comparison because we want 
optional last
-Collections.sort( plugins, getPluginComparator() );
+// can't use straight artifact comparison because we want optional 
last
+Collections.sort( pluginManagement, getPluginComparator() );
 
-startTable();
-tableHeader( tableHeader );
+startTable();
+tableHeader( tableHeader );
 
-for ( Iterator iterator = plugins.iterator(); 
iterator.hasNext(); )
+for ( Iterator iterator = pluginManagement.iterator(); 
iterator.hasNext(); )
+{
+Plugin plugin = (Plugin) iterator.next();
+VersionRange versionRange;
+if ( StringUtils.isEmpty( plugin.getVersion() ) )
 {
-Plugin plugin = (Plugin) iterator.next();
-VersionRange versionRange;
-if ( plugin.getVersion() == null || .equals( 
plugin.getVersion() ) )
-{
-versionRange = VersionRange.createFromVersion( 
Artifact.RELEASE_VERSION );
-}
-else
-{
-versionRange = VersionRange.createFromVersion( 
plugin.getVersion() );
-}
-
-   

svn commit: r676576 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 05:56:18 2008
New Revision: 676576

URL: http://svn.apache.org/viewvc?rev=676576view=rev
Log:
o added French missing  keys

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties?rev=676576r1=676575r2=676576view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties
 Mon Jul 14 05:56:18 2008
@@ -218,3 +218,20 @@
 report.transitivedependencies.intro= Ce qui 
suit est la liste des d\u00e9pendances transitives pour ce projet. Les 
d\u00e9pendances transitives sont les d\u00e9pendances des d\u00e9pendances du 
projet :
 report.transitivedependencies.nolist   = Il 
n\u0092y a aucune d\u00e9pendance transitive pour ce projet.
 report.transitivedependencies.title= 
D\u00e9pendances transitives du projet
+report.dependencyManagement.name   = Gestion 
des d\u00e9pendances
+report.dependencyManagement.description= Ce 
document liste les d\u00e9pendances d\u00e9finies \u00e0 travers 
dependencyManagement.
+report.dependencyManagement.title  = Gestion 
des d\u00e9pendances du project
+report.dependencyManagement.nolist = Il 
n\u0092y a aucune d\u00e9pendance d\u00e9finie dans DependencyManagement.
+report.dependencyManagement.column.groupId = GroupId
+report.dependencyManagement.column.artifactId  = ArtifactId
+report.dependencyManagement.column.version = Version
+report.dependencyManagement.column.classifier  = Classifier
+report.dependencyManagement.column.type= Type
+report.dependencyManagement.intro.compile  = Ce qui 
suit est la liste des d\u00e9pendances d\u00e9finies dans dependencyManagement 
de port\u00e9e compile pour ce projet. Ces d\u00e9pendances sont requises pour 
compiler et ex\u00e9cuter l\u0092application :
+report.dependencyManagement.intro.provided = Ce qui 
suit est la liste des d\u00e9pendances d\u00e9finies dans dependencyManagement 
de port\u00e9e provided pour ce projet. Ces d\u00e9pendances sont requises pour 
compiler l\u0092application, mais devraient \u00eatre fournies par d\u00e9faut 
lors de l\u0092utilisation de cette librairie :
+report.dependencyManagement.intro.runtime  = Ce qui 
suit est la liste des d\u00e9pendances d\u00e9finies dans dependencyManagement 
de port\u00e9e runtime pour ce projet. Ces d\u00e9pendances sont requises pour 
ex\u00e9cuter l\u0092application :
+report.dependencyManagement.intro.system   = Ce qui 
suit est la liste des d\u00e9pendances d\u00e9finies dans dependencyManagement 
de port\u00e9e system pour ce projet. Ces d\u00e9pendances sont requises pour 
compiler l\u0092application :
+report.dependencyManagement.intro.test = Ce qui 
suit est la liste des d\u00e9pendances d\u00e9finies dans dependencyManagement 
de port\u00e9e test pour ce projet. Ces d\u00e9pendances sont requises 
seulement pour compiler et ex\u00e9cuter les tests unitaires de 
l\u0092application :
+report.pluginManagement.name   = Gestion 
des plugins
+report.pluginManagement.description= Ce 
document liste les plugins d\u00e9finis \u00e0 travers plugins.
+report.pluginManagement.title  = Gestion 
des plugins du project

svn commit: r676577 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 06:08:49 2008
New Revision: 676577

URL: http://svn.apache.org/viewvc?rev=676577view=rev
Log:
o minor improvements

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java?rev=676577r1=676576r2=676577view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
 Mon Jul 14 06:08:49 2008
@@ -90,10 +90,8 @@
 /** [EMAIL PROTECTED] */
 public void executeReport( Locale locale )
 {
-PluginManagementRenderer r = new PluginManagementRenderer( getSink(), 
locale, i18n, project
+PluginManagementRenderer r = new PluginManagementRenderer( getLog(), 
getSink(), locale, i18n, project
 .getPluginManagement().getPlugins(), project, mavenProjectBuilder, 
artifactFactory, localRepository );
-
-r.setLog( getLog() );
 r.render();
 }
 
@@ -122,6 +120,8 @@
 protected static class PluginManagementRenderer
 extends AbstractMavenReportRenderer
 {
+private final Log log;
+
 private final List pluginManagement;
 
 private final Locale locale;
@@ -136,9 +136,8 @@
 
 private final ArtifactRepository localRepository;
 
-private Log log;
-
 /**
+ * @param log
  * @param sink
  * @param locale
  * @param i18n
@@ -148,12 +147,14 @@
  * @param artifactFactory
  * @param localRepository
  */
-public PluginManagementRenderer( Sink sink, Locale locale, I18N i18n, 
List plugins, MavenProject project,
+public PluginManagementRenderer( Log log, Sink sink, Locale locale, 
I18N i18n, List plugins, MavenProject project,
  MavenProjectBuilder 
mavenProjectBuilder, ArtifactFactory artifactFactory,
  ArtifactRepository localRepository )
 {
 super( sink );
 
+this.log = log;
+
 this.locale = locale;
 
 this.pluginManagement = plugins;
@@ -169,10 +170,6 @@
 this.localRepository = localRepository;
 }
 
-public void setLog( Log log )
-{
-this.log = log;
-}
 
 /** [EMAIL PROTECTED] */
 public String getTitle()
@@ -245,6 +242,7 @@
 
 private String[] getPluginTableHeader()
 {
+// reused key...
 String groupId = getReportString( 
report.dependencyManagement.column.groupId );
 String artifactId = getReportString( 
report.dependencyManagement.column.artifactId );
 String version = getReportString( 
report.dependencyManagement.column.version );

svn commit: r676578 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main: java/org/apache/maven/report/projectinfo/PluginsReport.java resources/project-info-report.properties resources

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 06:16:07 2008
New Revision: 676578

URL: http://svn.apache.org/viewvc?rev=676578view=rev
Log:
MPIR-125: Create a plugin report

o first implementation
o added some keys

Added:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
   (with props)
Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties

Added: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java?rev=676578view=auto
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
 (added)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
 Mon Jul 14 06:16:07 2008
@@ -0,0 +1,307 @@
+package org.apache.maven.report.projectinfo;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.report.projectinfo.dependencies.ArtifactUtils;
+import org.apache.maven.reporting.AbstractMavenReportRenderer;
+import org.codehaus.plexus.i18n.I18N;
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ * Generates the Project Plugins report.
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Vincent Siveton/a
+ * @version $Id$
+ * @since 2.1
+ * @goal plugins
+ * @requiresDependencyResolution test
+ */
+public class PluginsReport
+extends AbstractProjectInfoReport
+{
+// --
+// Mojo components
+// --
+
+/**
+ * Maven Project Builder component.
+ *
+ * @component
+ */
+private MavenProjectBuilder mavenProjectBuilder;
+
+/**
+ * Maven Artifact Factory component.
+ *
+ * @component
+ */
+private ArtifactFactory artifactFactory;
+
+// --
+// Public methods
+// --
+
+/** [EMAIL PROTECTED] */
+public String getName( Locale locale )
+{
+return i18n.getString( project-info-report, locale, 
report.plugins.name );
+}
+
+/** [EMAIL PROTECTED] */
+public String getDescription( Locale locale )
+{
+return i18n.getString( project-info-report, locale, 
report.plugins.description );
+}
+
+/** [EMAIL PROTECTED] */
+public void executeReport( Locale locale )
+{
+PluginsRenderer r = new PluginsRenderer( getLog(), getSink(), locale, 
i18n, project.getPluginArtifacts(),
+ project.getReportArtifacts(), 
project, mavenProjectBuilder,
+ artifactFactory, 
localRepository );
+r.render();
+}
+
+/** [EMAIL PROTECTED] */
+public String getOutputName()
+{
+return plugins;
+}
+
+/** [EMAIL PROTECTED] */
+public boolean canGenerateReport()
+{
+return ( project.getPluginArtifacts() != null  

svn commit: r676627 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main: java/org/apache/maven/report/projectinfo/dependencies/ java/org/apache/maven/report/projectinfo/dependencies/r

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 08:42:28 2008
New Revision: 676627

URL: http://svn.apache.org/viewvc?rev=676627view=rev
Log:
o take care if the repo is blacklisted or not
o ping repo url before calling wagon to prevent TransferFailedException
o display stacktrace for error logs in dependencyExistsInRepo() only if log is 
in debug mode
o added a new Blacklisted column in Dependency Repository Locations table

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java?rev=676627r1=676626r2=676627view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
 Mon Jul 14 08:42:28 2008
@@ -160,10 +160,20 @@
 /**
  * @param repo not null
  * @param artifact not null
- * @return codetrue/code if the artifact exists in the given repo, 
codefalse/ccode otherwise
+ * @return codetrue/code if the artifact exists in the given repo, 
codefalse/code otherwise or if
+ * the repo is blacklisted.
  */
 public boolean dependencyExistsInRepo( ArtifactRepository repo, Artifact 
artifact )
 {
+if ( repo.isBlacklisted() )
+{
+if ( log.isDebugEnabled() )
+{
+log.debug( The repo ' + repo.getId() + ' is black listed - 
Ignored it );
+}
+return false;
+}
+
 Wagon wagon;
 try
 {
@@ -205,22 +215,50 @@
 }
 catch ( ConnectionException e )
 {
-log.error( Unable to connect to:  + repo.getUrl(), e );
+if ( log.isDebugEnabled() )
+{
+log.error( Unable to connect to:  + repo.getUrl(), e );
+}
+else
+{
+log.error( Unable to connect to:  + repo.getUrl() );
+}
 return false;
 }
 catch ( AuthenticationException e )
 {
-log.error( Unable to connect to:  + repo.getUrl(), e );
+if ( log.isDebugEnabled() )
+{
+log.error( Unable to connect to:  + repo.getUrl(), e );
+}
+else
+{
+log.error( Unable to connect to:  + repo.getUrl() );
+}
 return false;
 }
 catch ( TransferFailedException e )
 {
-log.error( Unable to determine if resource  + artifact +  
exists in  + repo.getUrl(), e );
+if ( log.isDebugEnabled() )
+{
+log.error( Unable to determine if resource  + artifact +  
exists in  + repo.getUrl(), e );
+}
+else
+{
+log.error( Unable to determine if resource  + artifact +  
exists in  + repo.getUrl() );
+}
 return false;
 }
 catch ( AuthorizationException e )
 {
-log.error( Unable to connect to:  + repo.getUrl(), e );
+if ( log.isDebugEnabled() )
+{
+log.error( Unable to connect to:  + repo.getUrl(), e );
+}
+else
+{
+log.error( Unable to connect to:  + repo.getUrl() );
+}
 return false;
 }
 catch ( AbstractMethodError e )
@@ -236,7 +274,14 @@
 }
 catch ( ConnectionException e )
 {
-log.error( Error disconnecting wagon - ignored, e );
+if ( log.isDebugEnabled() )
+{
+log.error( Error disconnecting wagon - ignored, e );
+}
+else
+{
+log.error( Error disconnecting wagon - ignored );
+}
 }
 }
 }

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: 

svn commit: r676645 - /maven/components/branches/maven-2.0.10-RC/maven-script/maven-script-ant/pom.xml

[jdcasey]

Author: jdcasey
Date: Mon Jul 14 09:58:38 2008
New Revision: 676645

URL: http://svn.apache.org/viewvc?rev=676645view=rev
Log:
Update to exclude ant:ant-* and include org.apache.ant:ant-*, forcing the 
exclusion from plexus-ant-factory.

Modified:

maven/components/branches/maven-2.0.10-RC/maven-script/maven-script-ant/pom.xml

Modified: 
maven/components/branches/maven-2.0.10-RC/maven-script/maven-script-ant/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-script/maven-script-ant/pom.xml?rev=676645r1=676644r2=676645view=diff
==
--- 
maven/components/branches/maven-2.0.10-RC/maven-script/maven-script-ant/pom.xml 
(original)
+++ 
maven/components/branches/maven-2.0.10-RC/maven-script/maven-script-ant/pom.xml 
Mon Jul 14 09:58:38 2008
@@ -1,7 +1,4 @@
-?xml version='1.0' encoding='UTF-8'?
-
-
-
+?xml version=1.0 encoding=UTF-8?
 !--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -20,10 +17,7 @@
 specific language governing permissions and limitations
 under the License.
 --
-
-
-
-project 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' 
xmlns='http://maven.apache.org/POM/4.0.0'
+project xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xmlns=http://maven.apache.org/POM/4.0.0; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
   parent
 artifactIdmaven-script/artifactId
 groupIdorg.apache.maven/groupId
@@ -34,6 +28,16 @@
   nameMaven Ant Mojo Support/name
   dependencies
 dependency
+  groupIdorg.apache.ant/groupId
+  artifactIdant/artifactId
+  version1.7.1/version
+/dependency
+dependency
+  groupIdorg.apache.ant/groupId
+  artifactIdant-launcher/artifactId
+  version1.7.1/version
+/dependency
+dependency
   groupIdorg.apache.maven/groupId
   artifactIdmaven-plugin-api/artifactId
 /dependency
@@ -41,6 +45,19 @@
   groupIdorg.codehaus.plexus/groupId
   artifactIdplexus-ant-factory/artifactId
   version1.0-alpha-2/version
+  !-- We need to exclude this artifact's dependency on Ant, --
+  !-- because it has a different groupId that the version of Ant --
+  !-- we want to use now. --
+  exclusions
+exclusion
+  groupIdant/groupId
+  artifactIdant/artifactId
+/exclusion
+exclusion
+  groupIdant/groupId
+  artifactIdant-launcher/artifactId
+/exclusion
+  /exclusions
 /dependency
 dependency
   groupIdorg.codehaus.plexus/groupId
@@ -48,4 +65,3 @@
 /dependency
   /dependencies
 /project
-

svn commit: r676674 - in /maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src: main/java/org/apache/maven/project/ main/java/org/apache/maven/project/builder/impl/ test/resources/org/apache/maven/pr

[sisbell]

Author: sisbell
Date: Mon Jul 14 11:37:33 2008
New Revision: 676674

URL: http://svn.apache.org/viewvc?rev=676674view=rev
Log:
Fixed bugs 1) which allowed old builder code to execute; 2) not finding parent 
pom on local path.

Modified:

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=676674r1=676673r2=676674view=diff
==
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Mon Jul 14 11:37:33 2008
@@ -11,7 +11,7 @@
  *
  *  http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
+ * Unless required by applicable law or agreed to in writing,  
r
  * software distributed under the License is distributed on an
  * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
@@ -502,7 +502,11 @@
 {
 //getLogger().debug( Allowing project-build to proceed for:  + 
projectDescriptor );
 
-Model model = readModel( unknown, projectDescriptor, 
STRICT_MODEL_PARSING );
+//Model model = readModel( unknown, projectDescriptor, 
STRICT_MODEL_PARSING );
+
+Model model = readModel( unknown, projectDescriptor, new 
PomArtifactResolver(config.getLocalRepository(),
+buildArtifactRepositories( getSuperModel() ), 
artifactResolver) );
+
 
 project = buildInternal( model,
 config,
@@ -511,6 +515,7 @@
 STRICT_MODEL_PARSING,
 true,
 true );
+
 }
 //else
 //{
@@ -1796,48 +1801,6 @@
 }
 }
 
-private Model readModel( String projectId,
- File file,
- boolean strict )
-throws ProjectBuildingException
-{
-Reader reader = null;
-try
-{
-reader = ReaderFactory.newXmlReader( file );
-
-String modelSource = IOUtil.toString( reader );
-
-checkModelVersion( modelSource, projectId, file );
-
-StringReader sReader = new StringReader( modelSource );
-
-try
-{
-return modelReader.read( sReader, strict );
-}
-catch ( XmlPullParserException e )
-{
-throw new InvalidProjectModelException( projectId, Parse 
error reading POM. Reason:  + e.getMessage(),
-file, e );
-}
-}
-catch ( FileNotFoundException e )
-{
-throw new ProjectBuildingException( projectId,
-Could not find the model file ' + file.getAbsolutePath() + 
'., file, e );
-}
-catch ( IOException e )
-{
-throw new ProjectBuildingException( projectId, Failed to build 
model from file ' +
-file.getAbsolutePath() + '.\nError: \' + 
e.getLocalizedMessage() + \', file, e );
-}
-finally
-{
-IOUtil.close( reader );
-}
-}
-
 private void checkModelVersion( String modelSource,
 String projectId,
 File file )
@@ -2107,8 +2070,14 @@
 PomArtifactResolver resolver )
throws ProjectBuildingException
{
-   //System.out.println(projectDescriptor.getAbsolutePath());
+   if(projectDescriptor == null) {
+   throw new IllegalArgumentException(projectDescriptor: null, 
Project Id = + projectId);
+   }
 
+   if(projectBuilder == null) {
+   throw new IllegalArgumentException(projectBuilder: not 
initialized);
+   }
+   
MavenProject mavenProject;
try {
mavenProject = projectBuilder.buildFromStream(new 
FileInputStream(projectDescriptor), null, resolver,

Modified: 

svn commit: r676689 - /maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

[sisbell]

Author: sisbell
Date: Mon Jul 14 11:53:12 2008
New Revision: 676689

URL: http://svn.apache.org/viewvc?rev=676689view=rev
Log:
Fix: compile error.

Modified:

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=676689r1=676688r2=676689view=diff
==
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Mon Jul 14 11:53:12 2008
@@ -560,17 +560,7 @@
 artifactResolver.resolve( projectArtifact, 
remoteArtifactRepositories, localRepository );
 
 File file = projectArtifact.getFile();
-if(isOldProjectBuilder) {
-logger.info(Old Project Builder);
-model = readModel( projectId, file, STRICT_MODEL_PARSING );
-}  else {
-logger.info(New Project Builder);
-model = readModel( projectId, file, new 
PomArtifactResolver(localRepository, remoteArtifactRepositories, 
artifactResolver) );
-}
-
-//model = readModel( projectId, file, new 
PomArtifactResolver(localRepository, remoteArtifactRepositories, 
artifactResolver) );
-
-   // model = readModel( projectId, file, STRICT_MODEL_PARSING );
+model = readModel( projectId, file, new 
PomArtifactResolver(localRepository, remoteArtifactRepositories, 
artifactResolver) );
 
 String downloadUrl = null;
 

svn commit: r676691 - /maven/components/branches/maven-2.0.10-RC/README.txt

[brianf]

Author: brianf
Date: Mon Jul 14 12:01:14 2008
New Revision: 676691

URL: http://svn.apache.org/viewvc?rev=676691view=rev
Log:
test commit

Modified:
maven/components/branches/maven-2.0.10-RC/README.txt

Modified: maven/components/branches/maven-2.0.10-RC/README.txt
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/README.txt?rev=676691r1=676690r2=676691view=diff
==
--- maven/components/branches/maven-2.0.10-RC/README.txt (original)
+++ maven/components/branches/maven-2.0.10-RC/README.txt Mon Jul 14 12:01:14 
2008
@@ -1,7 +1,7 @@
 ---
 Bootstrapping Maven
 ---
-
+ 
 Set the environment variable M2_HOME pointing to the dir where you want Maven2 
installed.
 
 NOTE: presently, the directory {M2_HOME}/bin must be in your path:

svn commit: r676712 - in /maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src: main/java/org/apache/maven/project/builder/ main/java/org/apache/maven/project/builder/impl/ test/java/org/apache/maven

[sisbell]

Author: sisbell
Date: Mon Jul 14 13:03:55 2008
New Revision: 676712

URL: http://svn.apache.org/viewvc?rev=676712view=rev
Log:
New builder code does not contain parent info in pom. Fixed unit tests not to 
check for this.

Modified:

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/imports/t01/ProjectImportsTest.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=676712r1=676711r2=676712view=diff
==
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 Mon Jul 14 13:03:55 2008
@@ -132,6 +132,9 @@
 tmp.add(new ModelProperty(ProjectUri.groupId, 
parentGroupId.getValue()));
 }
 
+//Not inherited plugin rule
+
+
 
 //SCM Rule
 ModelProperty scmUrlProperty = getPropertyFor(ProjectUri.Scm.url, 
tmp);

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=676712r1=676711r2=676712view=diff
==
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
 Mon Jul 14 13:03:55 2008
@@ -131,8 +131,8 @@
 
 if (!parentFile.exists()) {
 logger.warn(Parent pom does not exist on local path: File =  
+ parentFile.getAbsolutePath());
-  throw new IOException(Parent pom does not exist: File =  + 
artifactParent.getFile() + , Child Id =  +
-  model.getGroupId() + : + model.getArtifactId() + 
: + model.getVersion());
+//  throw new IOException(Parent pom does not exist: File =  
+ artifactParent.getFile() + , Child Id =  +
+ // model.getGroupId() + : + model.getArtifactId() + 
: + model.getVersion());
 }
 artifactParent.setFile(parentFile);
 }

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?rev=676712r1=676711r2=676712view=diff
==
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
 (original)
+++ 

svn commit: r676730 - /maven/components/branches/maven-2.0.x/pom.xml

[dennisl]

Author: dennisl
Date: Mon Jul 14 13:57:20 2008
New Revision: 676730

URL: http://svn.apache.org/viewvc?rev=676730view=rev
Log:
o Use version 2.2.1 of clirr-maven-plugin to avoid running into MCLIRR-12.

Modified:
maven/components/branches/maven-2.0.x/pom.xml

Modified: maven/components/branches/maven-2.0.x/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=676730r1=676729r2=676730view=diff
==
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Mon Jul 14 13:57:20 2008
@@ -218,7 +218,7 @@
 plugin
   groupIdorg.codehaus.mojo/groupId
   artifactIdclirr-maven-plugin/artifactId
-  version2.2/version
+  version2.2.1/version
   configuration
 !-- needed for release: default value (,${project.version}) for 
2.0.10 is 2.0.10-SNAPSHOT --
 comparisonVersion2.0.9/comparisonVersion

svn commit: r676731 - /maven/components/branches/maven-2.0.10-RC/pom.xml

[dennisl]

Author: dennisl
Date: Mon Jul 14 14:02:36 2008
New Revision: 676731

URL: http://svn.apache.org/viewvc?rev=676731view=rev
Log:
o Use version 2.2.1 of clirr-maven-plugin to avoid running into MCLIRR-12 
(merged from 2.0.x r676730).

Modified:
maven/components/branches/maven-2.0.10-RC/pom.xml

Modified: maven/components/branches/maven-2.0.10-RC/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/pom.xml?rev=676731r1=676730r2=676731view=diff
==
--- maven/components/branches/maven-2.0.10-RC/pom.xml (original)
+++ maven/components/branches/maven-2.0.10-RC/pom.xml Mon Jul 14 14:02:36 2008
@@ -221,7 +221,7 @@
 plugin
   groupIdorg.codehaus.mojo/groupId
   artifactIdclirr-maven-plugin/artifactId
-  version2.2/version
+  version2.2.1/version
   configuration
 !-- needed for release: default value 
(,${project.version}) for 2.0.10 is 2.0.10-SNAPSHOT --
 comparisonVersion2.0.9/comparisonVersion

svn commit: r676735 - /maven/components/branches/maven-2.0.x/pom.xml

[dennisl]

Author: dennisl
Date: Mon Jul 14 14:06:59 2008
New Revision: 676735

URL: http://svn.apache.org/viewvc?rev=676735view=rev
Log:
o Upgrade to Modello 1.0-alpha-19. This avoids binary incompatibility for code 
generated by Modello. See MODELLO-111.

Modified:
maven/components/branches/maven-2.0.x/pom.xml

Modified: maven/components/branches/maven-2.0.x/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=676735r1=676734r2=676735view=diff
==
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Mon Jul 14 14:06:59 2008
@@ -195,7 +195,7 @@
 plugin
   groupIdorg.codehaus.modello/groupId
   artifactIdmodello-maven-plugin/artifactId
-  version1.0-alpha-18/version
+  version1.0-alpha-19/version
   executions
 execution
   idsite-docs/id
@@ -232,17 +232,6 @@
   
excludeorg/apache/maven/project/inheritance/ModelInheritanceAssembler*/exclude
   
excludeorg/apache/maven/execution/MavenExecutionRequest*/exclude
   excludeorg/apache/maven/plugin/DefaultPluginManager*/exclude
-  
-  !-- TODO: These represent method CHANGES in code generated by 
modello that, frankly, 
-   should be private. These should be removed after 2.0.10 
release as well. --
-  excludeorg/apache/maven/model/io/xpp3/*/exclude
-  excludeorg/apache/maven/plugin/lifecycle/io/xpp3/*/exclude
-  excludeorg/apache/maven/usability/plugin/io/xpp3/*/exclude
-  excludeorg/apache/maven/plugin/registry/io/xpp3/*/exclude
-  excludeorg/apache/maven/profiles/io/xpp3/*/exclude
-  
excludeorg/apache/maven/artifact/repository/metadata/io/xpp3/*/exclude
-  excludeorg/apache/maven/settings/io/xpp3/*/exclude
-  excludeorg/apache/maven/toolchain/model/io/xpp3/*/exclude
 /excludes
   /configuration
 /plugin

svn commit: r676736 - /maven/components/branches/maven-2.0.10-RC/pom.xml

[dennisl]

Author: dennisl
Date: Mon Jul 14 14:10:45 2008
New Revision: 676736

URL: http://svn.apache.org/viewvc?rev=676736view=rev
Log:
o Upgrade to Modello 1.0-alpha-19. This avoids binary incompatibility for code 
generated by Modello. See MODELLO-111. Merged from 2.0.x r676735.

Modified:
maven/components/branches/maven-2.0.10-RC/pom.xml

Modified: maven/components/branches/maven-2.0.10-RC/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/pom.xml?rev=676736r1=676735r2=676736view=diff
==
--- maven/components/branches/maven-2.0.10-RC/pom.xml (original)
+++ maven/components/branches/maven-2.0.10-RC/pom.xml Mon Jul 14 14:10:45 2008
@@ -198,7 +198,7 @@
 plugin
   groupIdorg.codehaus.modello/groupId
   artifactIdmodello-maven-plugin/artifactId
-  version1.0-alpha-18/version
+  version1.0-alpha-19/version
   executions
 execution
   idsite-docs/id
@@ -223,10 +223,10 @@
   artifactIdclirr-maven-plugin/artifactId
   version2.2.1/version
   configuration
-!-- needed for release: default value 
(,${project.version}) for 2.0.10 is 2.0.10-SNAPSHOT --
+!-- needed for release: default value (,${project.version}) for 
2.0.10 is 2.0.10-SNAPSHOT --
 comparisonVersion2.0.9/comparisonVersion
 excludes
-!-- TODO: These represent method ADDITIONS from 
2.0.9, and should be removed after 
+  !-- TODO: These represent method ADDITIONS from 2.0.9, and 
should be removed after 
2.0.10 is released. --
   
excludeorg/apache/maven/artifact/metadata/ArtifactMetadataSource*/exclude
   excludeorg/apache/maven/project/MavenProjectBuilder*/exclude
@@ -235,17 +235,6 @@
   
excludeorg/apache/maven/project/inheritance/ModelInheritanceAssembler*/exclude
   
excludeorg/apache/maven/execution/MavenExecutionRequest*/exclude
   excludeorg/apache/maven/plugin/DefaultPluginManager*/exclude
-  
-!-- TODO: These represent method CHANGES in code 
generated by modello that, frankly, 
-   should be private. These should be removed after 2.0.10 
release as well. --
-  excludeorg/apache/maven/model/io/xpp3/*/exclude
-  excludeorg/apache/maven/plugin/lifecycle/io/xpp3/*/exclude
-  excludeorg/apache/maven/usability/plugin/io/xpp3/*/exclude
-  excludeorg/apache/maven/plugin/registry/io/xpp3/*/exclude
-  excludeorg/apache/maven/profiles/io/xpp3/*/exclude
-  
excludeorg/apache/maven/artifact/repository/metadata/io/xpp3/*/exclude
-  excludeorg/apache/maven/settings/io/xpp3/*/exclude
-  excludeorg/apache/maven/toolchain/model/io/xpp3/*/exclude
 /excludes
   /configuration
 /plugin

svn commit: r676742 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 14:17:43 2008
New Revision: 676742

URL: http://svn.apache.org/viewvc?rev=676742view=rev
Log:
o added a total row in the Dependency Repository Locations table
o code readingness

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=676742r1=676741r2=676742view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
 Mon Jul 14 14:17:43 2008
@@ -365,7 +365,7 @@
 List alldeps = dependencies.getAllDependencies();
 Collections.sort( alldeps, getArtifactComparator() );
 
-startTable();
+// i18n
 String filename = getReportString( 
report.dependencies.file.details.column.file );
 String size = getReportString( 
report.dependencies.file.details.column.size );
 String entries = getReportString( 
report.dependencies.file.details.column.entries );
@@ -378,6 +378,9 @@
 int[] justification = new int[]{Parser.JUSTIFY_LEFT, 
Parser.JUSTIFY_RIGHT, Parser.JUSTIFY_RIGHT,
 Parser.JUSTIFY_RIGHT, Parser.JUSTIFY_RIGHT, Parser.JUSTIFY_CENTER, 
Parser.JUSTIFY_CENTER,
 Parser.JUSTIFY_CENTER};
+
+startTable();
+
 sink.tableRows( justification, true );
 
 TotalCell totaldeps = new TotalCell( DEFAULT_DECIMAL_FORMAT );
@@ -441,6 +444,8 @@
 }
 }
 
+// Table header
+
 String[] tableHeader;
 if ( hasSealed )
 {
@@ -452,6 +457,8 @@
 }
 tableHeader( tableHeader );
 
+// Table rows
+
 for ( Iterator it = alldeps.iterator(); it.hasNext(); )
 {
 Artifact artifact = (Artifact) it.next();
@@ -539,6 +546,8 @@
 }
 }
 
+// Total raw
+
 tableHeader[0] = getReportString( 
report.dependencies.file.details.total );
 tableHeader( tableHeader );
 if ( hasSealed )
@@ -576,9 +585,9 @@
 tableRow( new String[]{artifact.getId(), 
artifactFile.getAbsolutePath(), e.getMessage(), , , , , } );
 }
 
-private void populateRepositoryMap( Map repos, List rawRepos )
+private void populateRepositoryMap( Map repos, List rowRepos )
 {
-Iterator it = rawRepos.iterator();
+Iterator it = rowRepos.iterator();
 while ( it.hasNext() )
 {
 ArtifactRepository repo = (ArtifactRepository) it.next();
@@ -630,7 +639,6 @@
 }
 }
 
-
 private void renderSectionDependencyRepositoryLocations()
 {
 startSection( getReportString( 
report.dependencies.repo.locations.title ) );
@@ -660,34 +668,53 @@
 List repoUrlBlackListed = new ArrayList();
 blacklistRepositoryMap( repoMap, repoUrlBlackListed );
 
-// Render Repository List
-
-startTable();
+// i18n
 String repoid = getReportString( 
report.dependencies.repo.locations.column.repoid );
 String url = getReportString( 
report.dependencies.repo.locations.column.url );
 String release = getReportString( 
report.dependencies.repo.locations.column.release );
 String snapshot = getReportString( 
report.dependencies.repo.locations.column.snapshot );
 String blacklisted = getReportString( 
report.dependencies.repo.locations.column.blacklisted );
+String releaseEnabled = getReportString( 
report.dependencies.repo.locations.cell.release.enabled );
+String releaseDisabled = getReportString( 
report.dependencies.repo.locations.cell.release.disabled );
+String snapshotEnabled = getReportString( 
report.dependencies.repo.locations.cell.snapshot.enabled );
+String snapshotDisabled = getReportString( 
report.dependencies.repo.locations.cell.snapshot.disabled );
+String blacklistedEnabled = getReportString( 
report.dependencies.repo.locations.cell.blacklisted.enabled );
+String blacklistedDisabled = getReportString( 
report.dependencies.repo.locations.cell.blacklisted.disabled );
+String artifact = getReportString( 
report.dependencies.repo.locations.column.artifact );
+
+// Render Repository List
+
+startTable();
+
+// Table header
 
 String[] tableHeader;
+int[] justificationRepo;
   

svn commit: r676745 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies: RepositoryUtils.java renderer/DependenciesRenderer.java

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 14:29:25 2008
New Revision: 676745

URL: http://svn.apache.org/viewvc?rev=676745view=rev
Log:
o getDependencyUrlFromRepository() could return null if the repo is blacklisted
o display stacktrace for error logs in getDependencyUrlFromRepository() only if 
log is in debug mode

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java?rev=676745r1=676744r2=676745view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
 Mon Jul 14 14:29:25 2008
@@ -315,10 +315,15 @@
  * @param artifact not null
  * @param repo not null
  * @return the artifact url in the given repo for the given artifact. If 
it is a snapshot artifact, the version
- * will be the the timestamp and the build number from the metadata.
+ * will be the timestamp and the build number from the metadata. Could 
return null if the repo is blacklisted.
  */
 public String getDependencyUrlFromRepository( Artifact artifact, 
ArtifactRepository repo )
 {
+if ( repo.isBlacklisted() )
+{
+return null;
+}
+
 Artifact copyArtifact = ArtifactUtils.copyArtifact( artifact );
 // Try to get the last artifact repo name depending the snapshot 
version
 if ( ( artifact.isSnapshot()  repo.getSnapshots().isEnabled() ) )
@@ -340,7 +345,14 @@
 catch ( RepositoryMetadataResolutionException e )
 {
 loggerManager.setThreshold( 
RepositoryMetadataManager.class.getName(), oldThreshold );
-log.error( Unable to connect to:  + repo.getUrl(), e 
);
+if ( log.isDebugEnabled() )
+{
+log.error( Unable to connect to:  + 
repo.getUrl(), e );
+}
+else
+{
+log.error( Unable to connect to:  + 
repo.getUrl() );
+}
 return artifact.getFile().getName();
 }
 finally

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=676745r1=676744r2=676745view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
 Mon Jul 14 14:29:25 2008
@@ -824,7 +824,14 @@
 if ( dependencyExists )
 {
 sink.tableCell();
-sink.link( depUrl );
+if ( StringUtils.isNotEmpty( depUrl ) )
+{
+sink.link( depUrl );
+}
+else
+{
+sink.text( depUrl );
+}
 
 sink.figure();
 sink.figureCaption();

svn commit: r676746 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo: DependenciesReport.java dependencies/renderer/DependenciesRenderer.ja

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 14:38:34 2008
New Revision: 676746

URL: http://svn.apache.org/viewvc?rev=676746view=rev
Log:
o make log as final like other fields

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?rev=676746r1=676745r2=676746view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
 Mon Jul 14 14:38:34 2008
@@ -222,10 +222,9 @@
 DependenciesReportConfiguration config =
 new DependenciesReportConfiguration( dependencyDetailsEnabled, 
dependencyLocationsEnabled );
 
-DependenciesRenderer r = new DependenciesRenderer( getSink(), locale, 
i18n, dependencies, dependencyTreeNode,
-   config, repoUtils, 
mavenProjectBuilder, remoteRepositories,
-   localRepository );
-r.setLog( getLog() );
+DependenciesRenderer r = new DependenciesRenderer( getSink(), locale, 
i18n, getLog(), dependencies,
+   dependencyTreeNode, 
config, repoUtils, mavenProjectBuilder,
+   remoteRepositories, 
localRepository );
 r.render();
 }
 

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=676746r1=676745r2=676746view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
 Mon Jul 14 14:38:34 2008
@@ -60,6 +60,8 @@
 import org.codehaus.plexus.util.StringUtils;
 
 /**
+ * Renderer the dependencies report.
+ *
  * @version $Id$
  * @since 2.1
  */
@@ -87,15 +89,15 @@
 
 private final DependencyNode dependencyTreeNode;
 
-private Dependencies dependencies;
+private final Dependencies dependencies;
 
-private DependenciesReportConfiguration configuration;
+private final DependenciesReportConfiguration configuration;
 
-private I18N i18n;
+private final I18N i18n;
 
-private Log log;
+private final Log log;
 
-private RepositoryUtils repoUtils;
+private final RepositoryUtils repoUtils;
 
 /**
  * Will be filled with license name / list of projects.
@@ -148,6 +150,7 @@
  * @param sink
  * @param locale
  * @param i18n
+ * @param log
  * @param dependencies
  * @param dependencyTreeNode
  * @param config
@@ -156,7 +159,7 @@
  * @param remoteRepositories
  * @param localRepository
  */
-public DependenciesRenderer( Sink sink, Locale locale, I18N i18n, 
Dependencies dependencies,
+public DependenciesRenderer( Sink sink, Locale locale, I18N i18n, Log log, 
Dependencies dependencies,
  DependencyNode dependencyTreeNode, 
DependenciesReportConfiguration config,
  RepositoryUtils repoUtils, 
MavenProjectBuilder mavenProjectBuilder,
  List remoteRepositories, ArtifactRepository 
localRepository )
@@ -164,21 +167,14 @@
 super( sink );
 
 this.locale = locale;
-
+this.i18n = i18n;
+this.log = log;
+this.dependencies = dependencies;
 this.dependencyTreeNode = dependencyTreeNode;
-
 this.repoUtils = repoUtils;
-
-this.dependencies = dependencies;
-
-this.i18n = i18n;
-
 this.configuration = config;
-
 this.mavenProjectBuilder = mavenProjectBuilder;
-
 this.remoteRepositories = remoteRepositories;
-
 this.localRepository = localRepository;
 
 // Using the right set of 

svn commit: r676749 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 14:46:42 2008
New Revision: 676749

URL: http://svn.apache.org/viewvc?rev=676749view=rev
Log:
o formatting

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?rev=676749r1=676748r2=676749view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
 Mon Jul 14 14:46:42 2008
@@ -219,10 +219,10 @@
 
 Dependencies dependencies = new Dependencies( project, 
dependencyTreeNode, classesAnalyzer );
 
-DependenciesReportConfiguration config =
-new DependenciesReportConfiguration( dependencyDetailsEnabled, 
dependencyLocationsEnabled );
+DependenciesReportConfiguration config = new 
DependenciesReportConfiguration( dependencyDetailsEnabled,
+   
   dependencyLocationsEnabled );
 
-DependenciesRenderer r = new DependenciesRenderer( getSink(), locale, 
i18n, getLog(), dependencies,
+DependenciesRenderer r = new DependenciesRenderer( getSink(), locale, 
i18n, getLog(), settings, dependencies,
dependencyTreeNode, 
config, repoUtils, mavenProjectBuilder,
remoteRepositories, 
localRepository );
 r.render();
@@ -270,8 +270,7 @@
 private void copyResources( File outputDirectory )
 throws IOException
 {
-InputStream resourceList = getClass().getClassLoader()
-.getResourceAsStream( RESOURCES_DIR + /resources.txt );
+InputStream resourceList = 
getClass().getClassLoader().getResourceAsStream( RESOURCES_DIR + 
/resources.txt );
 
 if ( resourceList != null )
 {

svn commit: r676750 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo: LicenseReport.java ProjectInfoReportUtils.java dependencies/renderer/

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 14:52:05 2008
New Revision: 676750

URL: http://svn.apache.org/viewvc?rev=676750view=rev
Log:
o r676627 doesn't take care of user proxy
o moved LicenseReport#getLicenseInputStream() to a new utility class

Added:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
   (with props)
Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java?rev=676750r1=676749r2=676750view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
 Mon Jul 14 14:52:05 2008
@@ -24,23 +24,17 @@
 import org.apache.maven.model.License;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.AbstractMavenReportRenderer;
-import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.i18n.I18N;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.Authenticator;
 import java.net.MalformedURLException;
-import java.net.PasswordAuthentication;
 import java.net.URL;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
-import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -236,7 +230,8 @@
 String licenseContent = null;
 try
 {
-licenseContent = getLicenseInputStream( licenseUrl 
);
+// All licenses are supposed in English...
+licenseContent = 
ProjectInfoReportUtils.getInputStream( licenseUrl, settings, ISO-8859-1 );
 }
 catch ( IOException e )
 {
@@ -275,76 +270,6 @@
 endSection();
 }
 
-/**
- * Get the content of the license Url
- *
- * @param licenseUrl
- * @return the content of the licenseUrl
- * @throws IOException
- */
-private String getLicenseInputStream( URL licenseUrl )
-throws IOException
-{
-String scheme = licenseUrl.getProtocol();
-if ( !file.equals( scheme ) )
-{
-Proxy proxy = settings.getActiveProxy();
-if ( proxy != null )
-{
-if ( http.equals( scheme ) || https.equals( scheme ) )
-{
-scheme = http.;
-}
-else if ( ftp.equals( scheme ) )
-{
-scheme = ftp.;
-}
-else
-{
-scheme = ;
-}
-
-String host = proxy.getHost();
-if ( !StringUtils.isEmpty( host ) )
-{
-Properties p = System.getProperties();
-p.setProperty( scheme + proxySet, true );
-p.setProperty( scheme + proxyHost, host );
-p.setProperty( scheme + proxyPort, String.valueOf( 
proxy.getPort() ) );
-if ( !StringUtils.isEmpty( proxy.getNonProxyHosts() ) )
-{
-p.setProperty( scheme + nonProxyHosts, 
proxy.getNonProxyHosts() );
-}
-
-final String userName = proxy.getUsername();
-if ( !StringUtils.isEmpty( userName ) )
-{
-final String pwd = StringUtils.isEmpty( 
proxy.getPassword() ) ?  : proxy.getPassword();
-Authenticator.setDefault( new Authenticator()
-{
-protected PasswordAuthentication 
getPasswordAuthentication()
-{
-return new PasswordAuthentication( 
userName, pwd.toCharArray() );
-   

svn commit: r676751 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo: LicenseReport.java ProjectInfoReportUtils.java dependencies/renderer/

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 14:57:29 2008
New Revision: 676751

URL: http://svn.apache.org/viewvc?rev=676751view=rev
Log:
o improvement on the encoding use

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java?rev=676751r1=676750r2=676751view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
 Mon Jul 14 14:57:29 2008
@@ -231,7 +231,7 @@
 try
 {
 // All licenses are supposed in English...
-licenseContent = 
ProjectInfoReportUtils.getInputStream( licenseUrl, settings, ISO-8859-1 );
+licenseContent = 
ProjectInfoReportUtils.getInputStream( licenseUrl, settings );
 }
 catch ( IOException e )
 {

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java?rev=676751r1=676750r2=676751view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
 Mon Jul 14 14:57:29 2008
@@ -41,11 +41,27 @@
 public class ProjectInfoReportUtils
 {
 /**
- * Get the input stream from an URL
+ * Get the input stream using ISO-8859-1 as charset from an URL.
  *
  * @param url not null
  * @param settings not null to handle proxy settings
- * @return the inputstream found
+ * @return the ISO-8859-1 inputstream found.
+ * @throws IOException if any
+ * @see #getInputStream(URL, Settings, String)
+ */
+public static String getInputStream( URL url, Settings settings )
+throws IOException
+{
+return getInputStream( url, settings, ISO-8859-1 );
+}
+
+/**
+ * Get the input stream from an URL.
+ *
+ * @param url not null
+ * @param settings not null to handle proxy settings
+ * @param encoding the wanted encoding for the inputstream. If null, 
encoding will be ISO-8859-1.
+ * @return the inputstream found depending the wanted encoding.
  * @throws IOException if any
  */
 public static String getInputStream( URL url, Settings settings, String 
encoding )
@@ -104,6 +120,10 @@
 {
 in = url.openStream();
 
+if ( encoding == null )
+{
+return IOUtil.toString( in, ISO-8859-1 );
+}
 return IOUtil.toString( in, encoding );
 }
 finally

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=676751r1=676750r2=676751view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
 Mon Jul 14 14:57:29 2008
@@ -604,7 +604,7 @@
 try
 {
 URL repoUrl = new URL( repo.getUrl() );
-if ( ProjectInfoReportUtils.getInputStream( repoUrl, 
settings, ISO-8859-1 ) == null )
+if ( 

svn commit: r676752 - in /maven/sandbox/trunk/shared/maven-shared-model/src: main/java/org/apache/maven/shared/model/ main/java/org/apache/maven/shared/model/impl/ test/java/org/apache/maven/shared/mo

[sisbell]

Author: sisbell
Date: Mon Jul 14 15:09:45 2008
New Revision: 676752

URL: http://svn.apache.org/viewvc?rev=676752view=rev
Log:
Fix for mergeing collections of collections.

Modified:

maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java

maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java

maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java

Modified: 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java?rev=676752r1=676751r2=676752view=diff
==
--- 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
 (original)
+++ 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
 Mon Jul 14 15:09:45 2008
@@ -28,15 +28,6 @@
 }
 }
 
-private static boolean aContainsAnyOfB(ListModelProperty a, 
ListModelProperty b) {
-for (ModelProperty mp : b) {
-if (a.contains(mp)) {
-return true;
-}
-}
-return false;
-}
-
 /**
  * Default constructor
  *

Modified: 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java?rev=676752r1=676751r2=676752view=diff
==
--- 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
 (original)
+++ 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
 Mon Jul 14 15:09:45 2008
@@ -233,7 +233,15 @@
 
 private static int findLastIndexOfParent(ModelProperty modelProperty, 
ListModelProperty modelProperties) {
 for (int i = modelProperties.size() - 1; i = 0; i--) {
-if (modelProperties.get(i).isParentOf(modelProperty)) {
+if(modelProperties.get(i).getUri().equals(modelProperty.getUri())) 
{   
+for(int j = i; i = modelProperties.size(); j++){
+
if(!modelProperties.get(j).getUri().startsWith(modelProperty.getUri())) {
+return j -1;
+}
+}
+return modelProperties.size() - 1;
+}
+else if (modelProperties.get(i).isParentOf(modelProperty)) {
 return i;
 }
 }
@@ -248,19 +256,27 @@
  * @return list of merged properties
  */
 protected static ListModelProperty mergeModelContainers(ModelContainer 
a, ModelContainer b) {
+System.out.println(Merge);
 ListModelProperty m = new ArrayListModelProperty();
 m.addAll(a.getProperties());
 m.addAll(b.getProperties());
 
 LinkedListModelProperty processedProperties = new 
LinkedListModelProperty();
 ListString uris = new ArrayListString();
-
+String baseUri = a.getProperties().get(0).getUri();
 for (ModelProperty p : m) {
-if (!uris.contains(p.getUri())) {
+   // System.out.println(A: + p.getUri());
+  //  System.out.println(B: + baseUri);
+String subUri = p.getUri().substring(baseUri.length(), 
p.getUri().length());
+if (!uris.contains(p.getUri())
+|| (subUri.contains(#collection)  
!subUri.endsWith(#collection))) {
 processedProperties.add(findLastIndexOfParent(p, 
processedProperties) + 1, p);
 uris.add(p.getUri());
 }
 }
+for(ModelProperty mp : processedProperties) {
+System.out.println(mp);
+}
 return processedProperties;
 }
 

Modified: 
maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java?rev=676752r1=676751r2=676752view=diff
==
--- 
maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java
 (original)
+++ 

svn commit: r676753 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo: ./ dependencies/ dependencies/renderer/

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 15:22:34 2008
New Revision: 676753

URL: http://svn.apache.org/viewvc?rev=676753view=rev
Log:
o moved code from ArtifactUtils to ProjectInfoReportUtils

Removed:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ArtifactUtils.java
Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java?rev=676753r1=676752r2=676753view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
 Mon Jul 14 15:22:34 2008
@@ -36,7 +36,6 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.report.projectinfo.dependencies.ArtifactUtils;
 import org.apache.maven.reporting.AbstractMavenReportRenderer;
 import org.codehaus.plexus.i18n.I18N;
 import org.codehaus.plexus.util.StringUtils;
@@ -251,7 +250,7 @@
 
 private String[] getPluginRow( String groupId, String artifactId, 
String version, String link )
 {
-artifactId = ArtifactUtils.getArtifactIdCell( artifactId, link );
+artifactId = ProjectInfoReportUtils.getArtifactIdCell( artifactId, 
link );
 return new String[] { groupId, artifactId, version };
 }
 

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java?rev=676753r1=676752r2=676753view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
 Mon Jul 14 15:22:34 2008
@@ -36,7 +36,6 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.report.projectinfo.dependencies.ArtifactUtils;
 import org.apache.maven.reporting.AbstractMavenReportRenderer;
 import org.codehaus.plexus.i18n.I18N;
 import org.codehaus.plexus.util.StringUtils;
@@ -275,7 +274,7 @@
 
 private String[] getPluginRow( String groupId, String artifactId, 
String version, String link )
 {
-artifactId = ArtifactUtils.getArtifactIdCell( artifactId, link );
+artifactId = ProjectInfoReportUtils.getArtifactIdCell( artifactId, 
link );
 return new String[] { groupId, artifactId, version };
 }
 

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java?rev=676753r1=676752r2=676753view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
 Mon Jul 14 15:22:34 2008
@@ -1,17 +1,5 @@
 package org.apache.maven.report.projectinfo;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.Authenticator;
-import 

svn commit: r676754 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo: DependencyManagementReport.java dependencies/renderer/DependencyManag

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 15:29:22 2008
New Revision: 676754

URL: http://svn.apache.org/viewvc?rev=676754view=rev
Log:
o minor code improvements

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java?rev=676754r1=676753r2=676754view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
 Mon Jul 14 15:29:22 2008
@@ -89,15 +89,13 @@
 /** [EMAIL PROTECTED] */
 public void executeReport( Locale locale )
 {
+ManagementDependencies dependencies = new ManagementDependencies( 
project.getDependencyManagement()
+.getDependencies() );
 
-ManagementDependencies dependencies =
-new ManagementDependencies( 
project.getDependencyManagement().getDependencies() );
-
-DependencyManagementRenderer r = new DependencyManagementRenderer( 
getSink(), locale, i18n, dependencies,
-   
artifactFactory, mavenProjectBuilder,
-   
remoteRepositories, localRepository );
-
-r.setLog( getLog() );
+DependencyManagementRenderer r = new DependencyManagementRenderer( 
getSink(), locale, i18n, getLog(),
+   
dependencies, artifactFactory,
+   
mavenProjectBuilder, remoteRepositories,
+   
localRepository );
 r.render();
 }
 

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java?rev=676754r1=676753r2=676754view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
 Mon Jul 14 15:29:22 2008
@@ -47,13 +47,13 @@
 public class DependencyManagementRenderer
 extends AbstractMavenReportRenderer
 {
-private ManagementDependencies dependencies;
+private final ManagementDependencies dependencies;
 
 private final Locale locale;
 
-private I18N i18n;
+private final I18N i18n;
 
-private Log log;
+private final Log log;
 
 private final ArtifactFactory artifactFactory;
 
@@ -69,30 +69,27 @@
  * @param sink
  * @param locale
  * @param i18n
+ * @param log
  * @param artifactFactory
  * @param dependencies
  * @param mavenProjectBuilder
  * @param remoteRepositories
  * @param localRepository
  */
-public DependencyManagementRenderer( Sink sink, Locale locale, I18N i18n, 
ManagementDependencies dependencies,
- ArtifactFactory artifactFactory, 
MavenProjectBuilder mavenProjectBuilder,
- List remoteRepositories, 
ArtifactRepository localRepository )
+public DependencyManagementRenderer( Sink sink, Locale locale, I18N i18n, 
Log log,
+ ManagementDependencies dependencies, 
ArtifactFactory artifactFactory,
+ MavenProjectBuilder 
mavenProjectBuilder, List remoteRepositories,
+ ArtifactRepository localRepository )
 {
 super( sink );
 
 this.locale = locale;
-
-this.dependencies = dependencies;
-
 this.i18n = i18n;
-
+this.log = log;
+this.dependencies = dependencies;
 this.artifactFactory = artifactFactory;
-

svn commit: r676756 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo: DependencyManagementReport.java dependencies/renderer/DependencyManag

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 15:47:50 2008
New Revision: 676756

URL: http://svn.apache.org/viewvc?rev=676756view=rev
Log:
o removed todo

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java?rev=676756r1=676755r2=676756view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
 Mon Jul 14 15:47:50 2008
@@ -70,6 +70,11 @@
  */
 private List remoteRepositories;
 
+/**
+ * Lazy instantiation for management dependencies.
+ */
+private ManagementDependencies managementDependencies;
+
 // --
 // Public methods
 // --
@@ -89,13 +94,10 @@
 /** [EMAIL PROTECTED] */
 public void executeReport( Locale locale )
 {
-ManagementDependencies dependencies = new ManagementDependencies( 
project.getDependencyManagement()
-.getDependencies() );
-
 DependencyManagementRenderer r = new DependencyManagementRenderer( 
getSink(), locale, i18n, getLog(),
-   
dependencies, artifactFactory,
-   
mavenProjectBuilder, remoteRepositories,
-   
localRepository );
+   
getManagementDependencies(),
+   
artifactFactory, mavenProjectBuilder,
+   
remoteRepositories, localRepository );
 r.render();
 }
 
@@ -108,6 +110,29 @@
 /** [EMAIL PROTECTED] */
 public boolean canGenerateReport()
 {
-return project.getDependencyManagement() != null;
+return getManagementDependencies().hasDependencies();
+}
+
+// --
+// Private methods
+// --
+
+private ManagementDependencies getManagementDependencies()
+{
+if ( managementDependencies != null )
+{
+return managementDependencies;
+}
+
+if ( project.getDependencyManagement() == null )
+{
+managementDependencies = new ManagementDependencies( null );
+}
+else
+{
+managementDependencies = new ManagementDependencies( 
project.getDependencyManagement().getDependencies() );
+}
+
+return managementDependencies;
 }
 }

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java?rev=676756r1=676755r2=676756view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
 Mon Jul 14 15:47:50 2008
@@ -112,7 +112,6 @@
 {
 startSection( getTitle() );
 
-// TODO: should the report just be excluded?
 paragraph( getReportString( report.dependencyManagement.nolist ) 
);
 
 endSection();

svn commit: r676757 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies: ManagementDependencies.java renderer/DependencyManagemen

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 15:52:08 2008
New Revision: 676757

URL: http://svn.apache.org/viewvc?rev=676757view=rev
Log:
o renamed field to be more clear
o fixed javadoc

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java?rev=676757r1=676756r2=676757view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java
 Mon Jul 14 15:52:08 2008
@@ -30,32 +30,49 @@
 
 /**
  * @author Nick Stolwijk
- * @version $Id:$
+ * @version $Id$
  * @since 2.1
  */
 public class ManagementDependencies
 {
-private final List projectDependencies;
+private final List managementDependencies;
 
+/**
+ * @param projectDependencies
+ */
 public ManagementDependencies( List projectDependencies )
 {
-this.projectDependencies = projectDependencies;
+this.managementDependencies = projectDependencies;
 }
 
+/**
+ * @return codetrue/code if managementDependencies is not null and not 
empty.
+ */
 public boolean hasDependencies()
 {
-return ( projectDependencies != null )  ( 
!this.projectDependencies.isEmpty() );
+return ( managementDependencies != null )  ( 
!this.managementDependencies.isEmpty() );
 }
 
-public List getProjectDependencies()
+/**
+ * @return managementDependencies
+ */
+public List getManagementDependencies()
 {
-return new ArrayList( projectDependencies );
+return new ArrayList( managementDependencies );
 }
 
-public Map getDependenciesByScope()
+/**
+ * @return the managementDependencies by scope
+ * @see Artifact#SCOPE_COMPILE
+ * @see Artifact#SCOPE_PROVIDED
+ * @see Artifact#SCOPE_RUNTIME
+ * @see Artifact#SCOPE_SYSTEM
+ * @see Artifact#SCOPE_TEST
+ */
+public Map getManagementDependenciesByScope()
 {
 Map dependenciesByScope = new HashMap();
-for ( Iterator i = getProjectDependencies().iterator(); i.hasNext(); )
+for ( Iterator i = getManagementDependencies().iterator(); 
i.hasNext(); )
 {
 Dependency dependency = (Dependency) i.next();
 String scope = dependency.getScope() != null ? 
dependency.getScope() : Artifact.SCOPE_COMPILE;

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java?rev=676757r1=676756r2=676757view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
 Mon Jul 14 15:52:08 2008
@@ -132,7 +132,7 @@
 startSection( getTitle() );
 
 // collect dependencies by scope
-Map dependenciesByScope = dependencies.getDependenciesByScope();
+Map dependenciesByScope = 
dependencies.getManagementDependenciesByScope();
 
 renderDependenciesForAllScopes( dependenciesByScope );
 

svn commit: r676758 - /maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java

[sisbell]

Author: sisbell
Date: Mon Jul 14 16:01:08 2008
New Revision: 676758

URL: http://svn.apache.org/viewvc?rev=676758view=rev
Log:
Fixed index problem.

Modified:

maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java

Modified: 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java?rev=676758r1=676757r2=676758view=diff
==
--- 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
 (original)
+++ 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
 Mon Jul 14 16:01:08 2008
@@ -20,15 +20,6 @@
 
 private static Logger logger = Logger.getAnonymousLogger();
 
-private static boolean aContainsAnyOfB(ListModelProperty a, 
ListModelProperty b) {
-for (ModelProperty mp : b) {
-if (a.contains(mp)) {
-return true;
-}
-}
-return false;
-}
-
 public ModelContainer join(ModelContainer a, ModelContainer b) throws 
DataSourceException {
 if (a == null || a.getProperties() == null || a.getProperties().size() 
== 0) {
 throw new IllegalArgumentException(a or a.properties: empty);
@@ -57,9 +48,9 @@
 sb.append(mp).append(\r\n);
 }
 
-//for (DeleteEvent de : des) {
-//sb.append(de.toString());
-//}
+//for (DeleteEvent de : des) {
+//sb.append(de.toString());
+//}
 System.out.println(sb);
 throw new DataSourceException(ModelContainer 'a' contains 
elements not within datasource);
 }
@@ -86,7 +77,7 @@
 if (deletedProperties.size()  0) {
 deleteEvents.add(new DeleteEvent(a, b, deletedProperties, join));
 }
-
+
 return a.createNewInstance(joinedProperties);
 }
 
@@ -202,16 +193,16 @@
 public String getEventHistory() {
 StringBuffer sb = new StringBuffer();
 sb.append(Original Model Properties\r\n);
-for(ModelProperty mp : originalModelProperties) {
+for (ModelProperty mp : originalModelProperties) {
 sb.append(mp).append(\r\n);
 }
 
-for(DeleteEvent de : deleteEvents) {
+for (DeleteEvent de : deleteEvents) {
 sb.append(de.toString());
 }
 
 sb.append(Processed Model Properties\r\n);
-for(ModelProperty mp : modelProperties) {
+for (ModelProperty mp : modelProperties) {
 sb.append(mp).append(\r\n);
 }
 return sb.toString();
@@ -233,15 +224,14 @@
 
 private static int findLastIndexOfParent(ModelProperty modelProperty, 
ListModelProperty modelProperties) {
 for (int i = modelProperties.size() - 1; i = 0; i--) {
-if(modelProperties.get(i).getUri().equals(modelProperty.getUri())) 
{   
-for(int j = i; i = modelProperties.size(); j++){
-
if(!modelProperties.get(j).getUri().startsWith(modelProperty.getUri())) {
-return j -1;
+if 
(modelProperties.get(i).getUri().equals(modelProperty.getUri())) {
+for (int j = i; j  modelProperties.size(); j++) {
+if 
(!modelProperties.get(j).getUri().startsWith(modelProperty.getUri())) {
+return j - 1;
 }
 }
-return modelProperties.size() - 1;
-}
-else if (modelProperties.get(i).isParentOf(modelProperty)) {
+return modelProperties.size() - 1;
+} else if (modelProperties.get(i).isParentOf(modelProperty)) {
 return i;
 }
 }
@@ -265,21 +255,28 @@
 ListString uris = new ArrayListString();
 String baseUri = a.getProperties().get(0).getUri();
 for (ModelProperty p : m) {
-   // System.out.println(A: + p.getUri());
-  //  System.out.println(B: + baseUri);
 String subUri = p.getUri().substring(baseUri.length(), 
p.getUri().length());
 if (!uris.contains(p.getUri())
-|| (subUri.contains(#collection)  
!subUri.endsWith(#collection))) {
+|| (subUri.contains(#collection)  
!subUri.endsWith(#collection))) {
 processedProperties.add(findLastIndexOfParent(p, 
processedProperties) + 1, p);
 uris.add(p.getUri());
 }
 }
-for(ModelProperty mp : processedProperties) {
+for (ModelProperty mp : processedProperties) 

svn commit: r676759 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 16:02:47 2008
New Revision: 676759

URL: http://svn.apache.org/viewvc?rev=676759view=rev
Log:
o used clirr-maven-plugin:2.2.1

Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=676759r1=676758r2=676759view=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Mon Jul 14 
16:02:47 2008
@@ -79,6 +79,11 @@
   artifactIdmaven-surefire-plugin/artifactId
   version2.4.3/version
 /plugin
+plugin
+  groupIdorg.codehaus.mojo/groupId
+  artifactIdclirr-maven-plugin/artifactId
+  version2.2.1/version
+/plugin
   /plugins
 /pluginManagement
 plugins

svn commit: r676760 - /maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java

[sisbell]

Author: sisbell
Date: Mon Jul 14 16:02:49 2008
New Revision: 676760

URL: http://svn.apache.org/viewvc?rev=676760view=rev
Log:
Removed system prints.

Modified:

maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java

Modified: 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java?rev=676760r1=676759r2=676760view=diff
==
--- 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
 (original)
+++ 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
 Mon Jul 14 16:02:49 2008
@@ -246,7 +246,6 @@
  * @return list of merged properties
  */
 protected static ListModelProperty mergeModelContainers(ModelContainer 
a, ModelContainer b) {
-System.out.println(Merge);
 ListModelProperty m = new ArrayListModelProperty();
 m.addAll(a.getProperties());
 m.addAll(b.getProperties());
@@ -262,9 +261,11 @@
 uris.add(p.getUri());
 }
 }
+/*
 for (ModelProperty mp : processedProperties) {
 System.out.println(mp);
 }
+*/
 return processedProperties;
 }
 

svn commit: r676762 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 16:05:08 2008
New Revision: 676762

URL: http://svn.apache.org/viewvc?rev=676762view=rev
Log:
o used maven-*:2.0.6 since prerequisites is 2.0.6

Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=676762r1=676761r2=676762view=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Mon Jul 14 
16:05:08 2008
@@ -123,17 +123,17 @@
 dependency
   groupIdorg.apache.maven/groupId
   artifactIdmaven-artifact-manager/artifactId
-  version2.0.4/version
+  version2.0.6/version
 /dependency
 dependency
   groupIdorg.apache.maven/groupId
   artifactIdmaven-model/artifactId
-  version2.0.4/version
+  version2.0.6/version
 /dependency
 dependency
   groupIdorg.apache.maven/groupId
   artifactIdmaven-plugin-api/artifactId
-  version2.0.4/version
+  version2.0.6/version
 /dependency
 dependency
   groupIdorg.apache.maven/groupId
@@ -143,17 +143,17 @@
 dependency
   groupIdorg.apache.maven/groupId
   artifactIdmaven-repository-metadata/artifactId
-  version2.0.4/version
+  version2.0.6/version
 /dependency
 dependency
   groupIdorg.apache.maven/groupId
   artifactIdmaven-settings/artifactId
-  version2.0.4/version
+  version2.0.6/version
 /dependency
 dependency
   groupIdorg.apache.maven.reporting/groupId
   artifactIdmaven-reporting-api/artifactId
-  version2.0.4/version
+  version2.0.6/version
 /dependency
 dependency
   groupIdorg.apache.maven.reporting/groupId

svn commit: r676763 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 16:09:21 2008
New Revision: 676763

URL: http://svn.apache.org/viewvc?rev=676763view=rev
Log:
o updated code due to r676762

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java?rev=676763r1=676762r2=676763view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
 Mon Jul 14 16:09:21 2008
@@ -22,6 +22,7 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.manager.WagonConfigurationException;
 import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -174,19 +175,24 @@
 return false;
 }
 
+String id = repo.getId();
+Repository repository = new Repository( id, repo.getUrl() );
+
 Wagon wagon;
 try
 {
-wagon = wagonManager.getWagon( repo.getProtocol() );
+wagon = wagonManager.getWagon( repository );
 }
 catch ( UnsupportedProtocolException e )
 {
 log.error( Unsupported protocol: ' + repo.getProtocol() + ', e 
);
 return false;
 }
-
-String id = repo.getId();
-Repository repository = new Repository( id, repo.getUrl() );
+catch ( WagonConfigurationException e )
+{
+log.error( Unsupported protocol: ' + repo.getProtocol() + ', e 
);
+return false;
+}
 
 if ( log.isDebugEnabled() )
 {

svn commit: r676766 - in /maven/plugins/trunk/maven-project-info-reports-plugin: pom.xml src/site/site.xml

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 16:18:19 2008
New Revision: 676766

URL: http://svn.apache.org/viewvc?rev=676766view=rev
Log:
o adding a release notes link with maven-changes-plugin

Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
maven/plugins/trunk/maven-project-info-reports-plugin/src/site/site.xml

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=676766r1=676765r2=676766view=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Mon Jul 14 
16:18:19 2008
@@ -113,6 +113,30 @@
 /plugins
   /build
 
+  reporting
+plugins
+  plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-changes-plugin/artifactId
+version2.0/version
+configuration
+  !-- For JIRA-report --
+  columnNamesType,Key,Summary,Assignee,Status,Resolution,Fix 
Version/columnNames
+  onlyCurrentVersiontrue/onlyCurrentVersion
+  resolutionIdsClosed/resolutionIds
+  sortColumnNamesType,Key/sortColumnNames
+/configuration
+reportSets
+  reportSet
+reports
+  reportjira-report/report
+/reports
+  /reportSet
+/reportSets
+  /plugin
+/plugins
+  /reporting
+
   dependencies
 !-- Maven --
 dependency

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/site/site.xml?rev=676766r1=676765r2=676766view=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/site/site.xml 
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/site/site.xml Mon 
Jul 14 16:18:19 2008
@@ -26,6 +26,7 @@
   item name=Goals href=plugin-info.html/
   item name=Usage href=usage.html/
   item name=FAQ href=faq.html/
+  item name=Release Notes href=jira-report.html/
 /menu
 menu name=Examples
   item name=Run Selective Reports 
href=examples/selective-project-info-reports.html/

svn commit: r676767 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 16:19:54 2008
New Revision: 676767

URL: http://svn.apache.org/viewvc?rev=676767view=rev
Log:
o upgraded plexus-utils to 1.5.5

Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=676767r1=676766r2=676767view=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Mon Jul 14 
16:19:54 2008
@@ -335,7 +335,7 @@
 dependency
   groupIdorg.codehaus.plexus/groupId
   artifactIdplexus-utils/artifactId
-  version1.4.5/version
+  version1.5.5/version
 /dependency
 
 dependency

svn commit: r676768 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 16:40:30 2008
New Revision: 676768

URL: http://svn.apache.org/viewvc?rev=676768view=rev
Log:
[maven-release-plugin] prepare release maven-project-info-reports-plugin-mvn 
release:prepare

Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=676768r1=676767r2=676768view=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Mon Jul 14 
16:40:30 2008
@@ -27,7 +27,7 @@
   /parent
 
   artifactIdmaven-project-info-reports-plugin/artifactId
-  version2.1-SNAPSHOT/version
+  versionmvn release:prepare/version
   packagingmaven-plugin/packaging
   nameMaven Project Info Reports Plugin/name
   description
@@ -60,9 +60,9 @@
   /contributors
 
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin//connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin//developerConnection
-
urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin//url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-project-info-reports-plugin-mvn
 release:prepare/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-project-info-reports-plugin-mvn
 release:prepare/developerConnection
+
urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-project-info-reports-plugin-mvn
 release:prepare/url
   /scm
 
   build

svn commit: r676769 - in /maven/plugins/tags/maven-project-info-reports-plugin-mvn release:prepare: ./ pom.xml

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 16:40:36 2008
New Revision: 676769

URL: http://svn.apache.org/viewvc?rev=676769view=rev
Log:
[maven-release-plugin]  copy for tag maven-project-info-reports-plugin-mvn 
release:prepare

Added:
maven/plugins/tags/maven-project-info-reports-plugin-mvn release:prepare/
  - copied from r676767, 
maven/plugins/trunk/maven-project-info-reports-plugin/
maven/plugins/tags/maven-project-info-reports-plugin-mvn 
release:prepare/pom.xml
  - copied unchanged from r676768, 
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

svn commit: r676770 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 16:40:39 2008
New Revision: 676770

URL: http://svn.apache.org/viewvc?rev=676770view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=676770r1=676769r2=676770view=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Mon Jul 14 
16:40:39 2008
@@ -27,7 +27,7 @@
   /parent
 
   artifactIdmaven-project-info-reports-plugin/artifactId
-  versionmvn release:prepare/version
+  version2.2-SNAPSHOT/version
   packagingmaven-plugin/packaging
   nameMaven Project Info Reports Plugin/name
   description
@@ -60,9 +60,9 @@
   /contributors
 
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-project-info-reports-plugin-mvn
 release:prepare/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-project-info-reports-plugin-mvn
 release:prepare/developerConnection
-
urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-project-info-reports-plugin-mvn
 release:prepare/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin//connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin//developerConnection
+
urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin//url
   /scm
 
   build

svn commit: r676779 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 17:25:48 2008
New Revision: 676779

URL: http://svn.apache.org/viewvc?rev=676779view=rev
Log:
o revert release

Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=676779r1=676778r2=676779view=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Mon Jul 14 
17:25:48 2008
@@ -27,7 +27,7 @@
   /parent
 
   artifactIdmaven-project-info-reports-plugin/artifactId
-  version2.2-SNAPSHOT/version
+  version2.1-SNAPSHOT/version
   packagingmaven-plugin/packaging
   nameMaven Project Info Reports Plugin/name
   description

svn commit: r676780 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 17:28:38 2008
New Revision: 676780

URL: http://svn.apache.org/viewvc?rev=676780view=rev
Log:
[maven-release-plugin] prepare release maven-project-info-reports-plugin-2.1

Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=676780r1=676779r2=676780view=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Mon Jul 14 
17:28:38 2008
@@ -27,7 +27,7 @@
   /parent
 
   artifactIdmaven-project-info-reports-plugin/artifactId
-  version2.1-SNAPSHOT/version
+  version2.1/version
   packagingmaven-plugin/packaging
   nameMaven Project Info Reports Plugin/name
   description
@@ -60,9 +60,9 @@
   /contributors
 
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin//connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin//developerConnection
-
urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin//url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-project-info-reports-plugin-2.1/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-project-info-reports-plugin-2.1/developerConnection
+
urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-project-info-reports-plugin-2.1/url
   /scm
 
   build

svn commit: r676781 - in /maven/plugins/tags/maven-project-info-reports-plugin-2.1: ./ pom.xml

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 17:28:43 2008
New Revision: 676781

URL: http://svn.apache.org/viewvc?rev=676781view=rev
Log:
[maven-release-plugin]  copy for tag maven-project-info-reports-plugin-2.1

Added:
maven/plugins/tags/maven-project-info-reports-plugin-2.1/
  - copied from r676767, 
maven/plugins/trunk/maven-project-info-reports-plugin/
maven/plugins/tags/maven-project-info-reports-plugin-2.1/pom.xml
  - copied unchanged from r676780, 
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

svn commit: r676782 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

[vsiveton]

Author: vsiveton
Date: Mon Jul 14 17:28:47 2008
New Revision: 676782

URL: http://svn.apache.org/viewvc?rev=676782view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=676782r1=676781r2=676782view=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Mon Jul 14 
17:28:47 2008
@@ -27,7 +27,7 @@
   /parent
 
   artifactIdmaven-project-info-reports-plugin/artifactId
-  version2.1/version
+  version2.2-SNAPSHOT/version
   packagingmaven-plugin/packaging
   nameMaven Project Info Reports Plugin/name
   description
@@ -60,9 +60,9 @@
   /contributors
 
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-project-info-reports-plugin-2.1/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-project-info-reports-plugin-2.1/developerConnection
-
urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-project-info-reports-plugin-2.1/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin//connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin//developerConnection
+
urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin//url
   /scm
 
   build

svn commit: r676786 - in /maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src: main/java/org/apache/maven/project/builder/ main/java/org/apache/maven/project/builder/impl/ test/java/org/apache/maven

[sisbell]

Author: sisbell
Date: Mon Jul 14 18:33:18 2008
New Revision: 676786

URL: http://svn.apache.org/viewvc?rev=676786view=rev
Log:
No inheritence of plugin execution rule. Various bug fixes.

Modified:

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ProjectUri.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java?rev=676786r1=676785r2=676786view=diff
==
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
 Mon Jul 14 18:33:18 2008
@@ -63,7 +63,7 @@
 }
 
 if (artifactId == null) {
-throw new IllegalArgumentException(properties does not 
contain artifact id. Group ID =  + groupId +
+throw new IllegalArgumentException(Properties does not 
contain artifact id. Group ID =  + groupId +
 , Version =  + version);
 }
 }
@@ -103,7 +103,7 @@
 StringBuffer sb = new StringBuffer();
 sb.append(Group ID = ).append(groupId).append(, Artifact ID = 
).append(artifactId)
 .append(, Version).append(version).append(\r\n);
-for(ModelProperty mp : properties) {
+for (ModelProperty mp : properties) {
 sb.append(mp).append(\r\n);
 }
 return sb.toString();

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java?rev=676786r1=676785r2=676786view=diff
==
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
 Mon Jul 14 18:33:18 2008
@@ -13,7 +13,8 @@
 ProjectUri.PluginRepositories.PluginRepository.xUri,
 ProjectUri.Repositories.Repository.xUri,
 ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.xUri,
-ProjectUri.Profiles.Profile.xUri
+ProjectUri.Profiles.Profile.xUri,
+ProjectUri.Build.Plugins.Plugin.Executions.Execution.xUri  
 
 ));
 
 public CollectionString getUris() {

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java?rev=676786r1=676785r2=676786view=diff
==
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
 Mon Jul 14 18:33:18 2008
@@ -15,7 +15,8 @@
 /**
  * Provides a wrapper for the maven model.
  */
-public final class PomClassicDomainModel implements InputStreamDomainModel {
+public final class
+PomClassicDomainModel implements InputStreamDomainModel {
 
 private byte[] inputBytes;
 
@@ -99,6 +100,10 @@
 }
 
 public void setEventHistory(String eventHistory) {
+if(eventHistory == null) {
+throw new IllegalArgumentException(eventHistory: null);
+   

svn commit: r676790 - in /maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src: main/java/org/apache/maven/project/builder/ test/java/org/apache/maven/project/inheritance/t12scm/

[sisbell]

Author: sisbell
Date: Mon Jul 14 20:25:14 2008
New Revision: 676790

URL: http://svn.apache.org/viewvc?rev=676790view=rev
Log:
Fixed scm unit tests to verify that the scm URL contains artifact id (not 
module name). Added support for scm developer and scm connection rules.

Modified:

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java?rev=676790r1=676789r2=676790view=diff
==
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
 Mon Jul 14 20:25:14 2008
@@ -14,7 +14,8 @@
 ProjectUri.Repositories.Repository.xUri,
 ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.xUri,
 ProjectUri.Profiles.Profile.xUri,
-ProjectUri.Build.Plugins.Plugin.Executions.Execution.xUri  
 
+ProjectUri.Build.Plugins.Plugin.Executions.Execution.xUri,
+
ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.Execution.xUri
 ));
 
 public CollectionString getUris() {

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=676790r1=676789r2=676790view=diff
==
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 Mon Jul 14 20:25:14 2008
@@ -38,6 +38,7 @@
 ProjectUri.Dependencies.Dependency.Exclusions.xUri,
 
 ProjectUri.DependencyManagement.Dependencies.xUri,
+
ProjectUri.DependencyManagement.Dependencies.Dependency.Exclusions.xUri,
 
 ProjectUri.Developers.xUri,
 ProjectUri.Licenses.xUri,
@@ -46,24 +47,22 @@
 ProjectUri.PluginRepositories.xUri,
 
 ProjectUri.Profiles.xUri,
+
ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Dependencies.xUri,
+ProjectUri.Profiles.Profile.Build.Resources.xUri,
 ProjectUri.Profiles.Profile.Build.TestResources.xUri,
 ProjectUri.Profiles.Profile.Dependencies.xUri,
+
ProjectUri.Profiles.Profile.Dependencies.Dependency.Exclusions.xUri,
 
ProjectUri.Profiles.Profile.DependencyManagement.Dependencies.xUri,
+ProjectUri.Profiles.Profile.PluginRepositories.xUri,
 ProjectUri.Profiles.Profile.Repositories.xUri,
 
 ProjectUri.Reporting.Plugins.xUri,
+ProjectUri.Reporting.Plugins.Plugin.ReportSets.xUri,
 
 ProjectUri.Repositories.xUri,
 
-
http://apache.org/maven/project/dependencyManagement/dependencies/dependency/exclusions#collection;,
-
http://apache.org/maven/project/reporting/plugins/plugin/reportSets#collection;,
-
 
http://apache.org/maven/project/profiles/profile/build/pluginManagement/plugins/plugin/dependencies#collection;,
-
http://apache.org/maven/project/profiles/profile/build/resources#collection;,
 
http://apache.org/maven/project/profiles/profile/build/pluginManagement/plugins/plugin/dependencies/dependency/exclusions#collection;,
-
http://apache.org/maven/project/profiles/profile/build/plugins/plugin/dependencies#collection;,
-
http://apache.org/maven/project/profiles/profile/pluginRepositories#collection;,
-
http://apache.org/maven/project/profiles/profile/dependencies/dependency/exclusions#collection;,
 
http://apache.org/maven/project/profiles/profile/build/pluginManagement/plugins/plugin/executions#collection;,
 
http://apache.org/maven/project/profiles/profile/build/pluginManagement/plugins#collection;,

svn commit: r676794 - in /maven/sandbox/branches/SI_MAVEN_2_1: ./ maven-core/ maven-core/src/main/java/org/apache/maven/settings/ maven-distribution/ maven-distribution/src/bin/ maven-embedder/ maven-

[sisbell]

Author: sisbell
Date: Mon Jul 14 21:41:31 2008
New Revision: 676794

URL: http://svn.apache.org/viewvc?rev=676794view=rev
Log:
Merge from trunk.

Modified:
maven/sandbox/branches/SI_MAVEN_2_1/maven-core/pom.xml

maven/sandbox/branches/SI_MAVEN_2_1/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
maven/sandbox/branches/SI_MAVEN_2_1/maven-distribution/pom.xml
maven/sandbox/branches/SI_MAVEN_2_1/maven-distribution/src/bin/mvn.bat
maven/sandbox/branches/SI_MAVEN_2_1/maven-embedder/pom.xml

maven/sandbox/branches/SI_MAVEN_2_1/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingScmPluginTest.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java
maven/sandbox/branches/SI_MAVEN_2_1/pom.xml

Modified: maven/sandbox/branches/SI_MAVEN_2_1/maven-core/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-core/pom.xml?rev=676794r1=676793r2=676794view=diff
==
--- maven/sandbox/branches/SI_MAVEN_2_1/maven-core/pom.xml (original)
+++ maven/sandbox/branches/SI_MAVEN_2_1/maven-core/pom.xml Mon Jul 14 21:41:31 
2008
@@ -78,6 +78,10 @@
 
 dependency
   groupIdorg.codehaus.plexus/groupId
+  artifactIdplexus-interpolation/artifactId
+/dependency
+dependency
+  groupIdorg.codehaus.plexus/groupId
   artifactIdplexus-utils/artifactId
 /dependency
 dependency

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?rev=676794r1=676793r2=676794view=diff
==
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 Mon Jul 14 21:41:31 2008
@@ -24,16 +24,15 @@
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
 import org.apache.maven.settings.validation.SettingsValidationResult;
 import org.apache.maven.settings.validation.SettingsValidator;
+import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
+import org.codehaus.plexus.interpolation.InterpolationException;
+import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
+import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource;
-import org.codehaus.plexus.util.interpolation.PropertiesBasedValueSource;
-import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
-import hidden.org.codehaus.plexus.interpolation.InterpolationException;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.Reader;

Modified: maven/sandbox/branches/SI_MAVEN_2_1/maven-distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-distribution/pom.xml?rev=676794r1=676793r2=676794view=diff
==
--- maven/sandbox/branches/SI_MAVEN_2_1/maven-distribution/pom.xml (original)
+++ maven/sandbox/branches/SI_MAVEN_2_1/maven-distribution/pom.xml Mon Jul 14 
21:41:31 2008
@@ -74,10 +74,6 @@
   groupIdeasymock/groupId
   artifactIdeasymock/artifactId
 /dependency
-dependency
-  groupIdcommons-httpclient/groupId
-  artifactIdcommons-httpclient/artifactId
-/dependency
   /dependencies
   profiles
 profile
@@ -245,4 +241,4 @@
   /build
 /profile
   /profiles
-/project
\ No newline at end of file
+/project

Modified: maven/sandbox/branches/SI_MAVEN_2_1/maven-distribution/src/bin/mvn.bat
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-distribution/src/bin/mvn.bat?rev=676794r1=676793r2=676794view=diff
==
--- maven/sandbox/branches/SI_MAVEN_2_1/maven-distribution/src/bin/mvn.bat 
(original)
+++ maven/sandbox/branches/SI_MAVEN_2_1/maven-distribution/src/bin/mvn.bat Mon 
Jul 14 21:41:31 2008
@@ -184,6 +184,6 @@
 
 if %MAVEN_TERMINATE_CMD% == on exit %ERROR_CODE%
 
-exit /B %ERROR_CODE%
+cmd /C exit /B %ERROR_CODE%
 
 

Modified: maven/sandbox/branches/SI_MAVEN_2_1/maven-embedder/pom.xml
URL: 

svn commit: r676803 - in /maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src: main/java/org/apache/maven/project/builder/ main/java/org/apache/maven/project/builder/impl/ test/java/org/apache/maven

[sisbell]

Author: sisbell
Date: Mon Jul 14 22:45:14 2008
New Revision: 676803

URL: http://svn.apache.org/viewvc?rev=676803view=rev
Log:
Fix for dependency ordering.

Modified:

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java

maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=676803r1=676802r2=676803view=diff
==
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 Mon Jul 14 22:45:14 2008
@@ -47,6 +47,7 @@
 ProjectUri.PluginRepositories.xUri,
 
 ProjectUri.Profiles.xUri,
+ProjectUri.Profiles.Profile.Build.Plugins.xUri,
 
ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Dependencies.xUri,
 ProjectUri.Profiles.Profile.Build.Resources.xUri,
 ProjectUri.Profiles.Profile.Build.TestResources.xUri,
@@ -54,6 +55,7 @@
 
ProjectUri.Profiles.Profile.Dependencies.Dependency.Exclusions.xUri,
 
ProjectUri.Profiles.Profile.DependencyManagement.Dependencies.xUri,
 ProjectUri.Profiles.Profile.PluginRepositories.xUri,
+ProjectUri.Profiles.Profile.Reporting.Plugins.xUri,
 ProjectUri.Profiles.Profile.Repositories.xUri,
 
 ProjectUri.Reporting.Plugins.xUri,
@@ -66,10 +68,8 @@
 
http://apache.org/maven/project/profiles/profile/build/pluginManagement/plugins/plugin/executions#collection;,
 
http://apache.org/maven/project/profiles/profile/build/pluginManagement/plugins#collection;,
 
http://apache.org/maven/project/profiles/profile/build/plugins/plugin/dependencies/dependency/exclusions#collection;,
-
http://apache.org/maven/project/profiles/profile/reporting/plugins#collection;,
 
http://apache.org/maven/project/profiles/profile/dependencyManagement/dependencies/dependency/exclusions#collection;,
 
http://apache.org/maven/project/profiles/profile/reporting/plugins/plugin/reportSets#collection;,
-
http://apache.org/maven/project/profiles/profile/build/plugins#collection;,
 
http://apache.org/maven/project/profiles/profile/build/plugins/plugin/executions#collection;,
 
 
http://apache.org/maven/project/build/plugins/plugin/dependencies/dependency/exclusions#collection;,
@@ -202,6 +202,20 @@
 tmp.add(index, new 
ModelProperty(ProjectUri.Scm.developerConnection, scmDeveloperUrl.toString()));
 }
 
+//Ordered Dependency Rule
+if (domainModels.size()  1) {
+ModelDataSource source = new DefaultModelDataSource();
+source.init(tmp, Arrays.asList(new 
ArtifactModelContainerFactory(), new IdModelContainerFactory()));
+ListModelContainer containers = 
source.queryFor(ProjectUri.Dependencies.Dependency.xUri);
+int index = 
tmp.indexOf(getPropertyFor(ProjectUri.Dependencies.xUri, tmp));
+if (index  -1) {
+for (ModelContainer container : containers) {
+tmp.removeAll(container.getProperties());
+tmp.addAll(index + 1, container.getProperties());
+}
+}
+}
+
 projectNames.add(0, getPropertyFor(ProjectUri.artifactId, 
tmp).getValue());
 
 modelProperties.addAll(tmp);

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=676803r1=676802r2=676803view=diff
==
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
 Mon Jul 14 22:45:14 2008
@@