cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@locus.apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/components/language/markup AbstractMarkupLanguage.java
Date Mon, 11 Dec 2000 17:09:44 GMT
bloritsch    00/12/11 09:09:44

  Modified:    src/org/apache/cocoon/components/classloader Tag:
                        xml-cocoon2 RepositoryClassLoader.java
               src/org/apache/cocoon/components/language/generator Tag:
                        xml-cocoon2 ProgramGeneratorImpl.java
               src/org/apache/cocoon/components/language/markup Tag:
                        xml-cocoon2 AbstractMarkupLanguage.java
  Log:
  More exception handling stuff
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.10  +2 -2      xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/RepositoryClassLoader.java
  
  Index: RepositoryClassLoader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/RepositoryClassLoader.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- RepositoryClassLoader.java	2000/12/11 16:06:30	1.1.2.9
  +++ RepositoryClassLoader.java	2000/12/11 17:09:37	1.1.2.10
  @@ -24,7 +24,7 @@
    * A class loader with a growable list of path search directories
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/12/11 16:06:30 $
  + * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/12/11 17:09:37 $
    */
   class RepositoryClassLoader extends ClassLoader {
     /**
  @@ -95,7 +95,7 @@
           this.repositories.addElement(repository);
       } catch (SecurityException se) {
           log.debug("RepositoryClassLoader:SecurityException", se);
  -        throw new IOException("Cannot access directory" + fullFilename);
  +        throw new IOException("Cannot access directory");
       }
     }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.20  +3 -4      xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java
  
  Index: ProgramGeneratorImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java,v
  retrieving revision 1.1.2.19
  retrieving revision 1.1.2.20
  diff -u -r1.1.2.19 -r1.1.2.20
  --- ProgramGeneratorImpl.java	2000/12/11 15:05:54	1.1.2.19
  +++ ProgramGeneratorImpl.java	2000/12/11 17:09:40	1.1.2.20
  @@ -53,7 +53,7 @@
    * The default implementation of <code>ProgramGenerator</code>
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.19 $ $Date: 2000/12/11 15:05:54 $
  + * @version CVS $Revision: 1.1.2.20 $ $Date: 2000/12/11 17:09:40 $
    */
   public class ProgramGeneratorImpl
     implements ProgramGenerator, Composer, Configurable, ThreadSafe
  @@ -90,11 +90,10 @@
             this.manager = manager;
   
             try {
  -              log.debug("Lookup " + Roles.MARKUP_LANGUAGE);
                 this.markupSelector = (ComponentSelector) this.manager.lookup(Roles.MARKUP_LANGUAGE);
  -          log.debug("Lookup " + Roles.PROGRAMMING_LANGUAGE);
  +
                 this.languageSelector = (ComponentSelector) this.manager.lookup(Roles.PROGRAMMING_LANGUAGE);
  -          log.debug("Lookup " + Roles.COCOON);
  +
                 this.workDir = ((Cocoon) this.manager.lookup(Roles.COCOON)).getWorkDir();
             } catch (Exception e) {
                 log.warn("Could not lookup Component", e);
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.15  +10 -2     xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java
  
  Index: AbstractMarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java,v
  retrieving revision 1.1.2.14
  retrieving revision 1.1.2.15
  diff -u -r1.1.2.14 -r1.1.2.15
  --- AbstractMarkupLanguage.java	2000/12/11 15:05:55	1.1.2.14
  +++ AbstractMarkupLanguage.java	2000/12/11 17:09:43	1.1.2.15
  @@ -50,7 +50,7 @@
    * be decoupled from this context!!!
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.14 $ $Date: 2000/12/11 15:05:55 $
  + * @version CVS $Revision: 1.1.2.15 $ $Date: 2000/12/11 17:09:43 $
    */
   public abstract class AbstractMarkupLanguage
        implements MarkupLanguage, Composer, Configurable
  @@ -524,11 +524,19 @@
            * @return Whether the cached logicsheet has changed
            */
           protected boolean hasChanged() {
  +            boolean hasChanged = false;
  +
               if (this.file == null) {
                   return false;
               }
  +
  +            try {
  +                hasChanged = this.lastModified < this.file.lastModified();
  +            } catch (SecurityException se) {
  +                log.warn("SecurityException", se);
  +            }
   
  -            return this.lastModified < this.file.lastModified();
  +            return hasChanged;
           }
       }
   
  
  
  

Mime
View raw message