continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r446495 - in /maven/continuum/branches/continuum-acegi: ./ continuum-api/src/main/java/org/apache/maven/continuum/ continuum-api/src/main/java/org/apache/maven/continuum/release/ continuum-core/ continuum-core/src/main/java/org/apache/maven...
Date Fri, 15 Sep 2006 03:22:16 GMT
Author: carlos
Date: Thu Sep 14 20:22:12 2006
New Revision: 446495

URL: http://svn.apache.org/viewvc?view=rev&rev=446495
Log:
Merged rev# 443441-446408 from trunk

Added:
    maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/release/
      - copied from r446408, maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/
    maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseException.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseException.java
    maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
    maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/evaluators/
      - copied from r446408, maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/evaluators/
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/
      - copied from r446408, maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutor.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutor.java
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/
      - copied from r446408, maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/java/org/apache/maven/continuum/release/
      - copied from r446408, maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/
      - copied from r446408, maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/
      - copied from r446408, maven/continuum/trunk/continuum-release/src/test/scm/
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/README.txt
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/README.txt
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/conf/
      - copied from r446408, maven/continuum/trunk/continuum-release/src/test/scm/conf/
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/conf/authz
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/conf/authz
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/conf/passwd
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/conf/passwd
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/conf/svnserve.conf
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/conf/svnserve.conf
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/dav/
      - copied from r446408, maven/continuum/trunk/continuum-release/src/test/scm/dav/
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/
      - copied from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/current
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/current
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/format
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/format
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/fs-type
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/fs-type
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/revprops/
      - copied from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/revprops/
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/revprops/0
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/revprops/0
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/revprops/1
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/revprops/1
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/revprops/2
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/revprops/2
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/revs/
      - copied from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/revs/
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/revs/0
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/revs/0
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/revs/1
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/revs/1
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/revs/2
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/revs/2
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/transactions/
      - copied from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/transactions/
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/transactions/readme.txt
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/transactions/readme.txt
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/uuid
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/uuid
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/db/write-lock
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/db/write-lock
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/format
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/format
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/hooks/
      - copied from r446408, maven/continuum/trunk/continuum-release/src/test/scm/hooks/
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/hooks/post-commit.tmpl
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/hooks/post-commit.tmpl
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/hooks/post-lock.tmpl
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/hooks/post-lock.tmpl
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/hooks/post-revprop-change.tmpl
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/hooks/post-revprop-change.tmpl
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/hooks/post-unlock.tmpl
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/hooks/post-unlock.tmpl
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/hooks/pre-commit.tmpl
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/hooks/pre-commit.tmpl
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/hooks/pre-lock.tmpl
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/hooks/pre-lock.tmpl
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/hooks/pre-revprop-change.tmpl
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/hooks/pre-revprop-change.tmpl
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/hooks/pre-unlock.tmpl
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/hooks/pre-unlock.tmpl
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/hooks/start-commit.tmpl
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/hooks/start-commit.tmpl
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/locks/
      - copied from r446408, maven/continuum/trunk/continuum-release/src/test/scm/locks/
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/locks/db-logs.lock
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/locks/db-logs.lock
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/scm/locks/db.lock
      - copied unchanged from r446408, maven/continuum/trunk/continuum-release/src/test/scm/locks/db.lock
    maven/continuum/branches/continuum-acegi/continuum-uml/white-site/continuum_files/icon_in_progress_sml.gif
      - copied unchanged from r446408, maven/continuum/trunk/continuum-uml/white-site/continuum_files/icon_in_progress_sml.gif
    maven/continuum/branches/continuum-acegi/continuum-uml/white-site/performRelease.html
      - copied unchanged from r446408, maven/continuum/trunk/continuum-uml/white-site/performRelease.html
    maven/continuum/branches/continuum-acegi/continuum-uml/white-site/performReleaseFinish.html
      - copied unchanged from r446408, maven/continuum/trunk/continuum-uml/white-site/performReleaseFinish.html
    maven/continuum/branches/continuum-acegi/continuum-uml/white-site/performReleaseProgress.html
      - copied unchanged from r446408, maven/continuum/trunk/continuum-uml/white-site/performReleaseProgress.html
    maven/continuum/branches/continuum-acegi/continuum-uml/white-site/prepareRelease.html
      - copied unchanged from r446408, maven/continuum/trunk/continuum-uml/white-site/prepareRelease.html
    maven/continuum/branches/continuum-acegi/continuum-uml/white-site/prepareReleaseFinish.html
      - copied unchanged from r446408, maven/continuum/trunk/continuum-uml/white-site/prepareReleaseFinish.html
    maven/continuum/branches/continuum-acegi/continuum-uml/white-site/prepareReleaseProgress.html
      - copied unchanged from r446408, maven/continuum/trunk/continuum-uml/white-site/prepareReleaseProgress.html
    maven/continuum/branches/continuum-acegi/continuum-uml/white-site/releaseProject.html
      - copied unchanged from r446408, maven/continuum/trunk/continuum-uml/white-site/releaseProject.html
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ViewReleaseResultAction.java
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ViewReleaseResultAction.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/images/releaseproject.gif
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/webapp/images/releaseproject.gif
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/images/releaseproject_disabled.gif
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/webapp/images/releaseproject_disabled.gif
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performRelease.jsp
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/webapp/performRelease.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performReleaseFinished.jsp
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/webapp/performReleaseFinished.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/performReleaseProgress.jsp
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/webapp/performReleaseProgress.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareRelease.jsp
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareRelease.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/releaseProject.jsp
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseProject.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/releaseResult.jsp
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/webapp/releaseResult.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/viewReleaseResult.jsp
      - copied unchanged from r446408, maven/continuum/trunk/continuum-webapp/src/main/webapp/viewReleaseResult.jsp
