Commit Graph

3346 Commits

Author SHA1 Message Date
Olivier Lamy facd5173ce [MRM-1473] removing plexus-spring use
fix unit tests in archiva-repository-scanner (not yet moved in full spring)

Conflicts:
	archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125648 13f79535-47bb-0310-9956-ffa450edef68
2011-05-21 08:45:49 +00:00
Olivier Lamy 5a3e23ead6 [MRM-1473] removing plexus-spring use
fix unit tests in archiva-configuration

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125645 13f79535-47bb-0310-9956-ffa450edef68
2011-05-21 07:49:25 +00:00
Olivier Lamy ff5280f763 remove commented dependency declared below
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125644 13f79535-47bb-0310-9956-ffa450edef68
2011-05-21 07:49: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
Olivier Lamy 34d5a62c41 lock idea plugin version
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1124842 13f79535-47bb-0310-9956-ffa450edef68
2011-05-19 14:32: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
Olivier Lamy 5bfd24ff52 add an empty file to help git 'sync' with empty directories
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1104522 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17 20:19:27 +00:00
Maria Odea B. Ching ffac8916cd added wagon-ssh as dependency in site-plugin so site deploy using scp would work with maven 3
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1104020 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17 06:49:35 +00:00
Olivier Lamy 2dec55e1b1 update junit to 4.8.2
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1103913 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 21:35:46 +00:00
Olivier Lamy 79f8b36380 upgrade mpirp plugin to 2.3.1 and javadoc to 2.8
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1103903 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 21:27:22 +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 7c018c68ed fix some warning when building with maven3
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1103901 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 21:26:54 +00:00
Olivier Lamy 36466076b6 upgrade spring version to 3.0.5.RELEASE
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1103900 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 21:26:42 +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 d49d1eac24 merged -r1103608 from 1.3.x branch (MRM-1467)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1103611 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 05:43:15 +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
Olivier Lamy 65aec72c4d add a simple .gitignore
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1101620 13f79535-47bb-0310-9956-ffa450edef68
2011-05-10 20:00:55 +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
Brett Porter bed7aa1b59 [MRM-1327] fix 'used by' to work under JCR store. This will still have problems under the file store at the moment
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1085722 13f79535-47bb-0310-9956-ffa450edef68
2011-03-26 14:00:06 +00:00
Brett Porter 1a95fa3b64 upgrade surefire to the latest release
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1085709 13f79535-47bb-0310-9956-ffa450edef68
2011-03-26 12:23:31 +00:00
Brett Porter 522a7ac514 fix optional for dependencies in file metadata repository
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1085707 13f79535-47bb-0310-9956-ffa450edef68
2011-03-26 12:07:15 +00:00
Brett Porter 95b297a2ae [MRM-1327] use nodes for dependencies, make several notes about fixes required to properly isolate maven2 pieces
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1085704 13f79535-47bb-0310-9956-ffa450edef68
2011-03-26 11:54:11 +00:00
Brett Porter eec6cf2baf [MRM-1327] upgrade to a new release of Jackrabbit
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1085688 13f79535-47bb-0310-9956-ffa450edef68
2011-03-26 11:03:06 +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
Brett Porter 8786d832a5 [MRM-1248] improve documentation about potential issues with the network proxy configuration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1073214 13f79535-47bb-0310-9956-ffa450edef68
2011-02-22 03:19:40 +00:00
Brett Porter 17ed0cc157 correct name
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1072870 13f79535-47bb-0310-9956-ffa450edef68
2011-02-21 07:41:07 +00:00
Brett Porter f2b0885b53 ensure that it gets closed, even if close throws exception
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1071608 13f79535-47bb-0310-9956-ffa450edef68
2011-02-17 13:31:17 +00:00
Maria Odea B. Ching 1460694de3 close streams from previous commit
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1071145 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 04:51:03 +00:00