diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-09-18 22:03:12 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-09-18 22:03:12 +0000 |
| commit | d1d92da75130c6004208b8065d84ee0462b7eb80 (patch) | |
| tree | c12df9bb9f0b6f9156ac53a77dcc6bded2224365 /archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src | |
| parent | 5a3bf2a3af41b881f3c0f54a655eead342381459 (diff) | |
| download | archiva-d1d92da75130c6004208b8065d84ee0462b7eb80.tar.gz archiva-d1d92da75130c6004208b8065d84ee0462b7eb80.zip | |
implement merge method in merge repositories service
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1387390 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 | 12 |
1 files changed, 12 insertions, 0 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 4bc02ab0e..f206f0e9c 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 @@ -48,4 +48,16 @@ public interface MergeRepositoriesService List<Artifact> getMergeConflictedArtifacts( @PathParam ( "sourceRepositoryId" ) String sourceRepositoryId, @PathParam ( "targetRepositoryId" ) String targetRepositoryId ) throws ArchivaRestServiceException; + + @Path ( "mergeRepositories/{sourceRepositoryId}/{targetRepositoryId}/{skipConflicts}" ) + @GET + @RedbackAuthorization ( noPermission = true ) + /** + * <b>permissions are checked in impl</b> + * @since 1.4-M3 + */ + void mergeRepositories( @PathParam ( "sourceRepositoryId" ) String sourceRepositoryId, + @PathParam ( "targetRepositoryId" ) String targetRepositoryId, + @PathParam ( "skipConflicts" ) boolean skipConflicts ) + throws ArchivaRestServiceException; } |