Commit Graph

473 Commits

Author SHA1 Message Date
Olivier Lamy ec07849605 ensure ce use hsqldb for webdav unit test
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1343730 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 14:07:04 +00:00
Olivier Lamy e87db98689 upgrade hsql version
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1343713 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 13:28:55 +00:00
Olivier Lamy f287535cfb [MRM-1626] Use MavenXpp3Reader as a static variable
Submitted by charlie kim.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1327887 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 09:23:29 +00:00
Olivier Lamy 944bd484b8 osgi metadatas for taskqueue change
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1325980 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 22:10:42 +00:00
Olivier Lamy cc2feeebbe move spring-taskqueue to apache namespace
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1325979 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 22:10:16 +00:00
Olivier Lamy 7e545c5e70 move spring-utils to apache namespace
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1325919 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 19:45:54 +00:00
Olivier Lamy 5ba11055fe repackage spring-registry-commons to o.a.a namespace
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1325321 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 15:27:10 +00:00
Olivier Lamy 870ce2c4d8 use o.a.a package namespace for spring-quartz component
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1325047 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 22:26:10 +00:00
Olivier Lamy 07e40c0b28 fix package change in configuration files, normally all is fine now :-)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1311431 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 20:39:51 +00:00
Olivier Lamy 6a0d821567 move to package o.a.a.r redback module redback-common-integrations
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1311036 13f79535-47bb-0310-9956-ffa450edef68
2012-04-08 16:23:02 +00:00
Olivier Lamy 2ce3e9371f move to package o.a.a.r redback module redback-system
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1310918 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 23:19:30 +00:00
Olivier Lamy b146216520 move to package o.a.a.r redback module redback-policy
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1310896 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 22:30:34 +00:00
Olivier Lamy 0048b85f5d move to package o.a.a.r redback module redback-keys-memory
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1310890 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 22:18:55 +00:00
Olivier Lamy 12fcc72061 move to package o.a.a.r redback module redback-keys-api
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1310881 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 21:53:24 +00:00
Olivier Lamy c2266bcad9 move to package o.a.a.r redback module redback-authorization-api
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1310862 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 20:52:57 +00:00
Olivier Lamy 9780539136 move to package o.a.a.r redback module redback-authentication-api
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1310846 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 19:56:17 +00:00
Olivier Lamy 22682eeaf8 move to package o.a.a.r
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1310784 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 15:06:15 +00:00
Olivier Lamy 4ee186fe23 fix osgi import
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1310780 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 14:30:24 +00:00
Olivier Lamy da36c0b96e redback package change to asf namespace
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1310765 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 13:19:01 +00:00
Olivier Lamy 5c8ae7ca09 use new redback groupId
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1310512 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 17:57:23 +00:00
Olivier Lamy a6fc548e97 [MRM-1620] add a tab to browse artifact content in artifact detail view
implement artifact content browsing REST api

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1309830 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 13:04:10 +00:00
Olivier Lamy 5e159d8946 osgi import fix
/me grumble :-)

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1299578 13f79535-47bb-0310-9956-ffa450edef68
2012-03-12 08:30:48 +00:00
Olivier Lamy 6a46674535 remove deprecated class
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1299574 13f79535-47bb-0310-9956-ffa450edef68
2012-03-12 08:10:38 +00:00
Olivier Lamy 68365364e3 add wagon-http-lightweight as dependency to prevent CNFE in tests
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1240629 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 22:17:53 +00:00
Olivier Lamy 0cb6235dfa fix test compilation issue
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1233309 13f79535-47bb-0310-9956-ffa450edef68
2012-01-19 12:17:42 +00:00
Olivier Lamy 4f6ab06673 [MRM-1562] Update to Archiva as OSGi compliant application
Patch on features descriptor cleanup.
Submitted by Jean-Baptiste Onofre.



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1226052 13f79535-47bb-0310-9956-ffa450edef68
2011-12-31 09:28:02 +00:00
Olivier Lamy 2cad63366f webdav module need only on redback-common-integrations not on struts2-integrations
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1215218 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 16:56:09 +00:00
Brett Porter 615cfd730e remove all tab characters and fix some formatting
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1215120 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 13:13:10 +00:00
Olivier Lamy 58b08d0094 bump to 1.4-M3-SNAPSHOT version
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1213816 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 18:18:37 +00:00
Olivier Lamy 25df4bfef1 we don't scan files here
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1211183 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 21:41:15 +00:00
Olivier Lamy d6fa8f7ad8 [MRM-1562]Update to Archiva as OSGi compliant application
turn xmlrpc, some plugins as OSGi bundles.
Submitted by Jean Baptiste Onofre.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1207904 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 15:15:40 +00:00
Olivier Lamy 14b5f5d731 remove a deprecated class ArchivaRoleConstants from archiva-security
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1199736 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 13:14:32 +00:00
Olivier Lamy cef293cf57 move jdbc test url and jdbc test driver to properties to be able to change that in one place
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1198646 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 08:29:35 +00:00
Olivier Lamy b3f0bc9730 gloups compilation issue
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1198014 13f79535-47bb-0310-9956-ffa450edef68
2011-11-05 18:56:43 +00:00
Olivier Lamy 7ad0e303a0 [MRM-815] aggregate indices for repository groups.
delete temporary on session end with a session listener
periodical taks to cleanup too old temp group index.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1198011 13f79535-47bb-0310-9956-ffa450edef68
2011-11-05 18:50:28 +00:00
Olivier Lamy e9d93aa21b fix junit
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1197956 13f79535-47bb-0310-9956-ffa450edef68
2011-11-05 13:31:53 +00:00
Olivier Lamy 3332f36a12 [MRM-815] aggregate indices for repository groups.
correctlty returned various index files.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1197906 13f79535-47bb-0310-9956-ffa450edef68
2011-11-05 09:08:42 +00:00
Olivier Lamy f0a3cbb416 check first if the request is .indexer browsing to not iterate over repositories (ie normal process)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1197905 13f79535-47bb-0310-9956-ffa450edef68
2011-11-05 09:07:59 +00:00
Olivier Lamy a383916c30 fix link returned by archiva during browsing
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1197602 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 15:41:53 +00:00
Olivier Lamy 534334dd98 fix unit test in webdav weird issue with spring context not the same in servlet runner
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1197599 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 15:29:31 +00:00
Olivier Lamy 2b4b9f0c0b cleanup some test code
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1197570 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 13:52:43 +00:00
Olivier Lamy 840cabb0fb avoid lucene lock issues with starting spring container with no repositories
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1197569 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 13:51:54 +00:00
Olivier Lamy 1f57d52fa4 fix component in charge of cleaning maven index @Inject comes from a lot of packages: just use the good one :-)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1197434 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 08:56:59 +00:00
Olivier Lamy e11c4ccf18 start fixing unit test on webdav module: ensure correctly closing lucene index on shutdown
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1197361 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 23:47:50 +00:00
Olivier Lamy 8e36162963 [MRM-815] aggregate indices for repository groups.
pack index for download.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1196845 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 22:33:09 +00:00
Olivier Lamy 0262091faa [MRM-815] aggregate indices for repository groups.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1196840 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 22:31:42 +00:00
Olivier Lamy 546014d194 do not index directory in case of group: prevent NPE
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1196835 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 22:29:46 +00:00
Olivier Lamy c814b9b981 do not display index directory in case of group
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1196834 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 22:29:30 +00:00
Olivier Lamy 58991fda0d [MRM-1539] Upgrade to Jetty: fix webdav test
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1189905 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 18:10:24 +00:00
Olivier Lamy e624d21c43 [MRM-1539] Upgrade to Jetty 7.
change pom declaration.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1189902 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 18:09:49 +00:00
Olivier Lamy 33776a4920 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1185622 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 12:26:11 +00:00
Olivier Lamy ccd7d803f7 [maven-release-plugin] prepare release archiva-1.4-M1
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1185616 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 12:19:44 +00:00
Olivier Lamy 0d0e89a25b [MRM-1515] see how to reduce dependencies: exclude stax:stax-api
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1178425 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 15:12:20 +00:00
Brett Porter 3c20054f1d update version to 1.4-M1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1178021 13f79535-47bb-0310-9956-ffa450edef68
2011-10-01 15:38:32 +00:00
Brett Porter 0fa1fa6ac2 change configuration base to org.apache.archiva instead of org.apache.maven.archiva, update "upgrading" document accordingly
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1177933 13f79535-47bb-0310-9956-ffa450edef68
2011-10-01 06:56:48 +00:00
Brett Porter 77e42c692f make RAT report pass
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1177919 13f79535-47bb-0310-9956-ffa450edef68
2011-10-01 05:17:00 +00:00
Brett Porter 38638641f0 fix properties to avoid putting test data in JAR and remove derby.log from root
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1177916 13f79535-47bb-0310-9956-ffa450edef68
2011-10-01 05:08:15 +00:00
Olivier Lamy 18b92bde16 format : no code change
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1177068 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 21:33:56 +00:00
Olivier Lamy 45eaefbd9a [MRM-1490] REST services : add a service to copy an artifact from one repo to an other one
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1174423 13f79535-47bb-0310-9956-ffa450edef68
2011-09-22 22:20:45 +00:00
Olivier Lamy 0157bc252d as there is String concat use log.isDebugEnabled
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1174420 13f79535-47bb-0310-9956-ffa450edef68
2011-09-22 22:18:06 +00:00
Olivier Lamy 33850774a4 [MRM-1003] Repackage sources from org.apache.maven.archiva.. to org.apache.archiva.. : archiva-configuration module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1171539 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 13:18:21 +00:00
Olivier Lamy f62c5ec2d2 [MRM-1003] Repackage sources from org.apache.maven.archiva.. to org.apache.archiva.. : archiva-webdav module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1171522 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 12:09:31 +00:00
Olivier Lamy 353936a74f [MRM-1003] Repackage sources from org.apache.maven.archiva.. to org.apache.archiva.. : archiva-model module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1171458 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 09:06:08 +00:00
Olivier Lamy 58b11bca24 [MRM-1003] Repackage sources from org.apache.maven.archiva.. to org.apache.archiva.. : archiva-consumer-api module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1171453 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 08:54:07 +00:00
Olivier Lamy e41ad31bf9 [MRM-1003] Repackage sources from org.apache.maven.archiva.. to org.apache.archiva.. : archiva-repository-layer module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1171447 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 08:41:33 +00:00
Olivier Lamy d5366b9a91 [MRM-1003] Repackage sources from org.apache.maven.archiva.. to org.apache.archiva.. : archiva-policies module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1171444 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 08:34:11 +00:00
Olivier Lamy e4e35de0fa [MRM-1003] Repackage sources from org.apache.maven.archiva.. to org.apache.archiva.. : archiva-proxy module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1171440 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 08:21:12 +00:00
Olivier Lamy 7a01a324d6 [MRM-1003] Repackage sources from org.apache.maven.archiva.. to org.apache.archiva.. : archiva-common module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1171418 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 07:42:25 +00:00
Olivier Lamy 259220f867 code formatting : NO CODE CHANGE
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1171407 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 07:16:06 +00:00
Olivier Lamy c8ef0abdec [MRM-1520] remove duplicate beans : move model beans to a single package
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1171188 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 17:36:22 +00:00
Olivier Lamy 919a5ac3eb [MRM-1504] Add a new module for repository administration management
split the repo admin in two modules : api and default implementation (to be able to more easily change the impl).
Use the repo admin api consumers and indexing modules.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1170135 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 12:12:39 +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 281092c41a MRM-1507 : api to configure ProxyConnector
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1166130 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 11:41:15 +00:00
Olivier Lamy ac4dbb87e1 get RID of plexus.requirement annotation
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1165558 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 08:11:21 +00:00
Olivier Lamy f0c6ee5a71 get RID of plexus.component annotation
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1165527 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 07:26:05 +00:00
Olivier Lamy c7e5fea75a get RID of org.apache.maven.archiva packages : security package
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1164822 13f79535-47bb-0310-9956-ffa450edef68
2011-09-03 08:15:36 +00:00
Olivier Lamy 0d10fd3a9f [MRM-1504] api for repository admin
start some jobs

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1162369 13f79535-47bb-0310-9956-ffa450edef68
2011-08-27 15:06:42 +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 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 30ebe43f59 simplify inject of bean list
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1160293 13f79535-47bb-0310-9956-ffa450edef68
2011-08-22 15:11:34 +00:00
Olivier Lamy 94faa497ae fix webapp unit tests with commenting a spring which is not used and override the good one
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1159691 13f79535-47bb-0310-9956-ffa450edef68
2011-08-19 17:15:41 +00:00
Olivier Lamy c3af85436f ensure starting unit tests with clean configuration to prevent sporadic failure
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1137376 13f79535-47bb-0310-9956-ffa450edef68
2011-06-19 15:07:34 +00:00
Brett Porter ea6a0644af remove more old test files
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1136335 13f79535-47bb-0310-9956-ffa450edef68
2011-06-16 09:13:01 +00:00
Olivier Lamy 84ef692a11 ensure we don't have anymore proxy connectors for this unit test
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1136176 13f79535-47bb-0310-9956-ffa450edef68
2011-06-15 20:24:50 +00:00
Olivier Lamy 7b2233965f a little of help regarding memory in webdav unit tests
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1136121 13f79535-47bb-0310-9956-ffa450edef68
2011-06-15 16:57:39 +00:00
Olivier Lamy aefe91d87c back to forkMode once for webdav module : faster build
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1136035 13f79535-47bb-0310-9956-ffa450edef68
2011-06-15 13:37:52 +00:00
Olivier Lamy 26665cb8ea cleanup archivaConfiguration before new test
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1136005 13f79535-47bb-0310-9956-ffa450edef68
2011-06-15 11:54:15 +00:00
Olivier Lamy 48ba62c363 simplify/boost unit tests with loading a smaller container
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135266 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 20:33:55 +00:00
Olivier Lamy 9bc2b8ae00 fix junit : cleanup ProxyConnectors before each tests
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135265 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 20:33:37 +00:00
Olivier Lamy e318df26fc fix junit : ensure file from previous test is deleted, cleanup connectors before/after each tests
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135264 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 20:33:20 +00:00
Olivier Lamy 748a97c62f fix junit for RepositoryServletProxiedMetadataLocalOnlyTest
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135187 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 17:27:17 +00:00
Olivier Lamy 1a5b1ab654 forkMode always in webdav module to fix a lot of unit tests
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135169 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 16:48:37 +00:00
Olivier Lamy 1d66415cae fix unit test for RepositoryServletProxiedTimestampedSnapshotPolicyTest : call setup and tearDown
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135142 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 15:21:11 +00:00
Olivier Lamy 51abcfbcbb fix unit test for RepositoryServletProxiedPassthroughTest : call setup and tearDown
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135141 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 15:20:54 +00:00
Olivier Lamy 22ae2288b1 fix unit test for RepositoryServletProxiedMetadataRemoteOnlyTest : call setup and tearDown
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135140 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 15:20:37 +00:00
Olivier Lamy c97525b3b6 fix archiva configuration duplicate remote repos during unit tests for RepositoryServletProxiedPluginSnapshotPolicyTest
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135113 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 14:22:15 +00:00
Olivier Lamy 1eacae0de2 fix spring configuration for unit test RepositoryServletSecurityTest
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135112 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 14:21:55 +00:00
Olivier Lamy cd73ad4d78 fix junit spring configuration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135064 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 09:00:36 +00:00
Olivier Lamy b55ef5058a fix junit spring configuration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135059 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 08:24:17 +00:00
Olivier Lamy 4ebc70a0e6 ensure we save the configuration for restarting applicationcontext with httpunit tests
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134960 13f79535-47bb-0310-9956-ffa450edef68
2011-06-12 19:15:17 +00:00
Olivier Lamy 0ad81d8bc6 use slf4j feature to optimise debug
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134715 13f79535-47bb-0310-9956-ffa450edef68
2011-06-11 17:55:52 +00:00
Olivier Lamy 877d1d76b4 simplify debug with using slf4j feature with {}
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134713 13f79535-47bb-0310-9956-ffa450edef68
2011-06-11 17:55:28 +00:00
Olivier Lamy 013b9914d8 fix some unit tests setup in archiva-webdav
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1133581 13f79535-47bb-0310-9956-ffa450edef68
2011-06-08 22:12:21 +00:00
Olivier Lamy 9b142e861d start fixing spring configuration for unit test in archiva-webdav
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1133115 13f79535-47bb-0310-9956-ffa450edef68
2011-06-07 17:57:33 +00:00
Olivier Lamy 532dd24896 fix some unit tests initializationError
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1132596 13f79535-47bb-0310-9956-ffa450edef68
2011-06-06 11:06:00 +00:00
Olivier Lamy 8ad78e8f02 log when initservers is done
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1131451 13f79535-47bb-0310-9956-ffa450edef68
2011-06-04 18:01:39 +00:00
Olivier Lamy 0848bc6475 fix some test spring setup for archiva-webdav
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1131450 13f79535-47bb-0310-9956-ffa450edef68
2011-06-04 18:01:22 +00:00
Olivier Lamy dc25b2f5e6 plexus-spring remove , fix test compilation in archiva-webdav
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1131428 13f79535-47bb-0310-9956-ffa450edef68
2011-06-04 16:30:30 +00:00
Olivier Lamy fa5bd3e98b remove of plexus-spring fix compilation in webdav module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1131427 13f79535-47bb-0310-9956-ffa450edef68
2011-06-04 16:29:52 +00:00
Olivier Lamy 4abee3dd55 [MRM-1473] remove use of plexus-spring
start working on archiva-core-consumers


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1129114 13f79535-47bb-0310-9956-ffa450edef68
2011-05-30 10:20:18 +00:00
Olivier Lamy 5b69ca4fd3 remove use of plexus api (Initializable phase)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1128918 13f79535-47bb-0310-9956-ffa450edef68
2011-05-29 18:00:17 +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 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 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
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 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
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 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 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
Maria Odea B. Ching e82ce0f0b5 merged MRM-980 branch to trunk
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1002059 13f79535-47bb-0310-9956-ffa450edef68
2010-09-28 09:09:32 +00:00
Brett Porter 3387b53fca remove dependency on repository-layer from audit module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@921799 13f79535-47bb-0310-9956-ffa450edef68
2010-03-11 11:05:46 +00:00
Brett Porter 5c18f8b344 [MRM-1359] add tests for legacy format translation in WebDAV and other Maven 1 repository notes
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@921789 13f79535-47bb-0310-9956-ffa450edef68
2010-03-11 10:34:42 +00:00
Brett Porter e521a959c5 [MRM-1356] handle chunked / unknown length requests correctly
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@919307 13f79535-47bb-0310-9956-ffa450edef68
2010-03-05 06:09:53 +00:00
Brett Porter e4c8856490 [MRM-1355] merge test for audit log username setting from branch, with adjustments
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@918887 13f79535-47bb-0310-9956-ffa450edef68
2010-03-04 08:21:21 +00:00
Brett Porter 09f8d89c57 improve logging of failed uploads
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@917519 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 13:35:38 +00:00
Brett Porter 31891b80e4 [MRM-1302] add some prevention for concurrent modification of a list
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@917398 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 05:56:12 +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 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
Maria Odea B. Ching b44ad982c3 [MRM-1296] Audit logging report
merged MRM-1296 branch to trunk


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@897892 13f79535-47bb-0310-9956-ffa450edef68
2010-01-11 15:07:00 +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 0960c24cfb [MRM-1301] add back summary statistics for various counts
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@891102 13f79535-47bb-0310-9956-ffa450edef68
2009-12-16 02:25:42 +00:00
Brett Porter 0f4bec3049 [MRM-1301] add back problem reporting for invalid / missing POM
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@891084 13f79535-47bb-0310-9956-ffa450edef68
2009-12-16 00:38:50 +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 a08431ea1a [MRM-1300] move search and find artifact action over to metadata repository
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@889130 13f79535-47bb-0310-9956-ffa450edef68
2009-12-10 08:22:22 +00:00
Brett Porter 99765460e0 [MRM-1299] migrate RSS from the database to the metadata repository
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@888723 13f79535-47bb-0310-9956-ffa450edef68
2009-12-09 08:08:21 +00:00
Brett Porter 1dad23aaf3 [MRM-1293] adjust the EditManagedRepositoryAction to delete statistics when the repository location changes.
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@888185 13f79535-47bb-0310-9956-ffa450edef68
2009-12-07 23:27:58 +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 8a0aa76e24 Merged /archiva/trunk:r882384-883981
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@883995 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 06:55:27 +00:00
Maria Odea B. Ching 56ddb014a1 updated comment
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@883052 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 09:32:35 +00:00
Maria Odea B. Ching 614a6c1e2f [MRM-747] Archiva should prevent re-deployment of released or non-snapshot versioned artifacts
o make blocking of re-dployments configurable per repository
o added test


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@883051 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 09:28:36 +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 fa22abb913 [MRM-747] Archiva should prevent re-deployment of released or non-snapshot versioned artifacts
o moved check for metadata support files to RepositoryRequest and added tests
o throw DavException error 409 immediately for released artifacts intead of a ReleaseArtifactAlreadyExistsException


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@825449 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 09:40:40 +00:00
Brett Porter 0cf3f93e5a [MRM-1264] reduce memory used by indexing process
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@825082 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 10:27:48 +00:00
Brett Porter 3a327868d0 remove unused fields
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@825073 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 09:56:19 +00:00
Maria Odea B. Ching c893eefe9f [MRM-747] Archiva should prevent re-deployment of released or non-snapshot versioned artifacts
submitted by Marc Lustig
o added checks in webdav to block re-deployment if artifact version already exists in the repo and throw a 409 in such cases
o added tests for deploying and re-deploying an artifact

