maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r693332 [2/6] - in /maven/components/trunk: ./ maven-core-it-runner/ maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/errors/ maven-core/src/main/java/org/apache/maven/execution/ maven-core/src/main/java/...
Date Tue, 09 Sep 2008 01:04:21 GMT
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java?rev=693332&r1=693331&r2=693332&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java
(original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java
Mon Sep  8 18:04:17 2008
@@ -29,35 +29,25 @@
 import java.util.List;
 
 /**
- *
  * @author jdcasey
- *
  */
 public interface ProfileAdvisor
 {
 
     String ROLE = ProfileAdvisor.class.getName();
 
-    LinkedHashSet getArtifactRepositoriesFromActiveProfiles( Model model,
-                                                             File pomFile,
-                                                             ProfileManager profileManager
)
+    LinkedHashSet getArtifactRepositoriesFromActiveProfiles( Model model, File pomFile, ProfileManager
profileManager )
         throws ProjectBuildingException;
 
-    LinkedHashSet getArtifactRepositoriesFromActiveProfiles( Model model,
-                                                             File pomFile,
-                                                             boolean useProfilesXml,
+    LinkedHashSet getArtifactRepositoriesFromActiveProfiles( Model model, File pomFile, boolean
useProfilesXml,
                                                              ProfileActivationContext profileActivationContext
)
         throws ProjectBuildingException;
 
-    List applyActivatedProfiles( Model model,
-                                 File pomFile,
-                                 boolean useProfilesXml,
+    List applyActivatedProfiles( Model model, File pomFile, boolean useProfilesXml,
                                  ProfileActivationContext activationContext )
         throws ProjectBuildingException;
 
-    List applyActivatedExternalProfiles( Model model,
-                                         File pomFile,
-                                         ProfileManager externalProfileManager )
+    List applyActivatedExternalProfiles( Model model, File pomFile, ProfileManager externalProfileManager
)
         throws ProjectBuildingException;
 
 }

Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java?rev=693332&r1=693331&r2=693332&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java
(original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java
Mon Sep  8 18:04:17 2008
@@ -49,11 +49,11 @@
 /**
  * Inject profile data into a Model, using the profile as the dominant data source, and
  * persisting results of the injection in the Model.
- *
+ * <p/>
  * This will look similar to the ModelUtils/DefaultModelInheritanceAssembler code, but
  * they are distinct. In model inheritance, the child provides data dominance AND persists
  * the results of the merge...sort of a 'merge-out' system.
- *
+ * <p/>
  * In this system, the profile is dominant, but the model receives the merge result...sort
  * of a 'merge-in' system. The two pieces of code look like they could be combined with a
  * set of flags to determine which direction to merge 'to', but there are enough differences
@@ -142,15 +142,15 @@
 
     /**
      * This should be the resulting ordering of plugins after injection:
-     *
+     * <p/>
      * Given:
-     *
-     *   model: X -> A -> B -> D -> E
-     *   profile: Y -> A -> C -> D -> F
-     *
+     * <p/>
+     * model: X -> A -> B -> D -> E
+     * profile: Y -> A -> C -> D -> F
+     * <p/>
      * Result:
-     *
-     *   X -> Y -> A -> B -> C -> D -> E -> F
+     * <p/>
+     * X -> Y -> A -> B -> C -> D -> E -> F
      */
     protected void injectPlugins( PluginContainer profileContainer, PluginContainer modelContainer
)
     {
@@ -214,7 +214,8 @@
             modelPlugin.setVersion( profilePlugin.getVersion() );
         }
 
-        modelPlugin.setDependencies( injectDependencies( profilePlugin.getDependencies(),
modelPlugin.getDependencies() ) );
+        modelPlugin.setDependencies(
+            injectDependencies( profilePlugin.getDependencies(), modelPlugin.getDependencies()
) );
 
         // merge the lists of goals that are not attached to an <execution/>
         injectConfigurationContainer( profilePlugin, modelPlugin );
@@ -297,13 +298,13 @@
 
     /**
      * Merge two DOMs. Copy the dominant DOM so the original one is left unchanged.
-     * <p>
+     * <p/>
      * Use this method instead of a direct call to {@link Xpp3Dom#mergeXpp3Dom(Xpp3Dom, Xpp3Dom)}.
      * Profiles are dominant, thus they are merge targets, but they may be merged in several
times
      * (e.g. if they are inherited). So with the second merge, you don't get the profile's
original
      * DOM, but an already merged one.
      *
-     * @param dominant Dominant DOM
+     * @param dominant  Dominant DOM
      * @param recessive Recessive DOM
      * @return Merged DOM
      */



Mime
View raw message