Commit Graph

705 Commits

Author SHA1 Message Date
Brett Porter c6eac0e151 [MRM-1474] workaround url path mapping problems that rewrites HTML and doesn't detect the path in JavaScript
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1124691 13f79535-47bb-0310-9956-ffa450edef68
2011-05-19 11:43:31 +00:00
Olivier Lamy 9221d0e629 doh I have been to fast about excluding plexus-spring : need more job
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1124329 13f79535-47bb-0310-9956-ffa450edef68
2011-05-18 16:28:58 +00:00
Olivier Lamy 9553d302b1 fix 1.5 compilation
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1104563 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17 21:18:14 +00:00
Olivier Lamy 874aef16be fix compilation issue
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1103902 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 21:27:12 +00:00
Olivier Lamy b781d2f5f7 update plexus-spring groupId
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1103898 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 21:26:24 +00:00
Maria Odea B. Ching a5ec5dddc6 merged -r1102210 from 1.3.x branch (MRM-1469)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1102235 13f79535-47bb-0310-9956-ffa450edef68
2011-05-12 10:30:23 +00:00
Maria Odea B. Ching 29fae1ed8d [MRM-1468] added validation for adding a managed repository via xmlrpc + unit tests
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1100956 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 11:00:12 +00:00
Brett Porter adcdfcf3bf [MRM-1472] some cleanup based on Olivier's comments on the dev list to clarify how to get the tomcat plugin running
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1100227 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 14:22:41 +00:00
Maria Odea B. Ching 3f96b9c2b6 fixed compile failure in test after upgrade of compiler plugin
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1100144 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 09:20:55 +00:00
Wendy Smoak 480eaee429 [MRM-1472] Maven configuration to enable mvn -P dev tomcat:run from the top of the project. Includes moving the application.xml file. Submitted by: Olivier Lamy
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1099827 13f79535-47bb-0310-9956-ffa450edef68
2011-05-05 14:42:00 +00:00
Maria Odea B. Ching 39ecffa064 fixed cause of selenium test failure from merge in -r1099425
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1099671 13f79535-47bb-0310-9956-ffa450edef68
2011-05-05 03:03:06 +00:00
Maria Odea B. Ching 8fd13f6d0a merge -r1098897 from 1.3.x branch (MRM-1468: Fix XSS vulnerability in Archiva, patch submitted by Marc Jansen Tan Chua)
additional changes:
o added a factory for action validator manager since ObjectFactory.setObjectFactory(..) was removed in struts 2.1 so the unit tests for validation would work
o fixed conflicts

TODO:
o fix some failing selenium tests due to error 500


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1099425 13f79535-47bb-0310-9956-ffa450edef68
2011-05-04 12:03:29 +00:00
Jevica Arianne B. Zurbano d72ee0c68b [MRM-1470] Ability to add a repository relative to Archiva's appserver.base without knowing it's filesystem location
* applied patch

