fix spring configuration this hack is not anymore needed

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

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 1c21658d92284bbf79ae2a0c5f2ceeeb8abfd3a1..018b8c3d6cd8d19b040c33dbe97f330ee02b57dd 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
@@ -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>