additional modifications to the patch:
o update checking for artifact types that will be blocked
o add tests for deploying metadata and support file


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@824677 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 10:36:24 +00:00
Brett Porter 8142e83c50 additional clean up code to prevent the tests from running out of memory
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@822794 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:29:27 +00:00
Maria Odea B. Ching 40e247c7e4 [MRM-1056] Option to force scanning of an artifact/repository regardless of file dates
o add checkbox for processing all artifacts beside Scan Repository Now button in repositories page
o scan all artifacts if flag is set
o added unit tests


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@816084 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 07:48:55 +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 df265f5fad remove unused section
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@808298 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 06:44:36 +00:00
Maria Odea B. Ching 573472d62a [MRM-1239] Unable to get artifact-level maven-metadata.xml of artifacts that are only three directory levels deep
o added tests
o allow three levels for metadata and metadata checksums when checking if repository layout is default


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@808295 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 06:40:37 +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 8b3037bfdc [MRM-1232] Unable to get artifacts from repositories which requires Repository Manager role using repository group
o if at least one unauthorizeddavexception exists in the compiled errors from the repositories in the group, send back a 401 error to force maven to send 
attach credentials to the request
o added tests


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@803795 13f79535-47bb-0310-9956-ffa450edef68
2009-08-13 07:16:35 +00:00
Maria Odea B. Ching f62c635bde [MRM-1163] Add some decent logs in webdav for debugging purposes
Submitted by: Jevica Arianne Zurbano
o added debug logs in ArchivaDavResource and ArchivaDavResourceFactory with the filename, directory, repository, and/or current user included in logs


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@798827 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 09:55:18 +00:00
Maria Odea B. Ching 5e5fa749a2 [MRM-1212]/[MRM-1197] do not execute create-missing-checksum and metadata-updater consumers during webdav deployment
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@798403 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 05:04:44 +00:00
Maria Odea B. Ching 71b644e878 cleanup unused variables
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@796149 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 05:21: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 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 d1f4143e77 add note on potential issue to fix
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@757643 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 03:13:41 +00:00
Brett Porter 71eda3948c fix tabs
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@757642 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 03:13:00 +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
Maria Odea B. Ching 30ecf02f41 o synchronize repository scanning to prevent index writer/reader from being closed when repo consumers are executed from proxy requests and a
repository scanning is in progress
o updated test cases to accomodate changes


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@757116 13f79535-47bb-0310-9956-ffa450edef68
2009-03-22 02:24:21 +00:00
Brett Porter 6681581426 further cleanup references to xwork user that no longer needs to be instantiated
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@756564 13f79535-47bb-0310-9956-ffa450edef68
2009-03-20 16:14:45 +00:00
Brett Porter 9b150136fe clean up method calling
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755995 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 13:48:54 +00:00
Brett Porter 584031f68f clean up the webdav interface to make the code more readable
in addition, webdav now honours the delete operation separately to upload
improved the HTTP error responses for misconfiguration (500) vs not found on groups


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755845 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 06:10:38 +00:00
Maria Odea B. Ching aab7502db7 [MRM-901]
o merge all versions of artifacts with same groupId in all repos under a group (browse)
o added test case 


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755532 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 09:56:41 +00:00
Brett Porter f8373b46e0 clean up warnings in webdav module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755319 13f79535-47bb-0310-9956-ffa450edef68
2009-03-17 16:58:49 +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 f63959e3aa [MRM-1101] restore proper tracking of principal in DAV for audit logging
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@752519 13f79535-47bb-0310-9956-ffa450edef68
2009-03-11 16:53:17 +00:00
Emmanuel Venisse aae839ff4b [ARCHIVA-938] Remove harcoded guest user
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@752384 13f79535-47bb-0310-9956-ffa450edef68
2009-03-11 06:12:17 +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 8152eb5642 MRM-1015 - Move consumers and related API's to Spring
RepositoryContentConsumers needed to be ported over as a spring component so that we can use the ApplicationContextAware interface.



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@719157 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 04:13:50 +00:00
Brett Porter f578399872 remove @author tags as agreed on list: http://markmail.org/message/mtycwzotzosbywzr
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@718864 13f79535-47bb-0310-9956-ffa450edef68
2008-11-19 06:33:35 +00:00
James William Dumay 9265e9e8dd MRM-1004 - RepositoryServlet tests fail intermittently on Windows.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@718167 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 03:42:13 +00:00
James William Dumay 7feb3eb525 MRM-1004 - RepositoryServlet tests fail intermittently on Windows. Submitted by Martin Cooper.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@718157 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 01:39:20 +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 5e04d6c1a2 Changes for redback trunk (r656)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@710000 13f79535-47bb-0310-9956-ffa450edef68
2008-11-03 02:16:13 +00:00
James William Dumay e605aa289e MRM-977 Upgrade from webwork 2 to Struts 2
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@706113 13f79535-47bb-0310-9956-ffa450edef68
2008-10-20 03:10:09 +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
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 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
Maria Odea B. Ching 6ec22c4cb2 merged from -r693694 (MRM-911: check first if guest is enabled for the repository before failing the authentication) 1.1.x branch
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@693701 13f79535-47bb-0310-9956-ffa450edef68
2008-09-10 04:15:50 +00:00
Maria Odea B. Ching 092a8ce4f1 [MRM-915] and [MRM-926]
-get the default guest users from redback config files instead of the hardcoded constant value


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@691581 13f79535-47bb-0310-9956-ffa450edef68
2008-09-03 11:45:11 +00:00
James William Dumay 384b971464 MRM-907 - Remove VersionedReference/ProjectReference/ArtifactReference from RepositoryProxyConnectors
* Merging from https://svn.apache.org/repos/asf/archiva/branches/metadata-rejig-1.2



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@685423 13f79535-47bb-0310-9956-ffa450edef68
2008-08-13 03:09:52 +00:00
Maria Odea B. Ching ab7e59db21 [MRM-893]
submitted by Dan Tran