Submitted by: Maria Catherine Tan



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1097776 13f79535-47bb-0310-9956-ffa450edef68
2011-04-29 11:30:08 +00:00
Brett Porter 6566bcaa5e [MRM-1111] fix xpath after reverting to default freemarker templates
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1091636 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13 03:28:45 +00:00
Brett Porter f004a7a129 don't attempt to delete staging repository if it isn't there
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1091635 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13 03:27:48 +00:00
Brett Porter 51b1e5e8a3 cut-and-paste error
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1091634 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13 03:19:27 +00:00
Brett Porter c2e2076916 [MRM-1111] fix xpath after reverting to default freemarker templates
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1091633 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13 03:08:42 +00:00
Brett Porter 1b9d78a769 give Cargo some more memory to run the application
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1091632 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13 03:05:17 +00:00
Brett Porter e064cd7f67 accidentally merged Selenium tests that test functionality no longer there
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1091631 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13 03:03:54 +00:00
Brett Porter 05d32a4578 [MRM-1111] upgrade to Struts 2.1.8.1 - add missing unit testing code to 2 actions
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1091476 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 15:39:17 +00:00
Brett Porter 5b9f93dbe9 [MRM-1111] use default template and caching mechanism now. Old templates were omitting any text from hyperlinks.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1091473 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 15:36:18 +00:00
Brett Porter 465c52bdca [MRM-1111] accommodate that Struts no longer populates the parameters from the action mapping
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1091440 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 14:57:09 +00:00
Brett Porter 86ed5afc5c [MRM-1111] upgrade to Struts 2.1.8.1
Applied patch and made some additional modifications
Submitted by: Julien Henry, Gwen Harold Autencio

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1091398 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 13:23:24 +00:00
Brett Porter 58d905941b [MRM-1480]/[REDBACK-274] (CVE-2011-1026)
o upgrade to redback 1.2.8-SNAPSHOT
o configured struts2's token interceptor + use of <s:token> in affected actions to prevent CSRF issue
[MRM-1460] added selenium tests for CSRF fixes in affected pages
Merged: r1066067:1091313


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1091315 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 07:16:34 +00:00
Brett Porter 76289acb8d rename metadata-repository-file to metadata-store-file for consistency
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1086590 13f79535-47bb-0310-9956-ffa450edef68
2011-03-29 14:13:37 +00:00
Brett Porter 076a33f877 [MRM-1327] fix 'used by' to work under JCR store. Remove updateProjectReferences API
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1086569 13f79535-47bb-0310-9956-ffa450edef68
2011-03-29 12:42:47 +00:00
Maria Odea B. Ching 28a0b59676 [MRM-1461]
submitted by Maria Catherine Tan
o continue deleting contents of the repo even if it encountered a file that it couldn't delete then throw an IOException at the end


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1082160 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 14:53:40 +00:00
Maria Odea B. Ching 11f0262cdc [MRM-1453] fixed decimal format to US locale so test wouldn't fail on other locales
submitted by Mark Struberg


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1064737 13f79535-47bb-0310-9956-ffa450edef68
2011-01-28 15:41:06 +00:00
Maria Odea B. Ching fc3b5a9fa1 [MRM-1452] add ability to delete contents of a repository via xml-rpc
submitted by Maria Catherine Tan


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1064444 13f79535-47bb-0310-9956-ffa450edef68
2011-01-28 03:19:09 +00:00
Jevica Arianne B. Zurbano 55d4b5c3af [MRM-1451] NPE when merging through XMLRPC
* applied patch

