]> source.dussan.org Git - archiva.git/commit
[MRM-980] ability to merge repositories
authorMaria Odea B. Ching <oching@apache.org>
Tue, 27 Jul 2010 05:07:48 +0000 (05:07 +0000)
committerMaria Odea B. Ching <oching@apache.org>
Tue, 27 Jul 2010 05:07:48 +0000 (05:07 +0000)
commite711ec5177f1e4ceccb0278a32da3aeb28bebddb
treef122d24374a878688f9cee530366f5a46adbf9f5
parent4af6b292e4dc07af8d4db8c938e6e4675944a9b0
[MRM-980] ability to merge repositories
submitted by Patti Arachchige Eshan Sudharaka

o added audit logs for merging repos
o fixed merging, merge from staging to managed repo instead of the other way around
o change the repository id in artifact browse from staging one to managed one after the merging is done
o removed unused actions in struts.xml and gave proper name for methods in MergeAction class

additional changes made on top of the patch:
o fixed the title and messages displayed in the merge jsp page
o fixed formatting of merge action

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@979534 13f79535-47bb-0310-9956-ffa450edef68
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp
archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java
archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java