oops, forgot to remove debug logs..

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@778121 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
index 396b7e3a467dfd7c7b860b31abd73f06d6a20c00..3a8211a6df69c3b1528d6ce4fd3bd7e23850b773 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
@@ -156,24 +156,6 @@ public class ProjectModelToDatabaseConsumer
         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 @@ public class ProjectModelToDatabaseConsumer
             // 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 @@ public class ProjectModelToDatabaseConsumer
                 // 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

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
index 186b7d1a40c792245841ff73218789b7d9ce375b..04bec93afff15ef941c83f9b43182cbab6e543bc 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
@@ -100,14 +100,6 @@ public class EffectiveProjectModelFilter
         // 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.