Author: jdcasey
Date: Tue Apr 8 08:25:13 2008
New Revision: 645971
URL: http://svn.apache.org/viewvc?rev=645971&view=rev
Log:
quiet down some of the project-caching debug output for now...it's getting in
the way of debugging other things.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java?rev=645971&r1=645970&r2=645971&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
Tue Apr 8 08:25:13 2008
@@ -73,8 +73,8 @@
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 @@
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 );
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=645971&r1=645970&r2=645971&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Tue Apr 8 08:25:13 2008
@@ -223,13 +223,13 @@
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 @@
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 @@
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 @@
true,
true );
}
- else
- {
- getLogger().debug( "Returning cached project: " + project );
- }
+// else
+// {
+// getLogger().debug( "Returning cached project: " + project );
+// }
return project;
}
@@ -830,7 +830,7 @@
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 );
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java?rev=645971&r1=645970&r2=645971&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
Tue Apr 8 08:25:13 2008
@@ -283,7 +283,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
{
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 @@
if ( result != null )
{
- getLogger().debug( "Caching parent model-and-file: " + result );
+// getLogger().debug( "Caching parent model-and-file: " + result );
projectWorkspace.storeModelAndFile( result );
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java?rev=645971&r1=645970&r2=645971&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java
Tue Apr 8 08:25:13 2008
@@ -36,7 +36,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 );
}
