continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jzurb...@apache.org
Subject svn commit: r824635 - 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
Date Tue, 13 Oct 2009 08:31:06 GMT
Author: jzurbano
Date: Tue Oct 13 08:31:06 2009
New Revision: 824635

URL: http://svn.apache.org/viewvc?rev=824635&view=rev
Log:
revert changes made in r809963 (CONTINUUM-2347)

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=824635&r1=824634&r2=824635&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 Oct 13 08:31:06 2009
@@ -66,7 +66,7 @@
 
     private Collection<ProjectGroup> projectGroups;
 
-    private static int selectedProjectGroup;
+    private int selectedProjectGroup;
 
     private String projectGroupName;
 
@@ -144,11 +144,6 @@
             addActionError( authzE.getMessage() );
             return REQUIRES_AUTHORIZATION;
         }
-        
-        if ( this.getSelectedProjectGroup() == 0 )
-        {
-            return INPUT;
-        }
 
         String projectNameTrim = projectName.trim();
         String versionTrim = projectVersion.trim();
@@ -226,8 +221,6 @@
         }
 
         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=824635&r1=824634&r2=824635&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 Oct 13 08:31:06 2009
@@ -66,30 +66,6 @@
     }
     
     /**
-     * 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



Mime
View raw message