continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r443542 - in /maven/continuum/trunk: ./ continuum-core/ continuum-core/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/resources/META-INF/plexus/ continuum-release/ continuum-release/src/main/java/org/apache/maven/continuu...
Date Fri, 15 Sep 2006 01:35:11 GMT
Author: carlos
Date: Thu Sep 14 18:35:09 2006
New Revision: 443542

URL: http://svn.apache.org/viewvc?view=rev&rev=443542
Log:
[CONTINUUM-727] Merged rev# 437500-439056 from https://svn.apache.org/repos/asf/maven/continuum/branches/release-integration

Added:
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseResult.java
      - copied unchanged from r439056, maven/continuum/branches/release-integration/continuum-release/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseResult.java
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/evaluators/
      - copied from r439056, maven/continuum/branches/release-integration/continuum-release/src/main/java/org/apache/maven/continuum/release/evaluators/
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/
      - copied from r439056, maven/continuum/branches/release-integration/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
      - copied unchanged from r439056, maven/continuum/branches/release-integration/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java
      - copied unchanged from r439056, maven/continuum/branches/release-integration/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/
      - copied from r439056, maven/continuum/branches/release-integration/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
      - copied unchanged from r439056, maven/continuum/branches/release-integration/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
      - copied unchanged from r439056, maven/continuum/branches/release-integration/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java
      - copied unchanged from r439056, maven/continuum/branches/release-integration/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java
    maven/continuum/trunk/continuum-uml/white-site/continuum_files/icon_in_progress_sml.gif
      - copied unchanged from r439056, maven/continuum/branches/release-integration/continuum-uml/white-site/continuum_files/icon_in_progress_sml.gif
    maven/continuum/trunk/continuum-uml/white-site/performRelease.html
      - copied unchanged from r439056, maven/continuum/branches/release-integration/continuum-uml/white-site/performRelease.html
    maven/continuum/trunk/continuum-uml/white-site/performReleaseFinish.html
      - copied unchanged from r439056, maven/continuum/branches/release-integration/continuum-uml/white-site/performReleaseFinish.html
    maven/continuum/trunk/continuum-uml/white-site/performReleaseProgress.html
      - copied unchanged from r439056, maven/continuum/branches/release-integration/continuum-uml/white-site/performReleaseProgress.html
    maven/continuum/trunk/continuum-uml/white-site/prepareRelease.html
      - copied unchanged from r439056, maven/continuum/branches/release-integration/continuum-uml/white-site/prepareRelease.html
    maven/continuum/trunk/continuum-uml/white-site/prepareReleaseFinish.html
      - copied unchanged from r439056, maven/continuum/branches/release-integration/continuum-uml/white-site/prepareReleaseFinish.html
    maven/continuum/trunk/continuum-uml/white-site/prepareReleaseProgress.html
      - copied unchanged from r439056, maven/continuum/branches/release-integration/continuum-uml/white-site/prepareReleaseProgress.html
    maven/continuum/trunk/continuum-uml/white-site/releaseProject.html
      - copied unchanged from r439056, maven/continuum/branches/release-integration/continuum-uml/white-site/releaseProject.html
Modified:
    maven/continuum/trunk/continuum-core/pom.xml
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/trunk/continuum-release/pom.xml
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseException.java
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
    maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/ContinuumReleaseManagerTest.java
    maven/continuum/trunk/continuum-uml/white-site/groupStatus.html
    maven/continuum/trunk/pom.xml

Modified: maven/continuum/trunk/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/pom.xml?view=diff&rev=443542&r1=443541&r2=443542
==============================================================================
--- maven/continuum/trunk/continuum-core/pom.xml (original)
+++ maven/continuum/trunk/continuum-core/pom.xml Thu Sep 14 18:35:09 2006
@@ -154,6 +154,11 @@
       <artifactId>plexus-mail-sender-simple</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.continuum</groupId>
