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

oops, forgot to remove debug logs.. 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@778121 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maria Odea B. Ching 2009-05-24 11:04:35 +00:00
parent af0109d90f
commit b704d37229
2 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
View File

@ -156,24 +156,6 @@ public class ProjectModelToDatabaseConsumer
try try
{ {
model = reader.read( artifactFile ); model = reader.read( artifactFile );
Organization organization = model.getOrganization();
if( organization != null )
{
log.info( "++++ [AfterRead] organization NAME --> " + organization.getName() + " : " + organization.getOrganizationName() );
}
IssueManagement iM = model.getIssueManagement();
if( iM != null )
{
log.info( "++++ [AfterRead] issueMgnt url --> " + iM.getUrl() + " : " + iM.getIssueManagementUrl() );
}
CiManagement ci = model.getCiManagement();
if( ci != null )
{
log.info( "++++ [AfterRead] ci url --> " + ci.getUrl() + " : " + ci.getCiUrl() );
}
// The version should be updated to the artifact/filename version if it is a unique snapshot // The version should be updated to the artifact/filename version if it is a unique snapshot
if ( VersionUtil.isUniqueSnapshot( artifact.getVersion() ) ) if ( VersionUtil.isUniqueSnapshot( artifact.getVersion() ) )
@ -184,24 +166,6 @@ public class ProjectModelToDatabaseConsumer
// Resolve the project model (build effective model, resolve expressions) // Resolve the project model (build effective model, resolve expressions)
model = effectiveModelFilter.filter( model ); model = effectiveModelFilter.filter( model );
organization = model.getOrganization();
if( organization != null )
{
log.info( "++++ [AfterFilter] organization NAME --> " + organization.getName() + " : " + organization.getOrganizationName() );
}
iM = model.getIssueManagement();
if( iM != null )
{
log.info( "++++ [AfterFilter] issueMgnt url --> " + iM.getUrl() + " : " + iM.getIssueManagementUrl() );
}
ci = model.getCiManagement();
if( ci != null )
{
log.info( "++++ [AfterFilter] ci url --> " + ci.getUrl() + " : " + ci.getCiUrl() );
}
if ( isValidModel( model, repo, artifact ) ) if ( isValidModel( model, repo, artifact ) )
{ {
log.debug( "Adding project model to database - " + Keys.toKey( model ) ); log.debug( "Adding project model to database - " + Keys.toKey( model ) );
@ -209,25 +173,7 @@ public class ProjectModelToDatabaseConsumer
// Clone model, since DAO while detachingCopy resets its contents // Clone model, since DAO while detachingCopy resets its contents
// This changes contents of the cache in EffectiveProjectModelFilter // This changes contents of the cache in EffectiveProjectModelFilter
model = ArchivaModelCloner.clone( model ); model = ArchivaModelCloner.clone( model );
organization = model.getOrganization();
if( organization != null )
{
log.info( "++++ [AfterClone] organization NAME --> " + organization.getName() + " : " + organization.getOrganizationName() );
}
iM = model.getIssueManagement();
if( iM != null )
{
log.info( "++++ [AfterClone] issueMgnt url --> " + iM.getUrl() + " : " + iM.getIssueManagementUrl() );
}
ci = model.getCiManagement();
if( ci != null )
{
log.info( "++++ [AfterClone] ci url --> " + ci.getUrl() + " : " + ci.getCiUrl() );
}
dao.getProjectModelDAO().saveProjectModel( model ); dao.getProjectModelDAO().saveProjectModel( model );
} }
else else

8
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
View File

@ -100,14 +100,6 @@ public class EffectiveProjectModelFilter
// Clone submitted project (so that we don't mess with it) // Clone submitted project (so that we don't mess with it)
effectiveProject = ArchivaModelCloner.clone( project ); effectiveProject = ArchivaModelCloner.clone( project );
System.out.println( "++++[EFFECTIVE Project] effectiveProject --> " + effectiveProject );
IssueManagement iM = effectiveProject.getIssueManagement();
if( iM != null )
{
System.out.println( "++++[EFFECTIVE Project] issue mgnt URL --> " + iM.getUrl() + " $$ " +
iM.getIssueManagementUrl() );
}
DEBUG( "Starting build of effective with: " + effectiveProject ); DEBUG( "Starting build of effective with: " + effectiveProject );
// Merge in all the parent poms. // Merge in all the parent poms.