Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@archiva.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1386885 - in /archiva/trunk:
 archiva-docs/src/site/apt/adminguide/network-proxies.apt
 archiva-docs/src/site/resources/images/network-proxies.png
 archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
Date: Mon, 17 Sep 2012 22:32:48 -0000
To: commits@archiva.apache.org
From: olamy@apache.org
Message-Id: <20120917223248.77CFB2388900@eris.apache.org>

Author: olamy
Date: Mon Sep 17 22:32:47 2012
New Revision: 1386885

URL: http://svn.apache.org/viewvc?rev=1386885&view=rev
Log:
fix network proxies documentation

Added:
    archiva/trunk/archiva-docs/src/site/resources/images/network-proxies.png   (with props)
Modified:
    archiva/trunk/archiva-docs/src/site/apt/adminguide/network-proxies.apt
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js

Modified: archiva/trunk/archiva-docs/src/site/apt/adminguide/network-proxies.apt
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/apt/adminguide/network-proxies.apt?rev=1386885&r1=1386884&r2=1386885&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/src/site/apt/adminguide/network-proxies.apt (original)
+++ archiva/trunk/archiva-docs/src/site/apt/adminguide/network-proxies.apt Mon Sep 17 22:32:47 2012
@@ -34,18 +34,4 @@ Understanding Network Proxy Configuratio
   Once configured, the network proxy can be attached to operations that access remote resources. At present, this is configured on the
   remote repository proxy connectors that need to access the remote repository over the HTTP protocol.
 
-* Network Proxy Settings and the JVM
-
-  As Archiva still targets Java 5 and uses the built-in networking libraries, it must configure these settings using
-  system properties. This can be problematic in two scenarios:
-
-    * if you use multiple different network proxies on different proxy connectors, they may clash
-
-    * if you deploy other applications into the same container as Archiva, they will likely pick up the settings
-
-    []
-
-  Please refer to {{{http://jira.codehaus.org/browse/MRM-1248} MRM-1248}} for workarounds and to track the issue.
-
-  ~~TODO: walkthrough configuration
-
+[../images/network-proxies.png]

Added: archiva/trunk/archiva-docs/src/site/resources/images/network-proxies.png
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/resources/images/network-proxies.png?rev=1386885&view=auto
==============================================================================
Binary file - no diff available.

Propchange: archiva/trunk/archiva-docs/src/site/resources/images/network-proxies.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js?rev=1386885&r1=1386884&r2=1386885&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js Mon Sep 17 22:32:47 2012
@@ -47,7 +47,7 @@ define("archiva.network-proxies",["jquer
     this.password.subscribe(function(newValue){self.modified(true)});
 
     //use NTLM proxy
-    this.useNtlm=ko.observable(useNtlm);
+    this.useNtlm=ko.observable(useNtlm?useNtlm:false);
     this.useNtlm.subscribe(function(newValue){self.modified(true)});
 
     this.modified=ko.observable(false);