You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jz...@apache.org on 2009/09/01 12:47:22 UTC
svn commit: r809963 - in
/continuum/branches/continuum-1.3.x/continuum-webapp/src:
main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java
Author: jzurbano
Date: Tue Sep 1 10:47:21 2009
New Revision: 809963
URL: http://svn.apache.org/viewvc?rev=809963&view=rev
Log:
[CONTINUUM-2347] - "Project Group is required and all projects must be in a project group" is displayed when adding Ant/Shell Projects
Modified:
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
continuum/branches/continuum-1.3.x/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=809963&r1=809962&r2=809963&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Tue Sep 1 10:47:21 2009
@@ -66,7 +66,7 @@
private Collection<ProjectGroup> projectGroups;
- private int selectedProjectGroup;
+ private static int selectedProjectGroup;
private String projectGroupName;
@@ -144,6 +144,11 @@
addActionError( authzE.getMessage() );
return REQUIRES_AUTHORIZATION;
}
+
+ if ( this.getSelectedProjectGroup() == 0 )
+ {
+ return INPUT;
+ }
String projectNameTrim = projectName.trim();
String versionTrim = projectVersion.trim();
@@ -221,6 +226,8 @@
}
projectGroups = new ArrayList<ProjectGroup>();
+
+ selectedProjectGroup = 0;
Collection<ProjectGroup> allProjectGroups = getContinuum().getAllProjectGroups();
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java?rev=809963&r1=809962&r2=809963&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java Tue Sep 1 10:47:21 2009
@@ -20,11 +20,13 @@
*/
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import org.apache.maven.continuum.web.action.stub.AddProjectActionStub;
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.project.ProjectGroup;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
@@ -45,6 +47,12 @@
action = new AddProjectActionStub();
continuumMock = new Mock( Continuum.class );
action.setContinuum( (Continuum) continuumMock.proxy() );
+
+ Collection<ProjectGroup> projectGroups = new ArrayList<ProjectGroup>();
+ ProjectGroup projectGroup = new ProjectGroup();
+ projectGroups.add( projectGroup );
+
+ action.setProjectGroups( projectGroups );
}
public void testAddProjectNullValues()
@@ -58,6 +66,30 @@
}
/**
+ * Test add of project with no project groups available
+ *
+ * @throws Exception
+ */
+ public void testAddProjectNoProjectGroups()
+ throws Exception
+ {
+ Collection<ProjectGroup> projectGroups = new ArrayList<ProjectGroup>();
+
+ String scmUrl = "scm:svn:http://project/scm/url/test/build.xml";
+ action.setProjectGroups( projectGroups );
+
+ List<Project> projects = createProjectList();
+
+ action.setProjectName( "Ant Test Project" );
+ action.setProjectVersion( "1.0-SNAPSHOT" );
+ action.setProjectScmUrl( scmUrl );
+ action.setProjectType( "ant" );
+ action.setBuildDefintionTemplateId( 1 );
+
+ assertEquals( action.add(), "input" );
+ }
+
+ /**
* Test add of Ant project
*
* @throws Exception
@@ -81,7 +113,6 @@
action.validate();
action.add();
continuumMock.verify();
-
}
/**
Re: svn commit: r809963 - in /continuum/branches/continuum-1.3.x/continuum-webapp/src: main/java/org/apache/maven/continuum/web/action/AddProjectAction.java test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java
Posted by Brett Porter <br...@apache.org>.
shouldn't it be "cannot reproduce" instead of "fixed" then?
On 13/10/2009, at 7:55 PM, Jevica Arianne Zurbano wrote:
> I have reverted the changes made:
> - branch: 824635 (reverts r809963)
> - trunk: 824636 (reverts r809964)
>
> I also could not replicate the issue, so I removed the fix for
> version in
> the ticket too.
>
> Thanks Brett for pointing that out :)
Re: svn commit: r809963 - in /continuum/branches/continuum-1.3.x/continuum-webapp/src:
main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java
Posted by Jevica Arianne Zurbano <je...@gmail.com>.
I have reverted the changes made:
- branch: 824635 (reverts r809963)
- trunk: 824636 (reverts r809964)
I also could not replicate the issue, so I removed the fix for version in
the ticket too.
Thanks Brett for pointing that out :)
Re: svn commit: r809963 - in /continuum/branches/continuum-1.3.x/continuum-webapp/src:
main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java
Posted by Jevica Arianne Zurbano <je...@gmail.com>.
On Tue, Oct 13, 2009 at 8:25 AM, Brett Porter <br...@apache.org> wrote:
> I know this commit is super old, but I haven't got around to reviewing some
> lately...
>
> On 01/09/2009, at 8:47 PM, jzurbano@apache.org wrote:
>
> Author: jzurbano
>> Date: Tue Sep 1 10:47:21 2009
>> New Revision: 809963
>>
>> URL: http://svn.apache.org/viewvc?rev=809963&view=rev
>> Log:
>> [CONTINUUM-2347] - "Project Group is required and all projects must be in
>> a project group" is displayed when adding Ant/Shell Projects
>>
>>
>> Modified:
>> continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
>> URL:
>> http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=809963&r1=809962&r2=809963&view=diff
>>
>> ==============================================================================
>> ---
>> continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
>> (original)
>> +++
>> continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
>> Tue Sep 1 10:47:21 2009
>> @@ -66,7 +66,7 @@
>>
>> private Collection<ProjectGroup> projectGroups;
>>
>> - private int selectedProjectGroup;
>> + private static int selectedProjectGroup;
>>
>
> Why is this static?
>
I made this one static so that when the project is added, it will still have
the value of the project group
and will not return to the page with the error.
> - Brett
>
>
Re: svn commit: r809963 - in /continuum/branches/continuum-1.3.x/continuum-webapp/src: main/java/org/apache/maven/continuum/web/action/AddProjectAction.java test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java
Posted by Brett Porter <br...@apache.org>.
I know this commit is super old, but I haven't got around to reviewing
some lately...
On 01/09/2009, at 8:47 PM, jzurbano@apache.org wrote:
> Author: jzurbano
> Date: Tue Sep 1 10:47:21 2009
> New Revision: 809963
>
> URL: http://svn.apache.org/viewvc?rev=809963&view=rev
> Log:
> [CONTINUUM-2347] - "Project Group is required and all projects must
> be in a project group" is displayed when adding Ant/Shell Projects
>
>
> Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/
> main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
> URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=809963&r1=809962&r2=809963&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/
> java/org/apache/maven/continuum/web/action/AddProjectAction.java
> (original)
> +++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/
> java/org/apache/maven/continuum/web/action/AddProjectAction.java Tue
> Sep 1 10:47:21 2009
> @@ -66,7 +66,7 @@
>
> private Collection<ProjectGroup> projectGroups;
>
> - private int selectedProjectGroup;
> + private static int selectedProjectGroup;
Why is this static?
- Brett