diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-09-18 22:02:17 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-09-18 22:02:17 +0000 |
| commit | 65768e87199f3c85099da42da1a51d40638bf4c3 (patch) | |
| tree | 2a1785bd8ff8998e42f93f9da0d8207b5bdac877 /archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src | |
| parent | 06acdc5d5947aea361f3e7e7d57edc45ab0d40dd (diff) | |
| download | archiva-65768e87199f3c85099da42da1a51d40638bf4c3.tar.gz archiva-65768e87199f3c85099da42da1a51d40638bf4c3.zip | |
method must received both source and target repo to avoid the ugly -stage to be done in the service
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1387386 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/MergeRepositoriesService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/MergeRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/MergeRepositoriesService.java index 6ad8326d6..4bc02ab0e 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/MergeRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/MergeRepositoriesService.java @@ -37,7 +37,7 @@ import java.util.List; @Path ( "/mergeRepositoriesService/" ) public interface MergeRepositoriesService { - @Path ( "mergeConflictedArtifacts/{repositoryId}" ) + @Path ( "mergeConflictedArtifacts/{sourceRepositoryId}/{targetRepositoryId}" ) @GET @Produces ( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) @RedbackAuthorization ( noPermission = true ) @@ -45,6 +45,7 @@ public interface MergeRepositoriesService * <b>permissions are checked in impl</b> * @since 1.4-M3 */ - List<Artifact> getMergeConflictedArtifacts( @PathParam ( "repositoryId" ) String repositoryId ) + List<Artifact> getMergeConflictedArtifacts( @PathParam ( "sourceRepositoryId" ) String sourceRepositoryId, + @PathParam ( "targetRepositoryId" ) String targetRepositoryId ) throws ArchivaRestServiceException; } |