Commit Graph

3145 Commits

Author SHA1 Message Date
Wendy Smoak 4bb8ce3962 [MRM-980] Update docs on staging and promotion. Only a System Administrator can create/remove/merge staging repos.
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@996519 13f79535-47bb-0310-9956-ffa450edef68
2010-09-13 13:17:39 +00:00
Wendy Smoak 6613d0ebd6 [MRM-980] Update docs on staging and promotion
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@996392 13f79535-47bb-0310-9956-ffa450edef68
2010-09-12 21:36:05 +00:00
Maria Odea B. Ching b66c52c823 [MRM-1407] documentation for staging & merging repositories
submitted by Patti Arachchige Eshan Sudharaka

additional changes made:
o moved to staging repos doc to admin guide instead of user guide
o added a few lines and fixed typos in the staging doc


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@985674 13f79535-47bb-0310-9956-ffa450edef68
2010-08-15 13:33:42 +00:00
Maria Odea B. Ching ffbb7c1b12 [MRM-980] selenium tests for repository merging
submitted by Patti Arachchige Eshan Sudharaka


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@985612 13f79535-47bb-0310-9956-ffa450edef68
2010-08-15 03:20:27 +00:00
Maria Odea B. Ching 93cd044c22 [MRM-1398],[MRM-1401],[MRM-1403]
submitted by Patti Arachchige Eshan Sudharaka
o fixed repositories page
o do not merge snapshot artifacts
o fixed problem when merging artifacts with classifier


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@983343 13f79535-47bb-0310-9956-ffa450edef68
2010-08-08 05:19:33 +00:00
Maria Odea B. Ching 406f496d26 [MRM-1400] schedule repo scan after merging so metadata gets fixed
submitted by Patti Arachchige Eshan Sudharaka


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@981152 13f79535-47bb-0310-9956-ffa450edef68
2010-08-01 05:09:02 +00:00
Maria Odea B. Ching ee1c46df04 [MRM-980] remove unused jsp
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@981150 13f79535-47bb-0310-9956-ffa450edef68
2010-08-01 04:48:24 +00:00
Maria Odea B. Ching 214bb1f70e [MRM-980] move merge jsps inside admin dir
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@981149 13f79535-47bb-0310-9956-ffa450edef68
2010-08-01 04:39:49 +00:00
Maria Odea B. Ching b12f6e8426 [MRM-980] fixed variable names in action and label/messages in jsp
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@981136 13f79535-47bb-0310-9956-ffa450edef68
2010-08-01 04:03:00 +00:00
Maria Odea B. Ching 1014b00be4 [MRM-1397] reflect in the staging repo changes made in the configuration of the managed repo it is attached to
submitted by Patti Arachchige Eshan Sudharaka


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@981121 13f79535-47bb-0310-9956-ffa450edef68
2010-08-01 03:04:06 +00:00
Maria Odea B. Ching fde7697e4d [MRM-1406] use terget repo name instead of staging repo name for audit logging
submitted by Patti Arachchige Eshan Sudharaka


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@980397 13f79535-47bb-0310-9956-ffa450edef68
2010-07-29 10:52:57 +00:00
Maria Odea B. Ching 91a7926f26 [MRM-1402] fixed audit event name for merged artifacts
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@979568 13f79535-47bb-0310-9956-ffa450edef68
2010-07-27 07:51:20 +00:00
Maria Odea B. Ching 061c2e548f fixed formatting
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@979565 13f79535-47bb-0310-9956-ffa450edef68
2010-07-27 07:41:11 +00:00
Maria Odea B. Ching bb9b67877f delete unused test classes
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@979556 13f79535-47bb-0310-9956-ffa450edef68
2010-07-27 06:52:54 +00:00
Maria Odea B. Ching 2b9f40450e remove unused classes
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@979555 13f79535-47bb-0310-9956-ffa450edef68
2010-07-27 06:47:25 +00:00
Maria Odea B. Ching 24396152ea fixed formatting
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@979553 13f79535-47bb-0310-9956-ffa450edef68
2010-07-27 06:31:40 +00:00
Maria Odea B. Ching d847dbdbc7 [MRM-980] fixed button value names
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@979550 13f79535-47bb-0310-9956-ffa450edef68
2010-07-27 06:24:40 +00:00
Maria Odea B. Ching e711ec5177 [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
2010-07-27 05:07:48 +00:00
Maria Odea B. Ching 4af6b292e4 [MRM-980] UI integration for staging repos
submitted by Patti Arachchige Eshan Sudharaka


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@965157 13f79535-47bb-0310-9956-ffa450edef68
2010-07-18 05:05:40 +00:00
Maria Odea B. Ching e1a3f53902 [MRM-980] remove old classes for repo merge
submitted by Patti Arachchige Eshan Sudharaka


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@962979 13f79535-47bb-0310-9956-ffa450edef68
2010-07-11 04:51:12 +00:00
Maria Odea B. Ching 3779145ad5 [MRM-980] fix repo merger and update repo merger tests
submitted by Patti Arachchige Eshan Sudharaka


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@962977 13f79535-47bb-0310-9956-ffa450edef68
2010-07-11 04:23:27 +00:00
Maria Odea B. Ching de3ea2b93e [MRM-980] add implementation and test case for repository merger
submitted by Patti Arachchige Eshan Sudharaka


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@962756 13f79535-47bb-0310-9956-ffa450edef68
2010-07-10 04:04:32 +00:00
Brett Porter f6d87c18b4 [MRM-980] Add getArtifacts() method to be able to retrieve all artifacts in a repository
Submitted by: Patti Arachchige Eshan Sudharaka


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@961576 13f79535-47bb-0310-9956-ffa450edef68
2010-07-08 05:53:27 +00:00
Maria Odea B. Ching 27ad7cd108 merge -c 960322 from trunk (MRM-1394)
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@960421 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 02:33:18 +00:00
Jevica Arianne B. Zurbano 8cfd3806cc [MRM-1394] - Replace the use of clickLinkWithText() with getSelenium().open() for accessing navigation menu pages
merge -r 960310:960311 from 1.3.x branch



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@960322 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 11:27:10 +00:00
Maria Odea B. Ching dc625beeb1 [MRM-980] ability to merge repositories
submitted by Patti Arachchige Eshan Sudharaka

o added artifacts to test-repository to be used for repo merge


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@960320 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 11:16:31 +00:00
Maria Odea B. Ching 4868ae2e1a ignore ide descriptor files and target dir
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@959890 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 07:34:16 +00:00
Maria Odea B. Ching ee3d41f67e remove .project eclipse file
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@959888 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 07:30:39 +00:00
Brett Porter 0ffd5fa280 update versions/SCM info to avoid confusion
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@959885 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 07:28:25 +00:00
Maria Odea B. Ching 626279bf89 [MRM-980] ability to merge repositories
submitted by Patti Arachchige Eshan Sudharaka (for GSoC)

o added new plugin module for repository merge


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@959880 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 07:18:44 +00:00
Maria Odea B. Ching 4580974158 create branch for MRM-980 (staging repos)
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@959846 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 04:20:40 +00:00
Maria Odea B. Ching 78d78de276 ignore idea files
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@956318 13f79535-47bb-0310-9956-ffa450edef68
2010-06-20 04:05:30 +00:00
Jevica Arianne B. Zurbano 61c3175ac7 updated parent to release version
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@955138 13f79535-47bb-0310-9956-ffa450edef68
2010-06-16 06:36:22 +00:00
Dennis Lundberg 024954c6af The Windows batch file is called archiva.bat.
Merged from archiva-1.3.x branch.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@953659 13f79535-47bb-0310-9956-ffa450edef68
2010-06-11 11:09:16 +00:00
Maria Odea B. Ching 4664fef366 [MRM-1362] Add simple 'CRUD' pages for project-level metadata along with a "generic metadata" plugin
o use successful icon in successful delete


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@953620 13f79535-47bb-0310-9956-ffa450edef68
2010-06-11 09:27:02 +00:00
Maria Odea B. Ching a72aeb4d5e [MRM-1362] Add simple 'CRUD' pages for project-level metadata along with a "generic metadata" plugin
o do not show add property widget if user does not have repository manager role
o added selenium test for browsing metadata if user is not a repository manager


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@953612 13f79535-47bb-0310-9956-ffa450edef68
2010-06-11 08:49:48 +00:00
Brett Porter 8f1414a1dc [MRM-1387] switch to official javax.inject library that is in the central repository
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@953607 13f79535-47bb-0310-9956-ffa450edef68
2010-06-11 08:35:06 +00:00
Maria Odea B. Ching 50cbeb138e merge -r 953209 from 1.3.x branch (MRM-1373)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@953219 13f79535-47bb-0310-9956-ffa450edef68
2010-06-10 05:15:54 +00:00
Maria Odea B. Ching 3284d14fb4 [MRM-1362] Add simple 'CRUD' pages for project-level metadata along with a "generic metadata" plugin
o updated images in docs to reflect changes made in UI


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@952540 13f79535-47bb-0310-9956-ffa450edef68
2010-06-08 05:50:00 +00:00
Maria Odea B. Ching f5b6dcb189 [MRM-1362] Add simple 'CRUD' pages for project-level metadata along with a "generic metadata" plugin
o added css to add property form


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@952527 13f79535-47bb-0310-9956-ffa450edef68
2010-06-08 03:47:14 +00:00
Maria Odea B. Ching f46924e443 [MRM-1362] Add simple 'CRUD' pages for project-level metadata along with a "generic metadata" plugin
o added documentation


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@952515 13f79535-47bb-0310-9956-ffa450edef68
2010-06-08 02:54:16 +00:00
Maria Odea B. Ching a15932eb45 [MRM-1362] Add simple 'CRUD' pages for project-level metadata along with a "generic metadata" plugin
o updated selenium test for deleting metadata
o added selenium tests for adding generic metadata property


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@952174 13f79535-47bb-0310-9956-ffa450edef68
2010-06-07 09:56:57 +00:00
Maria Odea B. Ching a1cfde68ae fixed formatting
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@952141 13f79535-47bb-0310-9956-ffa450edef68
2010-06-07 08:45:18 +00:00
Maria Odea B. Ching f4732a184a fixed formatting
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@952137 13f79535-47bb-0310-9956-ffa450edef68
2010-06-07 08:20:58 +00:00
Maria Odea B. Ching f36029359a [MRM-1362] Add simple 'CRUD' pages for project-level metadata along with a "generic metadata" plugin
o allow only users with repo manager role to add & delete metadata content
o add archiva-add-metadata and archive-delete-metadata permissions 


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@952136 13f79535-47bb-0310-9956-ffa450edef68
2010-06-07 08:15:53 +00:00
Maria Odea B. Ching 8891e9fdd2 [MRM-1362] Add simple 'CRUD' pages for project-level metadata along with a "generic metadata" plugin
o removed project metadata custom tag
o enable delete of generic metadata properties
o added unit tests for adding and deleting properties
o clear facet properties read from file before doing the update so that removed facet properties are not retained when updating project version metadata


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@952127 13f79535-47bb-0310-9956-ffa450edef68
2010-06-07 07:40:26 +00:00
Jevica Arianne B. Zurbano a946c2e933 fixed typo
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@951347 13f79535-47bb-0310-9956-ffa450edef68
2010-06-04 09:51:45 +00:00
Maria Odea B. Ching 652118afbd fixed formatting
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@951294 13f79535-47bb-0310-9956-ffa450edef68
2010-06-04 06:32:22 +00:00
Maria Odea B. Ching a82088bc3f [MRM-1362] Add simple 'CRUD' pages for project-level metadata along with a "generic metadata" plugin
o added validation for adding new properties


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@951287 13f79535-47bb-0310-9956-ffa450edef68
2010-06-04 05:50:17 +00:00
Maria Odea B. Ching f51b049d51 fixed formatting
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@951241 13f79535-47bb-0310-9956-ffa450edef68
2010-06-04 02:16:24 +00:00