You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2008/03/13 19:28:50 UTC
svn commit: r636822 [1/9] - in /maven/archiva/branches/springy: ./
archiva-base/archiva-common/
archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/
archiva-base/archiva-consumers/archiva-...
Author: brett
Date: Thu Mar 13 11:28:26 2008
New Revision: 636822
URL: http://svn.apache.org/viewvc?rev=636822&view=rev
Log:
improvements to the Spring support
Bring in plexus-webdav code, from Plexus SVN r7233. The authors of this code are all committers at Maven: brett, evenisse, handyande, jesse, joakime, trygvis.
This also includes the it.could WebDAV library, which retains it's original license (Apache License 2.0).
Added:
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/webapp/
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/ (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/README-it.could-webdav.txt (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/pom.xml (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/StreamTools.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/StringTools.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/encoding/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/encoding/Encodable.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/encoding/EncodingAware.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/encoding/EncodingTools.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/encoding/package.html (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/http/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/http/HttpClient.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/http/WebDavClient.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/http/package.html (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/location/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/location/Location.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/location/Parameters.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/location/Path.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/location/package.html (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/location/url.gif (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/location/url.pdf (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/util/package.html (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/DAVException.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/DAVInputStream.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/DAVListener.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/DAVLogger.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/DAVMethod.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/DAVMultiStatus.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/DAVNotModified.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/DAVOutputStream.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/DAVProcessor.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/DAVRepository.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/DAVResource.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/DAVServlet.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/DAVTransaction.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/DAVUtilities.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/XMLRepository.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/methods/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/methods/COPY.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/methods/DELETE.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/methods/GET.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/methods/HEAD.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/methods/MKCOL.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/methods/MOVE.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/methods/OPTIONS.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/methods/PROPFIND.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/methods/PROPPATCH.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/methods/PUT.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/methods/package.html (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/package.html (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/replication/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/replication/DAVReplica.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/replication/DAVReplicator.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/it/could/webdav/replication/package.html (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/AbstractDavServerComponent.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/DavServerComponent.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/DavServerException.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/DavServerListener.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/DavServerManager.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/DefaultDavServerManager.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/servlet/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/servlet/AbstractWebDavServlet.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/servlet/DavServerRequest.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/servlet/basic/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/servlet/basic/BasicDavServerRequest.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/servlet/basic/BasicWebDavServlet.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/servlet/multiplexed/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/servlet/multiplexed/MultiplexedDavServerRequest.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/servlet/multiplexed/MultiplexedWebDavServlet.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/simple/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/simple/HackedMoveMethod.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/simple/ReplacementGetMethod.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/simple/SimpleDavServerComponent.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/WebdavMethodUtil.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/WrappedRepositoryRequest.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/betaversion/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/betaversion/webdav/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/betaversion/webdav/DAVServlet.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/java/org/betaversion/webdav/package.html (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/resources/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/resources/org/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/resources/org/apache/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/resources/org/apache/maven/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/resources/org/apache/maven/archiva/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/resources/org/apache/maven/archiva/webdav/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/resources/org/apache/maven/archiva/webdav/util/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/resources/org/apache/maven/archiva/webdav/util/mime-types.txt (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/resources/plexus-webdav/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/resources/plexus-webdav/mime.types (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/main/resources/plexus-webdav/webdav.props
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/TestableHttpServletRequest.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/servlet/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/servlet/multiplexed/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/servlet/multiplexed/MultiplexedDavServerRequestTest.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/simple/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/simple/SimpleDavServerComponentBasicTest.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/simple/SimpleDavServerComponentIndexHtmlTest.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/simple/SimpleDavServerComponentMultiTest.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/simple/SimpleWebdavServer.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/test/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/test/AbstractBasicWebdavProviderTestCase.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/test/AbstractMultiWebdavProviderTestCase.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/test/AbstractWebdavIndexHtmlTestCase.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/test/AbstractWebdavProviderTestCase.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/test/AbstractWebdavServer.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/test/TestMultiWebDavServlet.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/util/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/util/MimeTypesTest.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/util/WrappedRepositoryRequestTest.java (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/resources/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/resources/org/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/resources/org/apache/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/simple/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/simple/SimpleDavServerComponentBasicTest.xml (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/simple/SimpleDavServerComponentIndexHtmlTest.xml (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/simple/SimpleDavServerComponentMultiTest.xml (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/simple/SimpleWebdavServer.xml (with props)
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/webapp/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/webapp/WEB-INF/
maven/archiva/branches/springy/archiva-web/archiva-webdav/src/test/webapp/WEB-INF/web.xml (with props)
Modified:
maven/archiva/branches/springy/archiva-base/archiva-common/pom.xml
maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java
maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java
maven/archiva/branches/springy/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
maven/archiva/branches/springy/archiva-base/archiva-policies/pom.xml
maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml
maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml
maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml
maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml
maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml
maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml
maven/archiva/branches/springy/archiva-web/archiva-webapp/pom.xml
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoader.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoaderTest.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataRemoteOnlyTest.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedRepositoryServlet.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/META-INF/plexus/components.xml
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/log4j.xml
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.xml
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.xml
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletSecurityTest.xml
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
maven/archiva/branches/springy/archiva-web/pom.xml
maven/archiva/branches/springy/pom.xml
Modified: maven/archiva/branches/springy/archiva-base/archiva-common/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-common/pom.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-base/archiva-common/pom.xml (original)
+++ maven/archiva/branches/springy/archiva-base/archiva-common/pom.xml Thu Mar 13 11:28:26 2008
@@ -50,12 +50,6 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-slf4j-logging</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </dependency>
- removed for migration to spring -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-spring</artifactId>
Modified: maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java (original)
+++ maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java Thu Mar 13 11:28:26 2008
@@ -19,15 +19,15 @@
* under the License.
*/
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.repository.RepositoryContentFactory;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.ArchivaArtifactModel;
import org.apache.maven.archiva.model.ArchivaProjectModel;
+import org.apache.maven.archiva.repository.RepositoryContentFactory;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+import org.codehaus.plexus.util.FileUtils;
import java.io.File;
@@ -35,7 +35,7 @@
* @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
*/
public abstract class AbstractDatabaseCleanupTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
ArchivaConfiguration archivaConfig;
Modified: maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java (original)
+++ maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java Thu Mar 13 11:28:26 2008
@@ -22,7 +22,7 @@
import org.apache.maven.archiva.consumers.DatabaseCleanupConsumer;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.ArchivaArtifactModel;
-import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
/**
* LuceneCleanupRemoveIndexedConsumerTest
@@ -31,7 +31,7 @@
* @version
*/
public class LuceneCleanupRemoveIndexedConsumerTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private DatabaseCleanupConsumer luceneCleanupRemoveIndexConsumer;
Modified: maven/archiva/branches/springy/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java (original)
+++ maven/archiva/branches/springy/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java Thu Mar 13 11:28:26 2008
@@ -26,8 +26,8 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.i18n.I18N;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import java.io.File;
import java.io.IOException;
@@ -44,7 +44,7 @@
* @todo group metadata
*/
public class RepositoryConverterTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private ArtifactRepository sourceRepository;
Modified: maven/archiva/branches/springy/archiva-base/archiva-policies/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-policies/pom.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-base/archiva-policies/pom.xml (original)
+++ maven/archiva/branches/springy/archiva-base/archiva-policies/pom.xml Thu Mar 13 11:28:26 2008
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-spring</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml (original)
+++ maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml Thu Mar 13 11:28:26 2008
@@ -112,4 +112,4 @@
<lifecycle-handler>basic</lifecycle-handler>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml (original)
+++ maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml Thu Mar 13 11:28:26 2008
@@ -110,4 +110,4 @@
<lifecycle-handler>basic</lifecycle-handler>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml (original)
+++ maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml Thu Mar 13 11:28:26 2008
@@ -110,4 +110,4 @@
<lifecycle-handler>basic</lifecycle-handler>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml (original)
+++ maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml Thu Mar 13 11:28:26 2008
@@ -110,4 +110,4 @@
<lifecycle-handler>basic</lifecycle-handler>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml (original)
+++ maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml Thu Mar 13 11:28:26 2008
@@ -133,4 +133,4 @@
<lifecycle-handler>basic</lifecycle-handler>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml (original)
+++ maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml Thu Mar 13 11:28:26 2008
@@ -110,4 +110,4 @@
<lifecycle-handler>basic</lifecycle-handler>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml (original)
+++ maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml Thu Mar 13 11:28:26 2008
@@ -110,4 +110,4 @@
<lifecycle-handler>basic</lifecycle-handler>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/pom.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/pom.xml (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/pom.xml Thu Mar 13 11:28:26 2008
@@ -180,8 +180,8 @@
</dependency>
<!-- Other dependencies -->
<dependency>
- <groupId>org.codehaus.plexus.webdav</groupId>
- <artifactId>plexus-webdav-simple</artifactId>
+ <groupId>org.apache.maven.archiva</groupId>
+ <artifactId>archiva-webdav</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -223,6 +223,14 @@
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-quartz</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-taskqueue</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus.redback</groupId>
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoader.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoader.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoader.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoader.java Thu Mar 13 11:28:26 2008
@@ -19,9 +19,9 @@
* under the License.
*/
+import org.apache.maven.archiva.webdav.util.MimeTypes;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
-import org.codehaus.plexus.webdav.util.MimeTypes;
import java.io.IOException;
import java.net.URL;
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java Thu Mar 13 11:28:26 2008
@@ -19,18 +19,6 @@
* under the License.
*/
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.maven.archiva.common.utils.PathUtil;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.model.ProjectReference;
@@ -49,24 +37,35 @@
import org.apache.maven.archiva.repository.metadata.MetadataTools;
import org.apache.maven.archiva.repository.metadata.RepositoryMetadataException;
import org.apache.maven.archiva.security.ArchivaUser;
+import org.apache.maven.archiva.webdav.AbstractDavServerComponent;
+import org.apache.maven.archiva.webdav.DavServerComponent;
+import org.apache.maven.archiva.webdav.DavServerException;
+import org.apache.maven.archiva.webdav.DavServerListener;
+import org.apache.maven.archiva.webdav.servlet.DavServerRequest;
+import org.apache.maven.archiva.webdav.util.WebdavMethodUtil;
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Model;
import org.apache.maven.model.Relocation;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.codehaus.plexus.webdav.AbstractDavServerComponent;
-import org.codehaus.plexus.webdav.DavServerComponent;
-import org.codehaus.plexus.webdav.DavServerException;
-import org.codehaus.plexus.webdav.DavServerListener;
-import org.codehaus.plexus.webdav.servlet.DavServerRequest;
-import org.codehaus.plexus.webdav.util.WebdavMethodUtil;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
/**
* ProxiedDavServer
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
- * @plexus.component role="org.codehaus.plexus.webdav.DavServerComponent"
+ * @plexus.component role="org.apache.maven.archiva.webdav.DavServerComponent"
* role-hint="proxied" instantiation-strategy="per-lookup"
*/
public class ProxiedDavServer
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java Thu Mar 13 11:28:26 2008
@@ -24,6 +24,11 @@
import org.apache.maven.archiva.configuration.ConfigurationListener;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
+import org.apache.maven.archiva.webdav.DavServerComponent;
+import org.apache.maven.archiva.webdav.DavServerException;
+import org.apache.maven.archiva.webdav.servlet.DavServerRequest;
+import org.apache.maven.archiva.webdav.servlet.multiplexed.MultiplexedWebDavServlet;
+import org.apache.maven.archiva.webdav.util.WebdavMethodUtil;
import org.codehaus.plexus.redback.authentication.AuthenticationException;
import org.codehaus.plexus.redback.authentication.AuthenticationResult;
import org.codehaus.plexus.redback.authorization.AuthorizationException;
@@ -33,21 +38,17 @@
import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator;
-import org.codehaus.plexus.webdav.DavServerComponent;
-import org.codehaus.plexus.webdav.DavServerException;
-import org.codehaus.plexus.webdav.DavServerManager;
-import org.codehaus.plexus.webdav.servlet.DavServerRequest;
-import org.codehaus.plexus.webdav.servlet.multiplexed.MultiplexedWebDavServlet;
-import org.codehaus.plexus.webdav.util.WebdavMethodUtil;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
+import org.codehaus.plexus.spring.PlexusToSpringUtils;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
/**
* RepositoryServlet
@@ -69,25 +70,24 @@
private ArchivaMimeTypeLoader mimeTypeLoader;
- public synchronized void initComponents()
- throws ServletException
+ public synchronized void initServers( ServletConfig servletConfig )
+ throws DavServerException
{
- super.initComponents();
-
- mimeTypeLoader = (ArchivaMimeTypeLoader) lookup( ArchivaMimeTypeLoader.class.getName() );
-
- securitySystem = (SecuritySystem) lookup( SecuritySystem.ROLE );
- httpAuth = (HttpAuthenticator) lookup( HttpAuthenticator.ROLE, "basic" );
+ WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext( servletConfig.getServletContext() );
- configuration = (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName() );
+ mimeTypeLoader = (ArchivaMimeTypeLoader) wac.getBean(
+ PlexusToSpringUtils.buildSpringId( ArchivaMimeTypeLoader.class.getName() ) );
+
+ securitySystem = (SecuritySystem) wac.getBean( PlexusToSpringUtils.buildSpringId( SecuritySystem.ROLE ) );
+ httpAuth =
+ (HttpAuthenticator) wac.getBean( PlexusToSpringUtils.buildSpringId( HttpAuthenticator.ROLE, "basic" ) );
+
+ configuration = (ArchivaConfiguration) wac.getBean(
+ PlexusToSpringUtils.buildSpringId( ArchivaConfiguration.class.getName() ) );
configuration.addListener( this );
repositoryMap = configuration.getConfiguration().getManagedRepositoriesAsMap();
- }
- public synchronized void initServers( ServletConfig servletConfig )
- throws DavServerException
- {
for ( ManagedRepositoryConfiguration repo : repositoryMap.values() )
{
File repoDir = new File( repo.getLocation() );
@@ -109,45 +109,6 @@
}
@Override
- public void destroy()
- {
- try
- {
- release( securitySystem );
- }
- catch ( ServletException e )
- {
- log( "Unable to release SecuritySystem : " + e.getMessage(), e );
- }
- try
- {
- release( httpAuth );
- }
- catch ( ServletException e )
- {
- log( "Unable to release HttpAuth : " + e.getMessage(), e );
- }
- try
- {
- release( configuration );
- }
- catch ( ServletException e )
- {
- log( "Unable to release ArchivaConfiguration : " + e.getMessage(), e );
- }
- try
- {
- release( mimeTypeLoader );
- }
- catch ( ServletException e )
- {
- log( "Unable to release ArchivaMimeTypeLoader : " + e.getMessage(), e );
- }
-
- super.destroy();
- }
-
- @Override
protected void service( HttpServletRequest httpRequest, HttpServletResponse httpResponse )
throws ServletException, IOException
{
@@ -271,14 +232,12 @@
repositoryMap.clear();
repositoryMap.putAll( configuration.getConfiguration().getManagedRepositoriesAsMap() );
}
-
- DavServerManager davManager = getDavManager();
-
+
synchronized ( davManager )
{
// Clear out the old servers.
davManager.removeAllServers();
-
+
// Create new servers.
try
{
@@ -289,5 +248,10 @@
log( "Unable to init servers: " + e.getMessage(), e );
}
}
+ }
+
+ ArchivaConfiguration getConfiguration()
+ {
+ return configuration;
}
}
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml Thu Mar 13 11:28:26 2008
@@ -82,13 +82,16 @@
</component>
<component>
- <role>org.codehaus.plexus.webdav.DavServerManager</role>
+ <role>org.apache.maven.archiva.webdav.DavServerManager</role>
<role-hint>default</role-hint>
- <implementation>org.codehaus.plexus.webdav.DefaultDavServerManager</implementation>
+ <implementation>org.apache.maven.archiva.webdav.DefaultDavServerManager</implementation>
<description>DefaultDavServerManager</description>
- <configuration>
- <provider-hint>proxied</provider-hint>
- </configuration>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.archiva.webdav.DavServerComponent</role>
+ <role-hint>proxied</role-hint>
+ </requirement>
+ </requirements>
</component>
<component>
@@ -200,8 +203,8 @@
</component>
<component>
- <role>org.codehaus.plexus.webdav.util.MimeTypes</role>
- <implementation>org.codehaus.plexus.webdav.util.MimeTypes</implementation>
+ <role>org.apache.maven.archiva.webdav.util.MimeTypes</role>
+ <implementation>org.apache.maven.archiva.webdav.util.MimeTypes</implementation>
<description>MimeTypes</description>
<configuration>
<resource>archiva-mime-types.txt</resource>
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml Thu Mar 13 11:28:26 2008
@@ -68,6 +68,7 @@
<param-name>contextConfigLocation</param-name>
<param-value>
classpath*:/META-INF/plexus/components.xml
+ classpath*:/META-INF/spring-context.xml
/WEB-INF/classes/META-INF/plexus/application.xml
/WEB-INF/classes/META-INF/plexus/components.xml
/WEB-INF/applicationContext.xml
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java Thu Mar 13 11:28:26 2008
@@ -20,9 +20,8 @@
*/
import com.opensymphony.xwork.ActionSupport;
-
import org.apache.commons.lang.StringUtils;
-import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import java.lang.reflect.Method;
import java.util.Collection;
@@ -35,7 +34,7 @@
* @version $Id$
*/
public abstract class AbstractWebworkTestCase
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
/**
* This is a conveinence method for mimicking how the webwork interceptors
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java Thu Mar 13 11:28:26 2008
@@ -20,16 +20,15 @@
*/
import com.opensymphony.xwork.Action;
-
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
import java.io.File;
@@ -42,7 +41,7 @@
* @version $Id$
*/
public class AddManagedRepositoryActionTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private AddManagedRepositoryAction action;
@@ -59,7 +58,7 @@
private File location;
@Override
- protected String getCustomConfigurationName()
+ protected String getPlexusConfigLocation()
{
return AbstractManagedRepositoriesAction.class.getName().replace( '.', '/' ) + "Test.xml";
}
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java Thu Mar 13 11:28:26 2008
@@ -20,13 +20,12 @@
*/
import com.opensymphony.xwork.Action;
-
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
import java.util.Collections;
@@ -38,7 +37,7 @@
* @version $Id$
*/
public class AddRemoteRepositoryActionTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private AddRemoteRepositoryAction action;
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java Thu Mar 13 11:28:26 2008
@@ -20,24 +20,20 @@
*/
import com.opensymphony.xwork.Action;
-
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-
-import org.apache.maven.archiva.model.ArchivaProjectModel;
-
import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
-
+import org.apache.maven.archiva.model.ArchivaProjectModel;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
import org.codehaus.plexus.registry.RegistryException;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
import java.io.File;
@@ -50,7 +46,7 @@
* @version $Id$
*/
public class DeleteManagedRepositoryActionTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private DeleteManagedRepositoryAction action;
@@ -67,7 +63,7 @@
private File location;
@Override
- protected String getCustomConfigurationName()
+ protected String getPlexusConfigLocation()
{
return AbstractManagedRepositoriesAction.class.getName().replace( '.', '/' ) + "Test.xml";
}
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java Thu Mar 13 11:28:26 2008
@@ -20,15 +20,14 @@
*/
import com.opensymphony.xwork.Action;
-
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.registry.RegistryException;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
import java.util.Collections;
@@ -40,7 +39,7 @@
* @version $Id$
*/
public class DeleteRemoteRepositoryActionTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private static final String REPO_ID = "remote-repo-ident";
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java Thu Mar 13 11:28:26 2008
@@ -20,15 +20,14 @@
*/
import com.opensymphony.xwork.Action;
-
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
import java.io.File;
@@ -41,7 +40,7 @@
* @version $Id$
*/
public class EditManagedRepositoryActionTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private EditManagedRepositoryAction action;
@@ -58,7 +57,7 @@
private File location;
@Override
- protected String getCustomConfigurationName()
+ protected String getPlexusConfigLocation()
{
return AbstractManagedRepositoriesAction.class.getName().replace( '.', '/' ) + "Test.xml";
}
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java Thu Mar 13 11:28:26 2008
@@ -20,13 +20,12 @@
*/
import com.opensymphony.xwork.Action;
-
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
import java.util.Collections;
@@ -38,7 +37,7 @@
* @version $Id$
*/
public class EditRemoteRepositoryActionTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private static final String REPO_ID = "remote-repo-ident";
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java Thu Mar 13 11:28:26 2008
@@ -22,15 +22,15 @@
import com.meterware.servletunit.ServletRunner;
import com.meterware.servletunit.ServletUnitClient;
import com.opensymphony.xwork.Action;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
/**
* Test the repositories action returns the correct data.
*/
public class RepositoriesActionTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private RepositoriesAction action;
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java Thu Mar 13 11:28:26 2008
@@ -22,20 +22,15 @@
import com.meterware.httpunit.WebResponse;
import com.meterware.servletunit.ServletRunner;
import com.meterware.servletunit.ServletUnitClient;
+import net.sf.ehcache.CacheManager;
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
-import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
-import org.springframework.core.io.ClassPathResource;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import java.io.File;
import java.io.IOException;
@@ -52,12 +47,18 @@
protected ServletUnitClient sc;
- protected ArchivaConfiguration archivaConfiguration;
-
protected File repoRootInternal;
private ServletRunner sr;
+ protected ArchivaConfiguration archivaConfiguration;
+
+ protected void saveConfiguration()
+ throws Exception
+ {
+ saveConfiguration( archivaConfiguration );
+ }
+
protected void assertFileContents( String expectedContents, File repoRoot, String path )
throws IOException
{
@@ -134,7 +135,7 @@
}
}
- protected void saveConfiguration()
+ protected void saveConfiguration( ArchivaConfiguration archivaConfiguration )
throws Exception
{
archivaConfiguration.save( archivaConfiguration.getConfiguration() );
@@ -145,30 +146,25 @@
{
super.setUp();
- try
- {
- String appserverBase = getTestFile( "target/appserver-base" ).getAbsolutePath();
- System.setProperty( "appserver.base", appserverBase );
+ String appserverBase = getTestFile( "target/appserver-base" ).getAbsolutePath();
+ System.setProperty( "appserver.base", appserverBase );
- File testConf = getTestFile( "src/test/resources/repository-archiva.xml" );
- File testConfDest = new File( appserverBase, "conf/archiva.xml" );
- FileUtils.copyFile( testConf, testConfDest );
-
- archivaConfiguration = (ArchivaConfiguration) lookup( ArchivaConfiguration.class );
- repoRootInternal = new File( appserverBase, "data/repositories/internal" );
- Configuration config = archivaConfiguration.getConfiguration();
-
- config.addManagedRepository( createManagedRepository( REPOID_INTERNAL, "Internal Test Repo", repoRootInternal ) );
- saveConfiguration();
-
- sr = new ServletRunner();
- sr.registerServlet( "/repository/*", UnauthenticatedRepositoryServlet.class.getName() );
- sc = sr.newClient();
- }
- finally
- {
- tearDown();
- }
+ File testConf = getTestFile( "src/test/resources/repository-archiva.xml" );
+ File testConfDest = new File( appserverBase, "conf/archiva.xml" );
+ FileUtils.copyFile( testConf, testConfDest );
+
+ archivaConfiguration = (ArchivaConfiguration) lookup( ArchivaConfiguration.class );
+ repoRootInternal = new File( appserverBase, "data/repositories/internal" );
+ Configuration config = archivaConfiguration.getConfiguration();
+
+ config.addManagedRepository( createManagedRepository( REPOID_INTERNAL, "Internal Test Repo", repoRootInternal ) );
+ saveConfiguration( archivaConfiguration );
+
+ CacheManager.getInstance().removeCache( "url-failures-cache" );
+
+ sr = new ServletRunner( getTestFile( "src/test/webapp/WEB-INF/web.xml" ) );
+ sr.registerServlet( "/repository/*", UnauthenticatedRepositoryServlet.class.getName() );
+ sc = sr.newClient();
}
@Override
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoaderTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoaderTest.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoaderTest.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoaderTest.java Thu Mar 13 11:28:26 2008
@@ -19,8 +19,8 @@
* under the License.
*/
+import org.apache.maven.archiva.webdav.util.MimeTypes;
import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.webdav.util.MimeTypes;
/**
* ArchivaMimeTypesTest
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataRemoteOnlyTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataRemoteOnlyTest.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataRemoteOnlyTest.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataRemoteOnlyTest.java Thu Mar 13 11:28:26 2008
@@ -58,7 +58,7 @@
// --- Verification
assertExpectedMetadata( expectedMetadata, actualMetadata );
}
-
+
public void testGetProxiedPluginSnapshotVersionMetadataRemoteOnly()
throws Exception
{
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java Thu Mar 13 11:28:26 2008
@@ -19,6 +19,7 @@
* under the License.
*/
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@@ -54,9 +55,10 @@
RepositoryServlet servlet = (RepositoryServlet) sc.newInvocation( REQUEST_PATH ).getServlet();
assertNotNull( servlet );
+ ArchivaConfiguration archivaConfiguration = servlet.getConfiguration();
Configuration c = archivaConfiguration.getConfiguration();
c.removeManagedRepository( c.findManagedRepositoryById( REPOID_INTERNAL ) );
- saveConfiguration();
+ saveConfiguration( archivaConfiguration );
ManagedRepositoryConfiguration repository = servlet.getRepository( REPOID_INTERNAL );
assertNull( repository );
@@ -68,6 +70,7 @@
RepositoryServlet servlet = (RepositoryServlet) sc.newInvocation( REQUEST_PATH ).getServlet();
assertNotNull( servlet );
+ ArchivaConfiguration archivaConfiguration = servlet.getConfiguration();
Configuration c = archivaConfiguration.getConfiguration();
ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration();
repo.setId( NEW_REPOSITORY_ID );
@@ -79,7 +82,7 @@
}
repo.setLocation( repoRoot.getAbsolutePath() );
c.addManagedRepository( repo );
- saveConfiguration();
+ saveConfiguration( archivaConfiguration );
ManagedRepositoryConfiguration repository = servlet.getRepository( NEW_REPOSITORY_ID );
assertNotNull( repository );
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedRepositoryServlet.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedRepositoryServlet.java?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedRepositoryServlet.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedRepositoryServlet.java Thu Mar 13 11:28:26 2008
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.codehaus.plexus.webdav.servlet.DavServerRequest;
+import org.apache.maven.archiva.webdav.servlet.DavServerRequest;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/META-INF/plexus/components.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/META-INF/plexus/components.xml (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/META-INF/plexus/components.xml Thu Mar 13 11:28:26 2008
@@ -22,8 +22,8 @@
<components>
<!-- Components that are common for all test cases -->
<component>
- <role>org.codehaus.plexus.webdav.util.MimeTypes</role>
- <implementation>org.codehaus.plexus.webdav.util.MimeTypes</implementation>
+ <role>org.apache.maven.archiva.webdav.util.MimeTypes</role>
+ <implementation>org.apache.maven.archiva.webdav.util.MimeTypes</implementation>
<description>MimeTypes</description>
<configuration>
<resource>archiva-mime-types.txt</resource>
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/log4j.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/log4j.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/log4j.xml (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/log4j.xml Thu Mar 13 11:28:26 2008
@@ -23,8 +23,12 @@
<level value="info"/>
</logger>
- <logger name="org.codehaus.plexus.PlexusContainer">
- <level value="info"/>
+ <logger name="org.springframework">
+ <level value="error"/>
+ </logger>
+
+ <logger name="org.codehaus.plexus.spring">
+ <level value="error"/>
</logger>
<logger name="JPOX">
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.xml (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.xml Thu Mar 13 11:28:26 2008
@@ -24,7 +24,7 @@
<implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler>
</component>
-
+
<component>
<role>org.codehaus.plexus.cache.Cache</role>
<role-hint>url-failures-cache</role-hint>
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.xml (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.xml Thu Mar 13 11:28:26 2008
@@ -24,7 +24,7 @@
<implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler>
</component>
-
+
<component>
<role>org.codehaus.plexus.cache.Cache</role>
<role-hint>url-failures-cache</role-hint>
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml Thu Mar 13 11:28:26 2008
@@ -24,7 +24,7 @@
<implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler>
</component>
-
+
<component>
<role>com.opensymphony.xwork.Action</role>
<role-hint>addManagedRepositoryAction</role-hint>
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml Thu Mar 13 11:28:26 2008
@@ -19,7 +19,7 @@
<plexus>
<components>
- <component>
+ <component>
<role>org.codehaus.plexus.logging.LoggerManager</role>
<implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler>
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletSecurityTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletSecurityTest.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletSecurityTest.xml (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletSecurityTest.xml Thu Mar 13 11:28:26 2008
@@ -64,9 +64,9 @@
</component>
<component>
- <role>org.codehaus.plexus.webdav.DavServerManager</role>
+ <role>org.apache.maven.archiva.webdav.DavServerManager</role>
<role-hint>default</role-hint>
- <implementation>org.codehaus.plexus.webdav.DefaultDavServerManager</implementation>
+ <implementation>org.apache.maven.archiva.webdav.DefaultDavServerManager</implementation>
<description>DefaultDavServerManager</description>
<configuration>
<provider-hint>proxied</provider-hint>
Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml?rev=636822&r1=636821&r2=636822&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml Thu Mar 13 11:28:26 2008
@@ -64,13 +64,16 @@
</component>
<component>
- <role>org.codehaus.plexus.webdav.DavServerManager</role>
+ <role>org.apache.maven.archiva.webdav.DavServerManager</role>
<role-hint>default</role-hint>
- <implementation>org.codehaus.plexus.webdav.DefaultDavServerManager</implementation>
+ <implementation>org.apache.maven.archiva.webdav.DefaultDavServerManager</implementation>
<description>DefaultDavServerManager</description>
- <configuration>
- <provider-hint>proxied</provider-hint>
- </configuration>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.archiva.webdav.DavServerComponent</role>
+ <role-hint>proxied</role-hint>
+ </requirement>
+ </requirements>
</component>
<component>
Added: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml?rev=636822&view=auto
==============================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml (added)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml Thu Mar 13 11:28:26 2008
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>Apache Archiva</display-name>
+
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
+
+ <context-param>
+ <param-name>contextClass</param-name>
+ <param-value>org.codehaus.plexus.spring.PlexusWebApplicationContext</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>
+ classpath*:/META-INF/plexus/components.xml
+ classpath*:/META-INF/spring-context.xml
+ target/test-classes/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
+ </param-value>
+ </context-param>
+
+</web-app>
Propchange: maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/springy/archiva-web/archiva-webdav/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 13 11:28:26 2008
@@ -0,0 +1 @@
+target