Author: oching
Date: Sun May 24 11:04:35 2009
New Revision: 778121
URL: http://svn.apache.org/viewvc?rev=778121&view=rev
Log:
oops, forgot to remove debug logs..
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java?rev=778121&r1=778120&r2=778121&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
Sun May 24 11:04:35 2009
@@ -156,24 +156,6 @@
try
{
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
if ( VersionUtil.isUniqueSnapshot( artifact.getVersion() ) )
@@ -184,24 +166,6 @@
// Resolve the project model (build effective model, resolve
expressions)
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 ) )
{
log.debug( "Adding project model to database - " + Keys.toKey(
model ) );
@@ -209,25 +173,7 @@
// Clone model, since DAO while detachingCopy resets its
contents
// This changes contents of the cache in
EffectiveProjectModelFilter
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 );
}
else
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java?rev=778121&r1=778120&r2=778121&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
Sun May 24 11:04:35 2009
@@ -100,14 +100,6 @@
// Clone submitted project (so that we don't mess with it)
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 );
// Merge in all the parent poms.
