[prev in list] [next in list] [prev in thread] [next in thread] 

List:       maven-dev
Subject:    svn commit: r690613 -
From:       sisbell () apache ! org
Date:       2008-08-30 23:27:18
Message-ID: 20080830232718.E5A4323889C1 () eris ! apache ! org
[Download RAW message or body]

Author: sisbell
Date: Sat Aug 30 16:27:18 2008
New Revision: 690613

URL: http://svn.apache.org/viewvc?rev=690613&view=rev
Log:
Enable caching and fixes for profiles.

Modified:
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java


Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
                
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/ \
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=690613&r1=690612&r2=690613&view=diff
 ==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java \
                (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java \
Sat Aug 30 16:27:18 2008 @@ -165,25 +165,26 @@
     public MavenProject build(File projectDescriptor,
                               ProjectBuilderConfiguration config)
             throws ProjectBuildingException {
-        MavenProject project = null;//projectWorkspace.getProject( projectDescriptor \
); +        MavenProject project = projectWorkspace.getProject( projectDescriptor );
 
         if (project == null) {
             project = readModelFromLocalPath("unknown", projectDescriptor, new \
                PomArtifactResolver(config.getLocalRepository(),
                     repositoryHelper.buildArtifactRepositories(getSuperModel()), \
artifactResolver), config); +
+            project.setFile(projectDescriptor);
             project = buildInternal(project.getModel(),
                     config,
                     projectDescriptor,
                     project.getParentFile(),
                     true
             );
-
+            
             Build build = project.getBuild();
             // NOTE: setting this script-source root before path translation, \
                because
             // the plugin tools compose basedir and scriptSourceRoot into a single \
                file.
             project.addScriptSourceRoot(build.getScriptSourceDirectory());
             project.addCompileSourceRoot(build.getSourceDirectory());
             project.addTestCompileSourceRoot(build.getTestSourceDirectory());
-            // Only track the file of a POM in the source tree
             project.setFile(projectDescriptor);
         }
         return project;
@@ -439,6 +440,19 @@
         catch (InvalidRepositoryException e) {
             throw new InvalidProjectModelException(projectId, e.getMessage(), \
projectDescriptor, e);  }
+       
+        project.setActiveProfiles( profileAdvisor.applyActivatedProfiles( \
project.getModel(), project.getFile(), isReactorProject, profileActivationContext ) \
); +
+        if (externalProfileManager != null) {
+            LinkedHashSet active = new LinkedHashSet();
+
+            List existingActiveProfiles = project.getActiveProfiles();
+            if ((existingActiveProfiles != null) && \
!existingActiveProfiles.isEmpty()) { +                \
active.addAll(existingActiveProfiles); +            }
+
+            profileAdvisor.applyActivatedExternalProfiles(project.getModel(), \
project.getFile(), externalProfileManager); +        }
 
         projectWorkspace.storeProjectByCoordinate(project);
         projectWorkspace.storeProjectByFile(project);
@@ -480,6 +494,7 @@
                 project.getVersion(), project.getPackaging());
         project.setArtifact(projectArtifact);
         project.setParentFile(parentFile);
+
         validateModel(model, pomFile);
         return project;
     }


[prev in list] [next in list] [prev in thread] [next in thread]