aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-docs
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-10-04 08:56:54 +0000
committerOlivier Lamy <olamy@apache.org>2011-10-04 08:56:54 +0000
commit4f0b680db5a15889be586211d830db3c8dd0ae1f (patch)
tree04a7d8ae13bbc74496b9128818079d2ef32e8b49 /archiva-docs
parent5c4045dd87769da8b9530a268a379ca23a7cab93 (diff)
downloadarchiva-4f0b680db5a15889be586211d830db3c8dd0ae1f.tar.gz
archiva-4f0b680db5a15889be586211d830db3c8dd0ae1f.zip
[MRM-1526] configure http connection pool values for wagon http: add docs
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1178727 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-docs')
-rw-r--r--archiva-docs/src/site/apt/adminguide/configuration.apt2
-rw-r--r--archiva-docs/src/site/apt/adminguide/index.apt1
-rw-r--r--archiva-docs/src/site/apt/adminguide/network-configuration.apt31
-rw-r--r--archiva-docs/src/site/resources/images/network-configuration.pngbin0 -> 27121 bytes
-rw-r--r--archiva-docs/src/site/site.xml15
5 files changed, 42 insertions, 7 deletions
diff --git a/archiva-docs/src/site/apt/adminguide/configuration.apt b/archiva-docs/src/site/apt/adminguide/configuration.apt
index 3355739bf..91cf8189e 100644
--- a/archiva-docs/src/site/apt/adminguide/configuration.apt
+++ b/archiva-docs/src/site/apt/adminguide/configuration.apt
@@ -34,6 +34,8 @@ Runtime Configuration of Apache Archiva
* {{{./network-proxies.html} Configuring network proxies}}
+ * {{{./network-configuration.html} Network Configuration}}
+
* {{{./legacy.html} Configuring legacy (maven 1) support}}
* {{{./consumers.html} Configuring repository scanning and consumers}}
diff --git a/archiva-docs/src/site/apt/adminguide/index.apt b/archiva-docs/src/site/apt/adminguide/index.apt
index 3812fbcd7..218bb5462 100644
--- a/archiva-docs/src/site/apt/adminguide/index.apt
+++ b/archiva-docs/src/site/apt/adminguide/index.apt
@@ -45,6 +45,7 @@ System Administrators Guide to Apache Archiva
* {{{./web-services.html} Archiva Web Services}}
+
[]
diff --git a/archiva-docs/src/site/apt/adminguide/network-configuration.apt b/archiva-docs/src/site/apt/adminguide/network-configuration.apt
new file mode 100644
index 000000000..783eacbd5
--- /dev/null
+++ b/archiva-docs/src/site/apt/adminguide/network-configuration.apt
@@ -0,0 +1,31 @@
+ ------
+ Network Configuration
+ ------
+ Olivier Lamy
+ ------
+ 2011-10-04
+ ------
+
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+Network Configuration
+
+ To download artifacts from remote repositories, Archiva use Apache Maven Wagon. This library use a connection pool mechanism.
+ You can configure this pool to limit network access to external resources.
+
+[../images/network-configuration.png] Network Configuration \ No newline at end of file
diff --git a/archiva-docs/src/site/resources/images/network-configuration.png b/archiva-docs/src/site/resources/images/network-configuration.png
new file mode 100644
index 000000000..be3a341bc
--- /dev/null
+++ b/archiva-docs/src/site/resources/images/network-configuration.png
Binary files differ
diff --git a/archiva-docs/src/site/site.xml b/archiva-docs/src/site/site.xml
index 9ed86f7f2..1a626c294 100644
--- a/archiva-docs/src/site/site.xml
+++ b/archiva-docs/src/site/site.xml
@@ -65,13 +65,14 @@
<item name="Using LDAP" href="/adminguide/ldap.html" />
-->
</item>
- <item name="Runtime Configuration" href="/adminguide/configuration.html" collapse="true">
- <item name="Repositories" href="/adminguide/repositories.html" />
- <item name="Proxy Connectors" href="/adminguide/proxy-connectors.html" />
- <item name="Network Proxies" href="/adminguide/network-proxies.html" />
- <item name="Legacy (Maven 1) Support" href="/adminguide/legacy.html" />
- <item name="Consumers" href="/adminguide/consumers.html" />
- <item name="Staging Repositories" href="/adminguide/staging-repositories.html"/>
+ <item name="Runtime Configuration" href="/adminguide/configuration.html" collapse="true">
+ <item name="Repositories" href="/adminguide/repositories.html" />
+ <item name="Proxy Connectors" href="/adminguide/proxy-connectors.html" />
+ <item name="Network Proxies" href="/adminguide/network-proxies.html" />
+ <item name="Network Configuration" href="/adminguide/network-configuration.html" />
+ <item name="Legacy (Maven 1) Support" href="/adminguide/legacy.html" />
+ <item name="Consumers" href="/adminguide/consumers.html" />
+ <item name="Staging Repositories" href="/adminguide/staging-repositories.html"/>
</item>
<item name="Configuration Files" href="/adminguide/configuration-files.html" />
<item name="Log Files" href="/adminguide/logging.html" collapse="true">