You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ri...@apache.org on 2007/01/19 23:02:29 UTC
svn commit: r497971 - in
/maven/continuum/branches/id-refactor/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/
java/org/apache/maven/continuum/web/action/component/
java/org/apache/maven/continuum/web/view/ mdo/
Author: rinku
Date: Fri Jan 19 14:02:28 2007
New Revision: 497971
URL: http://svn.apache.org/viewvc?view=rev&rev=497971
Log:
o fixed references to ints and related updates.
Modified:
maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
maven/continuum/branches/id-refactor/continuum-webapp/src/main/mdo/view-models.mdo
Modified: maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?view=diff&rev=497971&r1=497970&r2=497971
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original)
+++ maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Fri Jan 19 14:02:28 2007
@@ -62,7 +62,7 @@
private Collection projectGroups;
- private int selectedProjectGroup;
+ private long selectedProjectGroup;
public void validate()
{
@@ -229,12 +229,12 @@
this.projectGroups = projectGroups;
}
- public int getSelectedProjectGroup()
+ public long getSelectedProjectGroup()
{
return selectedProjectGroup;
}
- public void setSelectedProjectGroup( int selectedProjectGroup )
+ public void setSelectedProjectGroup( long selectedProjectGroup )
{
this.selectedProjectGroup = selectedProjectGroup;
}
Modified: maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java?view=diff&rev=497971&r1=497970&r2=497971
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java (original)
+++ maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java Fri Jan 19 14:02:28 2007
@@ -45,11 +45,11 @@
private int buildDefinitionId;
- private int projectId;
+ private long projectId;
- private int projectGroupId;
+ private long projectGroupId;
- private int scheduleId;
+ private long scheduleId;
private boolean defaultBuildDefinition;
@@ -86,7 +86,7 @@
{
Schedule schedule = (Schedule) i.next();
- schedules.put( new Integer( schedule.getId() ), schedule.getName() );
+ schedules.put( new Long( schedule.getId() ), schedule.getName() );
}
}
@@ -300,27 +300,27 @@
this.buildDefinitionId = buildDefinitionId;
}
- public int getProjectId()
+ public long getProjectId()
{
return projectId;
}
- public void setProjectId( int projectId )
+ public void setProjectId( long projectId )
{
this.projectId = projectId;
}
- public int getProjectGroupId()
+ public long getProjectGroupId()
{
return projectGroupId;
}
- public void setProjectGroupId( int projectGroupId )
+ public void setProjectGroupId( long projectGroupId )
{
this.projectGroupId = projectGroupId;
}
- public int getScheduleId()
+ public long getScheduleId()
{
return scheduleId;
}
Modified: maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java?view=diff&rev=497971&r1=497970&r2=497971
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java (original)
+++ maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java Fri Jan 19 14:02:28 2007
@@ -145,7 +145,7 @@
if ( buildResultsInSuccess != null )
{
BuildResult buildInSuccess =
- (BuildResult) buildResultsInSuccess.get( new Integer( project.getId() ) );
+ (BuildResult) buildResultsInSuccess.get( new Long( project.getId() ) );
if ( buildInSuccess != null )
{
@@ -155,7 +155,7 @@
if ( buildResults != null )
{
- BuildResult latestBuild = (BuildResult) buildResults.get( new Integer( project.getId() ) );
+ BuildResult latestBuild = (BuildResult) buildResults.get( new Long( project.getId() ) );
if ( latestBuild != null )
{
Modified: maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?view=diff&rev=497971&r1=497970&r2=497971
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Fri Jan 19 14:02:28 2007
@@ -182,7 +182,7 @@
{
projectInCOQueue = true;
}
- projects.put( p, new Integer( p.getProjectGroup().getId() ) );
+ projects.put( p, new Long( p.getProjectGroup().getId() ) );
}
}
@@ -190,7 +190,7 @@
while ( proj_group.hasNext() )
{
ProjectGroup pg = (ProjectGroup) proj_group.next();
- projectGroups.put( new Integer( pg.getId() ), pg.getName() );
+ projectGroups.put( new Long( pg.getId() ), pg.getName() );
}
return SUCCESS;
Modified: maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?view=diff&rev=497971&r1=497970&r2=497971
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Fri Jan 19 14:02:28 2007
@@ -36,11 +36,11 @@
extends ContinuumConfirmAction
implements SecureAction
{
- private int id;
+ private long id;
private boolean active = false;
- private int delay;
+ private long delay;
private String description;
@@ -52,7 +52,7 @@
private boolean confirmed;
- private int maxJobExecutionTime;
+ private long maxJobExecutionTime;
private String second = "0";
@@ -178,12 +178,12 @@
return schedules;
}
- public int getId()
+ public long getId()
{
return id;
}
- public void setId( int id )
+ public void setId( long id )
{
this.id = id;
}
@@ -198,12 +198,12 @@
this.active = active;
}
- public int getDelay()
+ public long getDelay()
{
return delay;
}
- public void setDelay( int delay )
+ public void setDelay( long delay )
{
this.delay = delay;
}
@@ -248,12 +248,12 @@
this.confirmed = confirmed;
}
- public int getMaxJobExecutionTime()
+ public long getMaxJobExecutionTime()
{
return maxJobExecutionTime;
}
- public void setMaxJobExecutionTime( int maxJobExecutionTime )
+ public void setMaxJobExecutionTime( long maxJobExecutionTime )
{
this.maxJobExecutionTime = maxJobExecutionTime;
}
Modified: maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?view=diff&rev=497971&r1=497970&r2=497971
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (original)
+++ maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java Fri Jan 19 14:02:28 2007
@@ -41,7 +41,7 @@
public class SummaryAction
extends ContinuumActionSupport
{
- private int projectGroupId;
+ private long projectGroupId;
private String projectGroupName;
@@ -118,7 +118,7 @@
if ( buildResultsInSuccess != null )
{
- BuildResult buildInSuccess = (BuildResult) buildResultsInSuccess.get( new Integer( project.getId() ) );
+ BuildResult buildInSuccess = (BuildResult) buildResultsInSuccess.get( new Long( project.getId() ) );
if ( buildInSuccess != null )
{
@@ -128,7 +128,7 @@
if ( buildResults != null )
{
- BuildResult latestBuild = (BuildResult) buildResults.get( new Integer( project.getId() ) );
+ BuildResult latestBuild = (BuildResult) buildResults.get( new Long( project.getId() ) );
if ( latestBuild != null )
{
@@ -167,12 +167,12 @@
this.projects = projects;
}
- public int getProjectGroupId()
+ public long getProjectGroupId()
{
return projectGroupId;
}
- public void setProjectGroupId( int projectGroupId )
+ public void setProjectGroupId( long projectGroupId )
{
this.projectGroupId = projectGroupId;
}
Modified: maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?view=diff&rev=497971&r1=497970&r2=497971
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java (original)
+++ maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java Fri Jan 19 14:02:28 2007
@@ -40,11 +40,11 @@
public class BuildDefinitionSummaryAction
extends ContinuumActionSupport
{
- private int projectGroupId;
+ private long projectGroupId;
private String projectGroupName;
- private int projectId;
+ private long projectId;
private ProjectGroup projectGroup;
@@ -103,7 +103,7 @@
return SUCCESS;
}
- private List gatherProjectBuildDefinitionSummaries( int projectId )
+ private List gatherProjectBuildDefinitionSummaries( long projectId )
throws ContinuumException
{
List summaryList = new ArrayList();
@@ -123,7 +123,7 @@
}
- private List gatherGroupBuildDefinitionSummaries( int projectGroupId )
+ private List gatherGroupBuildDefinitionSummaries( long projectGroupId )
throws ContinuumException
{
List summaryList = new ArrayList();
@@ -158,22 +158,22 @@
return bds;
}
- public int getProjectId()
+ public long getProjectId()
{
return projectId;
}
- public void setProjectId( int projectId )
+ public void setProjectId( long projectId )
{
this.projectId = projectId;
}
- public int getProjectGroupId()
+ public long getProjectGroupId()
{
return projectGroupId;
}
- public void setProjectGroupId( int projectGroupId )
+ public void setProjectGroupId( long projectGroupId )
{
this.projectGroupId = projectGroupId;
}
Modified: maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java?view=diff&rev=497971&r1=497970&r2=497971
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java (original)
+++ maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java Fri Jan 19 14:02:28 2007
@@ -55,7 +55,7 @@
ProjectSummary project = (ProjectSummary) tableModel.getCurrentRowBean();
String contextPath = tableModel.getContext().getContextPath();
- int buildNumber = project.getBuildNumber();
+ long buildNumber = project.getBuildNumber();
String result = "<div align=\"center\">";
@@ -78,13 +78,13 @@
{
HashMap params = new HashMap();
- params.put( "projectId", new Integer( project.getId() ) );
+ params.put( "projectId", new Long( project.getId() ) );
params.put( "projectName", project.getName() );
- params.put( "buildId", new Integer( project.getBuildInSuccessId() ) );
+ params.put( "buildId", new Long( project.getBuildInSuccessId() ) );
- params.put( "projectGroupId", new Integer( project.getProjectGroupId() ) );
+ params.put( "projectGroupId", new Long( project.getProjectGroupId() ) );
PageContext pageContext = (PageContext) tableModel.getContext().getContextObject();
Modified: maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?view=diff&rev=497971&r1=497970&r2=497971
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java (original)
+++ maven/continuum/branches/id-refactor/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java Fri Jan 19 14:02:28 2007
@@ -92,13 +92,13 @@
{
HashMap params = new HashMap();
- params.put( "projectId", new Integer( project.getId() ) );
+ params.put( "projectId", new Long( project.getId() ) );
params.put( "projectName", project.getName() );
- params.put( "buildId", new Integer( project.getLatestBuildId() ) );
+ params.put( "buildId", new Long( project.getLatestBuildId() ) );
- params.put( "projectGroupId", new Integer( project.getProjectGroupId() ) );
+ params.put( "projectGroupId", new Long( project.getProjectGroupId() ) );
String url = UrlHelper.buildUrl( "/" + action + ".action", ServletActionContext.getRequest(),
ServletActionContext.getResponse(), params );
Modified: maven/continuum/branches/id-refactor/continuum-webapp/src/main/mdo/view-models.mdo
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-webapp/src/main/mdo/view-models.mdo?view=diff&rev=497971&r1=497970&r2=497971
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-webapp/src/main/mdo/view-models.mdo (original)
+++ maven/continuum/branches/id-refactor/continuum-webapp/src/main/mdo/view-models.mdo Fri Jan 19 14:02:28 2007
@@ -63,7 +63,7 @@
<version>1.0.0</version>
<required>true</required>
<description>project id of the project</description>
- <type>int</type>
+ <type>long</type>
<defaultValue>-1</defaultValue>
</field>
<field>
@@ -85,7 +85,7 @@
<version>1.0.0</version>
<required>true</required>
<description>id of the project group this project is a member of</description>
- <type>int</type>
+ <type>long</type>
<defaultValue>-1</defaultValue>
</field>
<field>
@@ -100,7 +100,7 @@
<version>1.0.0</version>
<required>true</required>
<description>latest build id of the project</description>
- <type>int</type>
+ <type>long</type>
<defaultValue>-1</defaultValue>
</field>
<field>
@@ -108,7 +108,7 @@
<version>1.0.0</version>
<required>true</required>
<description></description>
- <type>int</type>
+ <type>long</type>
<defaultValue>-1</defaultValue>
</field>
<field>
@@ -116,7 +116,7 @@
<version>1.0.0</version>
<required>true</required>
<description></description>
- <type>int</type>
+ <type>long</type>
<defaultValue>-1</defaultValue>
</field>
<field>
@@ -154,7 +154,7 @@
<version>1.0.0</version>
<required>true</required>
<description>internal continuum group id</description>
- <type>int</type>
+ <type>long</type>
<defaultValue>-1</defaultValue>
</field>
<field>
@@ -251,21 +251,21 @@
<version>1.0.0</version>
<required>true</required>
<description>id of the build definition</description>
- <type>int</type>
+ <type>long</type>
</field>
<field>
<name>projectId</name>
<version>1.0.0</version>
<required>false</required>
<description>project id of the project containing the build definition</description>
- <type>int</type>
+ <type>long</type>
</field>
<field>
<name>projectGroupId</name>
<version>1.0.0</version>
<required>false</required>
<description>project group id of the project group with the build definition</description>
- <type>int</type>
+ <type>long</type>
</field>
<field>
<name>goals</name>
@@ -305,7 +305,7 @@
<version>1.0.0</version>
<required>true</required>
<description>id of the schedule for build definition</description>
- <type>int</type>
+ <type>long</type>
</field>
<field>
<name>scheduleName</name>
@@ -346,21 +346,21 @@
<version>1.0.0</version>
<required>true</required>
<description>id of the build definition</description>
- <type>int</type>
+ <type>long</type>
</field>
<field>
<name>projectId</name>
<version>1.0.0</version>
<required>false</required>
<description>project id of the project containing the build definition</description>
- <type>int</type>
+ <type>long</type>
</field>
<field>
<name>projectGroupId</name>
<version>1.0.0</version>
<required>false</required>
<description>project group id of the project group with the build definition</description>
- <type>int</type>
+ <type>long</type>
</field>
<field>
<name>type</name>