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 2009/05/28 14:03:44 UTC
svn commit: r779577 - in /camel/trunk/components/camel-mail/src:
main/java/org/apache/camel/component/mail/
test/java/org/apache/camel/component/mail/
Author: davsclaus
Date: Thu May 28 12:03:43 2009
New Revision: 779577
URL: http://svn.apache.org/viewvc?rev=779577&view=rev
Log:
Renamed alternative body header option as it was spelt wrong.
Added:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
- copied, changed from r779488, camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
Modified:
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java?rev=779577&r1=779576&r2=779577&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java Thu May 28 12:03:43 2009
@@ -393,7 +393,7 @@
}
protected static String getAlternativeBody(MailConfiguration configuration, org.apache.camel.Message camelMessage) {
- String alternativeBodyHeader = configuration.getAlternateBodyHeader();
+ String alternativeBodyHeader = configuration.getAlternativeBodyHeader();
return camelMessage.getHeader(alternativeBodyHeader, java.lang.String.class);
}
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=779577&r1=779576&r2=779577&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 Thu May 28 12:03:43 2009
@@ -55,7 +55,7 @@
private long connectionTimeout = MailConstants.MAIL_DEFAULT_CONNECTION_TIMEOUT;
private boolean dummyTrustManager;
private String contentType = "text/plain";
- private String alternateBodyHeader = MailConstants.MAIL_ALTERNATIVE_BODY;
+ private String alternativeBodyHeader = MailConstants.MAIL_ALTERNATIVE_BODY;
private boolean useInlineAttachments;
public MailConfiguration() {
@@ -408,12 +408,12 @@
this.contentType = contentType;
}
- public String getAlternateBodyHeader() {
- return alternateBodyHeader;
+ public String getAlternativeBodyHeader() {
+ return alternativeBodyHeader;
}
- public void setAlternateBodyHeader(String alternateBodyHeader) {
- this.alternateBodyHeader = alternateBodyHeader;
+ public void setAlternativeBodyHeader(String alternativeBodyHeader) {
+ this.alternativeBodyHeader = alternativeBodyHeader;
}
public boolean isUseInlineAttachments() {
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java?rev=779577&r1=779576&r2=779577&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java Thu May 28 12:03:43 2009
@@ -75,7 +75,7 @@
assertNotNull("The logo should be there", handler);
// TODO: content type does not work with geronomi mail jar (its a buggy jar, use SUN mail jar instead)
- // assertEquals("image/jpeg; name=logo.jpeg", handler.getContentType());
+ assertEquals("image/jpeg; name=logo.jpeg", handler.getContentType());
producer.stop();
}
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java?rev=779577&r1=779576&r2=779577&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java Thu May 28 12:03:43 2009
@@ -79,7 +79,7 @@
// content type should match
// TODO: content type does not work with geronomi mail jar (its a buggy jar, use SUN mail jar instead)
- // assertEquals("image/jpeg; name=logo.jpeg", handler.getContentType());
+ assertEquals("image/jpeg; name=logo.jpeg", handler.getContentType());
// save logo for visual inspection
template.sendBodyAndHeader("file://target", bytes, Exchange.FILE_NAME, "maillogo.jpg");
Copied: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java (from r779488, camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java?p2=camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java&p1=camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java&r1=779488&r2=779577&rev=779577&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java Thu May 28 12:03:43 2009
@@ -24,23 +24,18 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.jvnet.mock_javamail.Mailbox;
-/**
- * Unit test to verift that we can have multiple recipients in To, CC and BCC
- */
-public class MailMultipleRecipientsTest extends ContextTestSupport {
+public class MailNameAndEmailInRecipientTest extends ContextTestSupport {
- public void testSendWithMultipleRecipientsInHeader() throws Exception {
+ public void testSendWithNameAndEmailInRecipient() throws Exception {
Mailbox.clearAll();
// START SNIPPET: e1
Map<String, Object> headers = new HashMap<String, Object>();
- // test with both comma and semi colon as Camel supports both kind of separators
- headers.put("to", "claus@localhost, willem@localhost ; hadrian@localhost");
- headers.put("cc", "james@localhost");
-
- assertMailbox("claus");
- assertMailbox("willem");
- assertMailbox("hadrian");
+ headers.put("to", "Claus Ibsen <da...@localhost>");
+ headers.put("cc", "James Strachan <js...@localhost>");
+
+ assertMailbox("davsclaus");
+ assertMailbox("jstrachan");
template.sendBodyAndHeaders("smtp://localhost", "Hello World", headers);
// END SNIPPET: e1
@@ -48,38 +43,21 @@
assertMockEndpointsSatisfied();
}
- public void testSendWithMultipleRecipientsPreConfigured() throws Exception {
- Mailbox.clearAll();
-
- assertMailbox("claus");
- assertMailbox("willem");
-
- // START SNIPPET: e2
- // here we have preconfigued the to recievs to claus and willem. Notice we use comma to seperate
- // the two recipeients. Camel also support using colon as seperator char
- template.sendBody("smtp://localhost?To=claus@localhost,willem@localhost&CC=james@localhost", "Hello World");
- // END SNIPPET: e2
-
- assertMockEndpointsSatisfied();
- }
-
private void assertMailbox(String name) throws Exception {
MockEndpoint mock = getMockEndpoint("mock:" + name);
- mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Hello World");
- mock.expectedHeaderReceived("cc", "james@localhost");
+ mock.message(0).header("to").isEqualTo("Claus Ibsen <da...@localhost>");
+ mock.message(0).header("cc").isEqualTo("James Strachan <js...@localhost>");
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://claus@localhost?consumer.delay=1000").to("mock:claus");
-
- from("pop3://willem@localhost?consumer.delay=1000").to("mock:willem");
+ from("pop3://davsclaus@localhost?consumer.delay=1000").to("mock:davsclaus");
- from("pop3://hadrian@localhost?consumer.delay=1000").to("mock:hadrian");
+ from("pop3://jstrachan@localhost?consumer.delay=1000").to("mock:jstrachan");
}
};
}
-}
+}
\ No newline at end of file
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java?rev=779577&r1=779576&r2=779577&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java Thu May 28 12:03:43 2009
@@ -40,7 +40,7 @@
// create an exchange with a normal body and attachment to be produced as email
MailEndpoint endpoint = context.getEndpoint("smtp://ryan@mymailserver.com?password=secret", MailEndpoint.class);
endpoint.getConfiguration().setUseInlineAttachments(useInlineattachments);
- endpoint.getConfiguration().setAlternateBodyHeader(MailConstants.MAIL_ALTERNATIVE_BODY);
+ endpoint.getConfiguration().setAlternativeBodyHeader(MailConstants.MAIL_ALTERNATIVE_BODY);
// create the exchange with the mail message that is multipart with a file and a Hello World text/plain message.
Exchange exchange = endpoint.createExchange();