fix rest services declaration

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1387379 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java

@@ -23,6 +23,7 @@ import org.apache.archiva.metadata.repository.RepositorySession;
 import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
 import org.apache.archiva.rest.api.services.MergeRepositoriesService;
 import org.apache.archiva.stagerepository.merge.Maven2RepositoryMerger;
+import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -32,6 +33,7 @@ import java.util.List;
  * @author Olivier Lamy
  * @since 1.4-M3
  */
+@Service ( "mergeRepositoriesService#rest" )
 public class DefaultMergeRepositoriesService
     extends AbstractRestService
     implements MergeRepositoriesService

archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml

@@ -70,6 +70,7 @@
       <ref bean="browseService#rest"/>
       <ref bean="systemStatusService#rest"/>
       <ref bean="reportRepositoriesService#rest" />
+      <ref bean="mergeRepositoriesService#rest"/>
     </jaxrs:serviceBeans>
 
     <jaxrs:outInterceptors>

archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/MergeRepositoriesServiceTest.java

@@ -18,10 +18,12 @@ package org.apache.archiva.rest.services;
  * under the License.
  */
 
+import org.apache.archiva.metadata.model.ArtifactMetadata;
 import org.apache.archiva.rest.api.services.MergeRepositoriesService;
 import org.junit.Test;
 
 import java.io.File;
+import java.util.List;
 
 /**
  * @author Olivier Lamy
@@ -33,13 +35,22 @@ public class MergeRepositoriesServiceTest
     public void mergeConflictedArtifacts()
         throws Exception
     {
-        String testRepoId = "test-repo";
-        createStagedNeededAndIndexRepo( testRepoId, new File( "target/target-repo" ).getAbsolutePath() );
+        try
+        {
+            String testRepoId = "test-repo";
+            createStagedNeededAndIndexRepo( testRepoId, new File( "target/target-repo" ).getAbsolutePath() );
 
-        MergeRepositoriesService service = getMergeRepositoriesService();
+            MergeRepositoriesService service = getMergeRepositoriesService();
 
-        service.getMergeConflictedArtifacts( testRepoId );
+            List<ArtifactMetadata> artifactMetadatas = service.getMergeConflictedArtifacts( testRepoId );
 
-        deleteTestRepo( testRepoId );
+            log.info( "conflicts: {}", artifactMetadatas );
+
+            deleteTestRepo( testRepoId );
+        } catch( Exception e)
+        {
+            log.error( e.getMessage(), e );
+            throw e;
+        }
     }
 }