Author: jdumay
Date: Thu Oct 23 19:55:22 2008
New Revision: 707526
URL: http://svn.apache.org/viewvc?rev=707526&view=rev
Log:
Fixes the registration problem since moving redback to spring
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.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/src/main/resources/META-INF/plexus/application.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?rev=707526&r1=707525&r2=707526&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
Thu Oct 23 19:55:22 2008
@@ -59,14 +59,6 @@
</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>
<implementation>org.codehaus.plexus.jdo.DataSourceConfigurableJdoFactory</implementation>
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=707526&r1=707525&r2=707526&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
Thu Oct 23 19:55:22 2008
@@ -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>