Olivier Lamy
a2dd1fd1a4
use beanlib for wrappers constructions
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1166391 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 20:33:48 +00:00
Olivier Lamy
623651c5fb
revert global surefire configuration for appserver.base : breaks too much test
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1166162 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 13:15:04 +00:00
Olivier Lamy
1032b3d5d1
start using new repo admin module in webdav : need some other refactoring to remove it completely
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1166148 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 12:18:55 +00:00
Olivier Lamy
4f42feb44f
[MRM-1504] Add a new module for repository administration management : move redback configuration and role constants to a new module in archiva-base called archiva-security-common
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1165203 13f79535-47bb-0310-9956-ffa450edef68
2011-09-05 08:31:35 +00:00
Olivier Lamy
e6ce81d425
add unit for issue fixed in the previous commit
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1164151 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 16:42:17 +00:00
Olivier Lamy
9be7bece75
fix missing value in a bean constructor
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1164150 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 16:41:50 +00:00
Olivier Lamy
55f94e09f6
upgrade to dependency plugin 2.3
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1163948 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 08:49:16 +00:00
Olivier Lamy
0887d40cd8
[MRM-1505] api to configure ManagedRepositories : integrate it in webapp for delete action.
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1163444 13f79535-47bb-0310-9956-ffa450edef68
2011-08-30 22:49:42 +00:00
Olivier Lamy
6c75081b2a
lock maven-dependency-plugin version in parent pomarchiva-modules/archiva-web/archiva-webapp/pom.xml
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1162816 13f79535-47bb-0310-9956-ffa450edef68
2011-08-29 14:01:17 +00:00
Brett Porter
3445922612
update licenses and send in RAT
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1161440 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 08:42:50 +00:00
Olivier Lamy
b988841b1e
[MRM-1502] upgrade to wagon http 2.0-SNAPSHOT to avoid http(s) connection recreation
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1161435 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 08:21:03 +00:00
Olivier Lamy
131325daed
use wagon 1.0
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1160695 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 13:55:23 +00:00
Olivier Lamy
95e2f5b636
[MRM-1503] use wagon-http instead of wagon-http-lightweight (as it change proxy network system properties)
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1160694 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 13:55:11 +00:00
Olivier Lamy
d27077404a
desactivate animal sniffer plugin as it fail in module archiva-modules/metadata/test-repository/
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1160653 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 12:19:36 +00:00
Olivier Lamy
ca3ce2ba4e
fix animal sniffer configuration
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1160651 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 12:19:12 +00:00
Olivier Lamy
92ee458231
oups fix typo
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1160650 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 12:19:02 +00:00
Olivier Lamy
f71c441d3d
jaxb api is used so declare it
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1160649 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 12:18:49 +00:00
Brett Porter
0eec07ab1c
clean up repositories and deploy to Archiva
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1159638 13f79535-47bb-0310-9956-ffa450edef68
2011-08-19 13:50:50 +00:00
Olivier Lamy
014e2fa339
add animal sniffer check 1.5
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1159530 13f79535-47bb-0310-9956-ffa450edef68
2011-08-19 07:53:01 +00:00
Olivier Lamy
d85c1890d7
[MRM-1490] Expose archiva services trough rest
...
add the configuration in webapp module to expose it
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1159120 13f79535-47bb-0310-9956-ffa450edef68
2011-08-18 09:49:20 +00:00
Olivier Lamy
7a7f59aac5
upgrade ehcache to last version 2.4.4
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1159119 13f79535-47bb-0310-9956-ffa450edef68
2011-08-18 09:49:05 +00:00
Olivier Lamy
f3189bad3e
[MRM-1490] Expose Archiva services trough rest
...
add modules structure with the very first service : ping :-)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1158972 13f79535-47bb-0310-9956-ffa450edef68
2011-08-17 23:53:30 +00:00
Olivier Lamy
9357da09d3
upgrade to last versions of quartz and ehcache
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1158469 13f79535-47bb-0310-9956-ffa450edef68
2011-08-16 23:03:30 +00:00
Olivier Lamy
c3acb6212a
[MRM-1501] OSGI metadata search
...
[MRM-1501] OSGI metadatas search
use last maven-indexer SNAPSHOT which have those OSGI fields indexed
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1158019 13f79535-47bb-0310-9956-ffa450edef68
2011-08-15 21:26:55 +00:00
Olivier Lamy
f4a130e2c5
[MRM-1481] Ability to do user management through xmlrpc
...
Submitted by Maria Catherine Tan
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1156322 13f79535-47bb-0310-9956-ffa450edef68
2011-08-10 19:17:50 +00:00
Olivier Lamy
fc03e458ab
use a released version of a redback component
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1154247 13f79535-47bb-0310-9956-ffa450edef68
2011-08-05 14:51:54 +00:00
Olivier Lamy
c019b2a575
add a comment on why atlassian has been declared
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1154020 13f79535-47bb-0310-9956-ffa450edef68
2011-08-04 21:16:30 +00:00
Olivier Lamy
b666b511e6
add atlassian repo until xml rpc binder 0.11 reach central
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1154019 13f79535-47bb-0310-9956-ffa450edef68
2011-08-04 21:16:16 +00:00
Olivier Lamy
ff4d1607fc
[MRM-1473] use some versions of components moved to spring only
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1153975 13f79535-47bb-0310-9956-ffa450edef68
2011-08-04 19:32:01 +00:00
Maria Odea B. Ching
8391b7c4d7
[MRM-1484] Upgrade Atlassian XMLRPC binder to 0.11 to get fix for multi-threading issue in Aapache XMLRPC 3.1.1+
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1153002 13f79535-47bb-0310-9956-ffa450edef68
2011-08-02 02:35:47 +00:00
Olivier Lamy
445dfd7416
use project.version
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1142724 13f79535-47bb-0310-9956-ffa450edef68
2011-07-04 16:16:51 +00:00
Olivier Lamy
77281b4105
use released version
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1141988 13f79535-47bb-0310-9956-ffa450edef68
2011-07-01 16:42:16 +00:00
Olivier Lamy
ef6b7ed4eb
prefer using ${project.version} instead of the real version
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1141986 13f79535-47bb-0310-9956-ffa450edef68
2011-07-01 16:39:57 +00:00
Olivier Lamy
506689803d
use released version
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1141852 13f79535-47bb-0310-9956-ffa450edef68
2011-07-01 07:38:06 +00:00
Olivier Lamy
9edb7bc073
version already defined in parent
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1141602 13f79535-47bb-0310-9956-ffa450edef68
2011-06-30 16:14:08 +00:00
Olivier Lamy
d7f0f91636
[MRM-1478] Enable DB caching
...
Submitted by Maria Catherine Tan
patch applied with modifications
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1140869 13f79535-47bb-0310-9956-ffa450edef68
2011-06-28 22:19:30 +00:00
Olivier Lamy
478506f9ef
add dependency to oro as it's optionnal in commons-validator
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1140237 13f79535-47bb-0310-9956-ffa450edef68
2011-06-27 16:49:42 +00:00
Olivier Lamy
356f47fa89
upgrade to jackarabbit 2.3-SNAPSHOT which is compatible with lucene 3.x
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1139942 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 20:54:53 +00:00
Olivier Lamy
a20d601f8e
[MRM-1345] update use of Nexus indexer to use Maven indexer
...
remove the per-lookup component
refactor test to use only NexusIndexer facade
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1139940 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 20:54:21 +00:00
Olivier Lamy
d6a4fe82a6
move lucene version to a property
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1138226 13f79535-47bb-0310-9956-ffa450edef68
2011-06-21 22:37:08 +00:00
Olivier Lamy
0d6a0d7362
use surefire 2.9
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1137816 13f79535-47bb-0310-9956-ffa450edef68
2011-06-20 23:03:18 +00:00
Olivier Lamy
b3603c5c43
back to maven2 api for dependency tree
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1136082 13f79535-47bb-0310-9956-ffa450edef68
2011-06-15 15:30:53 +00:00
Maria Odea B. Ching
dab1e92990
[MRM-1411] project information is missing if a POM could not be read correctly
...
o proxy parent POM if not found in the repo when building the effective POM when creating metadata (also applied the same in dependency tree builder)
o added unit tests
o moved out wagonfactory classes into separate module so it can be used by maven2-repository w/o depending on archiva-proxy module (as it inroduces cyclic dependency)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135978 13f79535-47bb-0310-9956-ffa450edef68
2011-06-15 09:36:05 +00:00
Olivier Lamy
1bc0683d36
fix 1.5 build with reintroducing javax.annotation:jsr250-api dependency
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135418 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 08:58:21 +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
040d582980
upgrade struts2 version to 2.2.3 to align with redback
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134580 13f79535-47bb-0310-9956-ffa450edef68
2011-06-11 12:16:02 +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
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
de7890f4a3
fix more unit tests in archiva-security
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1133448 13f79535-47bb-0310-9956-ffa450edef68
2011-06-08 15:59:41 +00:00
Olivier Lamy
5b823ae184
follow maven conventions for order in pom
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1129258 13f79535-47bb-0310-9956-ffa450edef68
2011-05-30 17:04:04 +00:00
Olivier Lamy
e5f9142eae
upgrade some plugins version
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1129247 13f79535-47bb-0310-9956-ffa450edef68
2011-05-30 16:48:11 +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
22961f8dc4
[MRM-1473] remove use of plexus-spring
...
ok for archiva-artifact-converter
introduce a new bridge tru sisu-guice to be able to use maven apis components
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1128078 13f79535-47bb-0310-9956-ffa450edef68
2011-05-26 20:53:32 +00:00
Olivier Lamy
2fdf7359b3
fix tests in archiva-transaction
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1128076 13f79535-47bb-0310-9956-ffa450edef68
2011-05-26 20:52:33 +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
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
Olivier Lamy
e9b75d6715
add plexus-spring with old groupId in enforcer exclude rules
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125787 13f79535-47bb-0310-9956-ffa450edef68
2011-05-21 19:57:39 +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
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
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
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
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
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
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
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
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
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
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
2700c684dd
back to 2.5 again due to SUREFIRE-679
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053621 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29 11:58:45 +00:00
Brett Porter
ce25807cd6
upgrade Surefire to latest version again
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1053620 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29 11:51:22 +00:00
Brett Porter
1055953866
2.6 also has a problem
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1051857 13f79535-47bb-0310-9956-ffa450edef68
2010-12-22 11:45:33 +00:00
Brett Porter
30e7377a3d
back up a version so that errors are detected
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1051822 13f79535-47bb-0310-9956-ffa450edef68
2010-12-22 10:47:46 +00:00
Brett Porter
8ab39caf50
upgrade to Surefire 2.7
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1051354 13f79535-47bb-0310-9956-ffa450edef68
2010-12-21 01:06:09 +00:00
Brett Porter
4423d46b4f
[MRM-1327] very rough prototype of a JCR based storage mechanism. Passes tests, but needs to be cleaned up and properly integrated, then tested for performance
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1050283 13f79535-47bb-0310-9956-ffa450edef68
2010-12-17 06:26:09 +00:00
Brett Porter
82485c9ed4
move mockito version to management section
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1049376 13f79535-47bb-0310-9956-ffa450edef68
2010-12-15 01:28:22 +00:00
Brett Porter
b5255589cf
upgrade GPG plugin and use agent
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1039228 13f79535-47bb-0310-9956-ffa450edef68
2010-11-25 23:59:36 +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
Maria Odea B. Ching
d35e740ca9
[MRM-1409] web services for repository merge
...
submitted by Gwen Harold Autencio
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1003378 13f79535-47bb-0310-9956-ffa450edef68
2010-10-01 03:50:04 +00:00
Carlos Sanchez Gonzalez
a96167a55d
Disable redback snapshot repo for releases and manage site plugin to the same version across projects
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@983636 13f79535-47bb-0310-9956-ffa450edef68
2010-08-09 13:26:45 +00:00
Brett Porter
96309bc8b9
add snapshot repository for redback
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@982636 13f79535-47bb-0310-9956-ffa450edef68
2010-08-05 14:25:28 +00:00
Brett Porter
44017c40f5
[MRM-1416] upgrade to Redback 1.3
...
Merged from: r982559
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@982592 13f79535-47bb-0310-9956-ffa450edef68
2010-08-05 13:01:54 +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
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
1794af3da5
[MRM-1362] Add simple 'CRUD' pages for project-level metadata along with a "generic metadata" plugin
...
o added new facet for generic properties
o display correct metadata in Metadata tab
o add new properties to metadata from UI
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@951239 13f79535-47bb-0310-9956-ffa450edef68
2010-06-04 02:11:25 +00:00
Jevica Arianne B. Zurbano
6a2661f866
[MRM-1345] MRM-1345 update use of Nexus indexer
...
* applied patch
* moved the constant in a new class
Submitted by: Gwen Harold Autencio
updated dependency versions:
* nexus-indexer 2.0.5
* plexus-utils 1.5.5
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@938402 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 10:29:58 +00:00
Maria Odea B. Ching
db80101357
merge -r930230 from 1.3.x branch (MRM-1206)
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@930231 13f79535-47bb-0310-9956-ffa450edef68
2010-04-02 10:48:11 +00:00
Brett Porter
4c5672c59e
[MRM-1327] abstract test case so that multiple implementations can use it
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@924641 13f79535-47bb-0310-9956-ffa450edef68
2010-03-18 05:34:55 +00:00
Brett Porter
a7238c5eb0
[MRM-1361] add support for NPanday artifact types. Currently requires some hard coding into webapp and tests, but removing the plugin from the webapp would safely disable the functionality.
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@921687 13f79535-47bb-0310-9956-ffa450edef68
2010-03-11 04:43:23 +00:00
Brett Porter
af2a929978
[MNG-1301] remove the problem reports dependency on the repository layer, start to migrate path parsing into metadata API
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@920649 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 04:24:32 +00:00
Brett Porter
8ea87de1be
the Site plugin version we use requires a newer version of Maven
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@915292 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 11:49:52 +00:00
Brett Porter
4903f8dd2d
Merged /archiva/trunk:r909071-909464
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@909470 13f79535-47bb-0310-9956-ffa450edef68
2010-02-12 15:53:49 +00:00
Brett Porter
ea24dec5aa
update parent
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@909455 13f79535-47bb-0310-9956-ffa450edef68
2010-02-12 15:21:53 +00:00
Brett Porter
cf80989a26
make sure skin is build before modules where it is used
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@909220 13f79535-47bb-0310-9956-ffa450edef68
2010-02-12 04:16:43 +00:00
Brett Porter
f6f1c92ac9
add a skin based on maven-stylus-skin that can be shared among all the module sites
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@908814 13f79535-47bb-0310-9956-ffa450edef68
2010-02-11 02:53:26 +00:00
Brett Porter
606c82cbca
merged recent changes from trunk, and reimplemented incoming audit log functionality as a plugin using the metadata repository
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@900664 13f79535-47bb-0310-9956-ffa450edef68
2010-01-19 06:15:09 +00:00
Brett Porter
f90bb19efe
restore versions on trunk
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@900345 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 11:20:28 +00:00
Brett Porter
3411845c6b
[maven-release-plugin] prepare release archiva-1.3.x
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@900342 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 11:09:37 +00:00
Brett Porter
0321a820ce
[maven-release-plugin] prepare branch archiva-1.3.x
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@900339 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 11:08:52 +00:00
Brett Porter
8b05a51fa8
fix release profiles
...
Merged from: r898632
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@898633 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 03:05:35 +00:00
Brett Porter
d4352130bf
fix the release profiles
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/tags/archiva-1.3@898632 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 02:58:52 +00:00
Brett Porter
fb9ad3f771
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@898618 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 02:07:00 +00:00
Brett Porter
d3fede7d5d
[maven-release-plugin] prepare release archiva-1.3
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@898616 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 02:05:50 +00:00
Brett Porter
623f541bcb
change the ID so the server settings can be distinct
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@898608 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 01:44:35 +00:00
Brett Porter
4a0bd36640
fix typo
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@898605 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 01:42:00 +00:00
Brett Porter
f3a5730b31
update the release plugin and it's arguments to make the process faster and easier
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@898603 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 01:41:18 +00:00
Brett Porter
39039fed3d
add the distribution management we are using now
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@898599 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 01:37:48 +00:00
Brett Porter
08145a3809
upgrade to staged release
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@898598 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 01:33:45 +00:00
Maria Odea B. Ching
67dfcce4a1
upgrade redback version to 1.2.3
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@898250 13f79535-47bb-0310-9956-ffa450edef68
2010-01-12 08:36:17 +00:00
Brett Porter
23d65a33f6
[MRM-1025] remove JPOX from the model and remove the Archiva database configuration
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@891133 13f79535-47bb-0310-9956-ffa450edef68
2009-12-16 06:44:32 +00:00
Brett Porter
966d79546d
[MRM-1025] remove artifact deletion and update consumer. remove archiva-database module
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@891130 13f79535-47bb-0310-9956-ffa450edef68
2009-12-16 06:18:33 +00:00
Brett Porter
4331620db6
[MRM-1301] migrate reports to metadata repository
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@891064 13f79535-47bb-0310-9956-ffa450edef68
2009-12-15 23:07:36 +00:00
Brett Porter
7c7fffc71c
[MRM-1293] introduce repository statistics as a new plugin that operates over the metadata repository. Currently a work in progress - repository size statistics are not stored, and only the scanner and scheduler have been hooked in (meaning reports will be out of date)
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@888164 13f79535-47bb-0310-9956-ffa450edef68
2009-12-07 22:32:10 +00:00
Brett Porter
521bb63ade
Merged /archiva/trunk:r885006-887039
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@887043 13f79535-47bb-0310-9956-ffa450edef68
2009-12-04 03:00:22 +00:00
Brett Porter
7a63bee6de
[MRM-1025] remove project model as this is all now in the metadata repository
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@886037 13f79535-47bb-0310-9956-ffa450edef68
2009-12-02 02:33:02 +00:00
Brett Porter
52bcd1b58b
[MRM-1292] replace the dependency graph by a maven-dependency-tree based implementation (maven-project is not used)
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@885812 13f79535-47bb-0310-9956-ffa450edef68
2009-12-01 16:01:31 +00:00
Brett Porter
3278cdc8ae
[MRM-1288] move quickSearch from repository browsing to metadata content repository API
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@885430 13f79535-47bb-0310-9956-ffa450edef68
2009-11-30 14:19:56 +00:00
Brett Porter
f5c8218abe
[MRM-1123] nexus and its dependencies are now all on central
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@885012 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 21:04:56 +00:00
Brett Porter
70137a6054
[MRM-1282] ensure correct version of maven-model is used in the webapp, and utilise across all modules
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@884094 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 13:48:16 +00:00
Brett Porter
7a52fa2fbf
[MRM-1282] handle snapshot versions
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@883981 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 05:32:18 +00:00
Brett Porter
4102a4a916
[MRM-1025] split the scheduler into modules to isolate database and indexer dependent code
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@882207 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 17:16:20 +00:00
Brett Porter
e89326d687
[MRM-1025] merge -r721944:723577 from former MRM-1025 branch, now aligned to trunk
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@825867 13f79535-47bb-0310-9956-ffa450edef68
2009-10-16 12:35:38 +00:00
Maria Odea B. Ching
1593c57ef9
upgrade to 4-SNAPSHOT parent
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@810754 13f79535-47bb-0310-9956-ffa450edef68
2009-09-03 01:26:16 +00:00
Maria Odea B. Ching
6ad5da6f8d
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@808338 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 09:34:26 +00:00
Maria Odea B. Ching
924e33b562
[maven-release-plugin] prepare release archiva-1.2.2
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@808336 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 09:30:51 +00:00
Maria Odea B. Ching
81aa36aa09
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@807091 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 06:14:31 +00:00
Maria Odea B. Ching
03aae7ee6a
[maven-release-plugin] prepare release archiva-1.2.2
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@807087 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 06:12:10 +00:00
Maria Odea B. Ching
83eedac57d
removed codehaus repo, redback artifacts already synced in central
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@806911 13f79535-47bb-0310-9956-ffa450edef68
2009-08-23 00:09:06 +00:00
Maria Odea B. Ching
f94f2745b6
added codehaus repository
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@806812 13f79535-47bb-0310-9956-ffa450edef68
2009-08-22 08:50:25 +00:00
Maria Odea B. Ching
858712d13a
upgrade to redback 1.2.2
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@806792 13f79535-47bb-0310-9956-ffa450edef68
2009-08-22 06:05:57 +00:00
Maria Odea B. Ching
8b07e718db
[MRM-1202] upgrade to redback 1.3-SNAPHOT to get the fix for 404 error when changing password
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@798444 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 08:43:03 +00:00
Brett Porter
a73f0ccf31
[MRM-1219] correct log4j configuration, consolidate logging APIs
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@794572 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 07:45:17 +00:00
Brett Porter
1ef459b78e
[MRM-1217] Switch to Jetty 6.1.19
...
[MRM-1218] Upgrade to JSP 2.1
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@794554 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 06:57:47 +00:00
Maria Odea B. Ching
6981a1157b
remove outdated and unused dependency on archiva-core
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@789254 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 08:17:00 +00:00
Maria Odea B. Ching
3fea67fafd
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@778166 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 14:50:05 +00:00
Maria Odea B. Ching
2d00ba7504
[maven-release-plugin] prepare release archiva-1.2.1
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@778164 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 14:46:45 +00:00
Maria Odea B. Ching
4f50f5722e
revert to 1.2.1-SNAPSHOT
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@778156 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 14:17:53 +00:00
Maria Odea B. Ching
f2a299be93
[maven-release-plugin] prepare release archiva-1.2.1
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@778151 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 13:58:14 +00:00
Maria Odea B. Ching
02a22f45a5
[MRM-1161], [MRM-1179], [MRM-1143] and [MRM-1160]
...
o upgraded nexus indexer to 2.0.0
o queue all indexing tasks to avoid interrupting a current indexing task being executed
o cleaned up nexus indexer and index cleanup consumers
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@777816 13f79535-47bb-0310-9956-ffa450edef68
2009-05-23 07:28:12 +00:00
Brett Porter
698c912d15
updated redback release
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@768859 13f79535-47bb-0310-9956-ffa450edef68
2009-04-27 02:53:55 +00:00
Maria Odea B. Ching
8dc8cd536a
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@757124 13f79535-47bb-0310-9956-ffa450edef68
2009-03-22 03:19:24 +00:00
Maria Odea B. Ching
d811b1f00d
[maven-release-plugin] prepare release archiva-1.2
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@757122 13f79535-47bb-0310-9956-ffa450edef68
2009-03-22 03:15:29 +00:00
Brett Porter
61c6ef7e32
[MRM-1107] upgrade to redback 1.2
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@756086 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 16:55:08 +00:00
Brett Porter
537ff689e7
[MRM-1140] centralise logging through slf4j
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@753590 13f79535-47bb-0310-9956-ffa450edef68
2009-03-14 02:33:57 +00:00
Brett Porter
db5411198a
put the required repositories in by default
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@751553 13f79535-47bb-0310-9956-ffa450edef68
2009-03-08 23:37:01 +00:00
Brett Porter
32c2577fa0
formatting
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@750804 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 08:15:45 +00:00
Brett Porter
64a7ba1f3f
consistency in versions
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@747786 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 14:02:54 +00:00
Brett Porter
12c36ed347
[MRM-1098] upgrade to wagon 1.0-beta-5 and remove workaround that was needed previously
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@747621 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 00:11:47 +00:00
Maria Odea B. Ching
ae1a9ea059
add sonatype repo to get artifacts needed by nexus indexer
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@747356 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 12:09:24 +00:00
James William Dumay
f1488b0680
bump redback to snapshot
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@746068 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 00:26:16 +00:00
James William Dumay
77481fb93c
MRM-1084 - Upgrade modello maven plugin to 1.0 to support Java 5 generics
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@743630 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 06:47:36 +00:00
James William Dumay
d10e6a5ae2
MRM-1082 - Upgrade from plexus-maven-plugin to the plexus-component-metadata plugin
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@743238 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 05:45:52 +00:00
James William Dumay
e2dda2e977
Rolling back MRM-995 as it seemed to have broken lots of things
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@743171 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 23:54:32 +00:00
James William Dumay
034f98a509
MRM-995 - Generated Descriptors are wrong after Eclipse Project Clean
...
* Submitted by Steffen Grunwald. Thanks for the patch :)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@743169 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 23:43:05 +00:00
Maria Odea B. Ching
c0e1f8872e
[MRM-749]
...
merged -r 728552:740257 from archiva-nexus-indexer branch
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@740552 13f79535-47bb-0310-9956-ffa450edef68
2009-02-04 01:09:17 +00:00
Brett Porter
b30d149ebc
move up to the latest assembly plugin consistently
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@736038 13f79535-47bb-0310-9956-ffa450edef68
2009-01-20 17:00:03 +00:00
Maria Odea B. Ching
03a080a1d5
[MRM-1068]
...
submitted by Maria Catherine Tan
- upgrade redback to 1.2-beta-2
- needed to upgrade spring to 2.5.6 to be compatible with redback 1.2-beta-2
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@735937 13f79535-47bb-0310-9956-ffa450edef68
2009-01-20 05:32:11 +00:00
James William Dumay
5b6c91c02d
fix formatting
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@727320 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 09:27:44 +00:00
James William Dumay
20080174a4
MRM-1037 - Search Usability
...
* timestamp versions are merged to -SNAPSHOT versions
* duplicate artifacts are now merge by use of boolean filters
* we now search the correct fields
* content search has been removed (more accurate results)
* added more tokenizers for groupId, artifactId, version, etc
* Artifact Id's are weighted to improve quicksearch results
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@726928 13f79535-47bb-0310-9956-ffa450edef68
2008-12-16 02:13:25 +00:00
James William Dumay
2d11d2048a
MRM-1031 - Upgrade to jackrabbit-webdav 1.5.0
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@724235 13f79535-47bb-0310-9956-ffa450edef68
2008-12-08 02:39:39 +00:00
James William Dumay
e6c234136f
Binder upgraded to 0.9
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@719458 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 03:01:45 +00:00
Maria Odea B. Ching
db96d2d7f2
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@712168 13f79535-47bb-0310-9956-ffa450edef68
2008-11-07 15:44:29 +00:00
Maria Odea B. Ching
4cd3872031
[maven-release-plugin] prepare release archiva-1.2-M1
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@712154 13f79535-47bb-0310-9956-ffa450edef68
2008-11-07 15:15:14 +00:00
James William Dumay
4616a6f74f
Updating redback dependency to 1.2-beta-1
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@712077 13f79535-47bb-0310-9956-ffa450edef68
2008-11-07 07:09:01 +00:00
James William Dumay
b35fd5e19b
Upgrade lucene to 2.4.0
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@711507 13f79535-47bb-0310-9956-ffa450edef68
2008-11-05 04:04:49 +00:00
Maria Odea B. Ching
479e509ecd
updated sample client to use the atlassian-xmlrpc-binder instead of apache xmlrpc client
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@711444 13f79535-47bb-0310-9956-ffa450edef68
2008-11-04 22:09:47 +00:00
James William Dumay
615a79e2bd
Updating for latest redback snapshot
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@708062 13f79535-47bb-0310-9956-ffa450edef68
2008-10-26 23:57:05 +00:00
Maria Odea B. Ching
fb7574abc1
updated xmlrpc binder to 0.8.2
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@707245 13f79535-47bb-0310-9956-ffa450edef68
2008-10-23 01:56:02 +00:00
Maria Odea B. Ching
c303ba78c7
merged MRM-124 branch (-r706118) - archiva web services
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@706126 13f79535-47bb-0310-9956-ffa450edef68
2008-10-20 05:59:47 +00:00
James William Dumay
4f965b89cc
Merging from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-struts2@705848 13f79535-47bb-0310-9956-ffa450edef68
2008-10-18 06:45:02 +00:00
James William Dumay
f405f16e2d
Most jsp's working
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-struts2@705511 13f79535-47bb-0310-9956-ffa450edef68
2008-10-17 08:35:26 +00:00
Brett Porter
0472bf7af1
check the release notes and site descriptor version during release until it can be substituted
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@702438 13f79535-47bb-0310-9956-ffa450edef68
2008-10-07 11:40:56 +00:00
Maria Odea B. Ching
2262565505
merged from archiva-security-fix trunk
...
changes:
-fix security issue
-added RepositoryServletSecurityTest and ArchivaServletAuthenticatorTest test cases
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@702027 13f79535-47bb-0310-9956-ffa450edef68
2008-10-06 09:05:09 +00:00
James William Dumay
fa61616ee3
Behold! Struts2!
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-struts2@700721 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 09:11:06 +00:00
Maria Odea B. Ching
2b4e6995ca
[MRM-946]
...
upgraded redback to 1.1.1
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@696546 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 02:47:27 +00:00
Maria Odea B. Ching
ee6903c37f
upgrade redback to 1.1
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@696219 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 09:34:02 +00:00
Brett Porter
b7012bc63c
fix source distribution
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@683607 13f79535-47bb-0310-9956-ffa450edef68
2008-08-07 13:02:31 +00:00
Brett Porter
f8f40ba018
[maven-release-plugin] prepare release archiva-1.1.x
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@683479 13f79535-47bb-0310-9956-ffa450edef68
2008-08-07 02:17:27 +00:00
Brett Porter
b93da3745b
[maven-release-plugin] prepare branch archiva-1.1.x
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@683476 13f79535-47bb-0310-9956-ffa450edef68
2008-08-07 02:16:58 +00:00
Brett Porter
3d815cbe08
back to 6.1.6, test failures with 6.1.11
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@683473 13f79535-47bb-0310-9956-ffa450edef68
2008-08-07 02:13:00 +00:00
Brett Porter
5a2cefab12
update Jetty
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@683100 13f79535-47bb-0310-9956-ffa450edef68
2008-08-06 04:05:48 +00:00
Brett Porter
cad692d7a9
update to release versions
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@683099 13f79535-47bb-0310-9956-ffa450edef68
2008-08-06 04:03:48 +00:00
Maria Odea B. Ching
7852da039b
moved codehaus snapshots repo inside a profile
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@680573 13f79535-47bb-0310-9956-ffa450edef68
2008-07-29 00:00:26 +00:00
Maria Odea B. Ching
052d84eff7
temporarily added codehaus snapshots repo for redback 1.0.3-SNAPSHOT (vmbuild was failing)
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@680219 13f79535-47bb-0310-9956-ffa450edef68
2008-07-28 01:20:31 +00:00
Brett Porter
03bc6a82ef
[MRM-884] network proxy doesn't work
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@680127 13f79535-47bb-0310-9956-ffa450edef68
2008-07-27 15:23:30 +00:00
Maria Odea B. Ching
52c8dfc4ee
oops, redback should be upgraded to 1.0.3-SNAPSHOT and not 1.1-SNAPSHOT
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@679963 13f79535-47bb-0310-9956-ffa450edef68
2008-07-26 07:28:41 +00:00
Maria Odea B. Ching
538b12185f
-upgraded to redback 1.1-SNAPSHOT for the fix for MRM-584 (new user cannot login)
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@679959 13f79535-47bb-0310-9956-ffa450edef68
2008-07-26 06:56:29 +00:00
Maria Odea B. Ching
0d580b48c1
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@677215 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 09:43:54 +00:00
Maria Odea B. Ching
ef3b578f91
[maven-release-plugin] prepare release archiva-1.1
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@677213 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 09:41:07 +00:00
James William Dumay
67e651bbc4
MRM-870 - addRepositoryToGroup.action => AbstractMethodError on DeferredDocumentImpl.getXmlStandalone()
...
* excluded necko xerces minimal as its only used by the http wagon to get an upstream file list (which we dont do)
* explicitly added xercesImpl to dependencyManagement
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@675093 13f79535-47bb-0310-9956-ffa450edef68
2008-07-09 04:27:30 +00:00
Maria Odea B. Ching
c5b51473ba
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674706 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 02:04:28 +00:00
Maria Odea B. Ching
84c614d09a
[maven-release-plugin] prepare release archiva-1.1
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674704 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 02:01:17 +00:00
Brett Porter
fe054d97f0
remove snapshot repository, update javadoc plugin to fix release build
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674466 13f79535-47bb-0310-9956-ffa450edef68
2008-07-07 12:15:16 +00:00
Brett Porter
2a68a704a6
commons-logging-api is actually required by some client libraries, add back to main webapp dependencies
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674463 13f79535-47bb-0310-9956-ffa450edef68
2008-07-07 11:42:38 +00:00
Maria Odea B. Ching
09e2d352c5
putting back the enforcer-plugin
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674436 13f79535-47bb-0310-9956-ffa450edef68
2008-07-07 09:45:58 +00:00
Maria Odea B. Ching
b2a8ef8ffd
commented wrong parts of the pom in previous commit
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674435 13f79535-47bb-0310-9956-ffa450edef68
2008-07-07 09:39:21 +00:00
Maria Odea B. Ching
c3e0319a81
temporarily commented out enforcer-plugin to check if that causes the problems with the release
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674432 13f79535-47bb-0310-9956-ffa450edef68
2008-07-07 09:36:35 +00:00
Maria Odea B. Ching
e9128d18f5
reverted back release-plugin version to 2.0-beta-7
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674431 13f79535-47bb-0310-9956-ffa450edef68
2008-07-07 09:34:52 +00:00
Maria Odea B. Ching
9dbe47eb39
downgraded release-plugin version to 2.0-beta-6
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674430 13f79535-47bb-0310-9956-ffa450edef68
2008-07-07 09:30:29 +00:00
James William Dumay
d3bb6ccbcb
MRM-829 - Replace Company POM feature with simple Appearence customisation
...
* removing unneeded dependencies
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674170 13f79535-47bb-0310-9956-ffa450edef68
2008-07-05 09:43:42 +00:00
Maria Odea B. Ching
9824fcba98
upgrade redback to 1.0.2
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@673932 13f79535-47bb-0310-9956-ffa450edef68
2008-07-04 07:13:09 +00:00
James William Dumay
fa6cdded81
MRM-855 - java.lang.NoClassDefFoundError: org/apache/xml/serialize/OutputFormat
...
* exclude commons-logging from jackrabbit transtive dependency tree
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@673271 13f79535-47bb-0310-9956-ffa450edef68
2008-07-02 04:16:17 +00:00
James William Dumay
a0170714e3
MRM-855 - java.lang.NoClassDefFoundError: org/apache/xml/serialize/OutputFormat
...
* removed excludes for xerces:*
* updated enforcer rules
* excluded xerces from shade in archiva-cli
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@673269 13f79535-47bb-0310-9956-ffa450edef68
2008-07-02 04:11:34 +00:00
James William Dumay
9f3eadd519
MRM-840 - Wagon HTTP deadlocks under high load
...
* Reverted back to using wagon-http-lightweight from commons-http based wagon-http
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@673257 13f79535-47bb-0310-9956-ffa450edef68
2008-07-02 01:28:43 +00:00
Brett Porter
b407790664
[MRM-605] unit tests fail on Archiva source distribution
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@673249 13f79535-47bb-0310-9956-ffa450edef68
2008-07-02 01:11:18 +00:00
Brett Porter
6d84f3a0a5
POM clean up
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@667751 13f79535-47bb-0310-9956-ffa450edef68
2008-06-14 06:27:11 +00:00
Brett Porter
7baff81d61
use Wagon release
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@667720 13f79535-47bb-0310-9956-ffa450edef68
2008-06-14 02:29:10 +00:00
Brett Porter
8005fa064a
use release of taskqueue
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662668 13f79535-47bb-0310-9956-ffa450edef68
2008-06-03 07:04:53 +00:00
Brett Porter
7b95d20a49
update to release of plexus-spring, and spit out less information during build
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662666 13f79535-47bb-0310-9956-ffa450edef68
2008-06-03 07:03:39 +00:00
Emmanuel Venisse
130711f5b2
Update redback to 1.0.2-SNAPSHOT
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@661265 13f79535-47bb-0310-9956-ffa450edef68
2008-05-29 08:56:13 +00:00
James William Dumay
03584684d1
Moving RepositoryServlet to its new home in archiva-webdav. Thanks to Brett for helping out with the crazy failing tests.
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@661174 13f79535-47bb-0310-9956-ffa450edef68
2008-05-29 01:49:41 +00:00
Brett Porter
a145ac1cde
update parent
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@660790 13f79535-47bb-0310-9956-ffa450edef68
2008-05-28 02:37:01 +00:00
Brett Porter
ef7d07d4ee
this isn't needed here, the reference is deployed from archiva-modules which already has it
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@655381 13f79535-47bb-0310-9956-ffa450edef68
2008-05-11 23:05:00 +00:00
Wendy Smoak
98b9a7732a
Fix url and add distributionManagement to publish reference docs and reports.
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@655252 13f79535-47bb-0310-9956-ffa450edef68
2008-05-11 05:58:23 +00:00
Brett Porter
5d4435ac5e
adjust site structure in accordance with modules, and make the header consistent with the main site
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@655189 13f79535-47bb-0310-9956-ffa450edef68
2008-05-10 21:14:19 +00:00
James William Dumay
584bd356c2
MRM-781 Removal of Archiva-Webdav implementation in favor of Jackrabbit-webdav
...
* I broke MRM-440, so this restores that functionality
* Locked down the enforcer plugin version so that Maven does not go looking for it everytime we build
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@653817 13f79535-47bb-0310-9956-ffa450edef68
2008-05-06 15:40:22 +00:00
James William Dumay
f889364a39
MRM-781 - Removal of Archiva-Webdav implementation in favor of Jackrabbit-webdav
...
* Implemented Webdav properties, including copy/move/delete operations
* Unit tested the DavResourceLocator and DavLocatorFactory implementations (More tests on the way)
* Introduced joda-time dependency todo ISO8601 dates for the dav servlet
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@653769 13f79535-47bb-0310-9956-ffa450edef68
2008-05-06 13:32:28 +00:00
Brett Porter
d86d2ce9a1
remove inherited URL
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@653628 13f79535-47bb-0310-9956-ffa450edef68
2008-05-05 23:15:52 +00:00
Brett Porter
3066bec070
refer to the parent in the externals checkout
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@649745 13f79535-47bb-0310-9956-ffa450edef68
2008-04-19 03:07:20 +00:00
Brett Porter
558d0c2a4f
[MRM-781] Removal of Archiva-Webdav implementation in favor of Jackrabbit-webdav
...
Submitted by: James William Dumay
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@649352 13f79535-47bb-0310-9956-ffa450edef68
2008-04-18 03:05:18 +00:00
Joakim Erdfelt
92362e9ee3
Replacing plexus-digest with archiva-checksum
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@648115 13f79535-47bb-0310-9956-ffa450edef68
2008-04-15 04:44:17 +00:00
Brett Porter
db51c1b590
remove all traces of the Plexus container
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@647663 13f79535-47bb-0310-9956-ffa450edef68
2008-04-14 04:58:17 +00:00
Maria Odea B. Ching
0594ef58be
[MRM-677]
...
-upgrade redback to 1.0.1
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@647651 13f79535-47bb-0310-9956-ffa450edef68
2008-04-14 03:04:47 +00:00
Brett Porter
e34d718620
remove plexus container dependencies
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@646630 13f79535-47bb-0310-9956-ffa450edef68
2008-04-10 03:32:24 +00:00
Maria Odea B. Ching
d346a91845
[MRM-123]
...
-generate/update rss feeds after repository scan
-add rss feed icon in repositories (for new artifacts in repo feed) and in browse artifact (for new versions of artifact feed)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@645576 13f79535-47bb-0310-9956-ffa450edef68
2008-04-07 15:50:57 +00:00
Brett Porter
88d2fda16e
add a consumer (not enabled by default) that can generate a dependency tree as XML
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@645394 13f79535-47bb-0310-9956-ffa450edef68
2008-04-07 06:23:47 +00:00
Brett Porter
a488b7cebd
CLI requires these in the root
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@642526 13f79535-47bb-0310-9956-ffa450edef68
2008-03-29 10:21:20 +00:00
Brett Porter
d9c7f7f529
arrange plugin declarations to minimise need to release parent while maximising reuse. Move all reporting and Java configuration into modules section
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@642524 13f79535-47bb-0310-9956-ffa450edef68
2008-03-29 10:12:41 +00:00
Brett Porter
a05f42cc0e
restructure according to discussion on the dev list
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@642497 13f79535-47bb-0310-9956-ffa450edef68
2008-03-29 03:09:22 +00:00
Brett Porter
f257dd0798
change the group ID
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@642482 13f79535-47bb-0310-9956-ffa450edef68
2008-03-29 02:01:11 +00:00
Brett Porter
5582e7aec3
update SVN URLs
...
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@642455 13f79535-47bb-0310-9956-ffa450edef68
2008-03-29 00:35:44 +00:00
Brett Porter
7374e37ad1
update surefire plugin version to avoid a bug that lead to tests failing in the reactor
...
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@641139 13f79535-47bb-0310-9956-ffa450edef68
2008-03-26 04:14:16 +00:00
Brett Porter
7976dca5f6
required due to spring updates
...
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@640809 13f79535-47bb-0310-9956-ffa450edef68
2008-03-25 13:39:24 +00:00
Joakim Erdfelt
e821a90870
breaking mystery build loop
...
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@640315 13f79535-47bb-0310-9956-ffa450edef68
2008-03-24 05:02:11 +00:00
Joakim Erdfelt
5b8535ee5a
Disabling checkstyle:check until archiva-dev mailing list discussion is complete.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@640313 13f79535-47bb-0310-9956-ffa450edef68
2008-03-24 04:45:43 +00:00
Joakim Erdfelt
fe5f68cc4c
Adding placeholder for archiva-build-resources usage.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@640304 13f79535-47bb-0310-9956-ffa450edef68
2008-03-24 03:46:09 +00:00
Maria Odea B. Ching
58f7a148ae
[MRM-677]
...
-upgraded redback to 1.1-SNAPSHOT
-updated the archiva redback models to the new redback model
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@638845 13f79535-47bb-0310-9956-ffa450edef68
2008-03-19 14:36:08 +00:00
Brett Porter
036b3e9937
not needed in every project
...
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@637807 13f79535-47bb-0310-9956-ffa450edef68
2008-03-17 09:53:26 +00:00
Brett Porter
d277a2af08
avoid recursion in the archiva-docs module
...
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@637693 13f79535-47bb-0310-9956-ffa450edef68
2008-03-17 00:22:49 +00:00
Joakim Erdfelt
60a6e8e397
Adding plexus-slf4j-logging to top level pom (for now) as it is used everywhere
...
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@637520 13f79535-47bb-0310-9956-ffa450edef68
2008-03-16 03:32:02 +00:00
Joakim Erdfelt
6cd80fdabd
* Adding snapshots.repository.codehaus.org so that plexus-spring can be found.
...
* Adding spring as default dependency.
* Adding plexus-spring to depMgmt
* Adding spring-context to depMgmt
* Adding spring-web to depMgmt
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@637515 13f79535-47bb-0310-9956-ffa450edef68
2008-03-16 03:15:43 +00:00
Brett Porter
d410cff584
merge the archiva-spring branch
...
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@637056 13f79535-47bb-0310-9956-ffa450edef68
2008-03-14 11:13:29 +00:00
Maria Odea B. Ching
fc91eda1e6
[MRM-216]
...
Submitted by Wendy Smoak
-added jsp page and action class for uploading single artifacts
-added commons-file-upload as dependency
-i commented out some parts in UploadAction as they need to be modified to reflect the changes in some of the Archiva components used.
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@635836 13f79535-47bb-0310-9956-ffa450edef68
2008-03-11 07:59:35 +00:00