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
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
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
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
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
Maria Odea B. Ching
cb61344408
used IOUtils copy for merging so streams are buffered
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1071136 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 03:30:53 +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
Jevica Arianne B. Zurbano
13609a81fe
fixed typo
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1063154 13f79535-47bb-0310-9956-ffa450edef68
2011-01-25 06:45:31 +00:00
Brett Porter
605c1db826
[MRM-1327] choose a better default for login
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1061114 13f79535-47bb-0310-9956-ffa450edef68
2011-01-20 04:20:21 +00:00
Brett Porter
91a012ebdd
[MRM-1448] additional '.' in the classifier & extension should be attributed to the extension instead of the classifier.
...
Note that existing records will not be updated - the repository may need to be re-scanned to reflect the change.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1054034 13f79535-47bb-0310-9956-ffa450edef68
2010-12-31 00:53:23 +00:00
Brett Porter
8aacc3cd0b
[MRM-1443, MRM-1327] change to JSR-170's SQL queries to avoid the problem in JackRabbit 2.2.0 with ISDESCENDANTNODE and a large number of nodes
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053857 13f79535-47bb-0310-9956-ffa450edef68
2010-12-30 11:38:35 +00:00
Brett Porter
6e782b161c
[MRM-1443, MRM-1327] properly restrict per repository and improve performance
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053840 13f79535-47bb-0310-9956-ffa450edef68
2010-12-30 10:03:44 +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
479f10cb7f
[MRM-1443, MRM-1327] allow repository-statistics module to optimise statistics generation if JCR store is available
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053820 13f79535-47bb-0310-9956-ffa450edef68
2010-12-30 08:44:10 +00:00
Brett Porter
ed717a4b5b
[MRM-1327] assign node types to each different node so that they can be easily distinguished from each other when querying or traversing. Correct bug where projects would appear as namespaces and vice-versa.
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053788 13f79535-47bb-0310-9956-ffa450edef68
2010-12-30 02:30:09 +00:00
Brett Porter
6673c15740
[MRM-1327] don't auto-save artifact updates - this was only there for testing purposes
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053784 13f79535-47bb-0310-9956-ffa450edef68
2010-12-30 01:55:15 +00:00
Brett Porter
de23f7ef3f
[MRM-1327] make sure getArtifactsByDateRange and getArtifactsByChecksum query is restricted to the right repository
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053783 13f79535-47bb-0310-9956-ffa450edef68
2010-12-30 01:41:07 +00:00
Brett Porter
e28ae522d1
[MRM-1327] make sure getArtifacts query is restricted to the right repository
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053780 13f79535-47bb-0310-9956-ffa450edef68
2010-12-30 01:29:50 +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
201306c679
[MRM-1327] prevent facets being returned as artifact versions
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053767 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29 23:23:28 +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
653a42283b
[MRM-1330] problem-reports is decoupled
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053608 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29 10:44:09 +00:00
Brett Porter
53c1188710
[MRM-1330] correct bug - ensure parsed model from storage gets added to content repository
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053567 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29 08:15:02 +00:00
Brett Porter
e7c8bea2e6
[MRM-1330] update DuplicateArtifactsConsumer to the session-based API
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053554 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29 07:06:17 +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