You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2006/08/09 22:29:06 UTC
svn commit: r430138 - in /maven/continuum/trunk/continuum-webapp: ./
src/main/java/org/apache/maven/continuum/web/action/
src/main/java/org/apache/maven/continuum/web/model/
src/main/java/org/apache/maven/continuum/web/view/ src/main/mdo/
Author: evenisse
Date: Wed Aug 9 13:29:05 2006
New Revision: 430138
URL: http://svn.apache.org/viewvc?rev=430138&view=rev
Log:
[CONTINUUM-284] Generate view model classes
Added:
maven/continuum/trunk/continuum-webapp/src/main/mdo/
maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.xml (with props)
Removed:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/model/
Modified:
maven/continuum/trunk/continuum-webapp/pom.xml
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/action/SummaryAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
Modified: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/pom.xml?rev=430138&r1=430137&r2=430138&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Wed Aug 9 13:29:05 2006
@@ -66,6 +66,23 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <version>1.0-alpha-8</version>
+ <executions>
+ <execution>
+ <id>project summary model</id>
+ <configuration>
+ <model>src/main/mdo/view-models.xml</model>
+ <version>1.0.0</version>
+ </configuration>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<configuration>
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?rev=430138&r1=430137&r2=430138&view=diff
==============================================================================
--- 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 Wed Aug 9 13:29:05 2006
@@ -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() );
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?rev=430138&r1=430137&r2=430138&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java Wed Aug 9 13:29:05 2006
@@ -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() );
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java?rev=430138&r1=430137&r2=430138&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java Wed Aug 9 13:29:05 2006
@@ -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();
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?rev=430138&r1=430137&r2=430138&view=diff
==============================================================================
--- 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 Wed Aug 9 13:29:05 2006
@@ -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();
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?rev=430138&r1=430137&r2=430138&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java Wed Aug 9 13:29:05 2006
@@ -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();
Added: maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.xml?rev=430138&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.xml (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.xml Wed Aug 9 13:29:05 2006
@@ -0,0 +1,182 @@
+<model>
+ <id>continuum-view-models</id>
+ <name>ContinuumViewModels</name>
+ <defaults>
+ <default>
+ <key>package</key>
+ <value>org.apache.maven.continuum.web.model</value>
+ </default>
+ </defaults>
+ <classes>
+ <class rootElement="true">
+ <name>ContinuumViewModels</name>
+ <version>1.0.0</version>
+ <fields>
+ <field>
+ <name>projectSummarys</name>
+ <version>1.0.0</version>
+ <description></description>
+ <required>true</required>
+ <association>
+ <type>ProjectSummary</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>groupSummarys</name>
+ <version>1.0.0</version>
+ <description></description>
+ <required>true</required>
+ <association>
+ <type>GroupSummary</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ </fields>
+ </class>
+ <class>
+ <name>ProjectSummary</name>
+ <version>1.0.0</version>
+ <fields>
+ <field>
+ <name>id</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <description>project id of the project</description>
+ <type>int</type>
+ <defaultValue>-1</defaultValue>
+ </field>
+ <field>
+ <name>name</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <description>name of the project</description>
+ <type>String</type>
+ </field>
+ <field>
+ <name>version</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <description>version of the project</description>
+ <type>String</type>
+ </field>
+ <field>
+ <name>projectGroupName</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <description>name of the project group this project is a member of</description>
+ <type>String</type>
+ </field>
+ <field>
+ <name>latestBuildId</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <description>latest build id of the project</description>
+ <type>int</type>
+ <defaultValue>-1</defaultValue>
+ </field>
+ <field>
+ <name>buildInSuccessId</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <description></description>
+ <type>int</type>
+ <defaultValue>-1</defaultValue>
+ </field>
+ <field>
+ <name>buildNumber</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <description></description>
+ <type>int</type>
+ <defaultValue>-1</defaultValue>
+ </field>
+ <field>
+ <name>state</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <description>lifecycle state of the project</description>
+ <type>int</type>
+ <defaultValue>-1</defaultValue>
+ </field>
+ <field>
+ <name>inQueue</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <description>true/false depending on if the project is in the build queue or not</description>
+ <type>boolean</type>
+ <defaultValue>false</defaultValue>
+ </field>
+ </fields>
+ </class>
+ <class>
+ <name>GroupSummary</name>
+ <version>1.0.0</version>
+ <fields>
+ <field>
+ <name>id</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <description>internal continuum group id</description>
+ <type>int</type>
+ <defaultValue>-1</defaultValue>
+ </field>
+ <field>
+ <name>name</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <description>name of the project group</description>
+ <type>String</type>
+ </field>
+ <field>
+ <name>groupId</name>
+ <version>1.0.0</version>
+ <required>false</required>
+ <description>maven groupId of the project group</description>
+ <type>String</type>
+ </field>
+ <field>
+ <name>description</name>
+ <version>1.0.0</version>
+ <required>false</required>
+ <description>description of the project group</description>
+ <type>String</type>
+ </field>
+ <field>
+ <name>projects</name>
+ <version>1.0.0</version>
+ <description></description>
+ <required>true</required>
+ <association>
+ <type>ProjectSummary</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>numSuccesses</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <description>number of successful builds in the project group</description>
+ <type>int</type>
+ <defaultValue>-1</defaultValue>
+ </field>
+ <field>
+ <name>numFailures</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <description>number of failed builds in the project group</description>
+ <type>int</type>
+ <defaultValue>-1</defaultValue>
+ </field>
+ <field>
+ <name>numErrors</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <description>number of errored builds in the project group</description>
+ <type>int</type>
+ <defaultValue>-1</defaultValue>
+ </field>
+ </fields>
+ </class>
+ </classes>
+</model>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"