continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r571933 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/component/ mdo/ resources/localization/ webapp/WEB-INF/jsp/components/
Date Sun, 02 Sep 2007 09:01:59 GMT
Author: evenisse
Date: Sun Sep  2 02:01:59 2007
New Revision: 571933

URL: http://svn.apache.org/viewvc?rev=571933&view=rev
Log:
[CONTINUUM-1420] Add profile and "build fresh" columns
Submitted by: Olivier Lamy

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
    maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?rev=571933&r1=571932&r2=571933&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
Sun Sep  2 02:01:59 2007
@@ -197,6 +197,7 @@
         if ( bd.getProfile() != null )
         {
             bds.setProfileName( bd.getProfile().getName() );
+            bds.setProfileId( bd.getProfile().getId() );
         }
         return bds;
     }

Modified: maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo?rev=571933&r1=571932&r2=571933&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo Sun Sep  2 02:01:59
2007
@@ -335,6 +335,13 @@
           <description>if project lvl, then the name of the project using the definition</description>
           <type>String</type>
         </field>
+        <field>
+          <name>profileId</name>
+          <version>1.0.0</version>
+          <required>true</required>
+          <description>id of the profile for build definition</description>
+          <type>int</type>
+        </field>        
       </fields>
     </class>
     <class>

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=571933&r1=571932&r2=571933&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Sun Sep  2 02:01:59 2007
@@ -370,6 +370,12 @@
 buildDefinition.duplicatename.save.error.message = There was an error saving the schedule,
a schedule with the same name already exists.
 
 # ----------------------------------------------------------------------
+# Page: BuildSummary
+# ----------------------------------------------------------------------
+buildDefinitionSummary.projectGroup.section.title = Project Group Build Definitions of {0}
group
+
+
+# ----------------------------------------------------------------------
 # Page: DeleteBuildDefinition
 # ----------------------------------------------------------------------
 deleteBuildDefinition.page.title = Continuum - Delete Build Definition
@@ -633,6 +639,7 @@
 installation.envvar.type.label = Environment Variable
 installation.ant.type.label = ANT
 installation.automaticProfile.label=Create a Profile with the installation name
+
 
 
 

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?rev=571933&r1=571932&r2=571933&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
Sun Sep  2 02:01:59 2007
@@ -25,7 +25,7 @@
 
 <ww:i18n name="localization.Continuum">
 
-  <h3>Project Group Build Definitions of ${projectGroup.name} group</h3>
+  <h3><ww:text name="buildDefinitionSummary.projectGroup.section.title"><ww:param>${projectGroup.name}</ww:param></ww:text></h3>
   <ww:if test="${not empty groupBuildDefinitionSummaries}">
   <ec:table items="groupBuildDefinitionSummaries"
             var="buildDefinitionSummary"
@@ -49,7 +49,12 @@
           ${pageScope.buildDefinitionSummary.scheduleName}
         </redback:elseAuthorized>
       </ec:column>
-      <ec:column property="profileName" title="projectView.buildDefinition.profile"/>
     
+      <ec:column property="profileName" title="projectView.buildDefinition.profile">
+        <ww:url id="profileUrl" action="editProfile!edit.action" namespace="/" includeParams="none">
+          <ww:param name="profile.id">${pageScope.buildDefinitionSummary.profileId}</ww:param>
+        </ww:url>    
+        <ww:a href="%{profileUrl}">${pageScope.buildDefinitionSummary.profileName}</ww:a>
    
+      </ec:column>      
       <ec:column property="from" title="projectView.buildDefinition.from"/>
       <ec:column property="isBuildFresh" title="projectView.buildDefinition.buildFresh"/>
       <ec:column property="isDefault" title="projectView.buildDefinition.default"/>
@@ -130,7 +135,6 @@
       <ec:column property="goals" title="projectView.buildDefinition.goals"/>
       <ec:column property="arguments" title="projectView.buildDefinition.arguments"/>
       <ec:column property="buildFile" title="projectView.buildDefinition.buildFile"/>
-      <!-- ec:column property="profile" title="projectView.buildDefinition.profile"/ -->
       <ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
         <redback:ifAuthorized permission="continuum-manage-schedules">
           <ww:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
@@ -142,7 +146,14 @@
           ${pageScope.buildDefinitionSummary.scheduleName}
         </redback:elseAuthorized>
       </ec:column>
+      <ec:column property="profileName" title="projectView.buildDefinition.profile">
+        <ww:url id="profileUrl" action="editProfile!edit.action" namespace="/" includeParams="none">
+          <ww:param name="profile.id">${pageScope.buildDefinitionSummary.profileId}</ww:param>
+        </ww:url>
+        <ww:a href="%{profileUrl}">${pageScope.buildDefinitionSummary.profileName}</ww:a>
       
+      </ec:column>      
       <ec:column property="from" title="projectView.buildDefinition.from"/>
+      <ec:column property="isBuildFresh" title="projectView.buildDefinition.buildFresh"/>
       <ec:column property="isDefault" title="projectView.buildDefinition.default"/>
       <ec:column property="buildNowAction" title="&nbsp;" width="1%">
         <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">



Mime
View raw message