Removed:
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseException.java
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
    maven/continuum/branches/continuum-acegi/continuum-release/src/test/java/org/apache/maven/continuum/ContinuumReleaseManagerTest.java
Modified:
    maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
    maven/continuum/branches/continuum-acegi/continuum-core/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/branches/continuum-acegi/continuum-core/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/branches/continuum-acegi/continuum-plexus-application/src/conf/application.xml
    maven/continuum/branches/continuum-acegi/continuum-release/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
    maven/continuum/branches/continuum-acegi/continuum-release/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/branches/continuum-acegi/continuum-uml/white-site/groupStatus.html
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
    maven/continuum/branches/continuum-acegi/pom.xml

Modified: maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java Thu Sep 14 20:22:12 2006
@@ -33,6 +33,7 @@
 import org.apache.maven.continuum.model.system.UserGroup;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.apache.maven.continuum.security.ContinuumSecurity;
+import org.apache.maven.continuum.release.ContinuumReleaseManager;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
 
 /**
@@ -397,4 +398,9 @@
 
     void removeUserGroup( int userGroupId )
         throws ContinuumException;
+
+    // ----------------------------------------------------------------------
+    // Continuum Release
+    // ----------------------------------------------------------------------
+    ContinuumReleaseManager getReleaseManager();
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/pom.xml?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/pom.xml Thu Sep 14 20:22:12 2006
@@ -157,6 +157,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/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Thu Sep 14 20:22:12 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.apache.maven.user.model.PasswordRuleViolationException;
 import org.apache.maven.user.model.UserManager;
 import org.codehaus.plexus.PlexusConstants;
@@ -143,6 +144,11 @@
     private TaskQueue checkoutQueue;
 
     /**
+     * @plexus.requirement
+     */
+    private ContinuumReleaseManager releaseManager;
+
+    /**
      * @plexus.configuration
      */
     private String workingDirectory;
@@ -177,6 +183,21 @@
         } );
     }
 
+    public ContinuumReleaseManager getReleaseManager()
+    {
+        return releaseManager;
+    }
+
+    public void setActionManager( ActionManager actionManager )
+    {
+        this.actionManager = actionManager;
+    }
+
+    public ActionManager getActionManager()
+    {
+        return actionManager;
+    }
+
     // ----------------------------------------------------------------------
     // Project Groups
     // ----------------------------------------------------------------------
