maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject cvs commit: maven-components/maven-model maven.mdo
Date Thu, 26 Aug 2004 01:18:19 GMT
jdcasey     2004/08/25 18:18:19

  Modified:    maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase
                        GoalDecorationPhase.java
               maven-plugins/maven-resources-plugin pom.xml
               .        .cvsignore pom.xml
               maven-core/src/main/java/org/apache/maven MavenCli.java
                        DefaultMaven.java
               maven-core/src/main/java/org/apache/maven/plugin
                        DefaultPluginManager.java
               maven-core/src/test/java/org/apache/maven MavenTestCase.java
               maven-plugins/maven-jar-plugin pom.xml
               maven-artifact pom.xml
               maven-core pom.xml
               maven-plugins/maven-compiler-plugin pom.xml
               maven-model maven.mdo
  Log:
  o Changed to depend on plexus-0.17 instead of -0.16
  o Changed the embedder/container used to be the new artifact-aware container (plexus-artifact-container-1.0-alpha-1)
  o Added new dependency to maven-core for artifact-container.
  
  Revision  Changes    Path
  1.2       +2 -65     maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalDecorationPhase.java
  
  Index: GoalDecorationPhase.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalDecorationPhase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- GoalDecorationPhase.java	15 Aug 2004 15:01:51 -0000	1.1
  +++ GoalDecorationPhase.java	26 Aug 2004 01:18:01 -0000	1.2
  @@ -37,73 +37,10 @@
    */
   public class GoalDecorationPhase extends AbstractMavenGoalPhase
   {
  -    public static final String MAVEN_XML_DEFAULT_NAMESPACE = "mavenxml";
  -    public static final String MAVEN_SCRIPT = "decorators.xml";
  -    private GoalDecoratorBindings decorators;
  -    private boolean decoratorsInitialized = false;
  -
       public void execute( MavenGoalExecutionContext context )
           throws GoalExecutionException
       {
  -        synchronized ( this )
  -        {
  -            if ( !decoratorsInitialized )
  -            {
  -                try
  -                {
  -                    initializeDecorators( context );
  -                }
  -                catch ( XmlPullParserException e )
  -                {
  -                    throw new GoalExecutionException( "Error parsing decorators.xml: ",
e );
  -                }
  -                catch ( IOException e )
  -                {
  -                    throw new GoalExecutionException( "Error reading decorators.xml file:
", e );
  -                }
  -            }
  -        }
  -
  -        context.setGoalDecoratorBindings( decorators );
  +        
       }
   
  -    private void initializeDecorators( MavenGoalExecutionContext context )
  -        throws XmlPullParserException, IOException
  -    {
  -        MavenProject project = context.getProject();
  -
  -        File pom = project.getFile();
  -
  -        File dir = pom.getParentFile();
  -
  -        File scriptFile = new File( dir, MAVEN_SCRIPT );
  -
  -        if ( scriptFile.exists() )
  -        {
  -            BufferedReader reader = null;
  -
  -            try
  -            {
  -                reader = new BufferedReader( new FileReader( scriptFile ) );
  -
  -                GoalDecorationParser parser = new GoalDecorationParser();
  -                this.decorators = parser.parse( reader );
  -            }
  -            finally
  -            {
  -                if ( reader != null )
  -                {
  -                    try
  -                    {
  -                        reader.close();
  -                    }
  -                    catch ( IOException e )
  -                    {
  -                    }
  -                }
  -            }
  -        }
  -
  -        decoratorsInitialized = true;
  -    }
   }
  
  
  
  1.12      +1 -1      maven-components/maven-plugins/maven-resources-plugin/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-plugins/maven-resources-plugin/pom.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- pom.xml	15 Aug 2004 06:11:07 -0000	1.11
  +++ pom.xml	26 Aug 2004 01:18:02 -0000	1.12
  @@ -27,7 +27,7 @@
       <dependency>
         <groupId>plexus</groupId>
         <artifactId>plexus</artifactId>
  -      <version>0.16</version>
  +      <version>0.17</version>
       </dependency>
     </dependencies>
     <build>
  
  
  
  1.6       +1 -0      maven-components/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/maven-components/.cvsignore,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- .cvsignore	10 Aug 2004 02:41:13 -0000	1.5
  +++ .cvsignore	26 Aug 2004 01:18:06 -0000	1.6
  @@ -4,3 +4,4 @@
   .project
   bootstrap.repo
   maven-component.i*
  +.settings
  
  
  
  1.7       +1 -1      maven-components/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/pom.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- pom.xml	15 Aug 2004 04:25:02 -0000	1.6
  +++ pom.xml	26 Aug 2004 01:18:07 -0000	1.7
  @@ -78,7 +78,7 @@
       <dependency>
         <groupId>plexus</groupId>
         <artifactId>plexus</artifactId>
  -      <version>0.16</version>
  +      <version>0.17</version>
       </dependency>
       <dependency>
         <groupId>xstream</groupId>
  
  
  
  1.3       +3 -2      maven-components/maven-core/src/main/java/org/apache/maven/MavenCli.java
  
  Index: MavenCli.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/MavenCli.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MavenCli.java	15 Aug 2004 04:32:03 -0000	1.2
  +++ MavenCli.java	26 Aug 2004 01:18:08 -0000	1.3
  @@ -25,6 +25,7 @@
   import org.apache.commons.cli.PosixParser;
   import org.apache.maven.plugin.descriptor.MojoDescriptor;
   import org.codehaus.classworlds.ClassWorld;
  +import org.codehaus.plexus.embed.ArtifactEnabledEmbedder;
   import org.codehaus.plexus.embed.Embedder;
   import org.codehaus.plexus.util.StringUtils;
   
  @@ -55,7 +56,7 @@
   
           //---
   
  -        Embedder embedder = new Embedder();       
  +        ArtifactEnabledEmbedder embedder = new ArtifactEnabledEmbedder();       
   
           embedder.start( classWorld );
   
  
  
  
  1.6       +3 -2      maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
  
  Index: DefaultMaven.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultMaven.java	17 Aug 2004 20:55:50 -0000	1.5
  +++ DefaultMaven.java	26 Aug 2004 01:18:08 -0000	1.6
  @@ -28,6 +28,7 @@
   import org.apache.maven.project.MavenProject;
   import org.apache.maven.project.MavenProjectBuilder;
   import org.apache.maven.project.ProjectBuildingException;
  +import org.codehaus.plexus.ArtifactEnabledContainer;
   import org.codehaus.plexus.PlexusConstants;
   import org.codehaus.plexus.PlexusContainer;
   import org.codehaus.plexus.context.Context;
  @@ -50,7 +51,7 @@
       extends AbstractLogEnabled
       implements Maven, Contextualizable
   {
  -    private PlexusContainer container;
  +    private ArtifactEnabledContainer container;
   
       private String mavenHome;
   
  @@ -363,7 +364,7 @@
       public void contextualize( Context context )
           throws ContextException
       {
  -        container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
  +        container = (ArtifactEnabledContainer) context.get( PlexusConstants.PLEXUS_KEY
);
       }
   
       // ----------------------------------------------------------------------
  
  
  
  1.4       +3 -2      maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
  
  Index: DefaultPluginManager.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultPluginManager.java	19 Aug 2004 17:14:17 -0000	1.3
  +++ DefaultPluginManager.java	26 Aug 2004 01:18:14 -0000	1.4
  @@ -25,6 +25,7 @@
   import org.apache.maven.plugin.descriptor.MojoDescriptor;
   import org.apache.maven.plugin.descriptor.PluginDescriptor;
   import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
  +import org.codehaus.plexus.ArtifactEnabledContainer;
   import org.codehaus.plexus.PlexusConstants;
   import org.codehaus.plexus.PlexusContainer;
   import org.codehaus.plexus.component.discovery.ComponentDiscoveryEvent;
  @@ -62,7 +63,7 @@
   
       protected ArtifactHandlerManager artifactHandlerManager;
   
  -    protected PlexusContainer container;
  +    protected ArtifactEnabledContainer container;
   
       protected PluginDescriptorBuilder pluginDescriptorBuilder;
   
  @@ -279,7 +280,7 @@
       public void contextualize( Context context )
           throws ContextException
       {
  -        container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
  +        container = (ArtifactEnabledContainer) context.get( PlexusConstants.PLEXUS_KEY
);
       }
   
       public void initialize()
  
  
  
  1.4       +3 -2      maven-components/maven-core/src/test/java/org/apache/maven/MavenTestCase.java
  
  Index: MavenTestCase.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/MavenTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MavenTestCase.java	15 Aug 2004 15:01:51 -0000	1.3
  +++ MavenTestCase.java	26 Aug 2004 01:18:16 -0000	1.4
  @@ -25,6 +25,7 @@
   import org.apache.maven.project.MavenProjectBuilder;
   import org.codehaus.classworlds.ClassRealm;
   import org.codehaus.classworlds.ClassWorld;
  +import org.codehaus.plexus.ArtifactEnabledPlexusTestCase;
   import org.codehaus.plexus.PlexusTestCase;
   
   import java.io.File;
  @@ -36,7 +37,7 @@
    * @version $Id$
    */
   public class MavenTestCase
  -    extends PlexusTestCase
  +    extends ArtifactEnabledPlexusTestCase
   {
       protected PluginManager pluginManager;
   
  
  
  
  1.8       +1 -1      maven-components/maven-plugins/maven-jar-plugin/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-plugins/maven-jar-plugin/pom.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- pom.xml	9 Aug 2004 19:33:44 -0000	1.7
  +++ pom.xml	26 Aug 2004 01:18:18 -0000	1.8
  @@ -17,7 +17,7 @@
       <dependency>
         <groupId>plexus</groupId>
         <artifactId>plexus</artifactId>
  -      <version>0.16</version>
  +      <version>0.17</version>
       </dependency>
       <dependency>
         <groupId>maven</groupId>
  
  
  
  1.3       +1 -1      maven-components/maven-artifact/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/pom.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pom.xml	9 Aug 2004 19:38:15 -0000	1.2
  +++ pom.xml	26 Aug 2004 01:18:18 -0000	1.3
  @@ -23,7 +23,7 @@
       <dependency>
         <groupId>plexus</groupId>
         <artifactId>plexus</artifactId>
  -      <version>0.16</version>
  +      <version>0.17</version>
       </dependency>
       <dependency>
         <groupId>xstream</groupId>
  
  
  
  1.3       +5 -0      maven-components/maven-core/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/pom.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pom.xml	9 Aug 2004 21:42:47 -0000	1.2
  +++ pom.xml	26 Aug 2004 01:18:18 -0000	1.3
  @@ -15,6 +15,11 @@
     <package>org.apache.maven</package>
     <logo>/images/maven.gif</logo>
     <dependencies>
  +    <dependency>
  +      <groupId>plexus</groupId>
  +      <artifactId>plexus-artifact-container</artifactId>
  +      <version>1.0-alpha-1</version>
  +    </dependency>
       <!-- maven component -->
       <dependency>
         <groupId>maven</groupId>
  
  
  
  1.10      +1 -1      maven-components/maven-plugins/maven-compiler-plugin/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-plugins/maven-compiler-plugin/pom.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- pom.xml	9 Aug 2004 23:28:50 -0000	1.9
  +++ pom.xml	26 Aug 2004 01:18:18 -0000	1.10
  @@ -18,7 +18,7 @@
       <dependency>
         <groupId>plexus</groupId>
         <artifactId>plexus</artifactId>
  -      <version>0.16</version>
  +      <version>0.17</version>
       </dependency>
       <dependency>
         <groupId>plexus</groupId>
  
  
  
  1.51      +46 -0     maven-components/maven-model/maven.mdo
  
  Index: maven.mdo
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- maven.mdo	27 Jul 2004 15:40:04 -0000	1.50
  +++ maven.mdo	26 Aug 2004 01:18:19 -0000	1.51
  @@ -324,6 +324,20 @@
             <description>Distribution information for a project.</description>
             <type>DistributionManagement</type>
           </field>
  +        <field>
  +          <name>preGoals</name>
  +          <version>4.0.0</version>
  +          <description>Set of decorator(s) injected before the target goal(s).</description>
  +          <type>java.util.List</type>
  +          <defaultValue>new java.util.ArrayList()</defaultValue>
  +        </field>
  +        <field>
  +          <name>postGoals</name>
  +          <version>4.0.0</version>
  +          <description>Set of decorator(s) injected after the target goal(s).</description>
  +          <type>java.util.List</type>
  +          <defaultValue>new java.util.ArrayList()</defaultValue>
  +        </field>
         </fields>
         <!-- We need this because we can't use package as a field name. -->
         <codeSegments>
  @@ -1263,6 +1277,38 @@
             <type>String</type>
           </field>
         </fields>
  +    </class>
  +    <class>
  +      <name>GoalDecorator</name>
  +      <version>3.0.0+</version>
  +      <fields>
  +        <field>
  +          <name>name</name>
  +          <version>4.0.0</version>
  +          <description>The target goal which should be decorated.</description>
  +          <type>String</type>
  +        </field>
  +        <field>
  +          <name>attain</name>
  +          <version>4.0.0</version>
  +          <description>
  +            The goal which should be injected into the execution chain.
  +          </description>
  +          <type>String</type>
  +        </field>
  +      </fields>
  +    </class>
  +    <class>
  +      <superClass>GoalDecorator</superClass>
  +      <name>PreGoal</name>
  +      <version>4.0.0</version>
  +      <fields></fields>
  +    </class>
  +    <class>
  +      <superClass>GoalDecorator</superClass>
  +      <name>PostGoal</name>
  +      <version>4.0.0</version>
  +      <fields></fields>
       </class>
   
     </classes>
  
  
  

Mime
View raw message