+      <artifactId>continuum-release</artifactId>
+      <version>1.1-SNAPSHOT</version>
+    </dependency>
   </dependencies>
   <profiles>
     <profile>

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?view=diff&rev=443542&r1=443541&r2=443542
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Thu Sep 14 18:35:09 2006
@@ -50,6 +50,7 @@
 import org.apache.maven.continuum.utils.PlexusContainerManager;
 import org.apache.maven.continuum.utils.ProjectSorter;
 import org.apache.maven.continuum.utils.WorkingDirectoryService;
+import org.apache.maven.continuum.release.ContinuumReleaseManager;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.action.Action;
@@ -136,6 +137,11 @@
     private TaskQueue checkoutQueue;
 
     /**
+     * @plexus.requirement
+     */
+    private ContinuumReleaseManager releaseManager;
+
+    /**
      * @plexus.configuration
      */
     private String workingDirectory;
@@ -170,6 +176,21 @@
         } );
     }
 
+    public ContinuumReleaseManager getReleaseManager()
+    {
+        return releaseManager;
+    }
+
+    public void setActionManager( ActionManager actionManager )
+    {
+        this.actionManager = actionManager;
+    }
+
+    public ActionManager getActionManager()
+    {
+        return actionManager;
+    }
+
     // ----------------------------------------------------------------------
     // Project Groups
     // ----------------------------------------------------------------------
@@ -462,7 +483,6 @@
      * fire off a build for all of the projects in a project group using their default builds
      *
      * @param projectGroupId
-     * @param trigger
      * @throws ContinuumException
      */
     public void buildProjectGroup( int projectGroupId )

Modified: maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=443542&r1=443541&r2=443542
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
Thu Sep 14 18:35:09 2006
@@ -22,6 +22,9 @@
         <requirement>
           <role>org.apache.maven.continuum.build.settings.SchedulesActivator</role>
         </requirement>
+        <requirement>
+          <role>org.apache.maven.continuum.release.ContinuumReleaseManager</role>
+        </requirement>
         <!-- from core -->
         <requirement>
           <role>org.codehaus.plexus.taskqueue.TaskQueue</role>

Modified: maven/continuum/trunk/continuum-release/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/pom.xml?view=diff&rev=443542&r1=443541&r2=443542
==============================================================================
--- maven/continuum/trunk/continuum-release/pom.xml (original)
+++ maven/continuum/trunk/continuum-release/pom.xml Thu Sep 14 18:35:09 2006
@@ -18,5 +18,10 @@
       <artifactId>maven-release-plugin</artifactId>
       <version>2.0-beta-5-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-taskqueue</artifactId>
