svn commit: r659443 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories: AddManagedRepositoryAction.java AddRemoteRepositoryAction.java RepositoryGroupsAction.java

[oching]

Author: oching
Date: Thu May 22 23:18:36 2008
New Revision: 659443

URL: http://svn.apache.org/viewvc?rev=659443&view=rev
Log:
[MRM-694]
-add validation check for existing ids for repo groups and remote & managed 
repos

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java?rev=659443&r1=659442&r2=659443&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java
 Thu May 22 23:18:36 2008
@@ -104,7 +104,12 @@
             addFieldError( "repository.id", "Unable to add new repository with 
id [" + repoId
                 + "], that id already exists as a remote repository." );
         }
-
+        else if( config.getRepositoryGroupsAsMap().containsKey( repoId ) )
+        {
+            addFieldError( "repository.id", "Unable to add new repository with 
id [" + repoId
+               + "], that id already exists as a repository group." );
+        }
+        
         if ( !validator.validate( repository.getRefreshCronExpression() ) )
         {
             addFieldError( "repository.refreshCronExpression", "Invalid cron 
expression." );

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java?rev=659443&r1=659442&r2=659443&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
 Thu May 22 23:18:36 2008
@@ -100,6 +100,11 @@
             addFieldError( "repository.id", "Unable to add new repository with 
id [" + repoId
                 + "], that id already exists as a remote repository." );
         }
+        else if( config.getRepositoryGroupsAsMap().containsKey( repoId ) )
+        {
+            addFieldError( "repository.id", "Unable to add new repository with 
id [" + repoId
+               + "], that id already exists as a repository group." );
+        }
     }
     
     public RemoteRepositoryConfiguration getRepository()

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java?rev=659443&r1=659442&r2=659443&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java
 Thu May 22 23:18:36 2008
@@ -93,7 +93,19 @@
         if ( configuration.getRepositoryGroupsAsMap().containsKey( repoGroupId 
) )
         {
             addActionError( "Unable to add new repository group with id [" + 
repoGroupId
-                    + "], that id already exists." );
+                    + "], that id already exists as a repository group." );
+            return ERROR;
+        }
+        else if ( configuration.getManagedRepositoriesAsMap().containsKey( 
repoGroupId ) )
+        {
+            addActionError( "Unable to add new repository group with id [" + 
repoGroupId
+                    + "], that id already exists as a managed repository." );
+            return ERROR;
+        }
+        else if ( configuration.getRemoteRepositoriesAsMap().containsKey( 
repoGroupId ) )
+        {
+            addActionError( "Unable to add new repository group with id [" + 
repoGroupId
+                    + "], that id already exists as a remote repository." );
             return ERROR;
         }