Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 53497 invoked from network); 27 Mar 2004 22:01:26 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 27 Mar 2004 22:01:26 -0000 Received: (qmail 6201 invoked by uid 500); 27 Mar 2004 22:01:12 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 6152 invoked by uid 500); 27 Mar 2004 22:01:11 -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: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 6141 invoked by uid 500); 27 Mar 2004 22:01:11 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 6137 invoked from network); 27 Mar 2004 22:01:11 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 27 Mar 2004 22:01:11 -0000 Received: (qmail 53467 invoked by uid 1758); 27 Mar 2004 22:01:22 -0000 Date: 27 Mar 2004 22:01:22 -0000 Message-ID: <20040327220122.53466.qmail@minotaur.apache.org> From: unico@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl SimpleJdbcSourceDescriptor.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N unico 2004/03/27 14:01:22 Modified: src/blocks/repository/java/org/apache/cocoon/components/repository SourceRepositoryImpl.java SourceRepository.java src/blocks/repository/java/org/apache/cocoon/components/source/impl SimpleJdbcSourceDescriptor.java Log: formatting and cleanup Revision Changes Path 1.6 +1 -10 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/repository/SourceRepositoryImpl.java Index: SourceRepositoryImpl.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/repository/SourceRepositoryImpl.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- SourceRepositoryImpl.java 5 Mar 2004 13:02:21 -0000 1.5 +++ SourceRepositoryImpl.java 27 Mar 2004 22:01:22 -0000 1.6 @@ -34,12 +34,7 @@ /** * SourceRepository implementation. * - * @author Unico Hommes - * - * @avalon.component - * @avalon.service type="SourceRepository" - * @x-avalon.lifestyle type="singleton" - * @x-avalon.info name="source-repository" + * @version $Id$ */ public class SourceRepositoryImpl extends AbstractLogEnabled implements Serviceable, ThreadSafe, SourceRepository { @@ -53,10 +48,6 @@ public SourceRepositoryImpl() { } - /** - * @avalon.dependency type="SourceResolver" - * @avalon.dependency type="RepositoryInterceptor" optional="true" - */ public void service(ServiceManager manager) throws ServiceException { m_resolver = (SourceResolver) manager.lookup(SourceResolver.ROLE); if (manager.hasService(RepositoryInterceptor.ROLE)) { 1.6 +1 -4 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/repository/SourceRepository.java Index: SourceRepository.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/repository/SourceRepository.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- SourceRepository.java 5 Mar 2004 13:02:21 -0000 1.5 +++ SourceRepository.java 27 Mar 2004 22:01:22 -0000 1.6 @@ -25,12 +25,9 @@ * *

* Each operation returns a status code that is based on RFC 2518 (WebDAV). - * This does not mean to it cannot be used outside of a WebDAV context. - * It is reusing a standard to enable rich communication between - * the flow layer and the service layer. *

* - * @author Unico Hommes + * @version $Id$ */ public interface SourceRepository { 1.8 +4 -8 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/SimpleJdbcSourceDescriptor.java Index: SimpleJdbcSourceDescriptor.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/SimpleJdbcSourceDescriptor.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- SimpleJdbcSourceDescriptor.java 5 Mar 2004 13:02:21 -0000 1.7 +++ SimpleJdbcSourceDescriptor.java 27 Mar 2004 22:01:22 -0000 1.8 @@ -66,8 +66,7 @@ * sources that are described by this SourceDescriptor will NOT be cacheable. *

* - * @author Unico Hommes - * @version CVS $ID$ + * @version $Id$ */ public class SimpleJdbcSourceDescriptor extends AbstractConfigurableSourceDescriptor @@ -242,8 +241,7 @@ if (connection != null) { try { connection.close(); - } catch (SQLException e) { - } + } catch (SQLException e) {} } } } @@ -279,8 +277,7 @@ if (connection != null) { try { connection.close(); - } catch (SQLException e) { - } + } catch (SQLException e) {} } } } @@ -310,8 +307,7 @@ if (connection != null) { try { connection.close(); - } catch (SQLException e) { - } + } catch (SQLException e) {} } } }