Author: olamy
Date: Mon Oct 29 21:00:51 2012
New Revision: 1403507
URL: http://svn.apache.org/viewvc?rev=1403507&view=rev
Log:
[MRM-1704] Refactor to remove maven specific part from various
repository/metadata apis
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java
(contents, props changed)
- copied, changed from r1403505,
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnector.java
Removed:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnector.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/RepositoryProxyConnectors.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnectorOrderComparator.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
archiva/trunk/archiva-modules/archiva-base/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedLegacyRepositoryContentTest.java
archiva/trunk/pom.xml
Copied:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java
(from r1403505,
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnector.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnector.java&r1=1403505&r2=1403507&rev=1403507&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnector.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java
Mon Oct 29 21:00:51 2012
@@ -1,4 +1,4 @@
-package org.apache.archiva.proxy;
+package org.apache.archiva.proxy.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml?rev=1403507&r1=1403506&r2=1403507&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml Mon Oct 29
21:00:51 2012
@@ -61,6 +61,14 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>maven2-repository</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-proxy-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-proxy-common</artifactId>
<exclusions>
<exclusion>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=1403507&r1=1403506&r2=1403507&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
Mon Oct 29 21:00:51 2012
@@ -45,6 +45,8 @@ import org.apache.archiva.policies.urlca
import org.apache.archiva.proxy.common.WagonFactory;
import org.apache.archiva.proxy.common.WagonFactoryException;
import org.apache.archiva.proxy.common.WagonFactoryRequest;
+import org.apache.archiva.proxy.model.ProxyConnector;
+import org.apache.archiva.proxy.model.RepositoryProxyConnectors;
import org.apache.archiva.redback.components.registry.Registry;
import org.apache.archiva.redback.components.registry.RegistryListener;
import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnectorOrderComparator.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnectorOrderComparator.java?rev=1403507&r1=1403506&r2=1403507&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnectorOrderComparator.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnectorOrderComparator.java
Mon Oct 29 21:00:51 2012
@@ -19,6 +19,8 @@ package org.apache.archiva.proxy;
* under the License.
*/
+import org.apache.archiva.proxy.model.ProxyConnector;
+
import java.util.Comparator;
/**
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java?rev=1403507&r1=1403506&r2=1403507&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
Mon Oct 29 21:00:51 2012
@@ -34,6 +34,7 @@ import org.apache.archiva.policies.Propa
import org.apache.archiva.policies.PropagateErrorsOnUpdateDownloadPolicy;
import org.apache.archiva.policies.ReleasesPolicy;
import org.apache.archiva.policies.SnapshotsPolicy;
+import org.apache.archiva.proxy.model.RepositoryProxyConnectors;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.io.FileUtils;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java?rev=1403507&r1=1403506&r2=1403507&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
Mon Oct 29 21:00:51 2012
@@ -22,6 +22,7 @@ package org.apache.archiva.proxy;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import
org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
+import org.apache.archiva.proxy.model.RepositoryProxyConnectors;
import org.apache.commons.io.FileUtils;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.NetworkProxyConfiguration;
Modified: archiva/trunk/archiva-modules/archiva-base/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/pom.xml?rev=1403507&r1=1403506&r2=1403507&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/pom.xml Mon Oct 29 21:00:51 2012
@@ -41,6 +41,7 @@
<module>archiva-consumers</module>
<module>archiva-repository-layer</module>
<module>archiva-xml-tools</module>
+ <module>archiva-proxy-api</module>
<module>archiva-proxy-common</module>
<module>archiva-proxy</module>
<module>archiva-transaction</module>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java?rev=1403507&r1=1403506&r2=1403507&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
Mon Oct 29 21:00:51 2012
@@ -38,7 +38,7 @@ import org.apache.archiva.metadata.repos
import
org.apache.archiva.metadata.repository.storage.maven2.ArtifactMetadataVersionComparator;
import org.apache.archiva.metadata.repository.storage.maven2.MavenProjectFacet;
import org.apache.archiva.model.ArchivaArtifact;
-import org.apache.archiva.proxy.RepositoryProxyConnectors;
+import org.apache.archiva.proxy.model.RepositoryProxyConnectors;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.RepositoryContentFactory;
import org.apache.archiva.repository.RepositoryException;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java?rev=1403507&r1=1403506&r2=1403507&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
Mon Oct 29 21:00:51 2012
@@ -39,7 +39,7 @@ import org.apache.archiva.maven2.metadat
import org.apache.archiva.model.ArchivaRepositoryMetadata;
import org.apache.archiva.model.ArtifactReference;
import org.apache.archiva.policies.ProxyDownloadException;
-import org.apache.archiva.proxy.RepositoryProxyConnectors;
+import org.apache.archiva.proxy.model.RepositoryProxyConnectors;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authorization.AuthorizationException;
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml?rev=1403507&r1=1403506&r2=1403507&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml Mon Oct 29
21:00:51 2012
@@ -44,16 +44,20 @@
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-maven2-metadata</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-proxy</artifactId>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>problem-reports</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-proxy-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-proxy-common</artifactId>
<exclusions>
<exclusion>
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java?rev=1403507&r1=1403506&r2=1403507&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
Mon Oct 29 21:00:51 2012
@@ -46,8 +46,8 @@ import org.apache.archiva.model.ArchivaR
import org.apache.archiva.model.ArtifactReference;
import org.apache.archiva.model.SnapshotVersion;
import org.apache.archiva.policies.ProxyDownloadException;
-import org.apache.archiva.proxy.RepositoryProxyConnectors;
import org.apache.archiva.proxy.common.WagonFactory;
+import org.apache.archiva.proxy.model.RepositoryProxyConnectors;
import org.apache.archiva.reports.RepositoryProblemFacet;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.xml.XMLException;
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java?rev=1403507&r1=1403506&r2=1403507&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
Mon Oct 29 21:00:51 2012
@@ -30,13 +30,12 @@ import org.springframework.test.context.
import static org.junit.Assert.*;
/**
- * AbstractDefaultRepositoryContentTestCase
- *
- *
+ * AbstractDefaultRepositoryContentTestCase
*/
@RunWith ( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration ( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public abstract class AbstractDefaultRepositoryContentTestCase
+ extends AbstractRepositoryLayerTestCase
{
@Test
public void testBadPathMissingType()
@@ -47,7 +46,8 @@ public abstract class AbstractDefaultRep
@Test
public void testBadPathReleaseInSnapshotDir()
{
- assertBadPath( "invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar", "non
snapshot artifact inside of a snapshot dir" );
+ assertBadPath( "invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar",
+ "non snapshot artifact inside of a snapshot dir" );
}
@Test
@@ -82,10 +82,12 @@ public abstract class AbstractDefaultRep
"wrong artifact id" );
}
- /**
+ /**
* [MRM-432] Oddball version spec.
* Example of an oddball / unusual version spec.
+ *
* @throws org.apache.archiva.repository.layout.LayoutException
+ *
*/
@Test
public void testGoodButOddVersionSpecGanymedSsh2()
@@ -104,7 +106,9 @@ public abstract class AbstractDefaultRep
/**
* [MRM-432] Oddball version spec.
* Example of an oddball / unusual version spec.
+ *
* @throws org.apache.archiva.repository.layout.LayoutException
+ *
*/
@Test
public void testGoodButOddVersionSpecJavaxComm()
@@ -144,7 +148,9 @@ public abstract class AbstractDefaultRep
/**
* [MRM-432] Oddball version spec.
* Example of an oddball / unusual version spec.
+ *
* @throws org.apache.archiva.repository.layout.LayoutException
+ *
*/
@Test
public void testGoodButOddVersionSpecJavaxPersistence()
@@ -241,14 +247,17 @@ public abstract class AbstractDefaultRep
String version = "0.3";
String classifier = null;
String type = "pom";
- String path =
"com/company/department/com.company.department.project/0.3/com.company.department.project-0.3.pom";
+ String path =
+
"com/company/department/com.company.department.project/0.3/com.company.department.project-0.3.pom";
assertLayout( path, groupId, artifactId, version, classifier, type );
}
/**
* Test the classifier, and java-source type spec.
+ *
* @throws org.apache.archiva.repository.layout.LayoutException
+ *
*/
@Test
public void testGoodFooLibSources()
@@ -266,7 +275,9 @@ public abstract class AbstractDefaultRep
/**
* A timestamped versioned artifact, should reside in a SNAPSHOT
baseversion directory.
+ *
* @throws org.apache.archiva.repository.layout.LayoutException
+ *
*/
@Test
public void testGoodSnapshotMavenTest()
@@ -277,7 +288,8 @@ public abstract class AbstractDefaultRep
String version = "3.1-beta-1-20050831.101112-42";
String classifier = null;
String type = "jar";
- String path =
"org/apache/archiva/test/redonkulous/3.1-beta-1-SNAPSHOT/redonkulous-3.1-beta-1-20050831.101112-42.jar";
+ String path =
+
"org/apache/archiva/test/redonkulous/3.1-beta-1-SNAPSHOT/redonkulous-3.1-beta-1-20050831.101112-42.jar";
assertLayout( path, groupId, artifactId, version, classifier, type );
}
@@ -299,7 +311,7 @@ public abstract class AbstractDefaultRep
assertLayout( path, groupId, artifactId, version, classifier, type );
}
-
+
/**
* [MRM-562] Artifact type "maven-plugin" is not detected correctly in
.toArtifactReference() methods.
* Example uses "test" in artifact Id, which is also part of the
versionKeyword list.
@@ -410,8 +422,8 @@ public abstract class AbstractDefaultRep
private void assertArtifactReference( ArtifactReference actualReference,
String groupId, String artifactId,
String version, String classifier,
String type )
{
- String expectedId = "ArtifactReference - " + groupId + ":" +
artifactId + ":" + version + ":" + classifier
- + ":" + type;
+ String expectedId =
+ "ArtifactReference - " + groupId + ":" + artifactId + ":" +
version + ":" + classifier + ":" + type;
assertNotNull( expectedId + " - Should not be null.", actualReference
);
@@ -430,7 +442,8 @@ public abstract class AbstractDefaultRep
try
{
toArtifactReference( path );
- fail( "Should have thrown a LayoutException on the invalid path ["
+ path + "] because of [" + reason + "]" );
+ fail(
+ "Should have thrown a LayoutException on the invalid path [" +
path + "] because of [" + reason + "]" );
}
catch ( LayoutException e )
{
@@ -462,7 +475,7 @@ public abstract class AbstractDefaultRep
assertEquals( "Artifact <" + expectedArtifact + "> to path:", path,
toPath( testReference ) );
}
- private ArtifactReference createArtifact( String groupId, String
artifactId, String version, String classifier,
+ protected ArtifactReference createArtifact( String groupId, String
artifactId, String version, String classifier,
String type )
{
ArtifactReference artifact = new ArtifactReference();
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java?rev=1403507&r1=1403506&r2=1403507&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
Mon Oct 29 21:00:51 2012
@@ -49,22 +49,21 @@ import static org.junit.Assert.fail;
/**
* ManagedDefaultRepositoryContentTest
- *
- *
*/
@RunWith ( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration ( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class ManagedDefaultRepositoryContentTest
- extends AbstractRepositoryLayerTestCase
+ extends AbstractDefaultRepositoryContentTestCase
{
@Inject
- @Named( value = "managedRepositoryContent#default" )
+ @Named ( value = "managedRepositoryContent#default" )
private ManagedRepositoryContent repoContent;
@Inject
FileTypes fileTypes;
- @Inject @Named(value = "archivaConfiguration#default")
+ @Inject
+ @Named ( value = "archivaConfiguration#default" )
ArchivaConfiguration archivaConfiguration;
@Before
@@ -75,9 +74,7 @@ public class ManagedDefaultRepositoryCon
ManagedRepository repository = createRepository( "testRepo", "Unit
Test Repo", repoDir );
-
- FileType fileType =
- (FileType)
archivaConfiguration.getConfiguration().getRepositoryScanning().getFileTypes().get(
0 );
+ FileType fileType =
archivaConfiguration.getConfiguration().getRepositoryScanning().getFileTypes().get(
0 );
fileType.addPattern( "**/*.xml" );
assertEquals( FileTypes.ARTIFACTS, fileType.getId() );
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedLegacyRepositoryContentTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedLegacyRepositoryContentTest.java?rev=1403507&r1=1403506&r2=1403507&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedLegacyRepositoryContentTest.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedLegacyRepositoryContentTest.java
Mon Oct 29 21:00:51 2012
@@ -50,7 +50,7 @@ import static org.junit.Assert.*;
@RunWith ( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration ( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class ManagedLegacyRepositoryContentTest
- extends AbstractRepositoryLayerTestCase
+ extends AbstractDefaultRepositoryContentTestCase
{
@Inject
@Named( value = "managedRepositoryContent#legacy" )
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1403507&r1=1403506&r2=1403507&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Mon Oct 29 21:00:51 2012
@@ -347,6 +347,11 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-proxy-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-proxy</artifactId>
<version>${project.version}</version>
</dependency>
