Author: olamy
Date: Mon Sep 26 20:33:46 2011
New Revision: 1176035
URL: http://svn.apache.org/viewvc?rev=1176035&view=rev
Log:
[MRM-1524] downloading (optionnaly) remote index to display remote artifacts in
search results : setup a default weekly schedule for download remote index
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ManagedRepository.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=1176035&r1=1176034&r2=1176035&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
Mon Sep 26 20:33:46 2011
@@ -404,16 +404,6 @@
<defaultValue>default</defaultValue>
</field>
<field>
- <name>refreshCronExpression</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- When to run the refresh task.
- Default is every hour
- </description>
- <defaultValue>0 0 * * * ?</defaultValue>
- </field>
- <field>
<name>indexDir</name>
<version>1.0.0+</version>
<type>String</type>
@@ -494,6 +484,16 @@
<defaultValue>60</defaultValue>
</field>
<field>
+ <name>refreshCronExpression</name>
+ <version>1.4.0+</version>
+ <type>String</type>
+ <description>
+ When to run the refresh task.
+ Default is every sunday at 8H00.
+ </description>
+ <defaultValue>0 0 08 ? * SUN</defaultValue>
+ </field>
+ <field>
<name>downloadRemoteIndex</name>
<version>1.4.0+</version>
<type>boolean</type>
@@ -563,6 +563,16 @@
<defaultValue>true</defaultValue>
</field>
<field>
+ <name>refreshCronExpression</name>
+ <version>1.0.0+</version>
+ <type>String</type>
+ <description>
+ When to run the refresh task.
+ Default is every hour
+ </description>
+ <defaultValue>0 0 * * * ?</defaultValue>
+ </field>
+ <field>
<name>retentionCount</name>
<version>1.0.0+</version>
<type>int</type>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java?rev=1176035&r1=1176034&r2=1176035&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java
Mon Sep 26 20:33:46 2011
@@ -34,10 +34,7 @@ public class AbstractRepository
private String layout = "default";
- /**
- * default model value
- */
- private String cronExpression = "0 0 * * * ?";
+
private String indexDirectory;
@@ -83,15 +80,7 @@ public class AbstractRepository
this.layout = layout;
}
- public String getCronExpression()
- {
- return cronExpression;
- }
- public void setCronExpression( String cronExpression )
- {
- this.cronExpression = cronExpression;
- }
public String getIndexDirectory()
{
@@ -136,7 +125,6 @@ public class AbstractRepository
sb.append( "{id='" ).append( id ).append( '\'' );
sb.append( ", name='" ).append( name ).append( '\'' );
sb.append( ", layout='" ).append( layout ).append( '\'' );
- sb.append( ", cronExpression='" ).append( cronExpression ).append(
'\'' );
sb.append( ", indexDirectory='" ).append( indexDirectory ).append(
'\'' );
sb.append( '}' );
return sb.toString();
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ManagedRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ManagedRepository.java?rev=1176035&r1=1176034&r2=1176035&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ManagedRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ManagedRepository.java
Mon Sep 26 20:33:46 2011
@@ -40,6 +40,11 @@ public class ManagedRepository
private boolean blockRedeployments = false;
+ /**
+ * default model value hourly
+ */
+ private String cronExpression = "0 0 * * * ?";
+
/**
* not need when creating the repo : only available when reading
@@ -91,6 +96,16 @@ public class ManagedRepository
this.resetStats = resetStats;
}
+ public String getCronExpression()
+ {
+ return cronExpression;
+ }
+
+ public void setCronExpression( String cronExpression )
+ {
+ this.cronExpression = cronExpression;
+ }
+
public String getLocation()
{
return this.location;
@@ -159,7 +174,6 @@ public class ManagedRepository
}
-
public int getDaysOlder()
{
return daysOlder;
@@ -220,6 +234,7 @@ public class ManagedRepository
sb.append( ", snapshots=" ).append( snapshots );
sb.append( ", releases=" ).append( releases );
sb.append( ", blockRedeployments=" ).append( blockRedeployments );
+ sb.append( ", cronExpression='" ).append( cronExpression ).append(
'\'' );
sb.append( ", stagingRepository=" ).append( stagingRepository );
sb.append( ", scanned=" ).append( scanned );
sb.append( ", daysOlder=" ).append( daysOlder );
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java?rev=1176035&r1=1176034&r2=1176035&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java
Mon Sep 26 20:33:46 2011
@@ -52,6 +52,11 @@ public class RemoteRepository
private String remoteDownloadNetworkProxyId;
+ /**
+ * default model value daily : every sunday at 8H00
+ */
+ private String cronExpression = "0 0 08 ? * SUN";
+
public RemoteRepository()
{
@@ -144,6 +149,16 @@ public class RemoteRepository
this.remoteDownloadNetworkProxyId = remoteDownloadNetworkProxyId;
}
+ public String getCronExpression()
+ {
+ return cronExpression;
+ }
+
+ public void setCronExpression( String cronExpression )
+ {
+ this.cronExpression = cronExpression;
+ }
+
@Override
public String toString()
{
@@ -157,6 +172,7 @@ public class RemoteRepository
sb.append( ", downloadRemoteIndex=" ).append( downloadRemoteIndex );
sb.append( ", remoteIndexUrl='" ).append( remoteIndexUrl ).append(
'\'' );
sb.append( ", remoteDownloadNetworkProxyId='" ).append(
remoteDownloadNetworkProxyId ).append( '\'' );
+ sb.append( ", cronExpression='" ).append( cronExpression ).append(
'\'' );
sb.append( '}' );
return sb.toString();
}
