Index: src/main/java/org/apache/maven/continuum/web/model/SummaryProjectModel.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/model/SummaryProjectModel.java (revision 430077)
+++ src/main/java/org/apache/maven/continuum/web/model/SummaryProjectModel.java (working copy)
@@ -1,127 +0,0 @@
-package org.apache.maven.continuum.web.model;
-
-import java.io.Serializable;
-
-/*
- * Copyright 2004-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @author Emmanuel Venisse
- * @version $Id$
- */
-public class SummaryProjectModel
- implements Serializable
-{
- private int id = -1;
- private String name;
- private String version;
- private String projectGroupName;
- private int latestBuildId = -1;
- private int buildInSuccessId = -1;
- private int buildNumber = -1;
- private int state = -1;
- private boolean inQueue = false;
-
- public int getId()
- {
- return id;
- }
-
- public void setId( int id )
- {
- this.id = id;
- }
-
- public String getName()
- {
- return name;
- }
-
- public void setName( String name )
- {
- this.name = name;
- }
-
- public String getVersion()
- {
- return version;
- }
-
- public void setVersion( String version )
- {
- this.version = version;
- }
-
- public String getProjectGroupName()
- {
- return projectGroupName;
- }
-
- public void setProjectGroupName( String projectGroupName )
- {
- this.projectGroupName = projectGroupName;
- }
-
- public int getLatestBuildId()
- {
- return latestBuildId;
- }
-
- public void setLatestBuildId( int latestBuildId )
- {
- this.latestBuildId = latestBuildId;
- }
-
- public int getBuildInSuccessId()
- {
- return buildInSuccessId;
- }
-
- public void setBuildInSuccessId( int buildInSuccessId )
- {
- this.buildInSuccessId = buildInSuccessId;
- }
-
- public int getBuildNumber()
- {
- return buildNumber;
- }
-
- public void setBuildNumber( int buildNumber )
- {
- this.buildNumber = buildNumber;
- }
-
- public int getState()
- {
- return state;
- }
-
- public void setState( int state )
- {
- this.state = state;
- }
-
- public boolean isInQueue()
- {
- return inQueue;
- }
-
- public void setInQueue( boolean inQueue )
- {
- this.inQueue = inQueue;
- }
-}
Index: src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/view/BuildCell.java (revision 430077)
+++ src/main/java/org/apache/maven/continuum/web/view/BuildCell.java (working copy)
@@ -17,7 +17,7 @@
*/
import com.opensymphony.webwork.views.util.UrlHelper;
-import org.apache.maven.continuum.web.model.SummaryProjectModel;
+import org.apache.maven.continuum.web.model.ProjectSummary;
import org.extremecomponents.table.bean.Column;
import org.extremecomponents.table.cell.DisplayCell;
import org.extremecomponents.table.core.TableModel;
@@ -38,7 +38,7 @@
{
protected String getCellValue( TableModel tableModel, Column column )
{
- SummaryProjectModel project = (SummaryProjectModel) tableModel.getCurrentRowBean();
+ ProjectSummary project = (ProjectSummary) tableModel.getCurrentRowBean();
String contextPath = tableModel.getContext().getContextPath();
Index: src/main/java/org/apache/maven/continuum/web/view/StateCell.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/view/StateCell.java (revision 430077)
+++ src/main/java/org/apache/maven/continuum/web/view/StateCell.java (working copy)
@@ -18,7 +18,7 @@
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.views.util.UrlHelper;
-import org.apache.maven.continuum.web.model.SummaryProjectModel;
+import org.apache.maven.continuum.web.model.ProjectSummary;
import org.apache.maven.continuum.web.util.StateGenerator;
import org.extremecomponents.table.bean.Column;
import org.extremecomponents.table.cell.DisplayCell;
@@ -37,7 +37,7 @@
{
protected String getCellValue( TableModel tableModel, Column column )
{
- SummaryProjectModel project = (SummaryProjectModel) tableModel.getCurrentRowBean();
+ ProjectSummary project = (ProjectSummary) tableModel.getCurrentRowBean();
int latestBuildId = project.getLatestBuildId();
Index: src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java (revision 430077)
+++ src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java (working copy)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.maven.continuum.web.model.SummaryProjectModel;
+import org.apache.maven.continuum.web.model.ProjectSummary;
import org.extremecomponents.table.bean.Column;
import org.extremecomponents.table.cell.DisplayCell;
import org.extremecomponents.table.core.TableModel;
@@ -32,7 +32,7 @@
{
protected String getCellValue( TableModel tableModel, Column column )
{
- SummaryProjectModel project = (SummaryProjectModel) tableModel.getCurrentRowBean();
+ ProjectSummary project = (ProjectSummary) tableModel.getCurrentRowBean();
String contextPath = tableModel.getContext().getContextPath();
Index: src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java (revision 430077)
+++ src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java (working copy)
@@ -2,8 +2,8 @@
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import org.apache.maven.continuum.Continuum;
-import org.apache.maven.continuum.web.model.SummaryProjectModel;
-import org.apache.maven.continuum.web.model.GroupSummaryModel;
+import org.apache.maven.continuum.web.model.ProjectSummary;
+import org.apache.maven.continuum.web.model.GroupSummary;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.model.project.ProjectGroup;
@@ -64,7 +64,7 @@
getLogger().info("GroupSummaryAction: building group " + projectGroup.getName() );
- GroupSummaryModel groupModel = new GroupSummaryModel();
+ GroupSummary groupModel = new GroupSummary();
groupModel.setId( projectGroup.getId() );
groupModel.setGroupId( projectGroup.getGroupId() );
groupModel.setName( projectGroup.getName() );
@@ -86,7 +86,7 @@
{
Project project = (Project) i.next();
- SummaryProjectModel model = new SummaryProjectModel();
+ ProjectSummary model = new ProjectSummary();
getLogger().info("GroupSummaryAction: building project model " + project.getName() );
Index: src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (revision 430077)
+++ src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (working copy)
@@ -19,7 +19,7 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.web.model.SummaryProjectModel;
+import org.apache.maven.continuum.web.model.ProjectSummary;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import java.util.ArrayList;
@@ -86,7 +86,7 @@
{
Project project = (Project) i.next();
- SummaryProjectModel model = new SummaryProjectModel();
+ ProjectSummary model = new ProjectSummary();
model.setId( project.getId() );
Index: pom.xml
===================================================================
--- pom.xml (revision 430077)
+++ pom.xml (working copy)
@@ -66,6 +66,23 @@
+ org.codehaus.modello
+ modello-maven-plugin
+ 1.0-alpha-8
+
+
+ project summary model
+
+ src/main/mdo/view-models.xml
+ 1.0.0
+
+
+ java
+
+
+
+
+
org.mortbay.jetty
maven-jetty-plugin
Index: src/main/mdo/view-models.xml
===================================================================
--- src/main/mdo/view-models.xml (revision 0)
+++ src/main/mdo/view-models.xml (revision 0)
@@ -0,0 +1,182 @@
+
+ continuum-view-models
+ ContinuumViewModels
+
+
+ package
+ org.apache.maven.continuum.web.model
+
+
+
+
+ ContinuumViewModels
+ 1.0.0
+
+
+ projectSummarys
+ 1.0.0
+
+ true
+
+ ProjectSummary
+ *
+
+
+
+ groupSummarys
+ 1.0.0
+
+ true
+
+ GroupSummary
+ *
+
+
+
+
+
+ ProjectSummary
+ 1.0.0
+
+
+ id
+ 1.0.0
+ true
+ project id of the project
+ int
+ -1
+
+
+ name
+ 1.0.0
+ true
+ name of the project
+ String
+
+
+ version
+ 1.0.0
+ true
+ version of the project
+ String
+
+
+ projectGroupName
+ 1.0.0
+ true
+ name of the project group this project is a member of
+ String
+
+
+ latestBuildId
+ 1.0.0
+ true
+ latest build id of the project
+ int
+ -1
+
+
+ buildInSuccessId
+ 1.0.0
+ true
+
+ int
+ -1
+
+
+ buildNumber
+ 1.0.0
+ true
+
+ int
+ -1
+
+
+ state
+ 1.0.0
+ true
+ lifecycle state of the project
+ int
+ -1
+
+
+ inQueue
+ 1.0.0
+ true
+ true/false depending on if the project is in the build queue or not
+ boolean
+ false
+
+
+
+
+ GroupSummary
+ 1.0.0
+
+
+ id
+ 1.0.0
+ true
+ internal continuum group id
+ int
+ -1
+
+
+ name
+ 1.0.0
+ true
+ name of the project group
+ String
+
+
+ groupId
+ 1.0.0
+ false
+ maven groupId of the project group
+ String
+
+
+ description
+ 1.0.0
+ false
+ description of the project group
+ String
+
+
+ projects
+ 1.0.0
+
+ true
+
+ ProjectSummary
+ *
+
+
+
+ numSuccesses
+ 1.0.0
+ true
+ number of successful builds in the project group
+ int
+ -1
+
+
+ numFailures
+ 1.0.0
+ true
+ number of failed builds in the project group
+ int
+ -1
+
+
+ numErrors
+ 1.0.0
+ true
+ number of errored builds in the project group
+ int
+ -1
+
+
+
+
+
\ No newline at end of file
Property changes on: src/main/mdo/view-models.xml
___________________________________________________________________
Name: svn:eol-style
+ native