[MRM-857] set a user agent for proxy HTTP requests

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@673383 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 60ecdd63b802fc0fa77a9d7256ca580e0ffecc4e..a3a575535848a3ab09bff38ca55ee251b6f5ede7 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -226,6 +226,15 @@
     </dependency>
   </dependencies>
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/filtered-resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <!--
       <plugin>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties b/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
new file mode 100644 (file)
index 0000000..ba43607
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
@@ -0,0 +1 @@
+user.agent=Apache Archiva/${project.version}

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index f6b0fa81d33867469acbf81237bd3a5cbcb28926..93bd4a30ba4ba1b17bb94e6e20b9f8b76bd859da 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -11,4 +11,23 @@
     <constructor-arg ref="cache#url-failures-cache" type="org.codehaus.plexus.cache.Cache"/>
   </bean>
 
+  <bean name="wagon#http" class="org.apache.maven.wagon.providers.http.LightweightHttpWagon" scope="prototype">
+    <property name="httpHeaders">
+      <map>
+        <entry key="User-Agent" value="${user.agent}" />
+      </map>
+    </property>
+  </bean>
+
+  <bean name="wagon#https" class="org.apache.maven.wagon.providers.http.LightweightHttpsWagon" scope="prototype">
+    <property name="httpHeaders">
+      <map>
+        <entry key="User-Agent" value="${user.agent}" />
+      </map>
+    </property>
+  </bean>
+
+  <bean id="propertyPlaceholder" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+    <property name="location" value="classpath:application.properties" />
+  </bean>
 </beans>