Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 70818 invoked from network); 2 Oct 2006 17:16:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Oct 2006 17:16:42 -0000 Received: (qmail 87310 invoked by uid 500); 2 Oct 2006 17:16:41 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 87277 invoked by uid 500); 2 Oct 2006 17:16:41 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 87266 invoked by uid 99); 2 Oct 2006 17:16:41 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Oct 2006 10:16:41 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:50710] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 04/12-24395-87941254 for ; Mon, 02 Oct 2006 10:16:40 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 972371A981D; Mon, 2 Oct 2006 10:16:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r452129 - in /cocoon/trunk/blocks/cocoon-mail: cocoon-mail-impl/ cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/transformation/ cocoon-mail-sample/src/main/resources/COB-INF/mail/docs/mid-col-2/ Date: Mon, 02 Oct 2006 17:16:38 -0000 To: cvs@cocoon.apache.org From: asavory@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061002171638.972371A981D@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: asavory Date: Mon Oct 2 10:16:37 2006 New Revision: 452129 URL: http://svn.apache.org/viewvc?view=rev&rev=452129 Log: Apply COCOON-1818 patch Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/status.xml cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail/docs/mid-col-2/mail-action.xml Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java?view=diff&rev=452129&r1=452128&r2=452129 ============================================================================== --- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java (original) +++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java Mon Oct 2 10:16:37 2006 @@ -451,8 +451,10 @@ /** * */ - private void sendMail() { + private void sendMail() throws SAXException { try { + this.ignoreHooksCount++; + super.sendStartElementEventNS(ELEMENT_RESULT); Properties props = new Properties(); props.put("mail.smtp.host", this.mailHost); props.put("mail.smtp.port", String.valueOf(this.mailPort)); @@ -481,9 +483,6 @@ this.smtpMessage = setUpMessage(session); - this.ignoreHooksCount++; - super.sendStartElementEventNS(ELEMENT_RESULT); - if (this.sendPartial) { for (int i = 0; i < this.toAddresses.size(); i++) { List v = new ArrayList(1); @@ -495,12 +494,16 @@ } trans.close(); - super.sendEndElementEventNS(ELEMENT_RESULT); - this.ignoreHooksCount--; + } catch (SAXException e){ + throw e; } catch (Exception e) { getLogger().error("Exception sending mail", e); sendExceptionElement(e); } + finally { + super.sendEndElementEventNS(ELEMENT_RESULT); + this.ignoreHooksCount--; + } } /** @@ -511,13 +514,12 @@ throws Exception { AddressHandler[] iA = new AddressHandler[newAddresses.size()]; - for (int i = 0; i < newAddresses.size(); i++) { - InternetAddress inA = new InternetAddress((String) newAddresses.get(i)); - iA[i] = new AddressHandler(inA); - } - try { - InternetAddress[] iaArr = SendMailTransformer.getAddresses(iA); + for (int i = 0; i < newAddresses.size(); i++) { + InternetAddress inA = new InternetAddress((String) newAddresses.get(i)); + iA[i] = new AddressHandler(inA); + } + InternetAddress[] iaArr = SendMailTransformer.getAddresses(iA); this.smtpMessage.setRecipients(Message.RecipientType.TO, iaArr); trans.sendMessage(this.smtpMessage, iaArr); } catch (SendFailedException e) { Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/status.xml URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/status.xml?view=diff&rev=452129&r1=452128&r2=452129 ============================================================================== --- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/status.xml (original) +++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/status.xml Mon Oct 2 10:16:37 2006 @@ -66,6 +66,9 @@ + + Apply patch to handle malformed recipient address exception correctly. + The SendMailTransformer can now configure the smtp port. Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail/docs/mid-col-2/mail-action.xml URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail/docs/mid-col-2/mail-action.xml?view=diff&rev=452129&r1=452128&r2=452129 ============================================================================== --- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail/docs/mid-col-2/mail-action.xml (original) +++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail/docs/mid-col-2/mail-action.xml Mon Oct 2 10:16:37 2006 @@ -104,7 +104,7 @@ - +