[MRM-1527] remove http://download.java.net/maven/2/ from default remote repositories...

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1177595 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml
index 51b54f82f1ec57d9d47a825fd3cbe90dae44b7e2..5705f846064e9ab15798688ce62ae5740463af06 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml
@@ -34,12 +34,6 @@
       <url>http://repo1.maven.org/maven2</url>
       <layout>default</layout>
     </remoteRepository>
-    <remoteRepository>
-      <id>maven2-repository.dev.java.net</id>
-      <name>Java.net Repository for Maven 2</name>
-      <url>http://download.java.net/maven/2/</url>
-      <layout>default</layout>
-    </remoteRepository>
   </remoteRepositories>
 
   <proxyConnectors>
@@ -57,22 +51,6 @@
         <whiteListPattern>**/*</whiteListPattern>
       </whiteListPatterns>
     </proxyConnector>
-    <proxyConnector>
-      <sourceRepoId>internal</sourceRepoId>
-      <targetRepoId>maven2-repository.dev.java.net</targetRepoId>
-      <proxyId/>
-      <policies>
-        <snapshots>disabled</snapshots>
-        <releases>once</releases>
-        <checksum>fix</checksum>
-        <cache-failures>cached</cache-failures>
-      </policies>
-      <whiteListPatterns>
-        <whiteListPattern>javax/**</whiteListPattern>
-        <whiteListPattern>org/jvnet/**</whiteListPattern>
-        <whiteListPattern>com/sun/**</whiteListPattern>
-      </whiteListPatterns>
-    </proxyConnector>
   </proxyConnectors>
 
   <legacyArtifactPaths>

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
index 7c027290d7bcb51f2dca12a546fb4d99616b12a7..28bc6fcfbdb71dfff2d10b58353a40175802ec09 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
@@ -76,15 +76,13 @@ public class ArchivaConfigurationTest
     public void testGetConfigurationFromRegistryWithASingleNamedConfigurationResource()
         throws Exception
     {
-        ArchivaConfiguration archivaConfiguration =
-            (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-configuration" );
+        ArchivaConfiguration archivaConfiguration = lookup( ArchivaConfiguration.class, "test-configuration" );
 
         Configuration configuration = archivaConfiguration.getConfiguration();
-        assertConfiguration( configuration );
+        assertConfiguration( configuration, 2, 2, 2 );
         assertEquals( "check network proxies", 1, configuration.getNetworkProxies().size() );
 
-        ManagedRepositoryConfiguration repository =
-            (ManagedRepositoryConfiguration) configuration.getManagedRepositories().get( 0 );
+        ManagedRepositoryConfiguration repository = configuration.getManagedRepositories().get( 0 );
 
         assertEquals( "check managed repositories", "${appserver.base}/repositories/internal",
                       repository.getLocation() );
@@ -102,7 +100,7 @@ public class ArchivaConfigurationTest
             (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-defaults" );
 
         Configuration configuration = archivaConfiguration.getConfiguration();
-        assertConfiguration( configuration );
+        assertConfiguration( configuration, 2, 1, 1 );
         assertEquals( "check network proxies", 0, configuration.getNetworkProxies().size() );
 
         ManagedRepositoryConfiguration repository =
@@ -139,10 +137,10 @@ public class ArchivaConfigurationTest
                                      null );
 
         ArchivaConfiguration archivaConfiguration =
-            (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-defaults-default-repo-location-exists" );
+            lookup( ArchivaConfiguration.class, "test-defaults-default-repo-location-exists" );
 
         Configuration configuration = archivaConfiguration.getConfiguration();
-        assertConfiguration( configuration );
+        assertConfiguration( configuration, 2, 1, 1 );
 
         ManagedRepositoryConfiguration repository =
             (ManagedRepositoryConfiguration) configuration.getManagedRepositories().get( 0 );
@@ -155,22 +153,23 @@ public class ArchivaConfigurationTest
     private void assertConfiguration( Configuration configuration )
         throws Exception
     {
-        assertConfiguration( configuration, 2 );
+        assertConfiguration( configuration, 2, 2, 1 );
     }
 
     /**
      * Ensures that the provided configuration matches the details present in the archiva-default.xml file.
      */
