You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/11/26 13:22:07 UTC
svn commit: r1206431 - in /camel/trunk: components/camel-mail/
components/camel-mail/src/main/java/org/apache/camel/component/mail/
components/camel-mail/src/test/java/org/apache/camel/component/mail/
platforms/karaf/features/src/main/resources/
Author: davsclaus
Date: Sat Nov 26 12:22:00 2011
New Revision: 1206431
URL: http://svn.apache.org/viewvc?rev=1206431&view=rev
Log:
CAMEL-4161: camel-mail no longer dep on Spring JARs.
Added:
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultAuthenticator.java
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultJavaMailSender.java
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/JavaMailSender.java
Modified:
camel/trunk/components/camel-mail/pom.xml
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-mail/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/pom.xml?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/pom.xml (original)
+++ camel/trunk/components/camel-mail/pom.xml Sat Nov 26 12:22:00 2011
@@ -41,14 +41,6 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- </dependency>
- <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${javax-mail-version}</version>
Added: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultAuthenticator.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultAuthenticator.java?rev=1206431&view=auto
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultAuthenticator.java (added)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultAuthenticator.java Sat Nov 26 12:22:00 2011
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mail;
+
+import javax.mail.Authenticator;
+import javax.mail.PasswordAuthentication;
+
+/**
+ * Mail {@link Authenticator} that supplies username and password
+ */
+public class DefaultAuthenticator extends Authenticator {
+
+ private final String username;
+ private final String password;
+
+ public DefaultAuthenticator(String username, String password) {
+ this.password = password;
+ this.username = username;
+ }
+
+ /**
+ * Returns an authenticator object for use in sessions
+ */
+ public PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(username, password);
+ }
+
+}
Added: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultJavaMailSender.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultJavaMailSender.java?rev=1206431&view=auto
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultJavaMailSender.java (added)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultJavaMailSender.java Sat Nov 26 12:22:00 2011
@@ -0,0 +1,141 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mail;
+
+import java.util.Date;
+import java.util.Properties;
+import javax.mail.MessagingException;
+import javax.mail.NoSuchProviderException;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.MimeMessage;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Default {@link JavaMailSender} which uses the JDK Mail API.
+ */
+public class DefaultJavaMailSender implements JavaMailSender {
+
+ private static final transient Logger LOG = LoggerFactory.getLogger(DefaultJavaMailSender.class);
+
+ private Properties javaMailProperties;
+ private String host;
+ private String username;
+ private String password;
+ private int port;
+ private String protocol;
+ private Session session;
+
+ public String getHost() {
+ return host;
+ }
+
+ public void setHost(String host) {
+ this.host = host;
+ }
+
+ public Properties getJavaMailProperties() {
+ if (javaMailProperties == null) {
+ javaMailProperties = new Properties();
+ }
+ return javaMailProperties;
+ }
+
+ public void setJavaMailProperties(Properties javaMailProperties) {
+ this.javaMailProperties = javaMailProperties;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public Session getSession() {
+ if (session == null) {
+ session = Session.getInstance(getJavaMailProperties(), new DefaultAuthenticator(username, password));
+ }
+ return session;
+ }
+
+ public void setSession(Session session) {
+ this.session = session;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public String getProtocol() {
+ return protocol;
+ }
+
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
+ }
+
+ @Override
+ public void send(MimeMessage mimeMessage) throws MessagingException {
+ Transport transport = getTransport(getSession());
+ LOG.debug("Connecting to {}:{}", host, port);
+ transport.connect(getHost(), getPort(), getUsername(), getPassword());
+
+ try {
+ if (mimeMessage.getSentDate() == null) {
+ mimeMessage.setSentDate(new Date());
+ }
+ String messageId = mimeMessage.getMessageID();
+ mimeMessage.saveChanges();
+ if (messageId != null) {
+ // preserve explicitly specified message id, as it may be lost on save
+ mimeMessage.setHeader("Message-ID", messageId);
+ }
+ LOG.debug("Sending MimMessage: {} using host: {}", mimeMessage, host);
+ transport.sendMessage(mimeMessage, mimeMessage.getAllRecipients());
+ } finally {
+ try {
+ transport.close();
+ } catch (MessagingException e) {
+ LOG.warn("Error closing transport to host " + host + ". This exception will be ignored.", e);
+ }
+ }
+ }
+
+ /**
+ * Strategy to get the {@link Transport} from the mail {@link Session}.
+ */
+ protected Transport getTransport(Session session) throws NoSuchProviderException {
+ return session.getTransport(getProtocol());
+ }
+
+}
Added: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/JavaMailSender.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/JavaMailSender.java?rev=1206431&view=auto
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/JavaMailSender.java (added)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/JavaMailSender.java Sat Nov 26 12:22:00 2011
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mail;
+
+import java.util.Properties;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.internet.MimeMessage;
+
+/**
+ * The JavaMailSender interface contains all the methods of a JavaMailSender
+ * implementation currently used by the mail component.
+ */
+public interface JavaMailSender {
+
+ /**
+ * Send the mail
+ *
+ * @param mimeMessage the message to send
+ * @throws javax.mail.MessagingException is thrown if error sending the mail.
+ */
+ void send(MimeMessage mimeMessage) throws MessagingException;
+
+ Properties getJavaMailProperties();
+
+ void setJavaMailProperties(Properties javaMailProperties);
+
+ void setHost(String host);
+
+ String getHost();
+
+ void setPort(int port);
+
+ int getPort();
+
+ void setUsername(String username);
+
+ String getUsername();
+
+ void setPassword(String password);
+
+ String getPassword();
+
+ void setProtocol(String protocol);
+
+ String getProtocol();
+
+ void setSession(Session session);
+
+ Session getSession();
+}
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java Sat Nov 26 12:22:00 2011
@@ -20,14 +20,10 @@ import java.net.URI;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import javax.mail.Authenticator;
import javax.mail.Message;
-import javax.mail.PasswordAuthentication;
import javax.mail.Session;
import org.apache.camel.RuntimeCamelException;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Represents the configuration data for communicating over email
@@ -47,7 +43,6 @@ public class MailConfiguration implement
private String subject;
private Session session;
private boolean mapMailMessage = true;
- private String defaultEncoding;
private String from = MailConstants.MAIL_DEFAULT_FROM;
private String folderName = MailConstants.MAIL_DEFAULT_FOLDER;
private boolean delete;
@@ -109,8 +104,8 @@ public class MailConfiguration implement
}
}
- protected JavaMailSenderImpl createJavaMailSender() {
- JavaMailSenderImpl answer = new JavaMailSenderImpl();
+ protected JavaMailSender createJavaMailSender() {
+ JavaMailSender answer = new DefaultJavaMailSender();
if (javaMailProperties != null) {
answer.setJavaMailProperties(javaMailProperties);
@@ -123,9 +118,6 @@ public class MailConfiguration implement
}
}
- if (defaultEncoding != null) {
- answer.setDefaultEncoding(defaultEncoding);
- }
if (host != null) {
answer.setHost(host);
}
@@ -145,7 +137,7 @@ public class MailConfiguration implement
answer.setSession(session);
} else {
// use our authenticator that does no live user interaction but returns the already configured username and password
- Session session = Session.getInstance(answer.getJavaMailProperties(), getAuthenticator());
+ Session session = Session.getInstance(answer.getJavaMailProperties(), new DefaultAuthenticator(getUsername(), getPassword()));
// sets the debug mode of the underlying mail framework
session.setDebug(debugMode);
answer.setSession(session);
@@ -195,17 +187,6 @@ public class MailConfiguration implement
|| this.protocol.equalsIgnoreCase("imaps");
}
- /**
- * Returns an authenticator object for use in sessions
- */
- public Authenticator getAuthenticator() {
- return new Authenticator() {
- protected PasswordAuthentication getPasswordAuthentication() {
- return new PasswordAuthentication(getUsername(), getPassword());
- }
- };
- }
-
public String getMailStoreLogInformation() {
String ssl = "";
if (isSecureProtocol()) {
@@ -226,14 +207,6 @@ public class MailConfiguration implement
this.javaMailSender = javaMailSender;
}
- public String getDefaultEncoding() {
- return defaultEncoding;
- }
-
- public void setDefaultEncoding(String defaultEncoding) {
- this.defaultEncoding = defaultEncoding;
- }
-
public String getHost() {
return host;
}
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java Sat Nov 26 12:22:00 2011
@@ -40,7 +40,6 @@ import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* A {@link org.apache.camel.Consumer Consumer} which consumes messages from JavaMail using a
@@ -51,14 +50,14 @@ public class MailConsumer extends Schedu
public static final long DEFAULT_CONSUMER_DELAY = 60 * 1000L;
private static final transient Logger LOG = LoggerFactory.getLogger(MailConsumer.class);
- private final JavaMailSenderImpl sender;
+ private final JavaMailSender sender;
private Folder folder;
private Store store;
private int maxMessagesPerPoll;
private volatile ShutdownRunningTask shutdownRunningTask;
private volatile int pendingExchanges;
- public MailConsumer(MailEndpoint endpoint, Processor processor, JavaMailSenderImpl sender) {
+ public MailConsumer(MailEndpoint endpoint, Processor processor, JavaMailSender sender) {
super(endpoint, processor);
this.sender = sender;
}
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java Sat Nov 26 12:22:00 2011
@@ -27,8 +27,6 @@ import org.apache.camel.impl.DefaultExch
import org.apache.camel.impl.DefaultHeaderFilterStrategy;
import org.apache.camel.impl.ScheduledPollEndpoint;
import org.apache.camel.spi.HeaderFilterStrategy;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Endpoint for Camel Mail.
@@ -82,14 +80,14 @@ public class MailEndpoint extends Schedu
}
// must use java mail sender impl as we need to get hold of a mail session
- JavaMailSenderImpl sender = configuration.createJavaMailSender();
+ JavaMailSender sender = configuration.createJavaMailSender();
return createConsumer(processor, sender);
}
/**
* Creates a consumer using the given processor and sender
*/
- public Consumer createConsumer(Processor processor, JavaMailSenderImpl sender) throws Exception {
+ public Consumer createConsumer(Processor processor, JavaMailSender sender) throws Exception {
MailConsumer answer = new MailConsumer(this, processor, sender);
// ScheduledPollConsumer default delay is 500 millis and that is too often for polling a mailbox,
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java Sat Nov 26 12:22:00 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.mail;
+import java.io.IOException;
+import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import org.apache.camel.Exchange;
@@ -23,9 +25,6 @@ import org.apache.camel.impl.DefaultProd
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.MimeMessagePreparator;
-
/**
* A Producer to send messages using JavaMail.
*
@@ -41,14 +40,18 @@ public class MailProducer extends Defaul
}
public void process(final Exchange exchange) {
- sender.send(new MimeMessagePreparator() {
- public void prepare(MimeMessage mimeMessage) throws Exception {
- getEndpoint().getBinding().populateMailMessage(getEndpoint(), mimeMessage, exchange);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Sending MimeMessage: {}", MailUtils.dumpMessage(mimeMessage));
- }
+ MimeMessage mimeMessage = new MimeMessage(sender.getSession());
+ try {
+ getEndpoint().getBinding().populateMailMessage(getEndpoint(), mimeMessage, exchange);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Sending MimeMessage: {}", MailUtils.dumpMessage(mimeMessage));
}
- });
+ sender.send(mimeMessage);
+ } catch (MessagingException e) {
+ exchange.setException(e);
+ } catch (IOException e) {
+ exchange.setException(e);
+ }
}
@Override
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java Sat Nov 26 12:22:00 2011
@@ -27,7 +27,6 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Unit test for batch consumer.
@@ -67,7 +66,7 @@ public class MailBatchConsumerTest exten
private void prepareMailbox() throws Exception {
// connect to mailbox
Mailbox.clearAll();
- JavaMailSenderImpl sender = new JavaMailSenderImpl();
+ JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("pop3");
store.connect("localhost", 25, "jones", "secret");
Folder folder = store.getFolder("INBOX");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java Sat Nov 26 12:22:00 2011
@@ -28,7 +28,6 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Unit test for fetch size.
@@ -60,7 +59,7 @@ public class MailCommitOnCompletionTest
private void prepareMailbox() throws Exception {
// connect to mailbox
Mailbox.clearAll();
- JavaMailSenderImpl sender = new JavaMailSenderImpl();
+ JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("pop3");
store.connect("localhost", 25, "jones", "secret");
Folder folder = store.getFolder("INBOX");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java Sat Nov 26 12:22:00 2011
@@ -76,7 +76,6 @@ public class MailComponentTest extends C
assertEquals("getUsername()", "james", config.getUsername());
assertEquals("getRecipients().get(Message.RecipientType.TO)", "james@myhost", config.getRecipients().get(Message.RecipientType.TO));
assertEquals("folder", "INBOX", config.getFolderName());
- assertEquals("encoding", null, config.getDefaultEncoding());
assertEquals("from", "camel@localhost", config.getFrom());
assertEquals("password", "secret", config.getPassword());
assertEquals(false, config.isDelete());
@@ -100,7 +99,6 @@ public class MailComponentTest extends C
assertEquals("getUsername()", "james", config.getUsername());
assertEquals("getRecipients().get(Message.RecipientType.TO)", "james@myhost", config.getRecipients().get(Message.RecipientType.TO));
assertEquals("folder", "INBOX", config.getFolderName());
- assertEquals("encoding", null, config.getDefaultEncoding());
assertEquals("from", "camel@localhost", config.getFrom());
assertEquals("password", "secret", config.getPassword());
assertEquals(false, config.isDelete());
@@ -155,7 +153,6 @@ public class MailComponentTest extends C
assertEquals("getUsername()", "james", config.getUsername());
assertEquals("getRecipients().get(Message.RecipientType.TO)", "james@myhost", config.getRecipients().get(Message.RecipientType.TO));
assertEquals("folder", "INBOX", config.getFolderName());
- assertEquals("encoding", null, config.getDefaultEncoding());
assertEquals("from", "camel@localhost", config.getFrom());
assertEquals("password", "secret", config.getPassword());
assertEquals(false, config.isDelete());
@@ -176,7 +173,6 @@ public class MailComponentTest extends C
assertEquals("getUsername()", "james", config.getUsername());
assertEquals("getRecipients().get(Message.RecipientType.TO)", "james@myhost", config.getRecipients().get(Message.RecipientType.TO));
assertEquals("folder", "INBOX", config.getFolderName());
- assertEquals("encoding", null, config.getDefaultEncoding());
assertEquals("from", "camel@localhost", config.getFrom());
assertEquals("password", "secret", config.getPassword());
assertEquals(false, config.isDelete());
@@ -190,7 +186,7 @@ public class MailComponentTest extends C
@Test
public void testManyConfigurations() throws Exception {
MailEndpoint endpoint = resolveMandatoryEndpoint("smtp://james@myhost:30/subject?password=secret"
- + "&from=me@camelriders.org&delete=true&defaultEncoding=iso-8859-1&folderName=riders"
+ + "&from=me@camelriders.org&delete=true&folderName=riders"
+ "&contentType=text/html&unseen=false");
MailConfiguration config = endpoint.getConfiguration();
assertEquals("getProtocol()", "smtp", config.getProtocol());
@@ -199,7 +195,6 @@ public class MailComponentTest extends C
assertEquals("getUsername()", "james", config.getUsername());
assertEquals("getRecipients().get(Message.RecipientType.TO)", "james@myhost", config.getRecipients().get(Message.RecipientType.TO));
assertEquals("folder", "riders", config.getFolderName());
- assertEquals("encoding", "iso-8859-1", config.getDefaultEncoding());
assertEquals("from", "me@camelriders.org", config.getFrom());
assertEquals("password", "secret", config.getPassword());
assertEquals(true, config.isDelete());
@@ -220,7 +215,6 @@ public class MailComponentTest extends C
assertEquals("getUsername()", "james", config.getUsername());
assertEquals("getRecipients().get(Message.RecipientType.TO)", "someone@outthere.com", config.getRecipients().get(Message.RecipientType.TO));
assertEquals("folder", "XXX", config.getFolderName());
- assertEquals("encoding", null, config.getDefaultEncoding());
assertEquals("from", "camel@localhost", config.getFrom());
assertEquals("password", "secret", config.getPassword());
assertEquals(false, config.isDelete());
@@ -239,7 +233,6 @@ public class MailComponentTest extends C
assertEquals("getUsername()", "james", config.getUsername());
assertEquals("getRecipients().get(Message.RecipientType.TO)", "james@myhost", config.getRecipients().get(Message.RecipientType.TO));
assertEquals("folder", "INBOX", config.getFolderName());
- assertEquals("encoding", null, config.getDefaultEncoding());
assertEquals("from", "camel@localhost", config.getFrom());
assertEquals("password", "secret", config.getPassword());
assertEquals(false, config.isDelete());
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java Sat Nov 26 12:22:00 2011
@@ -26,7 +26,6 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* @version
@@ -50,7 +49,7 @@ public class MailConsumerUnsupportedChar
private void prepareMailbox() throws Exception {
// connect to mailbox
Mailbox.clearAll();
- JavaMailSenderImpl sender = new JavaMailSenderImpl();
+ JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", 25, "jones", "secret");
Folder folder = store.getFolder("INBOX");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java Sat Nov 26 12:22:00 2011
@@ -16,16 +16,14 @@
*/
package org.apache.camel.component.mail;
-import java.io.InputStream;
+import java.util.Properties;
+import javax.mail.MessagingException;
+import javax.mail.Session;
import javax.mail.internet.MimeMessage;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import org.springframework.mail.MailException;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.MimeMessagePreparator;
/**
* @version
@@ -50,36 +48,72 @@ public class MailCustomMailSenderTest ex
private static class MySender implements JavaMailSender {
- public void send(SimpleMailMessage simpleMessage) throws MailException {
- // noop
+ @Override
+ public void send(MimeMessage mimeMessage) throws MessagingException {
+ sent = true;
+ }
+
+ @Override
+ public Properties getJavaMailProperties() {
+ return null;
+ }
+
+ @Override
+ public void setJavaMailProperties(Properties javaMailProperties) {
+ }
+
+ @Override
+ public void setHost(String host) {
+ }
+
+ @Override
+ public String getHost() {
+ return null;
+ }
+
+ @Override
+ public void setPort(int port) {
+ }
+
+ @Override
+ public int getPort() {
+ return 0;
}
- public void send(SimpleMailMessage[] simpleMessages) throws MailException {
- // noop
+ @Override
+ public void setUsername(String username) {
}
- public MimeMessage createMimeMessage() {
+ @Override
+ public String getUsername() {
return null;
}
- public MimeMessage createMimeMessage(InputStream contentStream) throws MailException {
+ @Override
+ public void setPassword(String password) {
+ }
+
+ @Override
+ public String getPassword() {
return null;
}
- public void send(MimeMessage mimeMessage) throws MailException {
- // noop
+ @Override
+ public void setProtocol(String protocol) {
}
- public void send(MimeMessage[] mimeMessages) throws MailException {
- // noop
+ @Override
+ public String getProtocol() {
+ return null;
}
- public void send(MimeMessagePreparator mimeMessagePreparator) throws MailException {
- sent = true;
+ @Override
+ public void setSession(Session session) {
}
- public void send(MimeMessagePreparator[] mimeMessagePreparators) throws MailException {
- // noop
+ @Override
+ public Session getSession() {
+ return null;
}
}
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java Sat Nov 26 12:22:00 2011
@@ -28,7 +28,6 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Unit test for rollback option.
@@ -58,7 +57,7 @@ public class MailDoNotDeleteIfProcessFai
// connect to mailbox
Mailbox.clearAll();
- JavaMailSenderImpl sender = new JavaMailSenderImpl();
+ JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", 25, "claus", "secret");
Folder folder = store.getFolder("INBOX");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java Sat Nov 26 12:22:00 2011
@@ -26,7 +26,6 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Unit test for fetch size.
@@ -75,7 +74,7 @@ public class MailFetchSizeTest extends C
private void prepareMailbox() throws Exception {
// connect to mailbox
Mailbox.clearAll();
- JavaMailSenderImpl sender = new JavaMailSenderImpl();
+ JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("pop3");
store.connect("localhost", 25, "jones", "secret");
Folder folder = store.getFolder("INBOX");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java Sat Nov 26 12:22:00 2011
@@ -26,7 +26,6 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Unit test for a special corner case with fetchSize=0
@@ -57,7 +56,7 @@ public class MailFetchSizeZeroTest exten
private void prepareMailbox() throws Exception {
// connect to mailbox
Mailbox.clearAll();
- JavaMailSenderImpl sender = new JavaMailSenderImpl();
+ JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("pop3");
store.connect("localhost", 25, "bill", "secret");
Folder folder = store.getFolder("INBOX");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java Sat Nov 26 12:22:00 2011
@@ -27,7 +27,6 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Unit test for batch consumer.
@@ -64,7 +63,7 @@ public class MailMaxMessagesPerPollTest
private void prepareMailbox() throws Exception {
// connect to mailbox
Mailbox.clearAll();
- JavaMailSenderImpl sender = new JavaMailSenderImpl();
+ JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("pop3");
store.connect("localhost", 25, "jones", "secret");
Folder folder = store.getFolder("INBOX");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java Sat Nov 26 12:22:00 2011
@@ -20,7 +20,6 @@ import org.apache.camel.CamelExecutionEx
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import org.springframework.mail.MailPreparationException;
/**
* Unit test for no recipients
@@ -33,8 +32,7 @@ public class MailNoRecipientsTest extend
template.sendBody("direct:a", "Hello World");
fail("Should have thrown exception");
} catch (CamelExecutionException e) {
- MailPreparationException mpe = assertIsInstanceOf(MailPreparationException.class, e.getCause());
- IllegalArgumentException iae = assertIsInstanceOf(IllegalArgumentException.class, mpe.getCause());
+ IllegalArgumentException iae = assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
assertEquals("The mail message does not have any recipients set.", iae.getMessage());
}
}
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java Sat Nov 26 12:22:00 2011
@@ -26,7 +26,6 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Unit test for a special corner case with fetchSize=0
@@ -55,7 +54,7 @@ public class MailPollEnrichTest extends
private void prepareMailbox() throws Exception {
// connect to mailbox
Mailbox.clearAll();
- JavaMailSenderImpl sender = new JavaMailSenderImpl();
+ JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("pop3");
store.connect("localhost", 25, "bill", "secret");
Folder folder = store.getFolder("INBOX");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java Sat Nov 26 12:22:00 2011
@@ -27,7 +27,6 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Unit test for unseen option.
@@ -62,7 +61,7 @@ public class MailProcessOnlyUnseenMessag
private void prepareMailbox() throws Exception {
// connect to mailbox
Mailbox.clearAll();
- JavaMailSenderImpl sender = new JavaMailSenderImpl();
+ JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", 25, "claus", "secret");
Folder folder = store.getFolder("INBOX");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java Sat Nov 26 12:22:00 2011
@@ -26,7 +26,6 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
-import org.springframework.mail.MailPreparationException;
/**
* @version
@@ -97,8 +96,7 @@ public class MailProducerUnsupportedChar
template.sendBodyAndHeaders("smtp://localhost?ignoreUnsupportedCharset=false", "Bye World", headers);
fail("Should have thrown an exception");
} catch (RuntimeCamelException e) {
- assertIsInstanceOf(MailPreparationException.class, e.getCause());
- assertIsInstanceOf(UnsupportedEncodingException.class, e.getCause().getCause());
+ assertIsInstanceOf(UnsupportedEncodingException.class, e.getCause());
}
mock.assertIsSatisfied();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java Sat Nov 26 12:22:00 2011
@@ -28,7 +28,6 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Unit test for shutdown.
@@ -78,7 +77,7 @@ public class MailShutdownCompleteAllTask
private void prepareMailbox() throws Exception {
// connect to mailbox
Mailbox.clearAll();
- JavaMailSenderImpl sender = new JavaMailSenderImpl();
+ JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("pop3");
store.connect("localhost", 25, "jones", "secret");
Folder folder = store.getFolder("INBOX");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java Sat Nov 26 12:22:00 2011
@@ -27,7 +27,6 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Unit test for shutdown.
@@ -61,7 +60,7 @@ public class MailShutdownCompleteCurrent
private void prepareMailbox() throws Exception {
// connect to mailbox
Mailbox.clearAll();
- JavaMailSenderImpl sender = new JavaMailSenderImpl();
+ JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("pop3");
store.connect("localhost", 25, "jones", "secret");
Folder folder = store.getFolder("INBOX");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java Sat Nov 26 12:22:00 2011
@@ -31,7 +31,6 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Unit test for Mail using camel headers to set recipient subject.
@@ -125,7 +124,7 @@ public class RawMailMessageTest extends
private void prepareMailbox(String user, String type) throws Exception {
// connect to mailbox
- JavaMailSenderImpl sender = new JavaMailSenderImpl();
+ JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore(type);
store.connect("localhost", 25, user, "secret");
Folder folder = store.getFolder("INBOX");
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1206431&r1=1206430&r2=1206431&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sat Nov 26 12:22:00 2011
@@ -441,7 +441,6 @@
<bundle>mvn:org.apache.camel/camel-lucene/${pom.version}</bundle>
</feature>
<feature name='camel-mail' version='${pom.version}' resolver='(obr)' start-level='50'>
- <feature version="[3,4)">spring</feature>
<bundle dependency="true">mvn:javax.mail/mail/${javax-mail-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-mail/${pom.version}</bundle>