svn commit: r1164154 - in /archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src: main/java/org/apache/archiva/admin/repository/managed/ test/java/org/apache/archiva/admin/repository/managed/

[olamy]

Author: olamy
Date: Thu Sep  1 16:43:14 2011
New Revision: 1164154

URL: http://svn.apache.org/viewvc?rev=1164154&view=rev
Log:
throw exception when id or cron expression are empty

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java?rev=1164154&r1=1164153&r2=1164154&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
 Thu Sep  1 16:43:14 2011
@@ -181,8 +181,15 @@ public class DefaultManagedRepositoryAdm
                 throw new RepositoryAdminException( "Invalid cron expression." 
);
             }
         }
+        else
+        {
+            throw new RepositoryAdminException( "Cron expression cannot be 
empty." );
+        }
 
-        // FIXME checkId non empty
+        if (StringUtils.isBlank( repoId  ))
+        {
+            throw new RepositoryAdminException( "Repository ID cannot be 
empty." );
+        }
 
         if ( !GenericValidator.matchRegexp( repoId, 
REPOSITORY_ID_VALID_EXPRESSION ) )
         {

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java?rev=1164154&r1=1164153&r2=1164154&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
 Thu Sep  1 16:43:14 2011
@@ -100,6 +100,7 @@ public class ManagedRepositoryAdminTest
         repo.setId( repoId );
         repo.setName( "test repo" );
         repo.setLocation( repoLocation );
+        repo.setCronExpression(  "0 0 * * * ?" );
         managedRepositoryAdmin.addManagedRepository( repo, false, 
getFakeAuditInformation() );
         repos = managedRepositoryAdmin.getManagedRepositories();
         assertNotNull( repos );
@@ -147,6 +148,7 @@ public class ManagedRepositoryAdminTest
         repo.setId( repoId );
         repo.setName( "test repo" );
         repo.setLocation( repoLocation );
+        repo.setCronExpression(  "0 0 * * * ?" );
         managedRepositoryAdmin.addManagedRepository( repo, false, 
getFakeAuditInformation() );
 
         assertTemplateRoleExists( repoId );
@@ -160,6 +162,7 @@ public class ManagedRepositoryAdminTest
         repo.setName( newName );
 
         repo.setLocation( repoLocation );
+        repo.setCronExpression(  "0 0 * * * ?" );
 
         managedRepositoryAdmin.updateManagedRepository( repo, false, 
getFakeAuditInformation(), false );
 
@@ -204,6 +207,7 @@ public class ManagedRepositoryAdminTest
         repo.setId( repoId );
         repo.setName( "test repo" );
         repo.setLocation( repoLocation );
+        repo.setCronExpression(  "0 0 * * * ?" );
         managedRepositoryAdmin.addManagedRepository( repo, true, 
getFakeAuditInformation() );
         repos = managedRepositoryAdmin.getManagedRepositories();
         assertNotNull( repos );