diff options
| author | James William Dumay <jdumay@apache.org> | 2008-10-24 02:55:22 +0000 |
|---|---|---|
| committer | James William Dumay <jdumay@apache.org> | 2008-10-24 02:55:22 +0000 |
| commit | 13ccfecb4ad85bbe441aaf497f31c51ec7ec1257 (patch) | |
| tree | 6c964b132e7c76a6ac73ca9c223d709a1eba43fe | |
| parent | 338acb23ec241749d80e198feb6e61cb5d54a1ca (diff) | |
| download | archiva-13ccfecb4ad85bbe441aaf497f31c51ec7ec1257.tar.gz archiva-13ccfecb4ad85bbe441aaf497f31c51ec7ec1257.zip | |
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
2 files changed, 9 insertions, 8 deletions
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 bfa05c10a..0beea7e96 100644 --- 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 @@ -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> 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 d8604065c..a45d39c0b 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 @@ -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> |