Author: brett
Date: Wed Jul 2 06:04:01 2008
New Revision: 673383
URL: http://svn.apache.org/viewvc?rev=673383&view=rev
Log:
[MRM-857] set a user agent for proxy HTTP requests
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
(with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=673383&r1=673382&r2=673383&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Jul 2
06:04:01 2008
@@ -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>
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties?rev=673383&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
Wed Jul 2 06:04:01 2008
@@ -0,0 +1 @@
+user.agent=Apache Archiva/${project.version}
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=673383&r1=673382&r2=673383&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Wed Jul 2 06:04:01 2008
@@ -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>
