add bean attribute and modify ui. git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1240622 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-1.4-M3
@@ -139,7 +139,7 @@ | |||
</execution> | |||
</executions> | |||
<configuration> | |||
<version>1.4.0</version> | |||
<version>1.4.1</version> | |||
<models> | |||
<model>src/main/mdo/configuration.mdo</model> | |||
</models> |
@@ -1060,6 +1060,15 @@ | |||
</description> | |||
<type>String</type> | |||
</field> | |||
<field> | |||
<name>useNtlm</name> | |||
<version>1.0.0+</version> | |||
<description> | |||
Use ntlm authentification. | |||
</description> | |||
<type>boolean</type> | |||
<defaultValue>false</defaultValue> | |||
</field> | |||
</fields> | |||
<codeSegments> | |||
<codeSegment> |
@@ -57,6 +57,13 @@ public class NetworkProxy | |||
*/ | |||
private String password; | |||
/** | |||
* @since 1.4-M3 | |||
* | |||
* use NTLM proxy | |||
*/ | |||
private boolean useNtlm; | |||
public NetworkProxy() | |||
{ | |||
// no op | |||
@@ -132,6 +139,16 @@ public class NetworkProxy | |||
this.password = password; | |||
} | |||
public boolean isUseNtlm() | |||
{ | |||
return useNtlm; | |||
} | |||
public void setUseNtlm( boolean useNtlm ) | |||
{ | |||
this.useNtlm = useNtlm; | |||
} | |||
@Override | |||
public boolean equals( Object o ) | |||
{ | |||
@@ -173,6 +190,7 @@ public class NetworkProxy | |||
sb.append( ", port=" ).append( port ); | |||
sb.append( ", username='" ).append( username ).append( '\'' ); | |||
sb.append( ", password='" ).append( password ).append( '\'' ); | |||
sb.append( ", useNtlm=" ).append( useNtlm ); | |||
sb.append( '}' ); | |||
return sb.toString(); | |||
} |
@@ -25,3 +25,4 @@ | |||
<s:textfield name="proxy.port" label="Port" size="5" required="true" /> | |||
<s:textfield name="proxy.username" label="Username" size="25" required="false" /> | |||
<s:password name="proxy.password" label="Password" size="25" required="false" /> | |||
<s:checkbox name="proxy.useNtlm" label="Use ntlm"/> |
@@ -132,6 +132,10 @@ | |||
</tr> | |||
</c:if> | |||
</c:if> | |||
<tr> | |||
<th>Use NTLM</th> | |||
<td><c:out value="${proxy.useNtlm}" /></td> | |||
</tr> | |||
</table> | |||
</div> |