@@ -469,7 +490,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/branches/continuum-acegi/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/resources/META-INF/plexus/components.xml Thu Sep 14 20:22:12 2006
@@ -27,6 +27,9 @@
           <role>org.apache.maven.user.model.UserManager</role>
           <field-name>userManager</field-name>
         </requirement>
+        <requirement>
+          <role>org.apache.maven.continuum.release.ContinuumReleaseManager</role>
+        </requirement>
         <!-- from core -->
         <requirement>
           <role>org.codehaus.plexus.taskqueue.TaskQueue</role>

Modified: maven/continuum/branches/continuum-acegi/continuum-plexus-application/src/conf/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-plexus-application/src/conf/application.xml?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-plexus-application/src/conf/application.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-plexus-application/src/conf/application.xml Thu Sep 14 20:22:12 2006
@@ -12,6 +12,14 @@
       <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
       <role-hint>check-out-project</role-hint>
     </component>
+    <component>
+      <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
+      <role-hint>prepare-release</role-hint>
+    </component>
+    <component>
+      <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
+      <role-hint>perform-release</role-hint>
+    </component>
     <!--
     <component>
       <role>org.codehaus.xfire.plexus.config.ConfigurationService</role>

Modified: maven/continuum/branches/continuum-acegi/continuum-release/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-release/pom.xml?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-release/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-release/pom.xml Thu Sep 14 20:22:12 2006
@@ -14,9 +14,32 @@
   </description>
   <dependencies>
     <dependency>
+      <groupId>org.apache.maven.continuum</groupId>
+      <artifactId>continuum-api</artifactId>
+      <version>1.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>2.0.4</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <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>
+  <build>
+    <testResources>
+      <testResource>
+        <directory>src/test/scm</directory>
+        <targetPath>scm-src</targetPath>
+      </testResource>
+    </testResources>
+  </build>
 </project>

Modified: maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java Thu Sep 14 20:22:12 2006
@@ -1,20 +1,202 @@
 package org.apache.maven.continuum.release;
 
