Merged /archiva/trunk:r885006-887039

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@887043 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 8 insertions, 42 deletions

diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
index 0b8e63b7d..c1e81e388 100644
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
@@ -45,19 +45,6 @@ import org.apache.maven.archiva.model.ArchivaArtifact;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * SearchServiceImpl
- *
- * quick/general text search which returns a list of artifacts
- * query for an artifact based on a checksum
- * query for all available versions of an artifact, sorted in version significance order
- * query for all available versions of an artifact since a given date
- * query for an artifact's direct dependencies
- * query for an artifact's dependency tree (as with mvn dependency:tree - no duplicates should be included)
- * query for all artifacts that depend on a given artifact
- *
- * @version $Id: SearchServiceImpl.java
- */
 public class SearchServiceImpl
     implements SearchService
 {
@@ -214,9 +201,11 @@ public class SearchServiceImpl
         List<Artifact> artifacts = new ArrayList<Artifact>();
 
         // 1. get observable repositories
-        // 2. use metadata repository to query uniqueVersions? (but with date)
+        // 2. use RepositoryBrowsing method to query uniqueVersions? (but with date)
+        
+        throw new UnsupportedOperationException( "getArtifactVersionsByDate not yet implemented" );
 
-        return artifacts;
+//        return artifacts;
     }
 
     public List<Dependency> getDependencies( String groupId, String artifactId, String version )
@@ -248,8 +237,9 @@ public class SearchServiceImpl
         throws Exception
     {
         List<Artifact> a = new ArrayList<Artifact>();
-
-        return a;
+        
+        throw new UnsupportedOperationException( "getDependencyTree not yet implemented" );
+//        return a;
     }
 
     public List<Artifact> getDependees( String groupId, String artifactId, String version )
diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
index 34b18b483..751312536 100644
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
@@ -231,7 +231,7 @@ public class SearchServiceImplTest
         assertEquals( ARCHIVA_TEST_ARTIFACT_ID, artifact.getArtifactId() );
         assertEquals( "1.0", artifact.getVersion() );
         assertEquals( "jar", artifact.getType() );
-        assertEquals( "public.releases", artifact.getRepositoryId() );
+        assertNull( "Repository should be null since the model was not found in the database!", artifact.getRepositoryId() );
     }
 
     public void testQuickSearchArtifactRegularSearch()
diff --git a/pom.xml b/pom.xml
index 57d3ccfe2..865c1c259 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1221,28 +1221,4 @@
       </build>
     </profile>
   </profiles>
-  <repositories>
-    <repository>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>sonatype.public</id>
-      <name>Sonatype Public Repo</name>
-      <url>http://repository.sonatype.org/content/repositories/sonatype-apache-releases</url>
-    </repository> 
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>codehaus.org.snapshots</id>
-      <name>Codehaus Snapshots Repository</name>
-      <url>http://snapshots.repository.codehaus.org</url>
-    </repository> 
-  </repositories>
 </project>