You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2005/10/05 22:43:24 UTC
svn commit: r295111 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: jdcasey
Date: Wed Oct 5 13:43:06 2005
New Revision: 295111
URL: http://svn.apache.org/viewcvs?rev=295111&view=rev
Log:
Resolving: MNG-1056...Added code to reconstruct the remote artifact repository list after the project has had profiles applied. This was already done for plugin repositories. Also, added null protection to DefaultLog per Chris Berry's suggestion.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java?rev=295111&r1=295110&r2=295111&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java Wed Oct 5 13:43:06 2005
@@ -35,12 +35,24 @@
public void debug( CharSequence content )
{
- logger.debug( content.toString() );
+ logger.debug( toString( content ) );
+ }
+
+ private String toString( CharSequence content )
+ {
+ if ( content == null )
+ {
+ return "";
+ }
+ else
+ {
+ return content.toString();
+ }
}
public void debug( CharSequence content, Throwable error )
{
- logger.debug( content.toString(), error );
+ logger.debug( toString( content ), error );
}
public void debug( Throwable error )
@@ -50,12 +62,12 @@
public void info( CharSequence content )
{
- logger.info( content.toString() );
+ logger.info( toString( content ) );
}
public void info( CharSequence content, Throwable error )
{
- logger.info( content.toString(), error );
+ logger.info( toString( content ), error );
}
public void info( Throwable error )
@@ -65,12 +77,12 @@
public void warn( CharSequence content )
{
- logger.warn( content.toString() );
+ logger.warn( toString( content ) );
}
public void warn( CharSequence content, Throwable error )
{
- logger.warn( content.toString(), error );
+ logger.warn( toString( content ), error );
}
public void warn( Throwable error )
@@ -80,12 +92,12 @@
public void error( CharSequence content )
{
- logger.error( content.toString() );
+ logger.error( toString( content ) );
}
public void error( CharSequence content, Throwable error )
{
- logger.error( content.toString(), error );
+ logger.error( toString( content ), error );
}
public void error( Throwable error )
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=295111&r1=295110&r2=295111&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Wed Oct 5 13:43:06 2005
@@ -676,8 +676,10 @@
"\'.\n\n Reason(s):\n" + validationResult.render( " " ) );
}
- project.setRemoteArtifactRepositories( remoteRepositories );
-
+ project.setRemoteArtifactRepositories( ProjectUtils.buildArtifactRepositories( model.getRepositories(),
+ artifactRepositoryFactory,
+ container ) );
+
// TODO: these aren't taking active project artifacts into consideration in the reactor
project.setPluginArtifacts( createPluginArtifacts( project.getBuildPlugins() ) );
project.setReportArtifacts( createReportArtifacts( project.getReportPlugins() ) );