You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/09/26 22:34:25 UTC
svn commit: r1176036 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-configuration/src/main/mdo/
archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/
archiva-base/archiva-repos...
Author: olamy
Date: Mon Sep 26 20:34:24 2011
New Revision: 1176036
URL: http://svn.apache.org/viewvc?rev=1176036&view=rev
Log:
[MRM-1524] downloading (optionnaly) remote index to display remote artifacts in search results : add a download remote time out field as file are more important and can take more time.
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/RemoteRepository.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
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=1176036&r1=1176035&r2=1176036&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:34:24 2011
@@ -518,6 +518,15 @@
Id of the networkProxy to use when downloading remote index.
</description>
</field>
+ <field>
+ <name>remoteDownloadTimeout</name>
+ <version>1.4.0+</version>
+ <type>int</type>
+ <description>
+ Timeout in seconds for download remote index. Default is more long than artifact download.
+ </description>
+ <defaultValue>300</defaultValue>
+ </field>
</fields>
</class>
<class>
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=1176036&r1=1176035&r2=1176036&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:34:24 2011
@@ -57,6 +57,8 @@ public class RemoteRepository
*/
private String cronExpression = "0 0 08 ? * SUN";
+ private int remoteDownloadTimeout = 300;
+
public RemoteRepository()
{
@@ -159,6 +161,16 @@ public class RemoteRepository
this.cronExpression = cronExpression;
}
+ public int getRemoteDownloadTimeout()
+ {
+ return remoteDownloadTimeout;
+ }
+
+ public void setRemoteDownloadTimeout( int remoteDownloadTimeout )
+ {
+ this.remoteDownloadTimeout = remoteDownloadTimeout;
+ }
+
@Override
public String toString()
{
@@ -173,6 +185,7 @@ public class RemoteRepository
sb.append( ", remoteIndexUrl='" ).append( remoteIndexUrl ).append( '\'' );
sb.append( ", remoteDownloadNetworkProxyId='" ).append( remoteDownloadNetworkProxyId ).append( '\'' );
sb.append( ", cronExpression='" ).append( cronExpression ).append( '\'' );
+ sb.append( ", remoteDownloadTimeout=" ).append( remoteDownloadTimeout );
sb.append( '}' );
return sb.toString();
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java?rev=1176036&r1=1176035&r2=1176036&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java Mon Sep 26 20:34:24 2011
@@ -63,6 +63,7 @@ public class DefaultRemoteRepositoryAdmi
remoteRepository.setIndexDirectory( repositoryConfiguration.getIndexDir() );
remoteRepository.setRemoteDownloadNetworkProxyId(
repositoryConfiguration.getRemoteDownloadNetworkProxyId() );
+ remoteRepository.setRemoteDownloadTimeout( repositoryConfiguration.getRemoteDownloadTimeout() );
remoteRepositories.add( remoteRepository );
}
return remoteRepositories;
@@ -199,6 +200,7 @@ public class DefaultRemoteRepositoryAdmi
remoteRepositoryConfiguration.setIndexDir( remoteRepository.getIndexDirectory() );
remoteRepositoryConfiguration.setRemoteDownloadNetworkProxyId(
remoteRepository.getRemoteDownloadNetworkProxyId() );
+ remoteRepositoryConfiguration.setRemoteDownloadTimeout( remoteRepository.getRemoteDownloadTimeout() );
return remoteRepositoryConfiguration;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf?rev=1176036&r1=1176035&r2=1176036&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf Mon Sep 26 20:34:24 2011
@@ -32,6 +32,7 @@
<s:textfield name="repository.remoteIndexUrl" label="Remote index url, can be relative to url" size="60" required="false"/>
<s:textfield name="repository.cronExpression" label="Cron expression" size="10" required="false"/>
<s:textfield name="repository.indexDirectory" label="Directory index storage" size="60" required="false"/>
+<s:textfield name="repository.remoteDownloadTimeout" label="Download Remote Index Timeout in seconds" size="10" required="false"/>
<s:select list="networkProxies" name="repository.remoteDownloadNetworkProxyId" emptyOption="true"
required="false" listKey="id" listValue="id" label="Network Proxy to Use for download Remote Index"/>