Commit Graph

467 Commits

Author SHA1 Message Date
Olivier Lamy f9e6895b42 fix unit tets configuration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134603 13f79535-47bb-0310-9956-ffa450edef68
2011-06-11 12:45:41 +00:00
Olivier Lamy c6b5ed4818 fix some test compilation issues in webapp module : will fix unit later, must compile at least !
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134584 13f79535-47bb-0310-9956-ffa450edef68
2011-06-11 12:17:34 +00:00
Olivier Lamy 75ac09e5b5 fix some test compilation issues in webapp module : will fix unit later, must compile at least !
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134582 13f79535-47bb-0310-9956-ffa450edef68
2011-06-11 12:16:55 +00:00
Olivier Lamy 90eed34339 fix some test compilation issues in webapp module : will fix unit later, must compile at least !
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134581 13f79535-47bb-0310-9956-ffa450edef68
2011-06-11 12:16:27 +00:00
Olivier Lamy 8d497e8555 move audit plugin to spring annotations : it looks now mvn tomcat:run -Pdev works !!
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134378 13f79535-47bb-0310-9956-ffa450edef68
2011-06-10 16:38:49 +00:00
Olivier Lamy 3d2bbcff6c correctly set tccl during sisu init
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134351 13f79535-47bb-0310-9956-ffa450edef68
2011-06-10 15:38:09 +00:00
Olivier Lamy 45b308aab0 align maven api to use maven 3 version
temporary comment failing dependency tree

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134349 13f79535-47bb-0310-9956-ffa450edef68
2011-06-10 15:37:00 +00:00
Olivier Lamy d9ba2b6814 force spring-jdo version to be used
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134348 13f79535-47bb-0310-9956-ffa450edef68
2011-06-10 15:35:58 +00:00
Olivier Lamy 03accd4ffd oups miss to add a file
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1133953 13f79535-47bb-0310-9956-ffa450edef68
2011-06-09 15:55:58 +00:00
Olivier Lamy c90eea8f1c remove use of plexus-spring all struts actions are spring beans now. Note still have issues with tomcat plugin and sisu bridge which need an urlclassloader
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1133928 13f79535-47bb-0310-9956-ffa450edef68
2011-06-09 15:23:21 +00:00
Olivier Lamy 9c55823b96 fix main compilation in webapp module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1133091 13f79535-47bb-0310-9956-ffa450edef68
2011-06-07 16:44:27 +00:00
Maria Odea B. Ching 3289f9b03b [MRM-1476] 'Specified key was too long' error during startup when using MySQL databases with UTF8 charset
submitted by Greg Michael Meneses
o set default string length to 255 in jpox config


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1129622 13f79535-47bb-0310-9956-ffa450edef68
2011-05-31 11:05:07 +00:00
Olivier Lamy 789083836c [MRM-1473] remove plexus-spring use
replace plexus-quartz with spring-quartz



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1128404 13f79535-47bb-0310-9956-ffa450edef68
2011-05-27 17:26:26 +00:00
Olivier Lamy 1788eb54c4 [MRM-1473] remove use of plexus-spring
remove all dependencies to plexus-container
use of sisu-inject-plexus (version 2.2.2 with ASL license) for components using maven api components.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1128075 13f79535-47bb-0310-9956-ffa450edef68
2011-05-26 20:52:13 +00:00
Olivier Lamy 4f0e657361 fix compilation failure now we use standard java.util.concurrent.*
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1127588 13f79535-47bb-0310-9956-ffa450edef68
2011-05-25 17:23:51 +00:00
Olivier Lamy 971dcc2f35 [MRM-1473] remove use of plexus-spring
move archiva-repository-layer to full spring



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1127555 13f79535-47bb-0310-9956-ffa450edef68
2011-05-25 15:31:30 +00:00
Maria Odea B. Ching af0ae64f42 [MRM-1475] Add proxy connector is broken
submitted by Greg Michael Meneses
o removed id attribute in struts property tag in proxy connector form which was removed in struts 2.1.x
o added selenium test for add proxy connector


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1126927 13f79535-47bb-0310-9956-ffa450edef68
2011-05-24 08:37:00 +00:00
Olivier Lamy 02b4b8d6af [MRM-1473] remove use of plexus-spring
start with archiva-configuration and archiva-policies



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125538 13f79535-47bb-0310-9956-ffa450edef68
2011-05-20 20:08:12 +00:00
Olivier Lamy c96411890a [MRM-1473] remove use of plexus-spring
start some changes on archiva-configuration and archiva-security

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125142 13f79535-47bb-0310-9956-ffa450edef68
2011-05-19 22:20:55 +00:00
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
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
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
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 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 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
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 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