-import org.apache.maven.plugins.release.model.Release;
-import org.apache.maven.plugins.release.ReleaseManager;
+/*
+ * 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.continuum.model.project.Project;
+import org.apache.maven.continuum.release.tasks.PerformReleaseProjectTask;
+import org.apache.maven.continuum.release.tasks.PrepareReleaseProjectTask;
+import org.apache.maven.plugins.release.ReleaseManagerListener;
+import org.apache.maven.plugins.release.config.ReleaseDescriptor;
+import org.apache.maven.plugins.release.config.io.xpp3.ReleaseDescriptorXpp3Reader;
+import org.codehaus.plexus.taskqueue.TaskQueue;
+import org.codehaus.plexus.taskqueue.TaskQueueException;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Properties;
 
 /**
  * @author Jason van Zyl
+ * @author Edwin Punzalan
  */
 public class DefaultContinuumReleaseManager
     implements ContinuumReleaseManager
 {
-    private ReleaseManager releaseManager;
+    /**
+     * @plexus.requirement
+     */
+    private TaskQueue prepareReleaseQueue;
+
+    /**
+     * @plexus.requirement
+     */
+    private TaskQueue performReleaseQueue;
+
+    private Map listeners;
+
+    /**
+     * contains previous release:prepare descriptors; one per project
+     * @todo remove static when singleton strategy is working
+     */
+    private static Map preparedReleases;
+
+    /**
+     * contains results
+     * @todo remove static when singleton strategy is working
+     */
+    private static Map releaseResults;
+
+    public String prepare( Project project, Properties releaseProperties, Map relVersions,
+                           Map devVersions, ContinuumReleaseManagerListener listener )
+        throws ContinuumReleaseException
+    {
+        String releaseId = project.getGroupId() + ":" + project.getArtifactId();
 
-    public void release( Release release )
+        ReleaseDescriptor descriptor = getReleaseDescriptor( project, releaseProperties, relVersions, devVersions );
+
+        getListeners().put( releaseId, listener );
+
+        try
+        {
+            prepareReleaseQueue.put( new PrepareReleaseProjectTask( releaseId, descriptor,
+                                                                    (ReleaseManagerListener) listener ) );
+
+        }
+        catch ( TaskQueueException e )
+        {
+            throw new ContinuumReleaseException( "Failed to add prepare release task in queue.", e );
+        }
+
+        return releaseId;
+    }
+
+    public void perform( String releaseId, File buildDirectory, String goals, boolean useReleaseProfile,
+                         ContinuumReleaseManagerListener listener )
         throws ContinuumReleaseException
     {
-        //TODO:JW The release manager should be taught to use the release descriptor for the release perform.
-        //releaseManager.perform( );
+        ReleaseDescriptor descriptor = (ReleaseDescriptor) getPreparedReleases().get( releaseId );
+        if ( descriptor != null )
+        {
+            perform( releaseId, descriptor, buildDirectory, goals, useReleaseProfile, listener );
+        }
+    }
+
+    public void perform( String releaseId, File descriptorFile, File buildDirectory,
+                         String goals, boolean useReleaseProfile, ContinuumReleaseManagerListener listener )
+        throws ContinuumReleaseException
+    {
+        ReleaseDescriptor descriptor;
+        try
+        {
+            descriptor = new ReleaseDescriptorXpp3Reader().read( new FileReader( descriptorFile ) );
+        }
+        catch ( IOException e )
+        {
+            throw new ContinuumReleaseException( "Failed to parse descriptor file.", e );
+        }
+        catch ( XmlPullParserException e )
+        {
+            throw new ContinuumReleaseException( "Failed to parse descriptor file.", e );
+        }
+
+        perform( releaseId, descriptor, buildDirectory, goals, useReleaseProfile, listener );
+    }
+
+    private void perform( String releaseId, ReleaseDescriptor descriptor, File buildDirectory,
+                          String goals, boolean useReleaseProfile, ContinuumReleaseManagerListener listener )
+        throws ContinuumReleaseException
+    {
+        try
+        {
+            getListeners().put( releaseId, listener );
+
+            performReleaseQueue.put( new PerformReleaseProjectTask( releaseId, descriptor, buildDirectory,
+                                                                    goals, useReleaseProfile,
+                                                                    (ReleaseManagerListener) listener ) );
+        }
+        catch ( TaskQueueException e )
+        {
+            throw new ContinuumReleaseException( "Failed to add perform release task in queue.", e );
+        }
+    }
+
+    public Map getPreparedReleases()
+    {
+        if ( preparedReleases == null )
+        {
+            preparedReleases = new Hashtable();
+        }
+
+        return preparedReleases;
+    }
+
+    public Map getReleaseResults()
+    {
+        if ( releaseResults == null )
+        {
+            releaseResults = new Hashtable();
+        }
+
+        return releaseResults;
+    }
+
+    private ReleaseDescriptor getReleaseDescriptor( Project project, Properties releaseProperties,
+                                                    Map relVersions, Map devVersions )
+    {
+        ReleaseDescriptor descriptor = new ReleaseDescriptor();
+
+        //release properties from the project
+        descriptor.setWorkingDirectory( project.getWorkingDirectory() );
+        descriptor.setScmSourceUrl( project.getScmUrl() );
+
+        //required properties
+        descriptor.setScmReleaseLabel( releaseProperties.getProperty( "tag" ) );
+        descriptor.setScmTagBase( releaseProperties.getProperty( "tagBase" ) );
+        descriptor.setReleaseVersions( relVersions );
+        descriptor.setDevelopmentVersions( devVersions );
+        descriptor.setPreparationGoals( releaseProperties.getProperty( "prepareGoals" ) );
+
+        //other properties
+        if ( releaseProperties.containsKey( "username" ) )
+        {
+            descriptor.setScmUsername( releaseProperties.getProperty( "username" ) );
+        }
+        if ( releaseProperties.containsKey( "password" ) )
+        {
+            descriptor.setScmPassword( releaseProperties.getProperty( "password" ) );
+        }
+
+        //forced properties
+        descriptor.setInteractive( false );
+
+        return descriptor;
+    }
+
+    public Map getListeners()
+    {
+        if ( listeners == null )
+        {
+            listeners = new Hashtable();
+        }
+
+        return listeners;
     }
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-release/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-release/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-release/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-release/src/main/resources/META-INF/plexus/components.xml Thu Sep 14 20:22:12 2006
@@ -6,9 +6,144 @@
       <implementation>org.apache.maven.continuum.release.DefaultContinuumReleaseManager</implementation>
       <requirements>
         <requirement>
-          <role>org.apache.maven.plugins.release.ReleaseManager</role>          
+          <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
+          <role-hint>prepare-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>
+    </component>
+
+    <!--
+     |
+     | 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>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.continuum.release.ContinuumReleaseManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.plugins.release.ReleaseManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.project.MavenProjectBuilder</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.settings.MavenSettingsBuilder</role>
+        </requirement>
+      </requirements>
+      <configuration>
+        <local-repository>${plexus.home}/local-repository</local-repository>
+      </configuration>
+    </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>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.continuum.release.ContinuumReleaseManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.plugins.release.ReleaseManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.project.MavenProjectBuilder</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.settings.MavenSettingsBuilder</role>
+        </requirement>
+      </requirements>
+      <configuration>
+        <local-repository>${plexus.home}/local-repository</local-repository>
+      </configuration>
+    </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>
+
   </components>
-</component-set>
\ No newline at end of file
+
+</component-set>

Modified: maven/continuum/branches/continuum-acegi/continuum-uml/white-site/groupStatus.html
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-uml/white-site/groupStatus.html?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-uml/white-site/groupStatus.html (original)
+++ maven/continuum/branches/continuum-acegi/continuum-uml/white-site/groupStatus.html Thu Sep 14 20:22:12 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/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Thu Sep 14 20:22:12 2006
@@ -76,20 +76,14 @@
             schedule = getContinuum().getSchedule( id );
             active = schedule.isActive();
 
-            String[] cronEx = schedule.getCronExpression().split( " " );
-            int i = 0;
-            while ( i < cronEx.length )
-            {
-                switch( i )
-                {
-                    case 0 : second = cronEx[i]; break;
-                    case 1 : minute = cronEx[i]; break;
-                    case 2 : hour = cronEx[i]; break;
-                    case 3 : dayOfMonth = cronEx[i]; break;
-                    case 4 : month = cronEx[i]; break;
-                    case 5 : dayOfWeek = cronEx[i]; break;
-                    case 6 : year = cronEx[i]; break;
-                }
+                String[] cronEx = schedule.getCronExpression().split( " " );
+                second = cronEx[0];
+                minute = cronEx[1];
+                hour = cronEx[2];
+                dayOfMonth = cronEx[3];
+                month = cronEx[4];
+                dayOfWeek = cronEx[5];
+                year = cronEx[6];
                 i++;
             }
 

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Thu Sep 14 20:22:12 2006
@@ -23,6 +23,14 @@
     <component>
       <role>org.codehaus.plexus.acegi.intercept.method.aspectj.AspectJSecurityInterceptorHelper</role>
     </component>
+    <component>
+      <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
+      <role-hint>prepare-release</role-hint>
+    </component>
+    <component>
+      <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
+      <role-hint>perform-release</role-hint>
+    </component>
   </load-on-start>
 
   <components>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties Thu Sep 14 20:22:12 2006
@@ -388,6 +388,36 @@
 surefireReport.testCase = Test Case
 surefireReport.failureDetails = Failure Details
 
+# ----------------------------------------------------------------------
+# Page: Continuum Release Support
+# ----------------------------------------------------------------------
+releaseProject.page.title=Continuum - Release Project
+releaseProject.section.title=Choose Release Goal for {0}
+
+prepareRelease.section.title=Prepare Project Release
+prepareRelease.releaseParameters=Release Parameters
+prepareRelease.releaseVersion=Release Version*
+prepareRelease.nextDevelopmentVersion=Next Development Version*
+
+prepareReleaseProgress.section.title=Executing Prepare Project Release
+prepareReleaseFinished.section.title=Prepare Project Release Result
+
+performReleaseProgress.section.title=Executing Perform Project Release
+performReleaseFinished.section.title=Perform Project Release Result
+
+releaseProject.prepareReleaseOption=Prepare project for release
+releaseProject.performReleaseOption=Perform project release
+releaseProject.provideReleaseParameters=Project Release Parameters
+releaseProject.status=Status
+releaseProject.phase=Phase
+releaseProject.viewOutput=View Output
+
+viewReleaseResult.section.title=View Project Release Summary
+viewReleaseResult.summary=Release Project Details
+viewReleaseResult.success=SUCCESSFUL
+viewReleaseResult.error=ERROR
+viewReleaseResult.output=Release Execution Output
+
 
 # ----------------------------------------------------------------------
 # MavenUser.properties starts here

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml Thu Sep 14 20:22:12 2006
@@ -255,6 +255,49 @@
       <result name="success" type="chain">buildResults</result>
     </action>
 
+    <!--
+    - continuum release
+    -->
+    <action name="releaseProject" class="releaseProject">
+      <result name="prompt">releaseProject.jsp</result>
+      <result name="prepareRelease" type="redirect-action">
+        <param name="actionName">prepareRelease</param>
+        <param name="projectId">${projectId}</param>
+      </result>
+      <result name="performRelease" type="redirect-action">
+        <param name="actionName">performRelease</param>
+        <param name="projectId">${projectId}</param>
+        <param name="releaseId">${preparedReleaseId}</param>
+      </result>
+    </action>
+
+    <action name="prepareRelease" class="prepareRelease">
+      <result name="prompt">prepareRelease.jsp</result>
+      <!-- should be exec and wait -->
+      <result name="initialized" type="redirect-action">
+        <param name="actionName">prepareRelease!checkProgress.action</param>
+        <param name="releaseId">${releaseId}</param>
+        <param name="projectId">${projectId}</param>
+      </result>
+      <result name="inProgress">prepareReleaseProgress.jsp</result>
+      <result name="finished">prepareReleaseFinished.jsp</result>
+    </action>
+
+    <action name="performRelease" class="performRelease">
+      <result name="prompt">performRelease.jsp</result>
+      <!-- should be exec and wait -->
+      <result name="initialized" type="redirect-action">
+        <param name="actionName">performRelease!checkProgress.action</param>
+        <param name="releaseId">${releaseId}</param>
+      </result>
+      <result name="inProgress">performReleaseProgress.jsp</result>
+      <result name="finished">performReleaseFinished.jsp</result>
+    </action>
+
+    <action name="viewReleaseResult" class="viewReleaseResult">
+      <result name="success">viewReleaseResult.jsp</result>
+    </action>
+
   </package>
 
   <package name="component" extends="default">

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp Thu Sep 14 20:22:12 2006
@@ -55,6 +55,23 @@
           </c:otherwise>
         </c:choose>
       </ec:column>
+      <ec:column property="releaseAction" title="&nbsp;" width="1%" sortable="false">
+        <c:choose>
+          <c:when test="${pageScope.project.state == 2}">
+            <ww:url id="releaseProjectUrl" action="releaseProject!promptReleaseGoal.action" namespace="/">
+              <ww:param name="projectId" value="${project.id}"/>
+            </ww:url>
+            <ww:a href="%{releaseProjectUrl}">
+              <img src="<ww:url value='/images/releaseproject.gif'/>" alt="Release Project" title="Release Project"
+                border="0"/>
+            </ww:a>
+          </c:when>
+          <c:otherwise>
+            <img src="<ww:url value='/images/releaseproject_disabled.gif'/>" alt="Release Project"
+              title="Release Project" border="0"/>
+          </c:otherwise>
+        </c:choose>
+      </ec:column>
       <ec:column property="deleteAction" title="&nbsp;" width="1%" sortable="false">
         <c:choose>
           <c:when

Modified: maven/continuum/branches/continuum-acegi/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/pom.xml?view=diff&rev=446495&r1=446494&r2=446495
==============================================================================
--- maven/continuum/branches/continuum-acegi/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/pom.xml Thu Sep 14 20:22:12 2006
@@ -2,6 +2,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+<!--
+  ~ 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.
+  -->
+
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven</groupId>
@@ -83,6 +100,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>
     <module>continuum-security</module>
   </modules>
   <repositories>



Mime
View raw message