continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From epunza...@apache.org
Subject svn commit: r443306 - in /maven/continuum/branches/release-integration/continuum: continuum-release/src/main/java/org/apache/maven/continuum/release/ continuum-release/src/main/java/org/apache/maven/continuum/release/executors/ continuum-webapp/src/mai...
Date Thu, 14 Sep 2006 10:31:37 GMT
Author: epunzalan
Date: Thu Sep 14 03:31:34 2006
New Revision: 443306

URL: http://svn.apache.org/viewvc?view=rev&rev=443306
Log:
PR: CONTINUUM-727

fixed some bugs and added strings in Continuum.properties

Modified:
    maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
    maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseFinished.jsp
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseProgress.jsp
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareRelease.jsp
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseProject.jsp
    maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/viewReleaseResult.jsp

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?view=diff&rev=443306&r1=443305&r2=443306
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
Thu Sep 14 03:31:34 2006
@@ -172,6 +172,7 @@
         descriptor.setScmTagBase( releaseProperties.getProperty( "tagBase" ) );
         descriptor.setReleaseVersions( relVersions );
         descriptor.setDevelopmentVersions( devVersions );
+        descriptor.setPreparationGoals( releaseProperties.getProperty( "prepareGoals" ) );
 
         //other properties
         if ( releaseProperties.containsKey( "username" ) )

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java?view=diff&rev=443306&r1=443305&r2=443306
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
Thu Sep 14 03:31:34 2006
@@ -18,13 +18,15 @@
 
 import org.apache.maven.continuum.release.ContinuumReleaseException;
 import org.apache.maven.continuum.release.tasks.PerformReleaseProjectTask;
-import org.apache.maven.plugins.release.ReleaseExecutionException;
-import org.apache.maven.plugins.release.ReleaseFailureException;
 import org.apache.maven.plugins.release.ReleaseManagerListener;
+import org.apache.maven.plugins.release.ReleaseResult;
 import org.apache.maven.plugins.release.config.ReleaseDescriptor;
+import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
 
+import java.util.List;
+
 /**
  * @author Edwin Punzalan
  */
@@ -34,31 +36,42 @@
     public void executeTask( Task task )
         throws TaskExecutionException
     {
-        try
-        {
-            PerformReleaseProjectTask performTask = (PerformReleaseProjectTask) task;
-
-            ReleaseDescriptor descriptor = performTask.getDescriptor();
-
-            ReleaseManagerListener listener = performTask.getListener();
+        PerformReleaseProjectTask performTask = (PerformReleaseProjectTask) task;
 
-            releasePluginManager.perform( descriptor, getSettings(), getReactorProjects(
descriptor ),
-                                          performTask.getBuildDirectory(), performTask.getGoals(),
-                                          performTask.isUseReleaseProfile(), listener );
+        ReleaseDescriptor descriptor = performTask.getDescriptor();
 
-            continuumReleaseManager.getPreparedReleases().remove( performTask.getReleaseId()
);
+        Settings settings;
+        try
+        {
+            settings = getSettings();
         }
-        catch ( ReleaseExecutionException e )
+        catch ( ContinuumReleaseException e )
         {
-            throw new TaskExecutionException( "Release Manager Execution error occurred.",
e );
+            throw new TaskExecutionException( "Failed to build reactor projects.", e );
         }
-        catch ( ReleaseFailureException e )
+
+        List reactorProjects;
+        try
         {
-            throw new TaskExecutionException( "Release Manager failure occurred.", e );
+            reactorProjects = getReactorProjects( descriptor );
         }
         catch ( ContinuumReleaseException e )
         {
             throw new TaskExecutionException( "Failed to build reactor projects.", e );
+        }
+
+        ReleaseManagerListener listener = performTask.getListener();
+
+        ReleaseResult result =
+            releasePluginManager.performWithResult( descriptor, settings, reactorProjects,
+                                                    performTask.getBuildDirectory(), performTask.getGoals(),
+                                                    performTask.isUseReleaseProfile(), listener
);
+
+        if ( result.getResultCode() == ReleaseResult.SUCCESS )
+        {
+            continuumReleaseManager.getReleaseResults().put( performTask.getReleaseId(),
result );
+
+            continuumReleaseManager.getPreparedReleases().remove( performTask.getReleaseId()
);
         }
     }
 }

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java?view=diff&rev=443306&r1=443305&r2=443306
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PerformReleaseAction.java
Thu Sep 14 03:31:34 2006
@@ -263,4 +263,14 @@
     {
         this.result = result;
     }
