svn commit: r585699 - in /maven/components/trunk: maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java

[jd...@apache.org]

Author: jdcasey
Date: Wed Oct 17 14:01:50 2007
New Revision: 585699

URL: http://svn.apache.org/viewvc?rev=585699&view=rev
Log:
Fixing it0022

Modified:
    maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java

Modified: maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java?rev=585699&r1=585698&r2=585699&view=diff
==============================================================================
--- maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java (original)
+++ maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java Wed Oct 17 14:01:50 2007
@@ -44,10 +44,14 @@
     {
         File profilesXml = new File( basedir, PROFILES_XML_FILE );
 
+        getLogger().debug( "Checking for external profiles in: " + profilesXml.getAbsolutePath() );
+
         ProfilesRoot profilesRoot = null;
 
         if ( profilesXml.exists() )
         {
+            getLogger().debug( "reading: " + profilesXml.getAbsolutePath() );
+
             ProfilesXpp3Reader reader = new ProfilesXpp3Reader();
             Reader profileReader = null;
             try

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=585699&r1=585698&r2=585699&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 Wed Oct 17 14:01:50 2007
@@ -38,6 +38,8 @@
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
+import org.codehaus.plexus.logging.LogEnabled;
+import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
@@ -49,7 +51,7 @@
 import java.util.List;
 
 public class DefaultProfileAdvisor
-    implements ProfileAdvisor, Contextualizable
+    implements ProfileAdvisor, LogEnabled, Contextualizable
 {
 
     public static final String ROLE_HINT = "default";
@@ -62,9 +64,12 @@
 
     private PlexusContainer container;
 
+    private Logger logger;
+
     public List applyActivatedProfiles( Model model, File pomFile, List explicitlyActiveIds, List explicitlyInactiveIds )
         throws ProjectBuildingException
     {
+        logger.debug( "Building profile manager for model: " + model.getId() + " with pom file: " + pomFile );
         ProfileManager profileManager = buildProfileManager( model, pomFile, explicitlyActiveIds, explicitlyInactiveIds );
 
         return applyActivatedProfiles( model, pomFile, profileManager );
@@ -73,6 +78,7 @@
     public List applyActivatedExternalProfiles( Model model, File projectDir, ProfileManager externalProfileManager )
         throws ProjectBuildingException
     {
+        logger.debug( "Building profile manager for model: " + model.getId() + " with external profile manager including profiles: " + externalProfileManager.getProfilesById() );
         return applyActivatedProfiles( model, projectDir, externalProfileManager );
     }
 
@@ -134,11 +140,7 @@
 
         if ( pomFile != null )
         {
-            File projectDir = pomFile.getParentFile();
-            if ( projectDir != null )
-            {
-                loadExternalProjectProfiles( profileManager, model, projectDir );
-            }
+            loadExternalProjectProfiles( profileManager, model, pomFile );
         }
 
         return profileManager;
@@ -251,6 +253,11 @@
         throws ContextException
     {
         container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
+    }
+
+    public void enableLogging( Logger logger )
+    {
+        this.logger = logger;
     }
 
 }