svn commit: r732936 - in /maven/components/trunk: maven-model/src/main/mdo/maven.mdo maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java

[jv...@apache.org]

Author: jvanzyl
Date: Thu Jan  8 22:06:32 2009
New Revision: 732936

URL: http://svn.apache.org/viewvc?rev=732936&view=rev
Log:
MNG-3961: reverted the addition and we'll deal with this later properly

Modified:
    maven/components/trunk/maven-model/src/main/mdo/maven.mdo
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java

Modified: maven/components/trunk/maven-model/src/main/mdo/maven.mdo
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model/src/main/mdo/maven.mdo?rev=732936&r1=732935&r2=732936&view=diff
==============================================================================
--- maven/components/trunk/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/components/trunk/maven-model/src/main/mdo/maven.mdo Thu Jan  8 22:06:32 2009
@@ -2988,6 +2988,8 @@
             <type>ActivationFile</type>
           </association>
         </field>
+        <!--
+        This could be included once we teach Maven to deal with multiple versions of the model
         <field>
           <name>custom</name>
           <version>4.0.0</version>
@@ -2997,6 +2999,7 @@
             <type>ActivationCustom</type>
           </association>
         </field>
+        -->
       </fields>
     </class>
     <class>
@@ -3088,6 +3091,8 @@
         </field>
       </fields>
     </class>
+    <!--
+    This can be put back in when we figure out how to have multiple model versions
     <class>
       <name>ActivationCustom</name>
       <version>4.0.0</version>
@@ -3109,6 +3114,7 @@
         </field>
       </fields>
     </class>
+    -->
     <!-- /BuildProfile support -->
     <class xml.tagName="plugin">
       <name>ReportPlugin</name>

Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java?rev=732936&r1=732935&r2=732936&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java Thu Jan  8 22:06:32 2009
@@ -20,7 +20,7 @@
  */
 
 import org.apache.maven.model.Activation;
-import org.apache.maven.model.ActivationCustom;
+//import org.apache.maven.model.ActivationCustom;
 import org.apache.maven.model.Profile;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
@@ -58,6 +58,7 @@
     public boolean canDetermineActivation( Profile profile, ProfileActivationContext context )
         throws ProfileActivationException
     {
+        /*
         Activation activation = profile.getActivation();
 
         if ( activation != null )
@@ -74,10 +75,12 @@
                 }
             }
         }
+        */
 
         return false;
     }
 
+    /*
     private ProfileActivator loadProfileActivator( ActivationCustom custom, ProfileActivationContext context )
         throws ProfileActivationException
     {
@@ -117,15 +120,20 @@
 
         return activator;
     }
+    */
 
     public boolean isActive( Profile profile, ProfileActivationContext context )
         throws ProfileActivationException
     {
+        /*
         ActivationCustom custom = profile.getActivation().getCustom();
 
         ProfileActivator activator = loadProfileActivator( custom, context );
 
         return activator.isActive( profile, context );
+        */
+        
+        return false;
     }
 
     protected Logger getLogger()