+
+    public int getProjectId()
+    {
+        return projectId;
+    }
+
+    public void setProjectId( int projectId )
+    {
+        this.projectId = projectId;
+    }
 }

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java?view=diff&rev=443306&r1=443305&r2=443306
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
Thu Sep 14 03:31:34 2006
@@ -68,6 +68,8 @@
 
     private List relVersions;
 
+    private String prepareGoals;
+
     private ReleaseResult result;
 
     private ContinuumReleaseManagerListener listener;
@@ -79,7 +81,18 @@
         scmUsername = project.getScmUsername();
         scmPassword = project.getScmPassword();
         scmTag = project.getScmTag();
-        scmTagBase = "";
+        String scmUrl = project.getScmUrl();
+        if ( scmUrl.endsWith( "/trunk" ) )
+        {
+            //skip scm:provider in scm url
+            int idx = scmUrl.indexOf( ":", 4 ) + 1;
+            scmTagBase = scmUrl.substring( idx , scmUrl.lastIndexOf( "/trunk" ) ) + "/branches";
+        }
+        else
+        {
+            scmTagBase = scmUrl;
+        }
+        prepareGoals = "clean integration-test";
 
         processProject( project.getWorkingDirectory(), "pom.xml" );
 
@@ -230,6 +243,7 @@
 
         p.setProperty( "tag", scmTag );
         p.setProperty( "tagBase", scmTagBase );
+        p.setProperty( "prepareGoals", prepareGoals );
 
         return p;
     }
@@ -362,5 +376,15 @@
     public void setResult( ReleaseResult result )
     {
         this.result = result;
+    }
+
+    public String getPrepareGoals()
+    {
+        return prepareGoals;
+    }
+
+    public void setPrepareGoals( String prepareGoals )
+    {
+        this.prepareGoals = prepareGoals;
     }
 }

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java?view=diff&rev=443306&r1=443305&r2=443306
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
Thu Sep 14 03:31:34 2006
@@ -36,6 +36,8 @@
 {
     private int projectId;
 
+    private String projectName;
+
     private String preparedReleaseName;
 
     private String preparedReleaseId;
@@ -67,6 +69,8 @@
             preparedReleaseId = releaseId;
         }
 
+        projectName = project.getName();
+
         return "prompt";
     }
 
@@ -155,5 +159,15 @@
     public void setPreparedReleaseId( String preparedReleaseId )
     {
         this.preparedReleaseId = preparedReleaseId;
+    }
+
+    public String getProjectName()
+    {
+        return projectName;
+    }
+
+    public void setProjectName( String projectName )
+    {
+        this.projectName = projectName;
     }
 }

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=443306&r1=443305&r2=443306
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/resources/localization/Continuum.properties
Thu Sep 14 03:31:34 2006
@@ -370,3 +370,33 @@
 surefireReport.class = Class
 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
\ No newline at end of file

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseFinished.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseFinished.jsp?view=diff&rev=443306&r1=443305&r2=443306
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseFinished.jsp
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseFinished.jsp
Thu Sep 14 03:31:34 2006
@@ -8,31 +8,37 @@
         <title><ww:text name="releaseProject.page.title"/></title>
     </head>
     <body>
-      <h2>Continuum Release</h2>
+      <h2><ww:text name="performReleaseFinished.section.title"/></h2>
       <h3><ww:property value="name"/></h3>
       <ww:form action="groupSummary" method="post">
         <div class="axial">
           <table width="100%">
             <tr>
-              <th>Status</th>
-              <th>Phase</th>
+              <th><ww:text name="releaseProject.status"/></th>
+              <th width="100%"><ww:text name="releaseProject.phase"/></th>
             </tr>
             <ww:iterator value="listener.phases">
               <tr>
+                <td>
                 <ww:if test="listener.completedPhases.contains( top )">
-                  <td>done</td>
+                  <img src="<ww:url value='/images/icon_success_sml.gif'/>"
+                       alt="Done" title="Done" border="0">
                 </ww:if>
                 <ww:elseif test="listener.inProgress.equals( top )">
                   <ww:if test="listener.error == null">