-return a 404 when the request is a resource file appended with a '/' 


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@685076 13f79535-47bb-0310-9956-ffa450edef68
2008-08-12 07:50:27 +00:00
Brett Porter 6a85861b8a [MRM-891] remove leading ./ on links in index listing
Submitted by: Dan Tran


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@680256 13f79535-47bb-0310-9956-ffa450edef68
2008-07-28 05:41:43 +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
Brett Porter 28e545b65a [MRM-876] let Archiva proxy arbitrary paths, particularly allowing it for pre-emptive proxying of support files when requested before the artifact
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@677828 13f79535-47bb-0310-9956-ffa450edef68
2008-07-18 05:47:04 +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
Maria Odea B. Ching e0566ec1c1 [MRM-872]
-write the merged metadata into maven-metadata-${repoGroupId}.xml instead of merged-maven-metadata.xml


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@676526 13f79535-47bb-0310-9956-ffa450edef68
2008-07-14 09:23:33 +00:00
Maria Odea B. Ching 7f83fefd8d [MRM-872]
-generate checksums for the merged metadata
-additional fixes for handling the requests for the merged metadata and it's checksums


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@676516 13f79535-47bb-0310-9956-ffa450edef68
2008-07-14 09:04:34 +00:00
Maria Odea B. Ching a5d144eec4 [MRM-872]
-merge metadatas of the repositories under a virtual repo


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@676322 13f79535-47bb-0310-9956-ffa450edef68
2008-07-13 14:05:28 +00:00
Maria Odea B. Ching 6f322f77ce [MRM-872]
-added test case for repo group merged metadata request


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@675602 13f79535-47bb-0310-9956-ffa450edef68
2008-07-10 14:50:18 +00:00
Nicolas De Loof ce121d314f MRM-872 first step : don't return first available resource, but list all available, to support "merge" when more than one is present.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@675495 13f79535-47bb-0310-9956-ffa450edef68
2008-07-10 10:14:21 +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
James William Dumay c74f7ea2b9 MRM-867 - 500 on HTTP HEAD
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674698 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 01:28:19 +00:00
Emmanuel Venisse 1d5a1c02e2 Fix typo
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674530 13f79535-47bb-0310-9956-ffa450edef68
2008-07-07 15:58:05 +00:00
James William Dumay e66053f72a MRM-858 - last-modified header is missing
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@673578 13f79535-47bb-0310-9956-ffa450edef68
2008-07-03 04:07:35 +00:00
Brett Porter a5636c4509 [MRM-831] When deploying artifacts to the repo, they should be added to the index instantly. Improve audit logging as well
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@673360 13f79535-47bb-0310-9956-ffa450edef68
2008-07-02 11:23:05 +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
Maria Odea B. Ching 3fbd2cd8df [MRM-845]
submitted by Maria Catherine Tan

