From a42300a3c030afa35f7bd0c3636bfd2deea156fe Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Fri, 9 Dec 2011 08:33:05 +0000
Subject: [PATCH] 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
---
 .../src/main/webapp/WEB-INF/applicationContext.xml           | 5 -----
 1 file changed, 5 deletions(-)

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 1c21658d9..018b8c3d6 100644
--- 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>
-- 
2.39.5