+      <version>1.0-alpha-3</version>
+    </dependency>
   </dependencies>
 </project>

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseException.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseException.java?view=diff&rev=443542&r1=443541&r2=443542
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseException.java
(original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseException.java
Thu Sep 14 18:35:09 2006
@@ -1,5 +1,21 @@
 package org.apache.maven.continuum.release;
 
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 /**
  * @author Jason van Zyl
  */

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java?view=diff&rev=443542&r1=443541&r2=443542
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
(original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
Thu Sep 14 18:35:09 2006
@@ -1,6 +1,25 @@
 package org.apache.maven.continuum.release;
 
-import org.apache.maven.plugins.release.model.Release;
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.plugins.release.config.ReleaseDescriptor;
+import org.apache.maven.settings.Settings;
+
+import java.io.File;
 
 /**
  * The Continuum Release Manager is responsible for performing releases based on a release
descriptor
@@ -16,11 +35,21 @@
     String ROLE = ContinuumReleaseManager.class.getName();
 
     /**
+     * Prepare a project for release which also updates the release descriptor
+     *
+     * @param descriptor
+     * @throws ContinuumReleaseException
+     */
+    void prepare( ReleaseDescriptor descriptor, Settings settings )
+        throws ContinuumReleaseException;
+
+    /**
      * Perform a release based on a release descriptor received by the Maven Release Plugin.
      *
-     * @param release
+     * @param descriptor
      * @throws ContinuumReleaseException
      */
-    void release( Release release )
+    void perform( ReleaseDescriptor descriptor, Settings settings, File buildDirectory,
+                  String goals, boolean useReleaseProfile )
         throws ContinuumReleaseException;
 }

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?view=diff&rev=443542&r1=443541&r2=443542
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
(original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
Thu Sep 14 18:35:09 2006
@@ -1,20 +1,187 @@
 package org.apache.maven.continuum.release;
 
-import org.apache.maven.plugins.release.model.Release;
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.apache.maven.plugins.release.ReleaseManager;
+import org.apache.maven.plugins.release.ReleaseExecutionException;
+import org.apache.maven.plugins.release.ReleaseFailureException;
+import org.apache.maven.plugins.release.config.ReleaseDescriptor;
+import org.apache.maven.profiles.DefaultProfileManager;
+import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Settings;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.codehaus.plexus.PlexusConstants;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.context.Context;
+import org.codehaus.plexus.context.ContextException;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+import org.codehaus.plexus.taskqueue.TaskQueue;
+
+import java.util.Map;
+import java.util.List;
+import java.util.Iterator;
+import java.util.ArrayList;
+import java.io.File;
 
 /**
  * @author Jason van Zyl
  */
 public class DefaultContinuumReleaseManager
-    implements ContinuumReleaseManager
+    implements ContinuumReleaseManager, Contextualizable
 {
+    /**
+     * @plexus.requirement
+     */
+    private MavenProjectBuilder projectBuilder;
+
+    /**
+     * @plexus.requirement
+     */
     private ReleaseManager releaseManager;
 
-    public void release( Release release )
+    /**
+     * @plexus.requirement
+     */
+    private TaskQueue prepareReleaseQueue;
+
+    /**
+     * @plexus.requirement
+     */
+    private TaskQueue performReleaseQueue;
+
+    /**
+     * @plexus.configuration
+     */
+    private String localRepository;
+
+    private PlexusContainer container;
+
+    /**
+     * contains previous release:prepare descriptors; one per project
+     */
+    private Map preparedReleases;
+
+    public void prepare( ReleaseDescriptor descriptor, Settings settings )
+        throws ContinuumReleaseException
+    {
+        try
+        {
+            releaseManager.prepare( descriptor, settings, getReactorProjects( descriptor,
settings ) );
+        }
+        catch ( ReleaseExecutionException e )
+        {
+            throw new ContinuumReleaseException( "Release Manager Execution error occurred.",
e );
+        }
+        catch ( ReleaseFailureException e )
+        {
+            throw new ContinuumReleaseException( "Release Manager failure occurred.", e );
+        }
+    }
+
+    public void perform( ReleaseDescriptor descriptor, Settings settings, File buildDirectory,
+                         String goals, boolean useReleaseProfile )
         throws ContinuumReleaseException
     {
-        //TODO:JW The release manager should be taught to use the release descriptor for
the release perform.
-        //releaseManager.perform( );
+        try
+        {
+            releaseManager.perform( descriptor, settings, getReactorProjects( descriptor,
settings ),
+                                    new File( buildDirectory, "checkout" ), goals, useReleaseProfile
);
+        }
+        catch ( ReleaseExecutionException e )
+        {
+            throw new ContinuumReleaseException( "Release Manager Execution error occurred.",
e );
+        }
+        catch ( ReleaseFailureException e )
+        {
+            throw new ContinuumReleaseException( "Release Manager failure occurred.", e );
+        }
+    }
+
+    private List getReactorProjects( ReleaseDescriptor descriptor, Settings settings )
+        throws ContinuumReleaseException
+    {
+        List reactorProjects = new ArrayList();
+
+        MavenProject project;
+        try
+        {
+            project = projectBuilder.build( getProjectDescriptorFile( descriptor ),
+                                            getLocalRepository(), getProfileManager( settings
) );
+
+            reactorProjects.add( project );
+        }
+        catch ( ProjectBuildingException e )
+        {
+            throw new ContinuumReleaseException( "Failed to build project.", e );
+        }
+
+        for( Iterator modules = project.getModules().iterator(); modules.hasNext(); )
+        {
+            String moduleDir = modules.next().toString();
+
+            File pomFile = new File( project.getBasedir(), moduleDir );
+
+            try
+            {
+                projectBuilder.build( pomFile, getLocalRepository(), getProfileManager( settings
) );
+
+                reactorProjects.add( projectBuilder );
+            }
+            catch ( ProjectBuildingException e )
+            {
+                throw new ContinuumReleaseException( "Failed to build project.", e );
+            }
+        }
+
+        return reactorProjects;
+    }
+
+    private File getProjectDescriptorFile( ReleaseDescriptor descriptor )
+    {
+        String parentPath = descriptor.getWorkingDirectory();
+
+        String pomFilename = descriptor.getPomFileName();
+        if ( pomFilename == null )
+        {
+            pomFilename = "pom.xml";
+        }
+
+        return new File( parentPath, pomFilename );
+    }
+
+    private ArtifactRepository getLocalRepository()
+    {
+        return new DefaultArtifactRepository( "local-repository", "file://" + localRepository,
+                                              new DefaultRepositoryLayout() );
+    }
+
+    private ProfileManager getProfileManager( Settings settings )
+    {
+        return new DefaultProfileManager( container, settings );
+    }
+
+    public void contextualize( Context context )
+        throws ContextException
+    {
+        container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
     }
 }

Modified: maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=443542&r1=443541&r2=443542
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml
Thu Sep 14 18:35:09 2006
@@ -6,9 +6,121 @@
       <implementation>org.apache.maven.continuum.release.DefaultContinuumReleaseManager</implementation>
       <requirements>
         <requirement>
+          <role>org.apache.maven.project.MavenProjectBuilder</role>         

+        </requirement>
+        <requirement>
           <role>org.apache.maven.plugins.release.ReleaseManager</role>      
   
         </requirement>
+        <requirement>
+          <role>org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper</role>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
+          <role-hint>perpare-release</role-hint>
+          <field-name>prepareReleaseQueue</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
+          <role-hint>perform-release</role-hint>
+          <field-name>performReleaseQueue</field-name>
+        </requirement>
       </requirements>
+      <configuration>
+        <local-repository>${plexus.home}/local-repository</local-repository>
+      </configuration>
     </component>
   </components>
-</component-set>
\ No newline at end of file
+
+  <!--
+   |
+   | Prepare Release Project Task Queue
+   |
+   |-->
+
+  <component>
+    <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
+    <role-hint>prepare-release</role-hint>
+    <implementation>org.codehaus.plexus.taskqueue.DefaultTaskQueue</implementation>
+    <lifecycle-handler>plexus-configurable</lifecycle-handler>
+    <configuration>
+      <task-entry-evaluators>
+      </task-entry-evaluators>
+      <task-exit-evaluators>
+      </task-exit-evaluators>
+      <task-viability-evaluators>
+      </task-viability-evaluators>
+    </configuration>
+  </component>
+
+  <component>
+    <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>
+    <role-hint>prepare-release</role-hint>
+    <implementation>org.apache.maven.continuum.release.executors.PrepareReleaseTaskExecutor</implementation>
+  </component>
+
+  <component>
+    <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
+    <role-hint>prepare-release</role-hint>
+    <implementation>org.codehaus.plexus.taskqueue.execution.ThreadedTaskQueueExecutor</implementation>
+    <requirements>
+      <requirement>
+        <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>
+        <role-hint>prepare-release</role-hint>
+      </requirement>
+      <requirement>
+        <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
+        <role-hint>prepare-release</role-hint>
+      </requirement>
+    </requirements>
+    <configuration>
+      <name>prepare-release</name>
+    </configuration>
+  </component>
+
+  <!--
+   |
+   | Perform Release Project Task Queue
+   |
+   |-->
+
+  <component>
+    <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
+    <role-hint>perform-release</role-hint>
+    <implementation>org.codehaus.plexus.taskqueue.DefaultTaskQueue</implementation>
+    <lifecycle-handler>plexus-configurable</lifecycle-handler>
+    <configuration>
+      <task-entry-evaluators>
+      </task-entry-evaluators>
+      <task-exit-evaluators>
+      </task-exit-evaluators>
+      <task-viability-evaluators>
+      </task-viability-evaluators>
+    </configuration>
+  </component>
+
+  <component>
+    <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>
+    <role-hint>perform-release</role-hint>
+    <implementation>org.apache.maven.continuum.release.executors.PerformReleaseTaskExecutor</implementation>
+  </component>
+
+  <component>
+    <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
+    <role-hint>perform-release</role-hint>
+    <implementation>org.codehaus.plexus.taskqueue.execution.ThreadedTaskQueueExecutor</implementation>
+    <requirements>
+      <requirement>
+        <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>
+        <role-hint>perform-release</role-hint>
+      </requirement>
+      <requirement>
+        <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
+        <role-hint>perform-release</role-hint>
+      </requirement>
+    </requirements>
+    <configuration>
+      <name>perform-release</name>
+    </configuration>
+  </component>
+
+</component-set>

Modified: maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/ContinuumReleaseManagerTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/ContinuumReleaseManagerTest.java?view=diff&rev=443542&r1=443541&r2=443542
==============================================================================
--- maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/ContinuumReleaseManagerTest.java
(original)
+++ maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/ContinuumReleaseManagerTest.java
Thu Sep 14 18:35:09 2006
@@ -1,5 +1,21 @@
 package org.apache.maven.continuum;
 
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.codehaus.plexus.PlexusTestCase;
 import org.apache.maven.continuum.release.ContinuumReleaseManager;
 import org.apache.maven.plugins.release.model.Release;
@@ -17,6 +33,6 @@
 
         Release r = new Release();
 
-        crm.release( r );
+        crm.perform( r );
     }
 }