-                    <td>in progress</td>
+                    <img src="<ww:url value='/images/building.gif'/>"
+                         alt="In Progress" title="In Progress" border="0">
                   </ww:if>
                   <ww:else>
-                    <td>error</td>
+                    <img src="<ww:url value='/images/icon_error_sml.gif'/>"
+                         alt="Error" title="Error" border="0">
                   </ww:else>
                 </ww:elseif>
                 <ww:else>
-                  <td>not done</td>
+                  <img src="<ww:url value='/images/inqueue.gif'/>"
+                       alt="Queued" title="Queued" border="0">
                 </ww:else>
+                </td>
                 <td><ww:property/></td>
               </tr>
             </ww:iterator>
@@ -43,7 +49,7 @@
           <ww:url id="viewReleaseResultUrl" action="viewReleaseResult" namespace="/">
             <ww:param name="releaseId" value="releaseId"/>
           </ww:url>
-          <ww:a href="%{viewReleaseResultUrl}">View Release Output</ww:a>
+          <ww:a href="%{viewReleaseResultUrl}"><ww:text name="releaseProject.viewOutput"/></ww:a>
         </p>
 
         <ww:submit value="Done"/>

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseProgress.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseProgress.jsp?view=diff&rev=443306&r1=443305&r2=443306
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseProgress.jsp
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/performReleaseProgress.jsp
Thu Sep 14 03:31:34 2006
@@ -8,7 +8,7 @@
         <title><ww:text name="releaseProject.page.title"/></title>
     </head>
     <body>
-      <h2>Continuum Release</h2>
+      <h2><ww:text name="performReleaseProgress.section.title"/></h2>
       <h3><ww:property value="name"/></h3>
       <ww:form action="performRelease!checkProgress.action" method="post">
         <ww:hidden name="projectId"/>
@@ -16,25 +16,31 @@
         <div class="axial">
           <table width="100%">
             <tr>
-              <th>Status</th>
-              <th>Phase</th>
+              <th><ww:text name="releaseProject.status"/></th>
+              <th width="100%"><ww:text name="releaseProject.phase"/></th>
             </tr>
             <ww:iterator value="listener.phases">
               <tr>
+                <td>
                 <ww:if test="listener.completedPhases.contains( top )">
-                  <td>done</td>
+                  <img src="<ww:url value='/images/icon_success_sml.gif'/>"
+                       alt="Done" title="Done" border="0">
                 </ww:if>
                 <ww:elseif test="listener.inProgress.equals( top )">
                   <ww:if test="listener.error == null">
-                    <td>in progress</td>
+                    <img src="<ww:url value='/images/building.gif'/>"
+                         alt="In Progress" title="In Progress" border="0">
                   </ww:if>
                   <ww:else>
-                    <td>error</td>
+                    <img src="<ww:url value='/images/icon_error_sml.gif'/>"
+                         alt="Error" title="Error" border="0">
                   </ww:else>
                 </ww:elseif>
                 <ww:else>
-                  <td>not done</td>
+                  <img src="<ww:url value='/images/inqueue.gif'/>"
+                       alt="Queued" title="Queued" border="0">
                 </ww:else>
+                </td>
                 <td><ww:property/></td>
               </tr>
             </ww:iterator>

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareRelease.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareRelease.jsp?view=diff&rev=443306&r1=443305&r2=443306
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareRelease.jsp
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareRelease.jsp
Thu Sep 14 03:31:34 2006
@@ -8,9 +8,9 @@
         <title><ww:text name="releaseProject.page.title"/></title>
     </head>
     <body>
-      <h2>Prepare Project Release</h2>
+      <h2><ww:text name="prepareRelease.section.title"/></h2>
       <ww:form action="prepareRelease!doPrepare.action" method="post">
-        <h3>Release Parameters</h3>
+        <h3><ww:text name="prepareRelease.releaseParameters"/></h3>
         <input type="hidden" name="projectId" value="<ww:property value="projectId"/>"/>
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
@@ -18,6 +18,7 @@
             <ww:textfield label="SCM Password" name="scmPassword"/>
             <ww:textfield label="SCM Tag" name="scmTag"/>
             <ww:textfield label="SCM Tag Base" name="scmTagBase"/>
