Repository: archiva Updated Branches: refs/heads/master cae55ace9 -> c997c883f
Adding default userAgent system property The default userAgent string used for proxy connections can be configured by a system property. Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/bd10f7b8 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/bd10f7b8 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/bd10f7b8 Branch: refs/heads/master Commit: bd10f7b8a2ff638bb4b3796321425cac9db5476a Parents: cae55ac Author: Martin Stockhammer <[email protected]> Authored: Tue Sep 13 16:46:50 2016 +0200 Committer: Martin Stockhammer <[email protected]> Committed: Tue Sep 13 16:46:50 2016 +0200 ---------------------------------------------------------------------- .../archiva/proxy/common/WagonFactoryRequest.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/bd10f7b8/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java index 0e297f5..4054402 100644 --- a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java +++ b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java @@ -29,6 +29,11 @@ import java.util.Map; */ public class WagonFactoryRequest { + + public static final String USER_AGENT_SYSTEM_PROPERTY = "archiva.userAgent"; + + private static String DEFAULT_USER_AGENT = "Java-Archiva"; + /** * the protocol to find the Wagon for, which must be prefixed with <code>wagon#</code>, for example * <code>wagon#http</code>. <b>to have a wagon supporting ntlm add -ntlm</b> @@ -37,7 +42,13 @@ public class WagonFactoryRequest private Map<String, String> headers = new HashMap<>(); - private String userAgent = "Java-Archiva"; + private String userAgent = DEFAULT_USER_AGENT; + + static { + if (System.getProperty(USER_AGENT_SYSTEM_PROPERTY)!=null && !"".equals(System.getProperty(USER_AGENT_SYSTEM_PROPERTY))) { + DEFAULT_USER_AGENT=System.getProperty(USER_AGENT_SYSTEM_PROPERTY); + } + } private NetworkProxy networkProxy;