Modified: maven/continuum/trunk/continuum-uml/white-site/groupStatus.html
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-uml/white-site/groupStatus.html?view=diff&rev=443542&r1=443541&r2=443542
==============================================================================
--- maven/continuum/trunk/continuum-uml/white-site/groupStatus.html (original)
+++ maven/continuum/trunk/continuum-uml/white-site/groupStatus.html Thu Sep 14 18:35:09 2006
@@ -106,7 +106,7 @@
         <th width="100%">Name</th>
         <th>Version</th>
         <th>Build</th>
-        <th colspan="4"></th>
+        <th colspan="5"></th>
       </tr>
 
 
@@ -119,6 +119,7 @@
           <td><a href="#">Build&nbsp;Now</a></td>
           <td><a href="builds.html">Build&nbsp;History</a></td>
           <td><a href="workingCopy.html">Working&nbsp;Copy</a></td>
+          <td>Release</td>
           <td><a href="deleteProject.html">Delete</a></td>
         </tr>
 
@@ -131,11 +132,12 @@
           <td><a href="#">Cancel&nbsp;Build</a></td>
           <td><a href="builds.html">Build&nbsp;History</a></td>
           <td><a href="workingCopy.html">Working&nbsp;Copy</a></td>
+          <td>Release</td>
           <td><a href="deleteProject.html">Delete</a></td>
         </tr>
 
         <tr class="a">
