Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

slight logging adjustment 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1038916 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2010-11-25 04:23:21 +00:00
parent 8e9ef5cb4a
commit 0452f87c94
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
View File

@ -19,14 +19,6 @@ package org.apache.archiva.web.xmlrpc.services;
* under the License.
*/
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.archiva.audit.AuditEvent;
import org.apache.archiva.audit.AuditListener;
import org.apache.archiva.metadata.model.ArtifactMetadata;
@ -64,6 +56,14 @@ import org.codehaus.plexus.scheduler.CronExpressionValidator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* AdministrationServiceImpl
*
@ -493,11 +493,14 @@ public class AdministrationServiceImpl
List<ArtifactMetadata> conflicts =
repositoryMerger.getConflictingArtifacts( repoId, stagingId );
log.debug( "Artifacts in conflict.." );
for( ArtifactMetadata metadata : conflicts )
if ( log.isDebugEnabled() )
{
log.debug( metadata.getNamespace() + ":" + metadata.getProject() + ":" +
metadata.getProjectVersion() );
log.debug( "Artifacts in conflict.." );
for( ArtifactMetadata metadata : conflicts )
{
log.debug( metadata.getNamespace() + ":" + metadata.getProject() + ":" +
metadata.getProjectVersion() );
}
}
sourceArtifacts.removeAll( conflicts );
@ -519,13 +522,16 @@ public class AdministrationServiceImpl
List<ArtifactMetadata> conflicts =
repositoryMerger.getConflictingArtifacts( repoId, stagingId );
log.debug( "Artifacts in conflict.." );
for( ArtifactMetadata metadata : conflicts )
if ( log.isDebugEnabled() )
{
log.debug( metadata.getNamespace() + ":" + metadata.getProject() + ":" +
metadata.getProjectVersion() );
log.debug( "Artifacts in conflict.." );
for( ArtifactMetadata metadata : conflicts )
{
log.debug( metadata.getNamespace() + ":" + metadata.getProject() + ":" +
metadata.getProjectVersion() );
}
}
sourceArtifacts.removeAll( conflicts );
log.debug( "Source artifacts size :: " + sourceArtifacts.size() );