You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by un...@apache.org on 2004/03/27 23:01:22 UTC

cvs commit: cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl SimpleJdbcSourceDescriptor.java

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 <a href="mailto:unico@apache.org">Unico Hommes</a>
  - * 
  - * @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 @@
    * 
    * <p>
    * 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.
    * </p>
    * 
  - * @author <a href="mailto:unico@apache.org">Unico Hommes</a> 
  + * @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.
    * </p>
    * 
  - * @author <a href="mailto:unico@apache.org">Unico Hommes</a>
  - * @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) {}
                   }
               }
           }