From cvs-return-28732-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org Thu Oct 26 18:51:31 2006 Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 76476 invoked from network); 26 Oct 2006 18:51:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Oct 2006 18:51:17 -0000 Received: (qmail 7859 invoked by uid 500); 26 Oct 2006 18:51:28 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 7806 invoked by uid 500); 26 Oct 2006 18:51:28 -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 7795 invoked by uid 99); 26 Oct 2006 18:51:28 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Oct 2006 11:51:28 -0700 X-ASF-Spam-Status: No, hits=0.6 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: local policy) Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Oct 2006 11:51:14 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 314381A9846; Thu, 26 Oct 2006 11:50:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r468095 - /cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/ Date: Thu, 26 Oct 2006 18:50:51 -0000 To: cvs@cocoon.apache.org From: vgritsenko@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061026185052.314381A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vgritsenko Date: Thu Oct 26 11:50:50 2006 New Revision: 468095 URL: http://svn.apache.org/viewvc?view=rev&rev=468095 Log: sync with trunk - remove 'CVS' Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/ContentTypePreference.java cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/IndexerCtPref.java cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailAction.java cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandBuilder.java cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandManager.java cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContentHandlerDelegate.java cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContext.java cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContextHttpSession.java cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCtPref.java cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailSender.java cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MimeMessageUtil.java Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/ContentTypePreference.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/ContentTypePreference.java?view=diff&rev=468095&r1=468094&r2=468095 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/ContentTypePreference.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/ContentTypePreference.java Thu Oct 26 11:50:50 2006 @@ -5,9 +5,9 @@ * 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. @@ -23,7 +23,7 @@ * * @author Bernhard Huber * @since 26 October 2002 - * @version CVS $Id$ + * @version $Id$ */ public interface ContentTypePreference { @@ -33,7 +33,5 @@ *@param mimepart Description of the Parameter *@return Description of the Return Value */ - public int preference(MimePart mimepart); + int preference(MimePart mimepart); } - - Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/IndexerCtPref.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/IndexerCtPref.java?view=diff&rev=468095&r1=468094&r2=468095 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/IndexerCtPref.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/IndexerCtPref.java Thu Oct 26 11:50:50 2006 @@ -5,9 +5,9 @@ * 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. @@ -24,7 +24,7 @@ * * @author Bernhard Huber * @since 26 October 2002 - * @version CVS $Id$ + * @version $Id$ */ public class IndexerCtPref implements ContentTypePreference { /** @@ -50,5 +50,3 @@ } } } - - Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailAction.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailAction.java?view=diff&rev=468095&r1=468094&r2=468095 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailAction.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailAction.java Thu Oct 26 11:50:50 2006 @@ -5,9 +5,9 @@ * 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. @@ -53,7 +53,7 @@ * @see MailContext * * @author Bernhard Huber - * @version CVS $Id$ + * @version $Id$ * @since Cocoon 2.1, 16 December 2002 */ public class MailAction extends ServiceableAction implements ThreadSafe { @@ -387,4 +387,3 @@ } } } - Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandBuilder.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandBuilder.java?view=diff&rev=468095&r1=468094&r2=468095 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandBuilder.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandBuilder.java Thu Oct 26 11:50:50 2006 @@ -5,9 +5,9 @@ * 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. @@ -33,7 +33,7 @@ * * @author Bernhard Huber * @since 28. Dezember 2002 - * @version CVS $Id$ + * @version $Id$ */ public class MailCommandBuilder extends AbstractLogEnabled { @@ -94,7 +94,7 @@ Class clazz = (Class)cmdMap.get( cmd ); return clazz; } - + /** * test if command is mapped to a Command class * @@ -104,11 +104,11 @@ public boolean isCommandMapped( String cmd ) { return cmdMap.containsKey( cmd ); } - + /** * configure the cmd to mail command class mapping. *

- * New commands are registered here. A command name is associated with + * New commands are registered here. A command name is associated with * each command class. *

