You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2011/02/22 05:22:25 UTC
svn commit: r1073222 - in /archiva/branches/archiva-1.3.x: ./ archiva-docs/
archiva-docs/src/site/apt/adminguide/
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/
archiva-modules/arch...
Author: brett
Date: Tue Feb 22 04:22:24 2011
New Revision: 1073222
URL: http://svn.apache.org/viewvc?rev=1073222&view=rev
Log:
[MRM-1248] improve documentation about potential issues with the network proxy configuration
Merged from: r1073214
Modified:
archiva/branches/archiva-1.3.x/ (props changed)
archiva/branches/archiva-1.3.x/archiva-docs/ (props changed)
archiva/branches/archiva-1.3.x/archiva-docs/src/site/apt/adminguide/network-proxies.apt
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java (props changed)
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/ (props changed)
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties (props changed)
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml (props changed)
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java (props changed)
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/ (props changed)
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java (props changed)
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/ (props changed)
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml (props changed)
Propchange: archiva/branches/archiva-1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 22 04:22:24 2011
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements:723609-726925
/archiva/branches/archiva-struts2:699795-705848
/archiva/tags/archiva-1.3:898632
-/archiva/trunk:900342,909454-909456,917398,917519,919307,1039228
+/archiva/trunk:900342,909454-909456,917398,917519,919307,1039228,1073214
Propchange: archiva/branches/archiva-1.3.x/archiva-docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 22 04:22:24 2011
@@ -4,4 +4,4 @@
/archiva/branches/archiva-struts2/archiva-docs:699795-705848
/archiva/tags/archiva-1.3/archiva-docs:898632
/archiva/tags/archiva-1.3.2/archiva-docs:1040400
-/archiva/trunk/archiva-docs:900342,909454-909456,917398,917519,919307,1039228
+/archiva/trunk/archiva-docs:900342,909454-909456,917398,917519,919307,1039228,1073214
Modified: archiva/branches/archiva-1.3.x/archiva-docs/src/site/apt/adminguide/network-proxies.apt
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-docs/src/site/apt/adminguide/network-proxies.apt?rev=1073222&r1=1073221&r2=1073222&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-docs/src/site/apt/adminguide/network-proxies.apt (original)
+++ archiva/branches/archiva-1.3.x/archiva-docs/src/site/apt/adminguide/network-proxies.apt Tue Feb 22 04:22:24 2011
@@ -17,5 +17,18 @@ 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
Propchange: archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 22 04:22:24 2011
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:898632
-/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:900342,909454-909456,917398,917519,919307,1039228
+/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:900342,909454-909456,917398,917519,919307,1039228,1073214
Propchange: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 22 04:22:24 2011
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp-test:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp-test:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp-test:898632
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test:900342,909454-909456,915192-918810,919307,1039228
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test:900342,909454-909456,915192-918810,919307,1039228,1073214
Propchange: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 22 04:22:24 2011
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:898632
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:900342,909454-909456,917398,917519,919307,1039228
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:900342,909454-909456,917398,917519,919307,1039228,1073214
Propchange: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 22 04:22:24 2011
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:898632
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:900342,909454-909456,917398,917519,919307,1039228
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:900342,909454-909456,917398,917519,919307,1039228,1073214
Propchange: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 22 04:22:24 2011
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:898632
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:900342,909454-909456,917398,917519,919307,1039228
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:900342,909454-909456,917398,917519,919307,1039228,1073214
Propchange: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 22 04:22:24 2011
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:898632*
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:900342,909454-909456,917398,917519,919307,1039228
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:900342,909454-909456,917398,917519,919307,1039228,1073214
Propchange: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 22 04:22:24 2011
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:898632
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:900342,909454-909456,917398,917519,919307,1039228
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:900342,909454-909456,917398,917519,919307,1039228,1073214
Propchange: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 22 04:22:24 2011
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:898632*
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:900342,909454-909456,917398,917519,919307,1039228
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:900342,909454-909456,917398,917519,919307,1039228,1073214
Propchange: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 22 04:22:24 2011
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml:898632
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml:900342,909454-909456,917398,917519,919307,1039228
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml:900342,909454-909456,917398,917519,919307,1039228,1073214