[MRM-144] indexed -> scanned

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

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 1acc3c8a73c7285eeb61d61048308ad9fec38dd8..04355df6899bb117ebfd1356956f2a4ed5796e71 100644 (file)
--- 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 e174c7edb30ab2fc292155af21c313764425e69e..4429c1000055c38b203b31ad6d18d17209d23ca6 100644 (file)
--- 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 5ed67ddb0c25eeffa1adaf613241fa65534e5238..0f371f824db2a46aefa15263edd8ece85d183f2b 100644 (file)
--- 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>\r
           <defaultValue>false</defaultValue>\r
         </field>\r
-        <!-- TODO! is indexed better named as scanned? check it's usages (or lack of usages) when iterating repos -->\r
         <field>\r
-          <name>indexed</name>\r
+          <name>scanned</name>\r
           <version>1.0.0+</version>\r
           <type>boolean</type>\r
-          <description>True if this repository should be indexed.</description>\r
+          <description>True if this repository should be scanned and processed.</description>\r
           <defaultValue>true</defaultValue>\r
         </field>\r
         <field>\r
@@ -373,6 +372,12 @@
             The URL for this repository.\r
           </description>\r
         </field>\r
+        <field>\r
+          <name>indexed</name>\r
+          <version>1.0.0+</version>\r
+          <type>boolean</type>\r
+          <required>true</required>\r
+        </field>\r
       </fields>\r
     </class>\r
 \r

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 6b5b2134d2250680c1cbd57cb8921357489c1a9a..e0b1798c18e3dad0d7666317e2c5203f20e9536e 100644 (file)
--- 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 3dd0281aea53e81e78f2c6b1f6e12d8cf0e68ca4..917850952cc207e871dbe7366ffbf9072c34be17 100644 (file)
--- 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 4e96ccc0db4f8455ffaf8fa1b173411cde26d614..083f46a79ffb67ac2e2efc80c92bbf3e04a9e78f 100644 (file)
--- 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 06a881c1be451ecfefcaf027fc6c2cef2719890c..a8f7054a9f0094a23b017a8404f745d993d57360 100644 (file)
--- 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 f7708409fe70ae58499ebc14eba2485714c56d8e..fd4f88b8e252ff53093b840776c8ee17ba249009 100644 (file)
--- 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 c242bcb8b4c30158ee3e285d8e851dab4c528da9..eeebb7edc9ad6835820ca4f19cd505153ba5cae1 100644 (file)
--- 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;
     }
 

