From: Olivier Lamy <olamy@apache.org>
Date: Sat, 4 Feb 2012 22:04:51 +0000 (+0000)
Subject: [MRM-1599] NTLM proxy no longer works
X-Git-Tag: archiva-1.4-M3~1366
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e258bfb349b02210a7de84821c798fa1fb75c5d8;p=archiva.git

[MRM-1599] NTLM proxy no longer works
add bean attribute and modify ui.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1240622 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index 0f206357c..b50657070 100644
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -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>
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
index 7a0982aa4..2158d809e 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
@@ -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>
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java
index 6cc9f7974..7df353dc0 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java
@@ -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();
     }
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf
index 9446e36ec..725eebbc7 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf
@@ -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"/>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
index 05bff902d..e17719cfa 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
@@ -132,6 +132,10 @@
             </tr>
           </c:if>
         </c:if>
+        <tr>
+          <th>Use NTLM</th>
+          <td><c:out value="${proxy.useNtlm}" /></td>
+        </tr>
       </table>
 
       </div>