-    private void assertConfiguration( Configuration configuration, int managedExpected )
+    private void assertConfiguration( Configuration configuration, int managedExpected, int remoteExpected,
+                                      int proxyConnectorExpected )
         throws Exception
     {
         FileTypes filetypes = lookup( FileTypes.class );
 
         assertEquals( "check managed repositories: " + configuration.getManagedRepositories(), managedExpected,
                       configuration.getManagedRepositories().size() );
-        assertEquals( "check remote repositories: " + configuration.getRemoteRepositories(), 2,
+        assertEquals( "check remote repositories: " + configuration.getRemoteRepositories(), remoteExpected,
                       configuration.getRemoteRepositories().size() );
-        assertEquals( "check proxy connectors:" + configuration.getProxyConnectors(), 2,
+        assertEquals( "check proxy connectors:" + configuration.getProxyConnectors(), proxyConnectorExpected,
                       configuration.getProxyConnectors().size() );
 
         RepositoryScanningConfiguration repoScanning = configuration.getRepositoryScanning();
@@ -196,8 +195,7 @@ public class ArchivaConfigurationTest
     public void testGetConfigurationFromRegistryWithTwoConfigurationResources()
         throws Exception
     {
-        ArchivaConfiguration archivaConfiguration =
-            (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-configuration-both" );
+        ArchivaConfiguration archivaConfiguration = lookup( ArchivaConfiguration.class, "test-configuration-both" );
 
         Configuration configuration = archivaConfiguration.getConfiguration();
 
@@ -594,7 +592,7 @@ public class ArchivaConfigurationTest
         // we just use the defaults when upgrading from 0.9 at this point.
         Configuration configuration = archivaConfiguration.getConfiguration();
         // test-upgrade-09 contains a managed with id: local so it's 3 managed
-        assertConfiguration( configuration, 3 );
+        assertConfiguration( configuration, 3, 1, 1 );
         assertEquals( "check network proxies", 0, configuration.getNetworkProxies().size() );
 
         ManagedRepositoryConfiguration repository = configuration.getManagedRepositories().get( 0 );
@@ -625,7 +623,7 @@ public class ArchivaConfigurationTest
         archivaConfiguration.reload();
 
         Configuration configuration = archivaConfiguration.getConfiguration();
-        assertConfiguration( configuration );
+        assertConfiguration( configuration, 2, 2, 2 );
         assertEquals( "check network proxies", 1, configuration.getNetworkProxies().size() );
 
         ManagedRepositoryConfiguration repository = configuration.getManagedRepositories().get( 0 );
@@ -668,11 +666,10 @@ public class ArchivaConfigurationTest
     public void testArchivaV1()
         throws Exception
     {
-        ArchivaConfiguration archivaConfiguration =
-            (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-archiva-v1" );
+        ArchivaConfiguration archivaConfiguration = lookup( ArchivaConfiguration.class, "test-archiva-v1" );
 
         Configuration configuration = archivaConfiguration.getConfiguration();
-        assertConfiguration( configuration );
+        assertConfiguration( configuration, 2, 2, 2 );
         assertEquals( "check network proxies", 1, configuration.getNetworkProxies().size() );
 
         assertEquals( "check managed repositories", 2, configuration.getManagedRepositories().size() );
@@ -843,17 +840,15 @@ public class ArchivaConfigurationTest
     public void testGetConfigurationFixEmptyRemoteRepoUsernamePassword()
         throws Exception
     {
-        ArchivaConfiguration archivaConfiguration =
-            (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-configuration" );
+        ArchivaConfiguration archivaConfiguration = lookup( ArchivaConfiguration.class, "test-configuration" );
 
         archivaConfiguration.reload();
         Configuration configuration = archivaConfiguration.getConfiguration();
-        assertConfiguration( configuration );
+        assertConfiguration( configuration, 2, 2, 2 );
         assertEquals( "check remote repositories", 2, configuration.getRemoteRepositories().size() );
 
         RemoteRepositoryConfiguration repository =
-            (RemoteRepositoryConfiguration) configuration.getRemoteRepositoriesAsMap().get(
-                "maven2-repository.dev.java.net" );
+            configuration.getRemoteRepositoriesAsMap().get( "maven2-repository.dev.java.net" );
 
         assertEquals( "remote repository.url", "https://maven2-repository.dev.java.net/nonav/repository",
                       repository.getUrl() );

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java
index a5ac72881b0f1cfa1c2bb6da67cea7818d38ae5b..0e4303d7246b7e074636818f90c7690f55cf66f9 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java
@@ -38,7 +38,7 @@ public class ProxyConnectorAdminTest
         throws Exception
     {
         mockAuditListener.clearEvents();
-        assertEquals( "not proxyConnectors 2 " + proxyConnectorAdmin.getProxyConnectors(), 2,
+        assertEquals( "not proxyConnectors 1 " + proxyConnectorAdmin.getProxyConnectors(), 1,
                       proxyConnectorAdmin.getProxyConnectors().size() );
         assertFalse( proxyConnectorAdmin.getProxyConnectors().isEmpty() );
         ProxyConnector proxyConnector = new ProxyConnector();
@@ -47,13 +47,13 @@ public class ProxyConnectorAdminTest
         proxyConnectorAdmin.addProxyConnector( proxyConnector, getFakeAuditInformation() );
 
         assertFalse( proxyConnectorAdmin.getProxyConnectors().isEmpty() );
-        assertEquals( 3, proxyConnectorAdmin.getProxyConnectors().size() );
+        assertEquals( 2, proxyConnectorAdmin.getProxyConnectors().size() );
 
         assertNotNull( proxyConnectorAdmin.getProxyConnector( "snapshots", "central" ) );
 
         proxyConnectorAdmin.deleteProxyConnector( proxyConnector, getFakeAuditInformation() );
 
-        assertEquals( 2, proxyConnectorAdmin.getProxyConnectors().size() );
+        assertEquals( 1, proxyConnectorAdmin.getProxyConnectors().size() );
         assertFalse( proxyConnectorAdmin.getProxyConnectors().isEmpty() );
 
         assertEquals( 2, mockAuditListener.getAuditEvents().size() );
@@ -79,7 +79,7 @@ public class ProxyConnectorAdminTest
 
         remoteRepositoryAdmin.addRemoteRepository( remoteRepository, getFakeAuditInformation() );
 
-        assertEquals( "not proxyConnectors 2 " + proxyConnectorAdmin.getProxyConnectors(), 2,
+        assertEquals( "not proxyConnectors 1 " + proxyConnectorAdmin.getProxyConnectors(), 1,
                       proxyConnectorAdmin.getProxyConnectors().size() );
         assertFalse( proxyConnectorAdmin.getProxyConnectors().isEmpty() );
         ProxyConnector proxyConnector = new ProxyConnector();
@@ -89,7 +89,7 @@ public class ProxyConnectorAdminTest
         proxyConnectorAdmin.addProxyConnector( proxyConnector, getFakeAuditInformation() );
 
         assertFalse( proxyConnectorAdmin.getProxyConnectors().isEmpty() );
-        assertEquals( 3, proxyConnectorAdmin.getProxyConnectors().size() );
+        assertEquals( 2, proxyConnectorAdmin.getProxyConnectors().size() );
 
         assertNotNull( proxyConnectorAdmin.getProxyConnector( "snapshots", "central" ) );
         assertEquals( Arrays.asList( "foo", "bar" ),
@@ -108,7 +108,7 @@ public class ProxyConnectorAdminTest
 
         assertNull( proxyConnectorAdmin.getProxyConnector( "snapshots", "central" ) );
 
-        assertEquals( 2, proxyConnectorAdmin.getProxyConnectors().size() );
+        assertEquals( 1, proxyConnectorAdmin.getProxyConnectors().size() );
         assertFalse( proxyConnectorAdmin.getProxyConnectors().isEmpty() );
 
         assertEquals( 5, mockAuditListener.getAuditEvents().size() );