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/14 12:13:46 UTC
svn commit: r637056 [2/2] - in /maven/archiva/trunk: ./
archiva-base/archiva-common/ archiva-base/archiva-common/src/main/resources/
archiva-base/archiva-common/src/main/resources/org/
archiva-base/archiva-common/src/main/resources/org/apache/ archiva-...
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml Fri Mar 14 04:13:29 2008
@@ -60,9 +60,11 @@
<requirement>
<role>org.apache.maven.archiva.repository.RepositoryContentFactory</role>
<role-hint>mocked</role-hint>
+ <field-name>repositoryFactory</field-name>
</requirement>
<requirement>
<role>org.apache.maven.archiva.repository.metadata.MetadataTools</role>
+ <field-name>metadataTools</field-name>
</requirement>
<requirement>
<role>org.apache.maven.archiva.policies.PreDownloadPolicy</role>
@@ -73,17 +75,16 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
- <role-hint>default</role-hint>
- <field-name>urlFailureCache</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
+ <field-name>urlFailureCache</field-name>
+ </requirement>
</requirements>
</component>
-
+
<component>
<role>org.codehaus.plexus.cache.Cache</role>
<role-hint>url-failures-cache</role-hint>
@@ -103,12 +104,12 @@
<!-- 30 minutes = 1800 seconds -->
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
- </component>
-
+ </component>
+
<component>
<role>org.codehaus.plexus.logging.LoggerManager</role>
<implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml Fri Mar 14 04:13:29 2008
@@ -73,17 +73,16 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
- <role-hint>default</role-hint>
- <field-name>urlFailureCache</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
+ <field-name>urlFailureCache</field-name>
+ </requirement>
</requirements>
</component>
-
+
<component>
<role>org.codehaus.plexus.cache.Cache</role>
<role-hint>url-failures-cache</role-hint>
@@ -104,11 +103,11 @@
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
</component>
-
+
<component>
<role>org.codehaus.plexus.logging.LoggerManager</role>
<implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml Fri Mar 14 04:13:29 2008
@@ -73,17 +73,16 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
- <role-hint>default</role-hint>
- <field-name>urlFailureCache</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
+ <field-name>urlFailureCache</field-name>
+ </requirement>
</requirements>
</component>
-
+
<component>
<role>org.codehaus.plexus.cache.Cache</role>
<role-hint>url-failures-cache</role-hint>
@@ -104,11 +103,11 @@
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
</component>
-
+
<component>
<role>org.codehaus.plexus.logging.LoggerManager</role>
<implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml Fri Mar 14 04:13:29 2008
@@ -73,17 +73,16 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
- <role-hint>default</role-hint>
- <field-name>urlFailureCache</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
+ <field-name>urlFailureCache</field-name>
+ </requirement>
</requirements>
</component>
-
+
<component>
<role>org.codehaus.plexus.cache.Cache</role>
<role-hint>url-failures-cache</role-hint>
@@ -104,11 +103,11 @@
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
</component>
-
+
<component>
<role>org.codehaus.plexus.logging.LoggerManager</role>
<implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml Fri Mar 14 04:13:29 2008
@@ -42,8 +42,8 @@
</requirement>
</requirements>
</component>
-
-
+
+
<component>
<role>org.apache.maven.archiva.repository.metadata.MetadataTools</role>
<implementation>org.apache.maven.archiva.repository.metadata.MetadataTools</implementation>
@@ -64,7 +64,7 @@
</requirement>
</requirements>
</component>
-
+
<component>
<role>org.apache.maven.archiva.proxy.RepositoryProxyConnectors</role>
<role-hint>default</role-hint>
@@ -96,17 +96,16 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
- <role-hint>default</role-hint>
- <field-name>urlFailureCache</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
+ <field-name>urlFailureCache</field-name>
+ </requirement>
</requirements>
</component>
-
+
<component>
<role>org.codehaus.plexus.cache.Cache</role>
<role-hint>url-failures-cache</role-hint>
@@ -127,11 +126,11 @@
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
</component>
-
+
<component>
<role>org.codehaus.plexus.logging.LoggerManager</role>
<implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml Fri Mar 14 04:13:29 2008
@@ -73,17 +73,16 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
- <role-hint>default</role-hint>
- <field-name>urlFailureCache</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
+ <field-name>urlFailureCache</field-name>
+ </requirement>
</requirements>
</component>
-
+
<component>
<role>org.codehaus.plexus.cache.Cache</role>
<role-hint>url-failures-cache</role-hint>
@@ -104,11 +103,11 @@
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
</component>
-
+
<component>
<role>org.codehaus.plexus.logging.LoggerManager</role>
<implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml Fri Mar 14 04:13:29 2008
@@ -73,17 +73,16 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
- <role-hint>default</role-hint>
- <field-name>urlFailureCache</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
+ <field-name>urlFailureCache</field-name>
+ </requirement>
</requirements>
</component>
-
+
<component>
<role>org.codehaus.plexus.cache.Cache</role>
<role-hint>url-failures-cache</role-hint>
@@ -104,11 +103,11 @@
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
</component>
-
+
<component>
<role>org.codehaus.plexus.logging.LoggerManager</role>
<implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/pom.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/pom.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/pom.xml Fri Mar 14 04:13:29 2008
@@ -29,6 +29,11 @@
<name>Archiva Repository Interface Layer</name>
<dependencies>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-spring</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva-configuration</artifactId>
</dependency>
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java Fri Mar 14 04:13:29 2008
@@ -21,19 +21,30 @@
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
-import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import java.io.File;
/**
- * AbstractRepositoryLayerTestCase
+ * AbstractRepositoryLayerTestCase
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
*/
public abstract class AbstractRepositoryLayerTestCase
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
+ /**
+ * {@inheritDoc}
+ * @see org.codehaus.plexus.spring.PlexusInSpringTestCase#getSpringConfigLocation()
+ */
+ @Override
+ protected String getSpringConfigLocation()
+ throws Exception
+ {
+ return "org/apache/maven/archiva/repository/spring-context.xml";
+ }
+
protected ManagedRepositoryConfiguration createRepository( String id, String name, File location )
{
ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration();
@@ -51,7 +62,7 @@
repo.setUrl( url );
return repo;
}
-
+
protected ManagedRepositoryContent createManagedRepositoryContent( String id, String name, File location, String layout )
throws Exception
{
Modified: maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java (original)
+++ maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java Fri Mar 14 04:13:29 2008
@@ -26,9 +26,9 @@
import org.apache.maven.archiva.database.updater.TestDatabaseUnprocessedConsumer;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.model.VersionedReference;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
import org.codehaus.plexus.jdo.JdoFactory;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.jpox.SchemaTool;
import java.io.File;
@@ -49,7 +49,7 @@
* @version $Id$
*/
public abstract class AbstractArchivaDatabaseTestCase
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private static final String TIMESTAMP = "yyyy/MM/dd HH:mm:ss";
Modified: maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java (original)
+++ maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java Fri Mar 14 04:13:29 2008
@@ -61,7 +61,7 @@
public RepositoryBrowsing lookupBrowser()
throws Exception
{
- RepositoryBrowsing browser = (RepositoryBrowsing) lookup( RepositoryBrowsing.class.getName() );
+ RepositoryBrowsing browser = (RepositoryBrowsing) lookup( RepositoryBrowsing.class );
assertNotNull( "RepositoryBrowsing should not be null.", browser );
return browser;
}
Modified: maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.java (original)
+++ maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.java Fri Mar 14 04:13:29 2008
@@ -20,7 +20,7 @@
*/
import org.apache.commons.collections.CollectionUtils;
-import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import java.util.List;
@@ -31,7 +31,7 @@
* @version $Id$
*/
public class DatabaseConsumersTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private DatabaseConsumers lookupDbConsumers()
throws Exception
Modified: maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/AbstractArtifactReportsTestCase.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/AbstractArtifactReportsTestCase.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/AbstractArtifactReportsTestCase.java (original)
+++ maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/AbstractArtifactReportsTestCase.java Fri Mar 14 04:13:29 2008
@@ -20,9 +20,9 @@
*/
import org.apache.maven.archiva.database.ArchivaDAO;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
import org.codehaus.plexus.jdo.JdoFactory;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.jpox.SchemaTool;
import java.io.File;
@@ -41,7 +41,7 @@
* @version $Id$
*/
public abstract class AbstractArtifactReportsTestCase
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
protected ArchivaDAO dao;
Modified: maven/archiva/trunk/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.java (original)
+++ maven/archiva/trunk/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.java Fri Mar 14 04:13:29 2008
@@ -26,9 +26,9 @@
import org.apache.maven.archiva.database.constraints.ArtifactsProcessedConstraint;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
import org.codehaus.plexus.jdo.JdoFactory;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
import org.jpox.SchemaTool;
@@ -51,7 +51,7 @@
* @version $Id:$
*/
public class ArchivaDatabaseUpdateTaskExecutorTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private TaskExecutor taskExecutor;
Modified: maven/archiva/trunk/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java (original)
+++ maven/archiva/trunk/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java Fri Mar 14 04:13:29 2008
@@ -26,9 +26,9 @@
import org.apache.maven.archiva.database.ArtifactDAO;
import org.apache.maven.archiva.database.constraints.ArtifactsProcessedConstraint;
import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
import org.codehaus.plexus.jdo.JdoFactory;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
import org.jpox.SchemaTool;
@@ -49,7 +49,7 @@
* @version $Id$
*/
public class ArchivaRepositoryScanningTaskExecutorTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private TaskExecutor taskExecutor;
Modified: maven/archiva/trunk/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/SecurityStartupTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/SecurityStartupTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/SecurityStartupTest.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/SecurityStartupTest.java Fri Mar 14 04:13:29 2008
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
/**
* SecurityStartupTest
@@ -28,7 +28,7 @@
* @version $Id$
*/
public class SecurityStartupTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private SecurityStartup secStart;
Propchange: maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Mar 14 04:13:29 2008
@@ -1 +1,3 @@
target
+.classpath
+.project
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml Fri Mar 14 04:13:29 2008
@@ -181,14 +181,19 @@
</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>
<artifactId>plexus-xwork-integration</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>provided</scope>
@@ -219,6 +224,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/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoader.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoader.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoader.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoader.java Fri Mar 14 04:13:29 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/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java Fri Mar 14 04:13:29 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/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java Fri Mar 14 04:13:29 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/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java Fri Mar 14 04:13:29 2008
@@ -19,55 +19,53 @@
* under the License.
*/
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletException;
+
import org.apache.maven.archiva.common.ArchivaException;
import org.apache.maven.archiva.scheduled.ArchivaTaskScheduler;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.codehaus.plexus.spring.PlexusToSpringUtils;
+import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
/**
* ArchivaStartup - the startup of all archiva features in a deterministic order.
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
- *
- * @plexus.component
- * role="org.apache.maven.archiva.web.startup.ArchivaStartup"
- * role-hint="default"
*/
public class ArchivaStartup
- implements Initializable
+ implements ServletContextListener
{
- /**
- * @plexus.requirement role-hint="default"
- */
- private SecuritySynchronization securitySync;
-
- /**
- * @plexus.requirement role-hint="default"
- */
- private ResolverFactoryInit resolverFactory;
-
- /**
- * @plexus.requirement role-hint="default"
- */
- private ArchivaTaskScheduler taskScheduler;
+ public void contextDestroyed(ServletContextEvent arg0) {
+ }
- public void initialize()
- throws InitializationException
- {
- Banner.display( ArchivaVersion.determineVersion( this.getClass().getClassLoader() ) );
+ public void contextInitialized(ServletContextEvent arg0) {
+ WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(arg0.getServletContext());
+
+ SecuritySynchronization securitySync = (SecuritySynchronization) wac.getBean(PlexusToSpringUtils.buildSpringId(SecuritySynchronization.class));
+ ResolverFactoryInit resolverFactory = (ResolverFactoryInit) wac.getBean(PlexusToSpringUtils.buildSpringId(ResolverFactoryInit.class));
+ ArchivaTaskScheduler taskScheduler = (ArchivaTaskScheduler) wac.getBean(PlexusToSpringUtils.buildSpringId(ArchivaTaskScheduler.class));
+ TaskQueueExecutor databaseUpdateQueue = (TaskQueueExecutor) wac.getBean(PlexusToSpringUtils.buildSpringId(TaskQueueExecutor.class, "database-update"));
+ TaskQueueExecutor repositoryScanningQueue = (TaskQueueExecutor) wac.getBean(PlexusToSpringUtils.buildSpringId(TaskQueueExecutor.class, "repository-scanning"));
+ Banner banner = (Banner) wac.getBean(PlexusToSpringUtils.buildSpringId(Banner.class));
try
{
securitySync.startup();
resolverFactory.startup();
taskScheduler.startup();
+ banner.display();
}
catch ( ArchivaException e )
{
- throw new InitializationException( "Unable to properly startup archiva: " + e.getMessage(), e );
+ throw new RuntimeException( "Unable to properly startup archiva: " + e.getMessage(), e );
}
}
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java Fri Mar 14 04:13:29 2008
@@ -222,15 +222,9 @@
return injectVersion( decode( encodedBanner ), version );
}
- public static void display( String version )
+ public void display()
{
- String banner = getBanner( version );
+ String banner = getBanner( ArchivaVersion.determineVersion( this.getClass().getClassLoader() ) );
LoggerFactory.getLogger( Banner.class ).info( StringUtils.repeat( "_", 25 ) + "\n" + banner );
- }
-
- public void initialize()
- throws InitializationException
- {
- Banner.display( ArchivaVersion.determineVersion( this.getClass().getClassLoader() ) );
}
}
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml Fri Mar 14 04:13:29 2008
@@ -19,21 +19,6 @@
-->
<plexus>
- <load-on-start>
- <component>
- <role>org.apache.maven.archiva.web.startup.ArchivaStartup</role>
- <role-hint>default</role-hint>
- </component>
- <component>
- <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
- <role-hint>database-update</role-hint>
- </component>
- <component>
- <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
- <role-hint>repository-scanning</role-hint>
- </component>
- </load-on-start>
-
<components>
<component>
<role>org.codehaus.plexus.registry.Registry</role>
@@ -82,13 +67,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 +188,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/trunk/archiva-web/archiva-webapp/src/main/resources/webwork.properties
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/webwork.properties?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/webwork.properties (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/webwork.properties Fri Mar 14 04:13:29 2008
@@ -19,7 +19,7 @@
# define our own action mapper here
webwork.mapper.class = org.apache.maven.archiva.web.mapper.RepositoryActionMapper
-webwork.objectFactory = org.codehaus.plexus.xwork.PlexusObjectFactory
+webwork.objectFactory = org.codehaus.plexus.spring.WebWorkPlexusInSpringObjectFactory
webwork.url.includeParams = none
webwork.devMode = true
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml Fri Mar 14 04:13:29 2008
@@ -56,8 +56,28 @@
</filter-mapping>
<listener>
- <listener-class>org.codehaus.plexus.xwork.PlexusLifecycleListener</listener-class>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
+ <listener>
+ <!-- TODO: some Spring technique for this? -->
+ <listener-class>org.apache.maven.archiva.web.startup.ArchivaStartup</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
+ /WEB-INF/classes/META-INF/plexus/application.xml
+ /WEB-INF/classes/META-INF/plexus/components.xml
+ /WEB-INF/applicationContext.xml
+ </param-value>
+ </context-param>
<servlet>
<servlet-name>RepositoryServlet</servlet-name>
@@ -72,22 +92,22 @@
</servlet-mapping>
<resource-ref>
- <res-ref-name>jdbc/users</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
+ <res-ref-name>jdbc/users</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
<resource-ref>
- <res-ref-name>jdbc/archiva</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
+ <res-ref-name>jdbc/archiva</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
<resource-ref>
- <res-ref-name>mail/Session</res-ref-name>
- <res-type>javax.mail.Session</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
+ <res-ref-name>mail/Session</res-ref-name>
+ <res-type>javax.mail.Session</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
</web-app>
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java Fri Mar 14 04:13:29 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/trunk/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/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java Fri Mar 14 04:13:29 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/trunk/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/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java Fri Mar 14 04:13:29 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/trunk/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/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java Fri Mar 14 04:13:29 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/trunk/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/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java Fri Mar 14 04:13:29 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/trunk/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/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java Fri Mar 14 04:13:29 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/trunk/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/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java Fri Mar 14 04:13:29 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/trunk/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/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java Fri Mar 14 04:13:29 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/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java Fri Mar 14 04:13:29 2008
@@ -22,22 +22,18 @@
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.PlexusTestCase;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
/**
* AbstractRepositoryServletTestCase
*
@@ -45,18 +41,24 @@
* @version $Id$
*/
public abstract class AbstractRepositoryServletTestCase
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
protected static final String REPOID_INTERNAL = "internal";
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
{
@@ -133,7 +135,7 @@
}
}
- protected void saveConfiguration()
+ protected void saveConfiguration( ArchivaConfiguration archivaConfiguration )
throws Exception
{
archivaConfiguration.save( archivaConfiguration.getConfiguration() );
@@ -143,7 +145,7 @@
throws Exception
{
super.setUp();
-
+
String appserverBase = getTestFile( "target/appserver-base" ).getAbsolutePath();
System.setProperty( "appserver.base", appserverBase );
@@ -156,29 +158,26 @@
Configuration config = archivaConfiguration.getConfiguration();
config.addManagedRepository( createManagedRepository( REPOID_INTERNAL, "Internal Test Repo", repoRootInternal ) );
- saveConfiguration();
+ saveConfiguration( archivaConfiguration );
- sr = new ServletRunner();
+ 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();
- HttpSession session = sc.getSession( true );
- ServletContext servletContext = session.getServletContext();
- servletContext.setAttribute( PlexusConstants.PLEXUS_KEY, getContainer() );
}
-
+
@Override
- protected String getConfigurationName( String subname )
+ protected String getPlexusConfigLocation()
throws Exception
{
return "org/apache/maven/archiva/web/repository/RepositoryServletTest.xml";
}
-
+
@Override
protected void tearDown()
throws Exception
{
- release( archivaConfiguration );
-
if ( sc != null )
{
sc.clearContents();
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoaderTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoaderTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoaderTest.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoaderTest.java Fri Mar 14 04:13:29 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/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataRemoteOnlyTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataRemoteOnlyTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataRemoteOnlyTest.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataRemoteOnlyTest.java Fri Mar 14 04:13:29 2008
@@ -58,7 +58,7 @@
// --- Verification
assertExpectedMetadata( expectedMetadata, actualMetadata );
}
-
+
public void testGetProxiedPluginSnapshotVersionMetadataRemoteOnly()
throws Exception
{
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java Fri Mar 14 04:13:29 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/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedRepositoryServlet.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedRepositoryServlet.java?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedRepositoryServlet.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedRepositoryServlet.java Fri Mar 14 04:13:29 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/trunk/archiva-web/archiva-webapp/src/test/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/META-INF/plexus/components.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/META-INF/plexus/components.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/META-INF/plexus/components.xml Fri Mar 14 04:13:29 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/trunk/archiva-web/archiva-webapp/src/test/resources/log4j.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/log4j.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/log4j.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/log4j.xml Fri Mar 14 04:13:29 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/trunk/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/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.xml Fri Mar 14 04:13:29 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/trunk/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/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.xml Fri Mar 14 04:13:29 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/trunk/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/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml Fri Mar 14 04:13:29 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/trunk/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/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml Fri Mar 14 04:13:29 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/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletSecurityTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletSecurityTest.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletSecurityTest.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletSecurityTest.xml Fri Mar 14 04:13:29 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/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml Fri Mar 14 04:13:29 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>
Propchange: maven/archiva/trunk/archiva-web/archiva-webdav/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 14 04:13:29 2008
@@ -0,0 +1,3 @@
+target
+.classpath
+.project
Modified: maven/archiva/trunk/archiva-web/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/pom.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/pom.xml (original)
+++ maven/archiva/trunk/archiva-web/pom.xml Fri Mar 14 04:13:29 2008
@@ -33,6 +33,7 @@
<module>archiva-applet</module>
<module>archiva-security</module>
<module>archiva-webapp</module>
+ <module>archiva-webdav</module>
<module>archiva-standalone</module>
</modules>
Modified: maven/archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?rev=637056&r1=637055&r2=637056&view=diff
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Fri Mar 14 04:13:29 2008
@@ -159,8 +159,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.4.3</version>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -311,9 +310,9 @@
<version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.4.3</version>
+ <groupId>org.apache.maven.archiva</groupId>
+ <artifactId>archiva-webdav</artifactId>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -406,7 +405,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.8</version>
+ <version>1.2.14</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -651,16 +650,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus.webdav</groupId>
- <artifactId>plexus-webdav-simple</artifactId>
- <version>1.0-beta-2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus.webdav</groupId>
- <artifactId>plexus-webdav-api</artifactId>
- <version>1.0-beta-2</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -671,6 +660,16 @@
<version>2.2.1</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.0</version>
+ </dependency>
+ <dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
@@ -748,6 +747,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
<configuration>
<source>1.5</source>
<aggregate>true</aggregate>