You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2009/12/10 12:41:24 UTC

svn commit: r889205 - in /archiva/branches/MRM-1025/archiva-modules: archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ archiva-web/archiva-webapp/...

Author: brett
Date: Thu Dec 10 11:41:18 2009
New Revision: 889205

URL: http://svn.apache.org/viewvc?rev=889205&view=rev
Log:
[MRM-1025] remove constraint that is no longer used

Removed:
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/UniqueVersionConstraint.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueVersionConstraintTest.java
Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java?rev=889205&r1=889204&r2=889205&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java Thu Dec 10 11:41:18 2009
@@ -21,13 +21,11 @@
 
 import java.util.List;
 
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.database.ArchivaDAO;
 import org.apache.maven.archiva.database.ArtifactDAO;
 import org.apache.maven.archiva.database.RepositoryProblemDAO;
 import org.apache.maven.archiva.database.SimpleConstraint;
 import org.apache.maven.archiva.database.constraints.UniqueFieldConstraint;
-import org.apache.maven.archiva.database.constraints.UniqueVersionConstraint;
 
 /**
  * Stub class for Archiva DAO to avoid having to set up a database for tests.
@@ -37,23 +35,16 @@
 public class ArchivaDAOStub
     implements ArchivaDAO
 {
-    private ArchivaConfiguration configuration;
 
     private ArtifactDAO artifactDao;
 
-    private List<String> versions;
-
     private List<String> repositoryIds;
 
     private RepositoryProblemDAO repositoryProblemDAO;
 
     public List<?> query( SimpleConstraint constraint )
     {
-        if ( constraint instanceof UniqueVersionConstraint )
-        {
-            return versions;
-        }
-        else if ( constraint instanceof UniqueFieldConstraint )
+        if ( constraint instanceof UniqueFieldConstraint )
         {
             return repositoryIds;
         }
@@ -75,11 +66,6 @@
         this.artifactDao = artifactDao;
     }
 
-    public void setVersions( List<String> versions )
-    {
-        this.versions = versions;
-    }
-
     public void setRepositoryIds( List<String> repositoryIds )
     {
         this.repositoryIds = repositoryIds;