cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/acting PrincipalMultiAction.java
Date Sat, 15 Nov 2003 13:31:18 GMT
joerg       2003/11/15 05:31:18

  Modified:    src/blocks/slide/java/org/apache/cocoon/components/repository
                        Repository.java
               src/blocks/slide/java/org/apache/cocoon/components/repository/impl
                        SlidePrincipalProvider.java
               src/blocks/slide/java/org/apache/cocoon/acting
                        PrincipalMultiAction.java
  Log:
  - removed text references to "component"
  - removed logging on DEBUG level when the exception is thrown
  
  Revision  Changes    Path
  1.5       +2 -2      cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/Repository.java
  
  Index: Repository.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/Repository.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Repository.java	15 Nov 2003 13:26:00 -0000	1.4
  +++ Repository.java	15 Nov 2003 13:31:18 -0000	1.5
  @@ -57,7 +57,7 @@
    */
   public interface Repository {
   
  -    /** Role for the component */
  +    /** Role for the object */
       public final static String ROLE = "org.apache.cocoon.components.repository.Repository";
   }
   
  
  
  
  1.6       +4 -4      cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/impl/SlidePrincipalProvider.java
  
  Index: SlidePrincipalProvider.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/impl/SlidePrincipalProvider.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SlidePrincipalProvider.java	15 Nov 2003 13:26:00 -0000	1.5
  +++ SlidePrincipalProvider.java	15 Nov 2003 13:31:18 -0000	1.6
  @@ -155,9 +155,9 @@
       }
   
       /**
  -     * Initialialize the component. Initialization includes
  +     * Initialialize the service. Initialization includes
        * allocating any resources required throughout the
  -     * components lifecycle.
  +     * service's lifecycle.
        *
        * @throws Exception if an error occurs
        */
  @@ -191,7 +191,7 @@
               // this.macro = nat.getMacroHelper();
   
           } catch (ServiceException se) {
  -            getLogger().error("Could not lookup for component.", se);
  +            getLogger().error("Could not lookup for service.", se);
           } finally {
               if (repository!=null) {
                   this.manager.release(repository);
  
  
  
  1.3       +7 -19     cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/acting/PrincipalMultiAction.java
  
  Index: PrincipalMultiAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/acting/PrincipalMultiAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PrincipalMultiAction.java	15 Nov 2003 13:26:00 -0000	1.2
  +++ PrincipalMultiAction.java	15 Nov 2003 13:31:18 -0000	1.3
  @@ -127,9 +127,7 @@
               principalprovider.addPrincipal(caller, principal);
    
           } catch (ServiceException se) {
  -            if (getLogger().isDebugEnabled())
  -                getLogger().debug("Could not lookup for component.", se);
  -            throw new ProcessingException("Could not lookup for component.", se);
  +            throw new ProcessingException("Could not lookup for service.", se);
           } finally {
               if (principalprovider!=null)
                   principalproviders.release(principalprovider);
  @@ -177,9 +175,7 @@
               principalprovider.removePrincipal(caller, principal);
   
           } catch (ServiceException se) {
  -            if (getLogger().isDebugEnabled())
  -                getLogger().debug("Could not lookup for component.", se);
  -            throw new ProcessingException("Could not lookup for component.", se);
  +            throw new ProcessingException("Could not lookup for service.", se);
           } finally {
               if (principalprovider!=null)
                   principalproviders.release(principalprovider);
  @@ -227,9 +223,7 @@
               principalprovider.addPrincipalGroup(caller, principalgroup);
   
           } catch (ServiceException se) {
  -            if (getLogger().isDebugEnabled())
  -                getLogger().debug("Could not lookup for component.", se);
  -            throw new ProcessingException("Could not lookup for component.", se);
  +            throw new ProcessingException("Could not lookup for service.", se);
           } finally {
               if (principalprovider!=null)
                   principalproviders.release(principalprovider);
  @@ -277,9 +271,7 @@
               principalprovider.removePrincipalGroup(caller, principalgroup);
   
           } catch (ServiceException se) {
  -            if (getLogger().isDebugEnabled())
  -                getLogger().debug("Could not lookup for component.", se);
  -            throw new ProcessingException("Could not lookup for component.", se);
  +            throw new ProcessingException("Could not lookup for service.", se);
           } finally {
               if (principalprovider!=null)
                   principalproviders.release(principalprovider);
  @@ -331,9 +323,7 @@
               principalprovider.addMember(caller, principalgroup, principal);
   
           } catch (ServiceException se) {
  -            if (getLogger().isDebugEnabled())
  -                getLogger().debug("Could not lookup for component.", se);
  -            throw new ProcessingException("Could not lookup for component.", se);
  +            throw new ProcessingException("Could not lookup for service.", se);
           } finally {
               if (principalprovider!=null)
                   principalproviders.release(principalprovider);
  @@ -385,9 +375,7 @@
               principalprovider.removeMember(caller, principalgroup, principal);
   
           } catch (ServiceException se) {
  -            if (getLogger().isDebugEnabled())
  -                getLogger().debug("Could not lookup for component.", se);
  -            throw new ProcessingException("Could not lookup for component.", se);
  +            throw new ProcessingException("Could not lookup for service.", se);
           } finally {
               if (principalprovider!=null)
                   principalproviders.release(principalprovider);
  
  
  

Mime
View raw message