Merge from archiva-MRM-239 branch to trunk. r506385:HEAD

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

2 files changed, 7 insertions, 5 deletions

diff --git a/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-configuration/src/main/mdo/configuration.mdo
index d414a9273..2893e289c 100644
--- a/archiva-configuration/src/main/mdo/configuration.mdo
+++ b/archiva-configuration/src/main/mdo/configuration.mdo
@@ -85,12 +85,13 @@
           </description>

         </field>

         <field>

-          <name>indexerCronExpression</name>

+          <name>dataRefreshCronExpression</name>

           <version>1.0.0</version>

           <type>String</type>

-          <description>When to run the indexing mechanism. Default is every 0 and 30 mins of any hour.</description>

+          <description>When to run the data refresh task. Default is every 30 mins (translated as every 0 and 30 minute reading of every hour)</description>

           <defaultValue>0 0,30 * * * ?</defaultValue>

-        </field>

+        </field>
+        <!-- 
         <field>

           <name>globalBlackListPatterns</name>

           <version>1.0.0</version>

@@ -99,7 +100,8 @@
             <type>String</type>

             <multiplicity>*</multiplicity>

           </association>

-        </field>

+        </field>
+           -->

         <field>

           <name>proxy</name>

           <version>1.0.0</version>

diff --git a/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java b/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
index 94a2e3166..5164c561d 100644
--- a/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
+++ b/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
@@ -43,7 +43,7 @@ public class ArchivaConfigurationTest
         // check default configuration
         assertNotNull( "check configuration returned", configuration );
         assertEquals( "check configuration has default elements", "0 0,30 * * * ?",
-                      configuration.getIndexerCronExpression() );
+                      configuration.getDataRefreshCronExpression() );
         assertNull( "check configuration has default elements", configuration.getIndexPath() );
         assertTrue( "check configuration has default elements", configuration.getRepositories().isEmpty() );
     }