Author: brett
Date: Tue Dec 8 23:20:34 2009
New Revision: 888625
URL: http://svn.apache.org/viewvc?rev=888625&view=rev
Log:
[MRM-1025] remove more now unused database code
Removed:
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArchivaRepositoryByUrlConstraint.java
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraint.java
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/RecentArtifactsByAgeConstraint.java
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/UniqueArtifactIdConstraint.java
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/UniqueGroupIdConstraint.java
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RecentArtifactsByAgeConstraintTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueArtifactIdConstraintTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/UniqueGroupIdConstraintTest.java
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ArchivaDAO.java
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoArchivaDAO.java
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/AllTests.java
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-database/src/main/java/org/apache/maven/archiva/database/ArchivaDAO.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ArchivaDAO.java?rev=888625&r1=888624&r2=888625&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ArchivaDAO.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ArchivaDAO.java
Tue Dec 8 23:20:34 2009
@@ -19,7 +19,6 @@
* under the License.
*/
-import java.io.Serializable;
import java.util.List;
/**
@@ -39,14 +38,6 @@
*/
List<?> query( SimpleConstraint constraint );
- /**
- * Perform a simple save of a peristable object to the database.
- *
- * @param o the serializable (persistable) object to save.
- * @return the post-serialized object.
- */
- Object save( Serializable obj );
-
ArtifactDAO getArtifactDAO();
RepositoryProblemDAO getRepositoryProblemDAO();
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoArchivaDAO.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoArchivaDAO.java?rev=888625&r1=888624&r2=888625&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoArchivaDAO.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoArchivaDAO.java
Tue Dec 8 23:20:34 2009
@@ -19,7 +19,6 @@
* under the License.
*/
-import java.io.Serializable;
import java.util.List;
import org.apache.maven.archiva.database.ArchivaDAO;
@@ -62,11 +61,6 @@
return jdo.queryObjects( constraint );
}
- public Object save( Serializable obj )
- {
- return jdo.saveObject( obj );
- }
-
public ArtifactDAO getArtifactDAO()
{
return artifactDAO;
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/AllTests.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/AllTests.java?rev=888625&r1=888624&r2=888625&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/AllTests.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/AllTests.java
Tue Dec 8 23:20:34 2009
@@ -36,9 +36,7 @@
//$JUnit-BEGIN$
suite.addTestSuite( ArtifactsByChecksumConstraintTest.class );
suite.addTestSuite( OlderArtifactsByAgeConstraintTest.class );
- suite.addTestSuite( UniqueGroupIdConstraintTest.class );
suite.addTestSuite( OlderSnapshotArtifactsByAgeConstraintTest.class );
- suite.addTestSuite( RecentArtifactsByAgeConstraintTest.class );
//$JUnit-END$
return suite;
}
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=888625&r1=888624&r2=888625&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
Tue Dec 8 23:20:34 2009
@@ -19,7 +19,6 @@
* under the License.
*/
-import java.io.Serializable;
import java.util.List;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
@@ -27,9 +26,7 @@
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.UniqueArtifactIdConstraint;
import org.apache.maven.archiva.database.constraints.UniqueFieldConstraint;
-import org.apache.maven.archiva.database.constraints.UniqueGroupIdConstraint;
import org.apache.maven.archiva.database.constraints.UniqueVersionConstraint;
/**
@@ -46,10 +43,6 @@
private List<String> versions;
- private List<String> groups;
-
- private List<String> artifacts;
-
private List<String> repositoryIds;
private RepositoryProblemDAO repositoryProblemDAO;
@@ -60,14 +53,6 @@
{
return versions;
}
- else if ( constraint instanceof UniqueGroupIdConstraint )
- {
- return groups;
- }
- else if ( constraint instanceof UniqueArtifactIdConstraint )
- {
- return artifacts;
- }
else if ( constraint instanceof UniqueFieldConstraint )
{
return repositoryIds;
@@ -75,11 +60,6 @@
throw new UnsupportedOperationException();
}
- public Object save( Serializable obj )
- {
- throw new UnsupportedOperationException( "query not implemented for
stub" );
- }
-
public ArtifactDAO getArtifactDAO()
{
return artifactDao;
@@ -100,16 +80,6 @@
this.versions = versions;
}
- public void setGroups( List<String> groups )
- {
- this.groups = groups;
- }
-
- public void setArtifacts( List<String> artifacts )
- {
- this.artifacts = artifacts;
- }
-
public void setRepositoryIds( List<String> repositoryIds )
{
this.repositoryIds = repositoryIds;
