continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r708407 - in /continuum/branches/continuum-struts2: continuum-core/pom.xml continuum-webapp/pom.xml continuum-webapp/src/main/resources/META-INF/plexus/application.xml continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml pom.xml
Date Tue, 28 Oct 2008 00:24:01 GMT
Author: olamy
Date: Mon Oct 27 17:24:01 2008
New Revision: 708407

URL: http://svn.apache.org/viewvc?rev=708407&view=rev
Log:
remove plexus mail
redback has moved to spring mail too


Modified:
    continuum/branches/continuum-struts2/continuum-core/pom.xml
    continuum/branches/continuum-struts2/continuum-webapp/pom.xml
    continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml
    continuum/branches/continuum-struts2/pom.xml

Modified: continuum/branches/continuum-struts2/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-core/pom.xml?rev=708407&r1=708406&r2=708407&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-core/pom.xml (original)
+++ continuum/branches/continuum-struts2/continuum-core/pom.xml Mon Oct 27 17:24:01 2008
@@ -33,10 +33,6 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-mail-sender-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
     <dependency>
@@ -208,11 +204,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-mail-sender-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
@@ -225,11 +216,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-mail-sender-simple</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.redback</groupId>
       <artifactId>redback-struts2-integration</artifactId>
       <scope>test</scope>

Modified: continuum/branches/continuum-struts2/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/pom.xml?rev=708407&r1=708406&r2=708407&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/pom.xml (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/pom.xml Mon Oct 27 17:24:01 2008
@@ -544,11 +544,6 @@
       <artifactId>plexus-spring</artifactId>
     </dependency>    
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-mail-sender-javamail</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
     </dependency>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?rev=708407&r1=708406&r2=708407&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
Mon Oct 27 17:24:01 2008
@@ -107,15 +107,6 @@
         <toOverride></toOverride>
       </configuration>
     </component>
-  
-    <!-- TODO remove when redback will not use anymore plexus-mail -->
-    <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>
 
     <!--
     | The jabber notifier

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=708407&r1=708406&r2=708407&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Mon Oct 27 17:24:01 2008
@@ -68,5 +68,9 @@
   <bean name="mailSender#continuum" class="org.springframework.mail.javamail.JavaMailSenderImpl">
     <property name="session" ref="mailSession"/>
   </bean>   
+	
+  <bean name="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
+    <property name="session" ref="mailSession"/>
+  </bean>	
   
 </beans>

Modified: continuum/branches/continuum-struts2/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/pom.xml?rev=708407&r1=708406&r2=708407&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/pom.xml (original)
+++ continuum/branches/continuum-struts2/pom.xml Mon Oct 27 17:24:01 2008
@@ -703,26 +703,6 @@
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-mail-sender-api</artifactId>
-        <version>${mail-sender.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-mail-sender-simple</artifactId>
-        <version>${mail-sender.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-mail-sender-test</artifactId>
-        <version>${mail-sender.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-mail-sender-javamail</artifactId>
-        <version>${mail-sender.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-slf4j-logging</artifactId>
         <version>1.1-alpha-1</version>
         <exclusions>
@@ -1078,7 +1058,6 @@
     <wagon.version>1.0-beta-2</wagon.version>
     <maven-scm.version>1.1</maven-scm.version>
     <redback.version>1.2-SNAPSHOT</redback.version>
-    <mail-sender.version>1.0-alpha-7</mail-sender.version>
     <archiva.version>1.1</archiva.version>
   </properties>
 </project>



Mime
View raw message