+            <ww:textfield label="Preparation Goals" name="prepareGoals"/>
            </table>
         </div>
 
@@ -27,14 +28,14 @@
           <div class="axial">
             <table border="1" cellspacing="2" cellpadding="3" width="100%">
               <tr>
-                <th>Release Version*</th>
+                <th><ww:text name="prepareRelease.releaseVersion"/></th>
                 <td>
                   <input type=text name="relVersions"
                          value="<ww:property value="release"/>" size="100">
                 </td>
               </tr>
               <tr>
-                <th>Next Development Version*</th>
+                <th><ww:text name="prepareRelease.nextDevelopmentVersion"/></th>
                 <td>
                   <input type=text name="devVersions"
                          value="<ww:property value="dev"/>" size="100">

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp?view=diff&rev=443306&r1=443305&r2=443306
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseFinished.jsp
Thu Sep 14 03:31:34 2006
@@ -8,32 +8,38 @@
         <title><ww:text name="releaseProject.page.title"/></title>
     </head>
     <body>
-      <h2>Continuum Release</h2>
+      <h2><ww:text name="prepareReleaseFinished.section.title"/></h2>
       <h3><ww:property value="name"/></h3>
       <ww:form action="releaseProject!promptReleaseGoal.action" method="post">
         <ww:hidden name="projectId"/>
         <div class="axial">
           <table width="100%">
             <tr>
-              <th>Status</th>
-              <th>Phase</th>
+              <th><ww:text name="releaseProject.status"/></th>
+              <th width="100%"><ww:text name="releaseProject.phase"/></th>
             </tr>
             <ww:iterator value="listener.phases">
               <tr>
+                <td>
                 <ww:if test="listener.completedPhases.contains( top )">
-                  <td>done</td>
+                  <img src="<ww:url value='/images/icon_success_sml.gif'/>"
+                       alt="Done" title="Done" border="0">
                 </ww:if>
                 <ww:elseif test="listener.inProgress.equals( top )">
                   <ww:if test="listener.error == null">
-                    <td>in progress</td>
+                    <img src="<ww:url value='/images/building.gif'/>"
+                         alt="In Progress" title="In Progress" border="0">
                   </ww:if>
                   <ww:else>
-                    <td>error</td>
+                    <img src="<ww:url value='/images/icon_error_sml.gif'/>"
+                         alt="Error" title="Error" border="0">
                   </ww:else>
                 </ww:elseif>
                 <ww:else>
-                  <td>not done</td>
+                  <img src="<ww:url value='/images/inqueue.gif'/>"
+                       alt="Queued" title="Queued" border="0">
                 </ww:else>
+                </td>
                 <td><ww:property/></td>
               </tr>
             </ww:iterator>
@@ -44,7 +50,7 @@
           <ww:url id="viewReleaseResultUrl" action="viewReleaseResult" namespace="/">
             <ww:param name="releaseId" value="releaseId"/>
           </ww:url>
-          <ww:a href="%{viewReleaseResultUrl}">View Release Output</ww:a>
+          <ww:a href="%{viewReleaseResultUrl}"><ww:text name="releaseProject.viewOutput"/></ww:a>
         </p>
 
         <ww:submit value="Done"/>

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp?view=diff&rev=443306&r1=443305&r2=443306
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/prepareReleaseProgress.jsp
Thu Sep 14 03:31:34 2006
@@ -8,7 +8,7 @@
         <title><ww:text name="releaseProject.page.title"/></title>
     </head>
     <body>
-      <h2>Continuum Release</h2>
+      <h2><ww:text name="prepareReleaseProgress.section.title"/></h2>
       <h3><ww:property value="name"/></h3>
       <ww:form action="prepareRelease!checkProgress.action" method="post">
         <ww:hidden name="projectId"/>
@@ -16,25 +16,31 @@
         <div class="axial">
           <table width="100%">
             <tr>
-              <th>Status</th>
-              <th>Phase</th>
+              <th><ww:text name="releaseProject.status"/></th>
+              <th width="100%"><ww:text name="releaseProject.phase"/></th>
             </tr>
             <ww:iterator value="listener.phases">
               <tr>
+                <td>
                 <ww:if test="listener.completedPhases.contains( top )">