-fix 'page isn't redirecting properly' when repo group link is clicked


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@669762 13f79535-47bb-0310-9956-ffa450edef68
2008-06-20 01:47:44 +00:00
Brett Porter 1e08f8f6b6 fix headers
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@668024 13f79535-47bb-0310-9956-ffa450edef68
2008-06-16 00:03:23 +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
James William Dumay 451c614468 Removed redundant argument from writeHyperlink
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@666953 13f79535-47bb-0310-9956-ffa450edef68
2008-06-12 05:02:24 +00:00
James William Dumay 0550a9763a MRM-781 - Looks like I broke the collection redirect again. This time we have a regression test :)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@666951 13f79535-47bb-0310-9956-ffa450edef68
2008-06-12 05:00:17 +00:00
Emmanuel Venisse 323df4e8bb Fix html
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@666344 13f79535-47bb-0310-9956-ffa450edef68
2008-06-10 22:10:32 +00:00
James William Dumay 96f3712ef0 MRM-781 - Removal of Archiva-Webdav implementation in favor of Jackrabbit-webdav
* DELETE should 404 if resource does not exist
* 93% litmus coverage



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662989 13f79535-47bb-0310-9956-ffa450edef68
2008-06-04 05:52:40 +00:00
James William Dumay a0091f4898 MRM-781 - Removal of Archiva-Webdav implementation in favor of Jackrabbit-webdav
* Reenabled RepositoryServletBrowseTest
* Added Extra DavResourceLocator tests
* Increased Litmus test score to 87.7%



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662968 13f79535-47bb-0310-9956-ffa450edef68
2008-06-04 03:50:03 +00:00
James William Dumay 93334278f2 MRM-781 - Removal of Archiva-Webdav implementation in favor of Jackrabbit-webdav
* Changed so that non-existant parent directories are only created on PUT and not on MKCOL. This allows better litmus compliance.
* Added MkColMethodWebRequest which implements the MkCol method for HttpUnit
* Unit tests



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662933 13f79535-47bb-0310-9956-ffa450edef68
2008-06-04 00:29:27 +00:00
James William Dumay 35f82ea9c7 Commenting out failing test - Ill look at this in the morning.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662817 13f79535-47bb-0310-9956-ffa450edef68
2008-06-03 14:51:20 +00:00
James William Dumay b3d3556562 MRM-781 - Removal of Archiva-Webdav implementation in favor of Jackrabbit-webdav
* Webdav litmus test is now able to run correctly.



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662742 13f79535-47bb-0310-9956-ffa450edef68
2008-06-03 11:22:23 +00:00
James William Dumay 5a3192b85d MRM-781 - Removal of Archiva-Webdav implementation in favor of Jackrabbit-webdav
* Implementing litmus compatible removeMember() (DELETE)
* Unit tests



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662691 13f79535-47bb-0310-9956-ffa450edef68
2008-06-03 08:23:06 +00:00
James William Dumay 5695aac229 Enabling the DavResourceTest
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662686 13f79535-47bb-0310-9956-ffa450edef68
2008-06-03 07:58:54 +00:00
James William Dumay 0a3ca3fdb2 Actually fixing the failing test. Turns out I mixed up the file and logical paths in the DavResourceTest
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662682 13f79535-47bb-0310-9956-ffa450edef68
2008-06-03 07:57:27 +00:00
Brett Porter 82bc905da8 commenting out test again, it's still broken
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662655 13f79535-47bb-0310-9956-ffa450edef68
2008-06-03 05:31:44 +00:00
James William Dumay f643efedcb Fixing DavResourceTest from writing tests to /
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662382 13f79535-47bb-0310-9956-ffa450edef68
2008-06-02 10:06:44 +00:00
Brett Porter 8b1dbf37ee clean up dependencies
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662303 13f79535-47bb-0310-9956-ffa450edef68
2008-06-02 01:28:23 +00:00
Brett Porter df373a34db disable failing test
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662136 13f79535-47bb-0310-9956-ffa450edef68
2008-06-01 03:16:20 +00:00
Brett Porter ca40d80d1d remove old resources patterns
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662134 13f79535-47bb-0310-9956-ffa450edef68
2008-06-01 03:10:36 +00:00
Brett Porter 9e6f108d86 stop file being created in / - tests still fail though
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662126 13f79535-47bb-0310-9956-ffa450edef68
2008-06-01 02:19:07 +00:00
Brett Porter 2c3b232488 fix bad import
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@662047 13f79535-47bb-0310-9956-ffa450edef68
2008-05-31 17:03:16 +00:00
James William Dumay 2a9044f11c MRM-781 - Removal of Archiva-Webdav implementation in favor of Jackrabbit-webdav
* Adding tests for DavSession attachment and release
* Changed the ArchivaDavSessionProvider so that it does not rely on the WebApplicationContext

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@661630 13f79535-47bb-0310-9956-ffa450edef68
2008-05-30 10:15:05 +00:00
James William Dumay 86628294c8 Fixed failing test
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@661564 13f79535-47bb-0310-9956-ffa450edef68
2008-05-30 04:03:59 +00:00
James William Dumay 721f552dfa MRM-781 - Removal of Archiva-Webdav implementation in favor of Jackrabbit-webdav
* Adding LockManager to DavResourceFactory
* Adding locking support to DavResource
* General cleanup inside of the dav resource
* Adding DavSession attachement inside of DavSessionProvider
* Tests

