Author: olamy
Date: Fri Dec 9 08:33:05 2011
New Revision: 1212278
URL: http://svn.apache.org/viewvc?rev=1212278&view=rev
Log:
fix spring configuration this hack is not anymore needed
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
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=1212278&r1=1212277&r2=1212278&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
Fri Dec 9 08:33:05 2011
@@ -163,11 +163,6 @@
<property name="session" ref="mailSession"/>
</bean>
- <!-- This is used to prevent the old profile activator being loaded from the
running instance of Maven in jetty:run -->
- <bean name="profileActivator#jdk-prefix"
class="org.apache.archiva.web.spring.DummyProfileActivator"/>
- <bean name="profileActivator#system-property"
class="org.apache.archiva.web.spring.DummyProfileActivator"/>
- <bean name="profileActivator#always-on"
class="org.apache.archiva.web.spring.DummyProfileActivator"/>
-
<bean name="commons-configuration"
class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
<property name="properties">
<value>