diff --git a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
index 2d1a955cfa1b9314133f533e62856d6db26e7f42..c98d2500af2f75a3d3af7e9915e5437a7f73a972 100644 (file)
--- a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
+++ b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
@@ -328,7 +328,7 @@ public class DefaultCrossRepositorySearch
             List<ManagedRepositoryConfiguration> repos = configuration.getConfiguration().getManagedRepositories();
             for ( ManagedRepositoryConfiguration repo : repos )
             {
-                if ( repo.isIndexed() )
+                if ( repo.isScanned() )
                 {
                     localIndexedRepositories.add( ArchivaConfigurationAdaptor.toArchivaRepository( repo ) );
                 }

diff --git a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
index 2a0d8d6570766e7ca63f3943c27d5210cc5b4600..40c9e054be8c5cd7330d85b2201f4dfb60ee994f 100644 (file)
--- a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
+++ b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
@@ -76,7 +76,7 @@ public class DefaultCrossRepositorySearchTest
         repoConfig.setName( TEST_DEFAULT_REPOSITORY_NAME );
         repoConfig.setLocation( repoDir.getAbsolutePath() );
         repoConfig.setIndexDir( indexLocation.getAbsolutePath() );
-        repoConfig.setIndexed( true );
+        repoConfig.setScanned( true );
 
         if ( indexLocation.exists() )
         {

diff --git a/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java b/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
index 0bd89c3a125958c548c11f8ccc089a461721b021..3deb5bc4293647a198ce823db4efbf18ffb42237 100644 (file)
--- a/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
+++ b/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
@@ -103,7 +103,7 @@ public class DefaultArchivaTaskScheduler
             {
                 ManagedRepositoryConfiguration repoConfig = (ManagedRepositoryConfiguration) i.next();
 
-                if ( repoConfig.isIndexed() )
+                if ( repoConfig.isScanned() )
                 {
                     scheduleRepositoryJobs( repoConfig );
                 }

diff --git a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
index b1c1251f85dfe1c64fe6047d2779b45be5df671f..9f74cee0cde17b31471542321358320f9d64e76f 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
+++ b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
@@ -57,7 +57,7 @@ public class ConfigureRepositoryAction
         this.mode = "add";
 
         this.repository.setReleases( true );
-        this.repository.setIndexed( true );
+        this.repository.setScanned( true );
 
         return INPUT;
     }
@@ -128,7 +128,7 @@ public class ConfigureRepositoryAction
         {
             this.repository = new ManagedRepositoryConfiguration();
             this.repository.setReleases( false );
-            this.repository.setIndexed( false );
+            this.repository.setScanned( false );
         }
         else
         {

diff --git a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf
index 46b5727ef73985737f1a828f849646db8eebc877..8840a4e3c22886dff3842c032ceb2ef2b9d1f582 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf
+++ b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf
@@ -28,7 +28,7 @@
 <ww:textfield name="repository.retentionCount" label="Repository Purge By Retention Count" size="5"/>
 <ww:checkbox name="repository.releases" value="repository.releases" label="Releases Included"/>
 <ww:checkbox name="repository.snapshots" value="repository.snapshots" label="Snapshots Included"/>
-<ww:checkbox name="repository.indexed" value="repository.indexed" label="Scannable"/>
+<ww:checkbox name="repository.scanned" value="repository.scanned" label="Scannable"/>
 <ww:checkbox name="repository.deleteReleasedSnapshots" value="repository.deleteReleasedSnapshots"
              label="Delete Released Snapshots"/>
 

diff --git a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
index 484f60d0f43243ba93d76de14c8ffc83a392b35d..210109fd402be5695d4161e35b73f35b268d5549 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
+++ b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
@@ -148,13 +148,13 @@
 </tr>
 <tr>
   <th>Scanned</th>
-  <td class="${repository.indexed ? 'donemark' : 'errormark'} booleanIcon"> ${repository.indexed}</td>
+  <td class="${repository.scanned ? 'donemark' : 'errormark'} booleanIcon"> ${repository.scanned}</td>
 </tr>
 <tr>
   <th>Delete Released Snapshots</th>
   <td class="${repository.deleteReleasedSnapshots ? 'donemark' : 'errormark'} booleanIcon"> ${repository.deleteReleasedSnapshots}</td>
 </tr>
-<c:if test="${repository.indexed}">
+<c:if test="${repository.scanned}">
   <tr>
     <th>Scanning Cron</th>
     <td>${repository.refreshCronExpression}</td>

diff --git a/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java b/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java
index 77393aa080e85f29ebfc8c9dc90808a48e5ca35f..bd6f85fd3f711fc040a3546f1f55aed2c814b8c6 100644 (file)
--- a/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java
+++ b/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java
@@ -103,7 +103,7 @@ public class ConfigureRepositoryActionTest
         assertNull( configuration.getId() );
         // check all booleans are false
         assertFalse( configuration.isDeleteReleasedSnapshots() );
-        assertFalse( configuration.isIndexed() );
+        assertFalse( configuration.isScanned() );
         assertFalse( configuration.isReleases() );
         assertFalse( configuration.isSnapshots() );
 
@@ -112,7 +112,7 @@ public class ConfigureRepositoryActionTest
 
         // check defaults
         assertFalse( configuration.isDeleteReleasedSnapshots() );
-        assertTrue( configuration.isIndexed() );
+        assertTrue( configuration.isScanned() );
         assertTrue( configuration.isReleases() );
         assertFalse( configuration.isSnapshots() );
     }
@@ -312,7 +312,7 @@ public class ConfigureRepositoryActionTest
         assertEquals( expectedRepository.getRefreshCronExpression(), actualRepository.getRefreshCronExpression() );
         assertEquals( expectedRepository.getRetentionCount(), actualRepository.getRetentionCount() );
         assertEquals( expectedRepository.isDeleteReleasedSnapshots(), actualRepository.isDeleteReleasedSnapshots() );
-        assertEquals( expectedRepository.isIndexed(), actualRepository.isIndexed() );
+        assertEquals( expectedRepository.isScanned(), actualRepository.isScanned() );
         assertEquals( expectedRepository.isReleases(), actualRepository.isReleases() );
         assertEquals( expectedRepository.isSnapshots(), actualRepository.isSnapshots() );
     }
@@ -343,7 +343,7 @@ public class ConfigureRepositoryActionTest
         repository.setRetentionCount( 20 );
         repository.setReleases( true );
         repository.setSnapshots( true );
-        repository.setIndexed( true );
+        repository.setScanned( true );
         repository.setDeleteReleasedSnapshots( true );
     }