NOTE: We should have a complete Class 2 locking implementation (Exclusive only) so OS X dav client should work



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@661563 13f79535-47bb-0310-9956-ffa450edef68
2008-05-30 04:01:37 +00:00
Emmanuel Venisse 7a2ebd0be3 Add missing test file
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@661251 13f79535-47bb-0310-9956-ffa450edef68
2008-05-29 08:19:21 +00:00
James William Dumay 6c645d78b1 MRM-781 - Removal of Archiva-Webdav implementation in favor of Jackrabbit-webdav
* Adding a DavSession implementation for Class 2 locking support



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@661189 13f79535-47bb-0310-9956-ffa450edef68
2008-05-29 02:51:24 +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
Maria Odea B. Ching 5b5ab1010c updated return message when requested resource is not found
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@660784 13f79535-47bb-0310-9956-ffa450edef68
2008-05-28 02:09:57 +00:00
Maria Odea B. Ching 8b7e75cc71 [MRM-694]
-fix index writer sorting for virtual repos


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@659397 13f79535-47bb-0310-9956-ffa450edef68
2008-05-23 03:49:59 +00:00
Maria Odea B. Ching e681872838 [MRM-694]
-return 405 instead of 400 for write request to repo groups


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@659071 13f79535-47bb-0310-9956-ffa450edef68
2008-05-22 10:18:03 +00:00
Maria Odea B. Ching ac7cb9e9ce [MRM-694]
-fix virtual repo authentication problem


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@659069 13f79535-47bb-0310-9956-ffa450edef68
2008-05-22 10:02:29 +00:00
Maria Odea B. Ching 67b49a5fdd [MRM-694]
-handle problem with the missing '/' in the repository group url


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@658528 13f79535-47bb-0310-9956-ffa450edef68
2008-05-21 01:54:13 +00:00
Maria Odea B. Ching 0f07e0019f [MRM-694]
-put authorization check for virtual repos


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@658525 13f79535-47bb-0310-9956-ffa450edef68
2008-05-21 01:39:40 +00:00