/[Apache-SVN]
ViewVC logotype

Revision 979534


Jump to revision: Previous Next
Author: oching
Date: Tue Jul 27 05:07:48 2010 UTC (13 years, 9 months ago)
Changed paths: 8
Log Message:
[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


Changed paths

Path Details
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java modified , text changed
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml modified , text changed
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp modified , text changed
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp modified , text changed
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java modified , text changed
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java modified , text changed
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java modified , text changed
Directoryarchiva/branches/archiva-MRM-980/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26