summaryrefslogtreecommitdiffstats
path: root/archiva-docs/src/site
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-09-17 22:32:47 +0000
committerOlivier Lamy <olamy@apache.org>2012-09-17 22:32:47 +0000
commit96616bef6af2fddcc5533b085106a5c503ff2c7c (patch)
treeffd13333e7ee64ed1fc64d46c4fc10d07e07b482 /archiva-docs/src/site
parent7c6c74c28181a0f42f99bd0f96e813d6092e0e0d (diff)
downloadarchiva-96616bef6af2fddcc5533b085106a5c503ff2c7c.tar.gz
archiva-96616bef6af2fddcc5533b085106a5c503ff2c7c.zip
fix network proxies documentation
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1386885 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-docs/src/site')
-rw-r--r--archiva-docs/src/site/apt/adminguide/network-proxies.apt16
-rw-r--r--archiva-docs/src/site/resources/images/network-proxies.pngbin0 -> 83216 bytes
2 files changed, 1 insertions, 15 deletions
diff --git a/archiva-docs/src/site/apt/adminguide/network-proxies.apt b/archiva-docs/src/site/apt/adminguide/network-proxies.apt
index aa813901d..4162027de 100644
--- a/archiva-docs/src/site/apt/adminguide/network-proxies.apt
+++ b/archiva-docs/src/site/apt/adminguide/network-proxies.apt
@@ -34,18 +34,4 @@ Understanding Network Proxy Configuration of Apache Archiva
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]
diff --git a/archiva-docs/src/site/resources/images/network-proxies.png b/archiva-docs/src/site/resources/images/network-proxies.png
new file mode 100644
index 000000000..227f9ab16
--- /dev/null
+++ b/archiva-docs/src/site/resources/images/network-proxies.png
Binary files differ