Author: olamy
Date: Mon Sep 26 19:30:14 2011
New Revision: 1176008
URL: http://svn.apache.org/viewvc?rev=1176008&view=rev
Log:
[MRM-1524] downloading (optionnaly) remote index to display remote artifacts in
search results : fix configuration of the network proxy to use 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/RemoteRepository.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.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-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/networkproxy/NetworkProxyAdminTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRemoteRepositoriesAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.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=1176008&r1=1176007&r2=1176008&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 19:30:14 2011
@@ -510,6 +510,14 @@
Remote Index Url : if not starting with http will be relative to
the remote repository url.
</description>
</field>
+ <field>
+ <name>remoteDownloadNetworkProxyId</name>
+ <version>1.4.0+</version>
+ <type>String</type>
+ <description>
+ Id of the networkProxy to use when downloading remote index.
+ </description>
+ </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=1176008&r1=1176007&r2=1176008&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 19:30:14 2011
@@ -50,6 +50,8 @@ public class RemoteRepository
*/
private String remoteIndexUrl = ".index";
+ private String remoteDownloadNetworkProxyId;
+
public RemoteRepository()
{
@@ -132,6 +134,15 @@ public class RemoteRepository
this.remoteIndexUrl = remoteIndexUrl;
}
+ public String getRemoteDownloadNetworkProxyId()
+ {
+ return remoteDownloadNetworkProxyId;
+ }
+
+ public void setRemoteDownloadNetworkProxyId( String
remoteDownloadNetworkProxyId )
+ {
+ this.remoteDownloadNetworkProxyId = remoteDownloadNetworkProxyId;
+ }
@Override
public String toString()
@@ -145,6 +156,7 @@ public class RemoteRepository
sb.append( ", timeout=" ).append( timeout );
sb.append( ", downloadRemoteIndex=" ).append( downloadRemoteIndex );
sb.append( ", remoteIndexUrl='" ).append( remoteIndexUrl ).append(
'\'' );
+ sb.append( ", remoteDownloadNetworkProxyId='" ).append(
remoteDownloadNetworkProxyId ).append( '\'' );
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/networkproxy/DefaultNetworkProxyAdmin.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/networkproxy/DefaultNetworkProxyAdmin.java?rev=1176008&r1=1176007&r2=1176008&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java
Mon Sep 26 19:30:14 2011
@@ -25,11 +25,13 @@ import org.apache.archiva.admin.model.be
import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin;
import org.apache.archiva.admin.repository.AbstractRepositoryAdmin;
import org.apache.archiva.audit.AuditEvent;
+import org.apache.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.commons.lang.StringUtils;
import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.configuration.NetworkProxyConfiguration;
import org.springframework.stereotype.Service;
+import java.rmi.Remote;
import java.util.ArrayList;
import java.util.List;
@@ -124,6 +126,14 @@ public class DefaultNetworkProxyAdmin
NetworkProxyConfiguration networkProxyConfiguration =
getNetworkProxyConfiguration( networkProxy );
configuration.removeNetworkProxy( networkProxyConfiguration );
+ for ( RemoteRepositoryConfiguration rrc :
configuration.getRemoteRepositories())
+ {
+ if (StringUtils.equals( rrc.getRemoteDownloadNetworkProxyId(),
networkProxyId ))
+ {
+ rrc.setRemoteDownloadNetworkProxyId( null );
+ }
+ }
+
triggerAuditEvent( networkProxy.getId(), null,
AuditEvent.DELETE_NETWORK_PROXY, auditInformation );
saveConfiguration( configuration );
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=1176008&r1=1176007&r2=1176008&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 19:30:14 2011
@@ -61,6 +61,8 @@ public class DefaultRemoteRepositoryAdmi
remoteRepository.setRemoteIndexUrl(
repositoryConfiguration.getRemoteIndexUrl() );
remoteRepository.setCronExpression(
repositoryConfiguration.getRefreshCronExpression() );
remoteRepository.setIndexDirectory(
repositoryConfiguration.getIndexDir() );
+ remoteRepository.setRemoteDownloadNetworkProxyId(
+ repositoryConfiguration.getRemoteDownloadNetworkProxyId() );
remoteRepositories.add( remoteRepository );
}
return remoteRepositories;
@@ -195,6 +197,8 @@ public class DefaultRemoteRepositoryAdmi
remoteRepositoryConfiguration.setRemoteIndexUrl(
remoteRepository.getRemoteIndexUrl() );
remoteRepositoryConfiguration.setRefreshCronExpression(
remoteRepository.getCronExpression() );
remoteRepositoryConfiguration.setIndexDir(
remoteRepository.getIndexDirectory() );
+ remoteRepositoryConfiguration.setRemoteDownloadNetworkProxyId(
+ remoteRepository.getRemoteDownloadNetworkProxyId() );
return remoteRepositoryConfiguration;
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java?rev=1176008&r1=1176007&r2=1176008&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
Mon Sep 26 19:30:14 2011
@@ -135,6 +135,7 @@ public abstract class AbstractRepository
remoteRepository.setUserName( "foo-name" );
remoteRepository.setPassword( "toto" );
remoteRepository.setId( id );
+ remoteRepository.setRemoteDownloadNetworkProxyId( "foo" );
return remoteRepository;
}
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/networkproxy/NetworkProxyAdminTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/networkproxy/NetworkProxyAdminTest.java?rev=1176008&r1=1176007&r2=1176008&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/networkproxy/NetworkProxyAdminTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/networkproxy/NetworkProxyAdminTest.java
Mon Sep 26 19:30:14 2011
@@ -19,6 +19,7 @@ package org.apache.archiva.admin.reposit
*/
import org.apache.archiva.admin.model.beans.NetworkProxy;
+import org.apache.archiva.admin.model.beans.RemoteRepository;
import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin;
import org.apache.archiva.admin.repository.AbstractRepositoryAdminTest;
import org.apache.archiva.audit.AuditEvent;
@@ -128,6 +129,39 @@ public class NetworkProxyAdminTest
mockAuditListener.clearEvents();
}
+ /**
+ * ensure we cleanup remote repos linked to a network proxy
+ */
+ @Test
+ public void addAndDeleteWithRemoteRepoLinked()
+ throws Exception
+ {
+ mockAuditListener.clearEvents();
+ int initialSize = networkProxyAdmin.getNetworkProxies().size();
+ NetworkProxy networkProxy = getNetworkProxyTest( "foo" );
+
+ networkProxyAdmin.addNetworkProxy( networkProxy,
getFakeAuditInformation() );
+
+ assertEquals( initialSize + 1,
networkProxyAdmin.getNetworkProxies().size() );
+
+ networkProxy = networkProxyAdmin.getNetworkProxy( "foo" );
+
+ assertNotNull( networkProxy );
+
+ RemoteRepository remoteRepository = getRemoteRepository();
+ remoteRepository.setRemoteDownloadNetworkProxyId( networkProxy.getId()
);
+
+ remoteRepositoryAdmin.addRemoteRepository( remoteRepository,
getFakeAuditInformation() );
+
+ networkProxyAdmin.deleteNetworkProxy( "foo", getFakeAuditInformation()
);
+
+ remoteRepository = remoteRepositoryAdmin.getRemoteRepository(
getRemoteRepository().getId() );
+
+ assertNull( remoteRepository.getRemoteDownloadNetworkProxyId() );
+
+ remoteRepositoryAdmin.deleteRemoteRepository(
getRemoteRepository().getId(), getFakeAuditInformation() );
+ }
+
protected NetworkProxy getNetworkProxyTest( String id )
{
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java?rev=1176008&r1=1176007&r2=1176008&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java
Mon Sep 26 19:30:14 2011
@@ -114,10 +114,12 @@ public class RemoteRepositoryAdminTest
assertEquals( getRemoteRepository().getUserName(), repo.getUserName()
);
assertEquals( getRemoteRepository().getName(), repo.getName() );
assertEquals( getRemoteRepository().getTimeout(), repo.getTimeout() );
+ assertEquals( getRemoteRepository().getRemoteDownloadNetworkProxyId(),
repo.getRemoteDownloadNetworkProxyId() );
repo.setUserName( "foo-name-changed" );
repo.setPassword( "titi" );
repo.setUrl( "http://foo.com/maven-really-rocks"; );
+ repo.setRemoteDownloadNetworkProxyId( "toto" );
remoteRepositoryAdmin.updateRemoteRepository( repo,
getFakeAuditInformation() );
@@ -126,6 +128,7 @@ public class RemoteRepositoryAdminTest
assertEquals( "foo-name-changed", repo.getUserName() );
assertEquals( "titi", repo.getPassword() );
assertEquals( "http://foo.com/maven-really-rocks";, repo.getUrl() );
+ assertEquals( "toto", repo.getRemoteDownloadNetworkProxyId() );
remoteRepositoryAdmin.deleteRemoteRepository( "foo",
getFakeAuditInformation() );
@@ -150,5 +153,4 @@ public class RemoteRepositoryAdminTest
}
-
}
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java?rev=1176008&r1=1176007&r2=1176008&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
Mon Sep 26 19:30:14 2011
@@ -20,7 +20,6 @@ package org.apache.archiva.scheduler.ind
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.beans.NetworkProxy;
-import org.apache.archiva.admin.model.beans.ProxyConnector;
import org.apache.archiva.admin.model.beans.RemoteRepository;
import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin;
import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin;
@@ -160,28 +159,15 @@ public class DefaultDownloadRemoteIndexS
log.warn( "ignore scheduleDownloadRemote for repo with id {}
as not exists", repositoryId );
return;
}
- String networkProxyId = null;
- for ( ProxyConnector proxyConnector :
proxyConnectorAdmin.getProxyConnectors() )
- {
- if ( StringUtils.equals( proxyConnector.getTargetRepoId(),
repositoryId ) )
- {
- networkProxyId = proxyConnector.getProxyId();
- break;
- }
- }
-
- // FIXME add a field networkProxy at the remoteRepositories level
: only use for remote index download
-
NetworkProxy networkProxy = null;
- if ( networkProxyId != null )
+ if ( remoteRepository.getRemoteDownloadNetworkProxyId() != null )
{
- for ( NetworkProxy np : networkProxyAdmin.getNetworkProxies() )
+ networkProxy = networkProxyAdmin.getNetworkProxy(
remoteRepository.getRemoteDownloadNetworkProxyId() );
+ if ( networkProxy == null )
{
- if ( StringUtils.equals( np.getId(), networkProxyId ) )
- {
- networkProxy = np;
- break;
- }
+ log.warn(
+ "your remote repository is configured to download
remote index trought a proxy we cannot find id:{}",
+ remoteRepository.getRemoteDownloadNetworkProxyId() );
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRemoteRepositoriesAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRemoteRepositoriesAction.java?rev=1176008&r1=1176007&r2=1176008&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRemoteRepositoriesAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRemoteRepositoriesAction.java
Mon Sep 26 19:30:14 2011
@@ -1,8 +1,12 @@
package org.apache.archiva.web.action.admin.repositories;
+import org.apache.archiva.admin.model.beans.NetworkProxy;
+import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin;
import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin;
import javax.inject.Inject;
+import java.util.Collections;
+import java.util.List;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -34,6 +38,11 @@ public class AbstractRemoteRepositoriesA
@Inject
private RemoteRepositoryAdmin remoteRepositoryAdmin;
+ @Inject
+ private NetworkProxyAdmin networkProxyAdmin;
+
+ private List<NetworkProxy> networkProxies;
+
public RemoteRepositoryAdmin getRemoteRepositoryAdmin()
{
return remoteRepositoryAdmin;
@@ -43,4 +52,24 @@ public class AbstractRemoteRepositoriesA
{
this.remoteRepositoryAdmin = remoteRepositoryAdmin;
}
+
+ public NetworkProxyAdmin getNetworkProxyAdmin()
+ {
+ return networkProxyAdmin;
+ }
+
+ public void setNetworkProxyAdmin( NetworkProxyAdmin networkProxyAdmin )
+ {
+ this.networkProxyAdmin = networkProxyAdmin;
+ }
+
+ public List<NetworkProxy> getNetworkProxies()
+ {
+ return networkProxies == null ? Collections.<NetworkProxy>emptyList()
: networkProxies;
+ }
+
+ public void setNetworkProxies( List<NetworkProxy> networkProxies )
+ {
+ this.networkProxies = networkProxies;
+ }
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java?rev=1176008&r1=1176007&r2=1176008&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
Mon Sep 26 19:30:14 2011
@@ -43,8 +43,10 @@ public class AddRemoteRepositoryAction
private RemoteRepository repository;
public void prepare()
+ throws RepositoryAdminException
{
this.repository = new RemoteRepository();
+ setNetworkProxies( getNetworkProxyAdmin().getNetworkProxies() );
}
public String input()
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java?rev=1176008&r1=1176007&r2=1176008&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java
Mon Sep 26 19:30:14 2011
@@ -63,6 +63,7 @@ public class EditRemoteRepositoryAction
{
this.repository = getRemoteRepositoryAdmin().getRemoteRepository(
repoid );
}
+ setNetworkProxies( getNetworkProxyAdmin().getNetworkProxies() );
}
public String input()
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=1176008&r1=1176007&r2=1176008&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 19:30:14 2011
@@ -29,6 +29,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:select list="networkProxies" name="repository.remoteDownloadNetworkProxyId"
emptyOption="true" required="false" listKey="id" listValue="id"/>
<s:select list="#@java.util.LinkedHashMap@{'default' : 'Maven 2.x Repository',
'legacy' : 'Maven 1.x Repository'}"
