[MRM-144] indexed -> scanned

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

9 files changed, 24 insertions, 17 deletions

diff --git a/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
index 1acc3c8a7..04355df68 100644
--- a/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
@@ -122,6 +122,7 @@ public class DefaultArchivaConfiguration
             for ( Iterator i = config.getRepositories().iterator(); i.hasNext(); )
             {
                 V1RepositoryConfiguration r = (V1RepositoryConfiguration) i.next();
+                r.setScanned( r.isIndexed() );
 
                 if ( r.getUrl().startsWith( "file://" ) )
                 {
diff --git a/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java b/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
index e174c7edb..4429c1000 100644
--- a/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
+++ b/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
@@ -51,7 +51,7 @@ public class MavenProxyPropertyLoader
         config.setLocation( localCachePath );
         config.setName( "Imported Maven-Proxy Cache" );
         config.setId( "maven-proxy" );
-        config.setIndexed( false );
+        config.setScanned( false );
         config.setReleases( true );
         config.setSnapshots( false );
         configuration.addManagedRepository( config );
diff --git a/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
index 5ed67ddb0..0f371f824 100644
--- a/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
+++ b/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
@@ -304,12 +304,11 @@
           <description>True if this repository contains snapshot versioned artifacts.</description>

           <defaultValue>false</defaultValue>

         </field>

-        <!-- TODO! is indexed better named as scanned? check it's usages (or lack of usages) when iterating repos -->

         <field>

-          <name>indexed</name>

+          <name>scanned</name>

           <version>1.0.0+</version>

           <type>boolean</type>

-          <description>True if this repository should be indexed.</description>

+          <description>True if this repository should be scanned and processed.</description>

           <defaultValue>true</defaultValue>

         </field>

         <field>

@@ -373,6 +372,12 @@
             The URL for this repository.

           </description>

         </field>

+        <field>

+          <name>indexed</name>

+          <version>1.0.0+</version>

+          <type>boolean</type>

+          <required>true</required>

+        </field>

       </fields>

     </class>

 

diff --git a/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml b/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
index 6b5b2134d..e0b1798c1 100644
--- a/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
+++ b/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
@@ -9,7 +9,7 @@
       <layout>default</layout>
       <releases>true</releases>
       <snapshots>false</snapshots>
-      <indexed>true</indexed>
+      <scanned>true</scanned>
       <refreshCronExpression>0 0 0 * * ?</refreshCronExpression>
       <daysOlder>30</daysOlder>
     </managedRepository>
@@ -20,7 +20,7 @@
       <layout>default</layout>
       <releases>false</releases>
       <snapshots>true</snapshots>
-      <indexed>true</indexed>
+      <scanned>true</scanned>
       <refreshCronExpression>0 0\,30 0 * * ?</refreshCronExpression>
       <daysOlder>30</daysOlder>
     </managedRepository>
diff --git a/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml b/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml
index 3dd0281ae..917850952 100644
--- a/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml
+++ b/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml
@@ -37,7 +37,7 @@
       <layout>default</layout>
       <releases>false</releases>
       <snapshots>true</snapshots>
-      <indexed>true</indexed>
+      <indexed>false</indexed>
       <refreshCronExpression>0 0,30 * * ?</refreshCronExpression>
     </repository>
     <repository>
diff --git a/archiva-base/archiva-configuration/src/test/conf/conf-base.xml b/archiva-base/archiva-configuration/src/test/conf/conf-base.xml
index 4e96ccc0d..083f46a79 100644
--- a/archiva-base/archiva-configuration/src/test/conf/conf-base.xml
+++ b/archiva-base/archiva-configuration/src/test/conf/conf-base.xml
@@ -28,6 +28,7 @@
       <layout>default</layout>
       <releases>true</releases>
       <snapshots>false</snapshots>
+      <!-- TODO! -->
       <indexed>true</indexed>
       <refreshCronExpression>0 0 * * ?</refreshCronExpression>
     </managedRepository>
diff --git a/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml b/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
index 06a881c1b..a8f7054a9 100644
--- a/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
+++ b/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
@@ -28,7 +28,7 @@
       <layout>default</layout>
       <releases>true</releases>
       <snapshots>false</snapshots>
-      <indexed>true</indexed>
+      <scanned>true</scanned>
       <refreshCronExpression>0 0 * * ?</refreshCronExpression>
     </managedRepository>
     <managedRepository>
@@ -38,7 +38,7 @@
       <layout>default</layout>
       <releases>false</releases>
       <snapshots>true</snapshots>
-      <indexed>true</indexed>
+      <scanned>true</scanned>
       <refreshCronExpression>0 0,30 * * ?</refreshCronExpression>
     </managedRepository>
   </managedRepositories>
diff --git a/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java b/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
index f7708409f..fd4f88b8e 100644
--- a/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
+++ b/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
@@ -66,7 +66,7 @@ public class ArchivaConfigurationTest
         assertEquals( "check managed repositories", "Archiva Managed Internal Repository", repository.getName() );
         assertEquals( "check managed repositories", "internal", repository.getId() );
         assertEquals( "check managed repositories", "default", repository.getLayout() );
-        assertTrue( "check managed repositories", repository.isIndexed() );
+        assertTrue( "check managed repositories", repository.isScanned() );
     }
 
     public void testGetConfigurationFromDefaults()
@@ -87,7 +87,7 @@ public class ArchivaConfigurationTest
         assertEquals( "check managed repositories", "Archiva Managed Internal Repository", repository.getName() );
         assertEquals( "check managed repositories", "internal", repository.getId() );
         assertEquals( "check managed repositories", "default", repository.getLayout() );
-        assertTrue( "check managed repositories", repository.isIndexed() );
+        assertTrue( "check managed repositories", repository.isScanned() );
     }
 
     /**
@@ -489,7 +489,7 @@ public class ArchivaConfigurationTest
         assertEquals( "check managed repositories", "Archiva Managed Internal Repository", repository.getName() );
         assertEquals( "check managed repositories", "internal", repository.getId() );
         assertEquals( "check managed repositories", "default", repository.getLayout() );
-        assertTrue( "check managed repositories", repository.isIndexed() );
+        assertTrue( "check managed repositories", repository.isScanned() );
     }
 
     public void testAutoDetectV1()
@@ -510,7 +510,7 @@ public class ArchivaConfigurationTest
         assertEquals( "check managed repositories", "Archiva Managed Internal Repository", repository.getName() );
         assertEquals( "check managed repositories", "internal", repository.getId() );
         assertEquals( "check managed repositories", "default", repository.getLayout() );
-        assertTrue( "check managed repositories", repository.isIndexed() );
+        assertTrue( "check managed repositories", repository.isScanned() );
     }
 
     public void testArchivaV1()
@@ -533,7 +533,7 @@ public class ArchivaConfigurationTest
         assertEquals( "check managed repositories", "Archiva Managed Internal Repository", repository.getName() );
         assertEquals( "check managed repositories", "internal", repository.getId() );
         assertEquals( "check managed repositories", "default", repository.getLayout() );
-        assertTrue( "check managed repositories", repository.isIndexed() );
+        assertTrue( "check managed repositories", repository.isScanned() );
         assertFalse( "check managed repositories", repository.isSnapshots() );
 
         repository = map.get( "snapshots" );
@@ -542,7 +542,7 @@ public class ArchivaConfigurationTest
         assertEquals( "check managed repositories", "Archiva Managed Snapshot Repository", repository.getName() );
         assertEquals( "check managed repositories", "snapshots", repository.getId() );
         assertEquals( "check managed repositories", "default", repository.getLayout() );
-        assertTrue( "check managed repositories", repository.isIndexed() );
+        assertFalse( "check managed repositories", repository.isScanned() );
         assertTrue( "check managed repositories", repository.isSnapshots() );
     }
 
diff --git a/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationTest.java b/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationTest.java
index c242bcb8b..eeebb7edc 100644
--- a/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationTest.java
+++ b/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationTest.java
@@ -107,13 +107,13 @@ public class ConfigurationTest
     }
 
     private ManagedRepositoryConfiguration createManagedRepository( String id, String name, String location,
-                                                                    boolean indexed )
+                                                                    boolean scanned )
     {
         ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration();
         repo.setId( id );
         repo.setName( name );
         repo.setLocation( location );
-        repo.setIndexed( indexed );
+        repo.setScanned( scanned );
         return repo;
     }