-                  <td>done</td>
+                  <img src="<ww:url value='/images/icon_success_sml.gif'/>"
+                       alt="Done" title="Done" border="0">
                 </ww:if>
                 <ww:elseif test="listener.inProgress.equals( top )">
                   <ww:if test="listener.error == null">
-                    <td>in progress</td>
+                    <img src="<ww:url value='/images/building.gif'/>"
+                         alt="In Progress" title="In Progress" border="0">
                   </ww:if>
                   <ww:else>
-                    <td>error</td>
+                    <img src="<ww:url value='/images/icon_error_sml.gif'/>"
+                         alt="Error" title="Error" border="0">
                   </ww:else>
                 </ww:elseif>
                 <ww:else>
-                  <td>not done</td>
+                  <img src="<ww:url value='/images/inqueue.gif'/>"
+                       alt="Queued" title="Queued" border="0">
                 </ww:else>
+                </td>
                 <td><ww:property/></td>
               </tr>
             </ww:iterator>

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseProject.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseProject.jsp?view=diff&rev=443306&r1=443305&r2=443306
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseProject.jsp
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/releaseProject.jsp
Thu Sep 14 03:31:34 2006
@@ -8,12 +8,16 @@
         <title><ww:text name="releaseProject.page.title"/></title>
     </head>
     <body>
-      <h3>Continuum Release</h3>
+      <h3>
+        <ww:text name="releaseProject.section.title">
+          <ww:param><ww:property value="projectName"/></ww:param>
+        </ww:text>
+      </h3>
       <ww:form action="releaseProject" method="post">
         <p>
-          <input name="goal" type="radio" value="prepare" checked/>Prepare project
for release
+          <input name="goal" type="radio" value="prepare" checked/><ww:text name="releaseProject.prepareReleaseOption"/>
           <br/>
-          <input name="goal" type="radio" value="perform"/>Perform project release
+          <input name="goal" type="radio" value="perform"/><ww:text name="releaseProject.performReleaseOption"/>
           <br/>
           &nbsp;&nbsp;&nbsp;
           <select name="preparedReleaseId">
@@ -22,7 +26,7 @@
                 <ww:property value="preparedReleaseName"/>
               </option>
             </ww:if>
-            <option value="">Provide release descriptor</option>
+            <option value=""><ww:text name="releaseProject.provideReleaseParameters"/></option>
           </select>
           <br/>
         </p>

Modified: maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/viewReleaseResult.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/viewReleaseResult.jsp?view=diff&rev=443306&r1=443305&r2=443306
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/viewReleaseResult.jsp
(original)
+++ maven/continuum/branches/release-integration/continuum/continuum-webapp/src/main/webapp/viewReleaseResult.jsp
Thu Sep 14 03:31:34 2006
@@ -5,12 +5,12 @@
 <html>
   <ww:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="viewReleaseResult.page.title"/></title>
+        <title><ww:text name="releaseProject.page.title"/></title>
     </head>
     <body>
-      <h2>Continuum Release</h2>
+      <h2><ww:text name="viewReleaseResult.section.title"/></h2>
 
-      <h4><ww:text name="buildResult.buildOutput"/></h4>
+      <h4><ww:text name="viewReleaseResult.summary"/></h4>
       <div class="axial">
         <table border="1" cellspacing="2" cellpadding="3" width="100%">
           <c1:data label="%{getText('buildResult.startTime')}">
@@ -20,12 +20,19 @@
               <ww:param name="after"><c1:date name="result.endTime"/></ww:param>
           </c1:data>
           <c1:data label="%{getText('buildResult.state')}">
-              <ww:param name="after"><ww:property value="result.resultCode"/></ww:param>
+            <ww:param name="after">
+              <ww:if test="result.resultCode == 0">
+                <ww:text name="viewReleaseResult.success"/>
+              </ww:if>
+              <ww:else>
+                <ww:text name="viewReleaseResult.error"/>
+              </ww:else>
+            </ww:param>
           </c1:data>
         </table>
       </div>
 
-      <h4><ww:text name="result.buildOutput"/></h4>
+      <h4><ww:text name="viewReleaseResult.output"/></h4>
       <p>
         <ww:if test="result.output == ''">
             <ww:text name="buildResult.noOutput"/>



Mime
View raw message