Patch Submitted by: Maria Catherine Tan
* passed metadataRepository instead of null during merge



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1064082 13f79535-47bb-0310-9956-ffa450edef68
2011-01-27 11:17:18 +00:00
Brett Porter 23a09c2024 [MRM-1443, MRM-1327] allow repository-statistics module to optimise statistics generation if JCR store is available
- updates to other mock repositories

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053826 13f79535-47bb-0310-9956-ffa450edef68
2010-12-30 08:54:16 +00:00
Brett Porter bf3058dbeb [MRM-1327] save changes after metadata is added / removed
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053779 13f79535-47bb-0310-9956-ffa450edef68
2010-12-30 01:14:52 +00:00
Brett Porter 8c5de76d3b Customise settings so that you can debug the cargo instance, and show tests to output as they progress
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053778 13f79535-47bb-0310-9956-ffa450edef68
2010-12-30 01:05:58 +00:00
Brett Porter 6ff9147139 [MRM-1327] hook save()/close()/revert() methods to the repository implementation
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053630 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29 13:02:59 +00:00
Brett Porter f56609efad [MRM-1330] refactor access around the concept of a "repository session". See Javadoc for some notes. This should be a single entry point for application users of either the metadata repository, resolution, or storage access. The session needs to be explicitly closed (and modifications saved) to facilitate some storage mechanisms.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053542 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29 06:14:04 +00:00
Brett Porter a44b2ac9dd cache has moved to a different spring ID - use the default one from the archiva-policies module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1052163 13f79535-47bb-0310-9956-ffa450edef68
2010-12-23 03:18:17 +00:00
Brett Porter 091ebb7aea avoid exception if the scheduler never started
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1052162 13f79535-47bb-0310-9956-ffa450edef68
2010-12-23 03:15:17 +00:00
Brett Porter 34638d4e67 clean up the "TODO" list, and mark those that are more important as "FIXME"
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1051810 13f79535-47bb-0310-9956-ffa450edef68
2010-12-22 10:20:14 +00:00
Brett Porter c63e2a3f77 [MRM-1327] refactor the repository API to make each concern clearer. Storage, resolver and metadata repository are separate interfaces. Rename methods on the resolver and the storage to be clearer of their intent
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1051788 13f79535-47bb-0310-9956-ffa450edef68
2010-12-22 08:31:56 +00:00
Brett Porter badcc9e925 [MRM-1327] add exception handling to the metadata repository implementation
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1051732 13f79535-47bb-0310-9956-ffa450edef68
2010-12-22 01:53:10 +00:00
Brett Porter 5ce9fd5025 [MRM-1445] disable referrer check by default
Merged from: r1049409


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1049410 13f79535-47bb-0310-9956-ffa450edef68
2010-12-15 04:04:59 +00:00
Brett Porter 458e11fd33 correctly acknowledge September 19
Image is derived from http://commons.wikimedia.org/wiki/File:Piratey,_vector_version.svg, which is in the public domain
Merged from: r1043948



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1043969 13f79535-47bb-0310-9956-ffa450edef68
2010-12-09 14:02:45 +00:00
Brett Porter 59bc6aa509 fix title, as it is showing amount used, not free
Merged from: r1042714


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1042715 13f79535-47bb-0310-9956-ffa450edef68
2010-12-06 16:41:05 +00:00
Brett Porter 5285d77732 [MRM-1440] add current time as well, for comparison when troubleshooting captured results
Merged from: r1042711


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1042712 13f79535-47bb-0310-9956-ffa450edef68
2010-12-06 16:34:52 +00:00
Brett Porter 6b58a6c15c status page tweaks
Merged from: r1042700:1042702


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1042704 13f79535-47bb-0310-9956-ffa450edef68
2010-12-06 16:25:19 +00:00
Brett Porter 98d9fea131 [MRM-1442] track time spent in each consumer during a scan, to help diagnose poor scanning performance
Merged from: r1042689


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1042695 13f79535-47bb-0310-9956-ffa450edef68
2010-12-06 16:03:02 +00:00
Brett Porter 9565cefd5b [MRM-1440] correct incorrect package name
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1042690 13f79535-47bb-0310-9956-ffa450edef68
2010-12-06 15:57:12 +00:00
Brett Porter 6897c1f68a [MRM-1441] add repository scanning details to system status page
Merged from: r1042633


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1042652 13f79535-47bb-0310-9956-ffa450edef68
2010-12-06 14:09:28 +00:00
Brett Porter c795a64c84 [MRM-1440] add a system status page
Merged from: r1042625:1042631


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1042646 13f79535-47bb-0310-9956-ffa450edef68
2010-12-06 13:58:34 +00:00
Maria Odea B. Ching bc56d6353c [MRM-1097]
o upgrade nexus indexer to 3.0.1 + added logger bean which is needed by NexusIndexer
o for deployments/proxied artifacts, create and close indexing context when indexing task is executed as compared to the original behavior where the indexing context is created 
before it is queued (so as the indexing task queue builds up, more indexing contexts are being opened/created which might be causing the too many open files problem) 
o updated unit tests with changes made


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1039004 13f79535-47bb-0310-9956-ffa450edef68
2010-11-25 11:20:47 +00:00