From 0734c3e60ecf5b31c3c60d8921b3a68384baa24a Mon Sep 17 00:00:00 2001 From: John Dennis Casey Date: Tue, 8 Apr 2008 15:25:13 +0000 Subject: [PATCH] quiet down some of the project-caching debug output for now...it's getting in the way of debugging other things. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@645971 13f79535-47bb-0310-9956-ffa450edef68 --- .../profiles/build/DefaultProfileAdvisor.java | 10 +++---- .../project/DefaultMavenProjectBuilder.java | 26 +++++++++---------- .../model/DefaultModelLineageBuilder.java | 20 +++++++------- .../workspace/DefaultProjectWorkspace.java | 18 ++++++------- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java b/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java index b4ae7f6abc..6b813187b0 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java +++ b/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java @@ -73,8 +73,8 @@ public List applyActivatedProfiles( Model model, ProfileActivationContext activationContext ) throws ProjectBuildingException { - logger.debug( "Building profile manager for model: " + model.getId() + " with pom file: " - + pomFile ); +// logger.debug( "Building profile manager for model: " + model.getId() + " with pom file: " +// + pomFile ); ProfileManager profileManager = buildProfileManager( model, pomFile, useProfilesXml, @@ -93,9 +93,9 @@ public List applyActivatedExternalProfiles( Model model, return Collections.EMPTY_LIST; } - logger.debug( "Building profile manager for model: " + model.getId() - + " with external profile manager including profiles: " - + externalProfileManager.getProfilesById() ); +// logger.debug( "Building profile manager for model: " + model.getId() +// + " with external profile manager including profiles: " +// + externalProfileManager.getProfilesById() ); return applyActivatedProfiles( model, projectDir, externalProfileManager ); } diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index 8deb562b1f..056b9e26a0 100644 --- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -223,13 +223,13 @@ public MavenProject buildFromRepository( Artifact artifact, MavenProject project = null; if ( !Artifact.LATEST_VERSION.equals( artifact.getVersion() ) && !Artifact.RELEASE_VERSION.equals( artifact.getVersion() ) ) { - getLogger().debug( "Checking cache for project (in buildFromRepository): " + artifactKey ); +// getLogger().debug( "Checking cache for project (in buildFromRepository): " + artifactKey ); project = projectWorkspace.getProject( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() ); } if ( project == null ) { - getLogger().debug( "Allowing buildFromRepository to proceed for: " + artifactKey ); +// getLogger().debug( "Allowing buildFromRepository to proceed for: " + artifactKey ); Model model = findModelFromRepository( artifact, remoteArtifactRepositories, localRepository ); @@ -238,10 +238,10 @@ public MavenProject buildFromRepository( Artifact artifact, project = buildInternal( model, config, remoteArtifactRepositories, artifact.getFile(), false, false, false ); } - else - { - getLogger().debug( "Returning cached project: " + project ); - } +// else +// { +// getLogger().debug( "Returning cached project: " + project ); +// } return project; } @@ -482,13 +482,13 @@ private MavenProject buildFromSourceFileInternal( File projectDescriptor, ProjectBuilderConfiguration config ) throws ProjectBuildingException { - getLogger().debug( "Checking cache-hit on project (in build*): " + projectDescriptor ); +// getLogger().debug( "Checking cache-hit on project (in build*): " + projectDescriptor ); MavenProject project = projectWorkspace.getProject( projectDescriptor ); if ( project == null ) { - getLogger().debug( "Allowing project-build to proceed for: " + projectDescriptor ); +// getLogger().debug( "Allowing project-build to proceed for: " + projectDescriptor ); Model model = readModel( "unknown", projectDescriptor, STRICT_MODEL_PARSING ); @@ -500,10 +500,10 @@ private MavenProject buildFromSourceFileInternal( File projectDescriptor, true, true ); } - else - { - getLogger().debug( "Returning cached project: " + project ); - } +// else +// { +// getLogger().debug( "Returning cached project: " + project ); +// } return project; } @@ -830,7 +830,7 @@ private MavenProject buildInternal( Model model, project.setFile( projectDescriptor ); } - getLogger().debug( "Caching project: " + project.getId() + " (also keyed by file: " + project.getFile() + ")" ); +// getLogger().debug( "Caching project: " + project.getId() + " (also keyed by file: " + project.getFile() + ")" ); projectWorkspace.storeProjectByCoordinate( project ); projectWorkspace.storeProjectByFile( project ); diff --git a/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java b/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java index 5c08894f35..a5aa13b78f 100644 --- a/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java @@ -283,7 +283,7 @@ private void loadActiveProfileRepositories( List repositories, boolean useProfilesXml ) throws ProjectBuildingException { - getLogger().debug( "Grabbing profile-injected repositories for: " + model.getId() ); +// getLogger().debug( "Grabbing profile-injected repositories for: " + model.getId() ); // FIXME: Find a way to pass in this context, so it's never null! ProfileActivationContext context; @@ -301,14 +301,14 @@ private void loadActiveProfileRepositories( List repositories, pomFile, config.getGlobalProfileManager() ); - getLogger().debug( "Got external-profile repositories: " + profileRepos ); +// getLogger().debug( "Got external-profile repositories: " + profileRepos ); LinkedHashSet pomProfileRepos = profileAdvisor.getArtifactRepositoriesFromActiveProfiles( model, pomFile, useProfilesXml, context ); - getLogger().debug( "Got pom-profile repositories: " + pomProfileRepos ); +// getLogger().debug( "Got pom-profile repositories: " + pomProfileRepos ); profileRepos.addAll( pomProfileRepos ); @@ -349,7 +349,7 @@ private ModelAndFile resolveParentPom( ModelAndFile child, if ( childIsReactorProject && modelPomFile != null ) { - getLogger().debug( "Attempting to locate parent model using relativePath and local filesystem; child is a reactor project." ); +// getLogger().debug( "Attempting to locate parent model using relativePath and local filesystem; child is a reactor project." ); // if the child isn't a reactor project, don't resolve the parent from the local filesystem...use the repository. String relativePath = modelParent.getRelativePath(); @@ -362,7 +362,7 @@ private ModelAndFile resolveParentPom( ModelAndFile child, parentPomFile = new File( parentPomFile, "pom.xml" ); } - getLogger().debug( "Checking cache for parent model-and-file instance: " + key + " using file: " + parentPomFile ); +// getLogger().debug( "Checking cache for parent model-and-file instance: " + key + " using file: " + parentPomFile ); result = projectWorkspace.getModelAndFile( parentPomFile ); if ( result != null && !parentModelMatches( modelParent, result.getModel() ) ) @@ -374,18 +374,18 @@ private ModelAndFile resolveParentPom( ModelAndFile child, if ( result == null ) { - getLogger().debug( "Checking cache for parent model-and-file instance: " + key + " using project groupId:artifactId:version." ); +// getLogger().debug( "Checking cache for parent model-and-file instance: " + key + " using project groupId:artifactId:version." ); result = projectWorkspace.getModelAndFile( modelParent.getGroupId(), modelParent.getArtifactId(), modelParent.getVersion() ); } if ( result != null ) { - getLogger().debug( "Returning cached instance." ); +// getLogger().debug( "Returning cached instance." ); return result; } - getLogger().debug( "Allowing parent-model resolution to proceed for: " + key + " (child is: " + model.getId() + ")" ); +// getLogger().debug( "Allowing parent-model resolution to proceed for: " + key + " (child is: " + model.getId() + ")" ); if ( parentPomFile != null ) { @@ -409,7 +409,7 @@ private ModelAndFile resolveParentPom( ModelAndFile child, { try { - getLogger().debug( "Attempting to resolve parent POM: " + modelParent.getId() + " using repositories:\n" + StringUtils.join( remoteRepositories.iterator(), "\n" ) ); +// getLogger().debug( "Attempting to resolve parent POM: " + modelParent.getId() + " using repositories:\n" + StringUtils.join( remoteRepositories.iterator(), "\n" ) ); parentPomFile = resolveParentFromRepositories( modelParent, config, @@ -473,7 +473,7 @@ private ModelAndFile resolveParentPom( ModelAndFile child, if ( result != null ) { - getLogger().debug( "Caching parent model-and-file: " + result ); +// getLogger().debug( "Caching parent model-and-file: " + result ); projectWorkspace.storeModelAndFile( result ); } diff --git a/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java b/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java index 34210269e1..bf026234d1 100644 --- a/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java +++ b/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java @@ -36,7 +36,7 @@ public ModelAndFile getModelAndFile( String groupId, String key = createCacheKey( groupId, artifactId, version ); - getLogger().debug( "Retrieving ModelAndFile instance for: " + key + " from workspace." ); +// getLogger().debug( "Retrieving ModelAndFile instance for: " + key + " from workspace." ); return (ModelAndFile) cache.get( key ); } @@ -46,7 +46,7 @@ public ModelAndFile getModelAndFile( File modelFile ) Object pathKey = resolvePathKey( modelFile ); - getLogger().debug( "Retrieving ModelAndFile instance for: " + pathKey + " from workspace." ); +// getLogger().debug( "Retrieving ModelAndFile instance for: " + pathKey + " from workspace." ); return (ModelAndFile) cache.get( pathKey ); } @@ -66,7 +66,7 @@ public MavenProject getProject( File projectFile ) Object pathKey = resolvePathKey( projectFile ); - getLogger().debug( "Retrieving MavenProject instance for: " + pathKey + " from workspace." ); +// getLogger().debug( "Retrieving MavenProject instance for: " + pathKey + " from workspace." ); return (MavenProject) cache.get( pathKey ); } @@ -78,7 +78,7 @@ public MavenProject getProject( String groupId, String key = createCacheKey( groupId, artifactId, version ); - getLogger().debug( "Retrieving MavenProject instance for: " + key + " from workspace." ); +// getLogger().debug( "Retrieving MavenProject instance for: " + key + " from workspace." ); return (MavenProject) cache.get( key ); } @@ -88,7 +88,7 @@ public void storeModelAndFile( ModelAndFile modelAndFile ) Object pathKey = resolvePathKey( modelAndFile.getFile() ); - getLogger().debug( "Storing ModelAndFile instance under: " + pathKey + " in workspace." ); +// getLogger().debug( "Storing ModelAndFile instance under: " + pathKey + " in workspace." ); cache.put( pathKey, modelAndFile ); cache = workspaceStore.getWorkspaceCache( ProjectWorkspace.MODEL_AND_FILE_BYGAV_KEY ); @@ -97,12 +97,12 @@ public void storeModelAndFile( ModelAndFile modelAndFile ) String key = createCacheKey( model.getGroupId(), model.getArtifactId(), model.getVersion() ); String keyWithParent = createCacheKeyUsingParent( model ); - getLogger().debug( "Storing ModelAndFile instance under: " + key + " in workspace." ); +// getLogger().debug( "Storing ModelAndFile instance under: " + key + " in workspace." ); cache.put( key, modelAndFile ); if ( !key.equals( keyWithParent ) ) { - getLogger().debug( "Also Storing ModelAndFile instance using groupId/version information from parent, under: " + keyWithParent + " in workspace." ); +// getLogger().debug( "Also Storing ModelAndFile instance using groupId/version information from parent, under: " + keyWithParent + " in workspace." ); cache.put( keyWithParent, modelAndFile ); } } @@ -139,7 +139,7 @@ public void storeProjectByFile( MavenProject project ) Object pathKey = resolvePathKey( project.getFile() ); - getLogger().debug( "Storing MavenProject instance under: " + pathKey + " in workspace." ); +// getLogger().debug( "Storing MavenProject instance under: " + pathKey + " in workspace." ); cache.put( pathKey, project ); } @@ -149,7 +149,7 @@ public void storeProjectByCoordinate( MavenProject project ) String key = createCacheKey( project.getGroupId(), project.getArtifactId(), project.getVersion() ); - getLogger().debug( "Storing MavenProject instance under: " + key + " in workspace." ); +// getLogger().debug( "Storing MavenProject instance under: " + key + " in workspace." ); cache.put( key, project ); }