Fixes the registration problem since moving redback to spring

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

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index bfa05c10acacfc619b2cc18b2f101cc48677b909..0beea7e96f4349bc712920867f8af857a9d859cf 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
@@ -58,14 +58,6 @@
       </configuration>
     </component>
 
-    <component>
-      <role>org.codehaus.plexus.mailsender.MailSender</role>
-      <implementation>org.codehaus.plexus.mailsender.javamail.JndiJavamailMailSender</implementation>
-      <configuration>
-        <jndiSessionName>java:comp/env/mail/Session</jndiSessionName>
-      </configuration>
-    </component>
-
     <component>
       <role>org.codehaus.plexus.jdo.JdoFactory</role>
       <role-hint>archiva</role-hint>

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 d8604065c52817bdaf336f4efad7b30cccc4cf77..a45d39c0bb5d8d23e2d717dd2ca2c86eeb089f58 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
@@ -53,4 +53,13 @@
          <ref bean="securitySystem"/>
       </constructor-arg>
   </bean>
+
+  <bean id="mailSession" class="org.springframework.jndi.JndiObjectFactoryBean">
+    <property name="jndiName" value="java:comp/env/mail/Session">
+    </property>
+  </bean>
+
+  <bean name="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
+    <property name="session" ref="mailSession"/>
+  </bean>  
 </beans>