revert changes made in r809963 (CONTINUUM-2347)

git-svn-id: https://svn.apache.org/repos/asf/continuum/branches/continuum-1.3.x@824635 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 13, 2009 · a626cb1 · a626cb1
1 parent 93a4d61
commit a626cb1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 32 deletions.
diff --git a/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java b/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
@@ -66,7 +66,7 @@ public class AddProjectAction
 
     private Collection<ProjectGroup> projectGroups;
 
-    private static int selectedProjectGroup;
+    private int selectedProjectGroup;
 
     private String projectGroupName;
 
@@ -144,11 +144,6 @@ public String add()
             addActionError( authzE.getMessage() );
             return REQUIRES_AUTHORIZATION;
         }
-
-        if ( this.getSelectedProjectGroup() == 0 )
-        {
-            return INPUT;
-        }
 
         String projectNameTrim = projectName.trim();
         String versionTrim = projectVersion.trim();
@@ -226,8 +221,6 @@ public String input()
         }
 
         projectGroups = new ArrayList<ProjectGroup>();
-
-        selectedProjectGroup = 0;
 
         Collection<ProjectGroup> allProjectGroups = getContinuum().getAllProjectGroups();
 

diff --git a/...nuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java b/...nuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java
@@ -65,30 +65,6 @@ public void testAddProjectNullValues()
         action.validate();
     }
 
-    /**
-     * 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
      *