-          <td><img src="continuum_files/icon_warning_sml.gif" alt="Error"></td>
+          <td><img src="continuum_files/icon_success_sml.gif" alt="Success"></td>
           <td><a href="viewProject.html">Plexus Action</a></td>
           <td>1.0-alpha-6-SNAPSHOT</td>
           <td><a href="viewBuild.html">2</a></td>
@@ -143,6 +145,7 @@
           <td><a href="#">Build&nbsp;Now</a></td>
           <td><a href="builds.html">Build&nbsp;History</a></td>
           <td><a href="workingCopy.html">Working&nbsp;Copy</a></td>
+          <td><a href="releaseProject.html">Release</a></td>
           <td><a href="deleteProject.html">Delete</a></td>
         </tr>
 
@@ -177,4 +180,4 @@
     </tbody></table>
 </div>
 
-</body></html>
\ No newline at end of file
+</body></html>

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=443542&r1=443541&r2=443542
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Thu Sep 14 18:35:09 2006
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 2006 The Apache Software Foundation.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -69,6 +86,7 @@
     <!-- module>continuum-web</module --> <!--Remove this when webapp will
be ready and packaged as a plexus-application -->
     <module>continuum-webapp</module>
     <module>continuum-xmlrpc</module>
+    <module>continuum-release</module>
   </modules>
   <repositories>
     <repository>



Mime
View raw message