Author: evenisse
Date: Tue Oct 31 06:52:43 2006
New Revision: 469505
URL: http://svn.apache.org/viewvc?view=rev&rev=469505
Log:
Remove Next Schedule Build and Status Message columns because they aren't implemented.
Modified:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java?view=diff&rev=469505&r1=469504&r2=469505
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
Tue Oct 31 06:52:43 2006
@@ -162,8 +162,8 @@
}
//todo wire in the next scheduled build for the project group and a meaningful
status message
- groupModel.setNextScheduledBuild( "unknown" );
- groupModel.setStatusMessage( "none" );
+ //groupModel.setNextScheduledBuild( "unknown" );
+ //groupModel.setStatusMessage( "none" );
groupModel.setNumSuccesses( numSuccesses );
groupModel.setNumFailures( numFailures );
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java?view=diff&rev=469505&r1=469504&r2=469505
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java
Tue Oct 31 06:52:43 2006
@@ -27,6 +27,7 @@
import org.codehaus.plexus.security.system.SecuritySystemConstants;
import org.codehaus.plexus.security.system.SecuritySystem;
import org.codehaus.plexus.security.authorization.AuthorizationException;
+import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.xwork.PlexusLifecycleListener;
import com.opensymphony.xwork.ActionContext;
@@ -92,7 +93,14 @@
case ContinuumProjectState.BUILDING:
{
- return createActionLink( contextPath, project, "cancelBuild", "Cancel Build",
"cancelbuild.gif" );
+ if ( !Os.isFamily( "windows" ) )
+ {
+ return createActionLink( contextPath, project, "cancelBuild", "Cancel
Build", "cancelbuild.gif" );
+ }
+ else
+ {
+ return image( contextPath, "Build Now", "buildnow_disabled.gif" );
+ }
}
default:
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp?view=diff&rev=469505&r1=469504&r2=469505
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp Tue
Oct 31 06:52:43 2006
@@ -36,8 +36,8 @@
<ec:column property="groupId" title="Group Id" width="20%"/>
<ec:column property="numProjects" title="Projects" width="1%" style="text-align:
center"/>
<ec:column property="numSuccesses" title="Build Status" width="1%" style="white-space:
nowrap" cell="org.apache.maven.continuum.web.view.BuildStatusCell"/>
- <ec:column property="nextScheduledBuild" title="Next Build" width="1%"
style="white-space: nowrap"/>
- <ec:column property="statusMessage" title="Status Message"/>
+ <!-- ec:column property="nextScheduledBuild" title="Next Build" width="1%"
style="white-space: nowrap"/>
+ <ec:column property="statusMessage" title="Status Message"/ -->
</ec:row>
</ec:table>
</div>
|