*/ @@ -125,4 +125,3 @@ } } - Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandManager.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandManager.java?view=diff&rev=468095&r1=468094&r2=468095 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandManager.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandManager.java Thu Oct 26 11:50:50 2006 @@ -5,9 +5,9 @@ * 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. @@ -42,7 +42,7 @@ * * @author Bernhard Huber * @since 23 October 2002 - * @version CVS $Id$ + * @version $Id$ */ public class MailCommandManager extends AbstractLogEnabled { @@ -636,4 +636,3 @@ } } } - Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContentHandlerDelegate.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContentHandlerDelegate.java?view=diff&rev=468095&r1=468094&r2=468095 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContentHandlerDelegate.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContentHandlerDelegate.java Thu Oct 26 11:50:50 2006 @@ -799,9 +799,6 @@ /** * XMLizable Wrapper for one or more folders, saxing folders. * - *@author Bernhard Huber - *@created 30. Dezember 2002 - *@version CVS Version: $Id$ */ static class FolderXMLizer extends AbstractLogEnabled implements XMLizable { @@ -849,10 +846,6 @@ /** * XMLizable Wrapper for one or more messages, saxing envelope only of messages. - * - *@author Bernhard Huber - *@created 30. Dezember 2002 - *@version CVS Version: $Id$ */ static class MessageEnvelopeXMLizer extends AbstractLogEnabled implements XMLizable { @@ -925,10 +918,6 @@ /** * XMLizable Wrapper for a message, saxing a message envelope, plus content. - * - *@author Bernhard Huber - *@created 30. Dezember 2002 - *@version CVS Version: $Id$ */ static class MessageXMLizer extends AbstractLogEnabled implements XMLizable { Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContext.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContext.java?view=diff&rev=468095&r1=468094&r2=468095 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContext.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContext.java Thu Oct 26 11:50:50 2006 @@ -5,9 +5,9 @@ * 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. @@ -35,7 +35,7 @@ * * @author Bernhard Huber * @since 29 December 2002 - * @version CVS $Id$ + * @version $Id$ */ public class MailContext extends DefaultContext implements LogEnabled { /** @@ -377,4 +377,3 @@ } } - Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContextHttpSession.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContextHttpSession.java?view=diff&rev=468095&r1=468094&r2=468095 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContextHttpSession.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailContextHttpSession.java Thu Oct 26 11:50:50 2006 @@ -5,9 +5,9 @@ * 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. @@ -23,13 +23,13 @@ /** * An extension of MailContext. *

- * It implments HttpSessionBindingListener for manging MailContext + * It implments HttpSessionBindingListener for manging MailContext * resources in case of valueUnbound - ie. session removal. - *

+ *

* * @author Bernhard Huber * @since 02 January 2003 - * @version CVS $Id$ + * @version $Id$ */ public class MailContextHttpSession extends MailContext implements HttpSessionBindingListener { @@ -60,9 +60,8 @@ */ public void valueUnbound(HttpSessionBindingEvent event) { getLogger().info("value unbound " + String.valueOf(event)); - + // This should not happen, removeStore of this this.removeStore(); } } - Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCtPref.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCtPref.java?view=diff&rev=468095&r1=468094&r2=468095 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCtPref.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailCtPref.java Thu Oct 26 11:50:50 2006 @@ -5,9 +5,9 @@ * 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. @@ -24,7 +24,7 @@ * * @author Bernhard Huber * @since 26. Oktober 2002 - * @version CVS $Id$ + * @version $Id$ */ public class MailCtPref implements ContentTypePreference { @@ -53,4 +53,3 @@ } } } - Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java?view=diff&rev=468095&r1=468094&r2=468095 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java Thu Oct 26 11:50:50 2006 @@ -100,8 +100,6 @@ /** * Helper class for attachment data. - * @author haul - * @since 2.1 */ private static class Attachment { private Object obj; Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailSender.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailSender.java?view=diff&rev=468095&r1=468094&r2=468095 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailSender.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailSender.java Thu Oct 26 11:50:50 2006 @@ -26,7 +26,7 @@ * * @since 2.1.5 * @author Christian Haul - * @version CVS $Id$ + * @version $Id$ */ public interface MailSender { @@ -44,7 +44,7 @@ /** * Set SMTP hostname, username, and password to use for mail sending. */ - public void setSmtpHost(String hostname, String username, String password); + void setSmtpHost(String hostname, String username, String password); // // Compose Message Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MimeMessageUtil.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MimeMessageUtil.java?view=diff&rev=468095&r1=468094&r2=468095 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MimeMessageUtil.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MimeMessageUtil.java Thu Oct 26 11:50:50 2006 @@ -5,9 +5,9 @@ * 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. @@ -33,7 +33,7 @@ * * @author Bernhard Huber * @since 26. Oktober 2002 - * @version CVS $Id$ + * @version $Id$ */ public class MimeMessageUtil { /** @@ -231,4 +231,3 @@ return (MimePart[]) parts.toArray(new MimePart[0]); } } -