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 2012/02/04 23:04:51 UTC
svn commit: r1240622 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-configuration/
archiva-base/archiva-configuration/src/main/mdo/
archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/mod...
Author: olamy
Date: Sat Feb 4 22:04:51 2012
New Revision: 1240622
URL: http://svn.apache.org/viewvc?rev=1240622&view=rev
Log:
[MRM-1599] NTLM proxy no longer works
add bean attribute and modify ui.
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
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/NetworkProxy.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml?rev=1240622&r1=1240621&r2=1240622&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml Sat Feb 4 22:04:51 2012
@@ -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>
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=1240622&r1=1240621&r2=1240622&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 Sat Feb 4 22:04:51 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.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/NetworkProxy.java?rev=1240622&r1=1240621&r2=1240622&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java Sat Feb 4 22:04:51 2012
@@ -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();
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf?rev=1240622&r1=1240621&r2=1240622&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf Sat Feb 4 22:04:51 2012
@@ -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"/>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp?rev=1240622&r1=1240621&r2=1240622&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp Sat Feb 4 22:04:51 2012
@@ -132,6 +132,10 @@
</tr>
</c:if>
</c:if>
+ <tr>
+ <th>Use NTLM</th>
+ <td><c:out value="${proxy.useNtlm}" /></td>
+ </tr>
</table>
</div>