mirror of https://github.com/apache/archiva.git
[MRM-138] add HTTP proxy configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@430724 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter
parent
be479fa137
commit
1b3454c564
|
|
@ -86,6 +86,14 @@
|
|||
<type>String</type>
|
||||
<description>Blacklisted patterns in the discovery process</description>
|
||||
</field>
|
||||
<field>
|
||||
<name>proxy</name>
|
||||
<version>1.0.0</version>
|
||||
<association>
|
||||
<type>Proxy</type>
|
||||
</association>
|
||||
<description>The network proxy to use for outgoing requests.</description>
|
||||
</field>
|
||||
</fields>
|
||||
<codeSegments>
|
||||
<codeSegment>
|
||||
|
|
@ -344,6 +352,15 @@
|
|||
The interval in minutes before updating releases if the policy is set to 'interval'.
|
||||
</description>
|
||||
</field>
|
||||
<field>
|
||||
<name>useNetworkProxy</name>
|
||||
<version>1.0.0</version>
|
||||
<type>boolean</type>
|
||||
<defaultValue>false</defaultValue>
|
||||
<description>
|
||||
Whether to use the network proxy, if one is configured for the protocol of this repository.
|
||||
</description>
|
||||
</field>
|
||||
</fields>
|
||||
</class>
|
||||
<class>
|
||||
|
|
@ -388,6 +405,53 @@
|
|||
</field>
|
||||
</fields>
|
||||
</class>
|
||||
<class>
|
||||
<name>Proxy</name>
|
||||
<version>1.0.0</version>
|
||||
<fields>
|
||||
<field>
|
||||
<name>protocol</name>
|
||||
<version>1.0.0</version>
|
||||
<description><![CDATA[The proxy protocol.]]></description>
|
||||
<type>String</type>
|
||||
<defaultValue>http</defaultValue>
|
||||
</field>
|
||||
<field>
|
||||
<name>username</name>
|
||||
<version>1.0.0</version>
|
||||
<description><![CDATA[The proxy user.]]></description>
|
||||
<type>String</type>
|
||||
</field>
|
||||
<field>
|
||||
<name>password</name>
|
||||
<version>1.0.0</version>
|
||||
<description><![CDATA[The proxy password.]]></description>
|
||||
<type>String</type>
|
||||
</field>
|
||||
<field>
|
||||
<name>port</name>
|
||||
<version>1.0.0</version>
|
||||
<description><![CDATA[The proxy port.]]></description>
|
||||
<type>int</type>
|
||||
<defaultValue>8080</defaultValue>
|
||||
</field>
|
||||
<field>
|
||||
<name>host</name>
|
||||
<version>1.0.0</version>
|
||||
<description><![CDATA[The proxy host.]]></description>
|
||||
<type>String</type>
|
||||
<required>true</required>
|
||||
</field>
|
||||
<field>
|
||||
<name>nonProxyHosts</name>
|
||||
<version>1.0.0</version>
|
||||
<description><![CDATA[
|
||||
The list of non-proxied hosts (delimited by |).
|
||||
]]></description>
|
||||
<type>String</type>
|
||||
</field>
|
||||
</fields>
|
||||
</class>
|
||||
</classes>
|
||||
</model>
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,11 @@
|
|||
<ww:form method="post" action="saveConfiguration" namespace="/admin" validate="true">
|
||||
<ww:textfield name="indexPath" label="Index Directory" size="100" />
|
||||
<ww:textfield name="indexerCronExpression" label="Indexing Schedule" />
|
||||
<ww:hidden name="proxy.protocol" value="http" />
|
||||
<ww:textfield name="proxy.host" label="HTTP Proxy Host" />
|
||||
<ww:textfield name="proxy.port" label="HTTP Proxy Port" />
|
||||
<ww:textfield name="proxy.username" label="HTTP Proxy Username" />
|
||||
<ww:password name="proxy.password" label="HTTP Proxy Password" />
|
||||
<ww:submit value="Save Configuration" />
|
||||
</ww:form>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
~ limitations under the License.
|
||||
--%>
|
||||
|
||||
<%@ taglib prefix="ww" uri="/webwork" %>
|
||||
<ww:textfield name="name" label="Name" size="50" />
|
||||
<ww:textfield name="url" label="URL" size="50" />
|
||||
<ww:select list="#@java.util.LinkedHashMap@{'default' : 'Maven 2.x Repository', 'legacy' : 'Maven 1.x Repository'}"
|
||||
|
|
@ -33,3 +34,4 @@
|
|||
'interval' : 'Enabled, updated on given interval'}" />
|
||||
<ww:textfield label="Release update interval" name="releasesInterval" size="4" />
|
||||
<ww:select list="configuration.repositoriesMap" name="managedRepository" label="Proxied through" />
|
||||
<ww:checkbox name="useNetworkProxy" fieldValue="true" label="Use HTTP Proxy" />
|
||||
|
|
|
|||
|
|
@ -49,6 +49,26 @@
|
|||
</tr>
|
||||
</table>
|
||||
|
||||
<ww:set name="proxy" value="proxy" />
|
||||
<c:if test="${!empty(proxy.host)}">
|
||||
<h3>HTTP Proxy</h3>
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<th>Host</th>
|
||||
<td>${proxy.host}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Port</th>
|
||||
<td>${proxy.port}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Username</th>
|
||||
<td>${proxy.username}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</c:if>
|
||||
|
||||
<p>
|
||||
<a href="<ww:url action="configure" />">Edit Configuration</a>
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -123,6 +123,17 @@
|
|||
(<code>${repositoriesMap[repository.managedRepository].id}</code>)
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Use HTTP Proxy</th>
|
||||
<td>
|
||||
<c:if test="${!repository.useNetworkProxy}">
|
||||
<span class="statusFailed">NO</span>
|
||||
</c:if>
|
||||
<c:if test="${repository.useNetworkProxy}">
|
||||
<span class="statusOk">YES</span>
|
||||
</c:if>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</c:forEach>
|
||||
|
|
|
|||
Loading…
Reference in New Issue