You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by br...@apache.org on 2003/07/24 14:57:57 UTC

cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding BindingManager.java JXPathBindingManager.java

bruno       2003/07/24 05:57:57

  Modified:    src/blocks/woody/java/org/apache/cocoon/woody/binding
                        BindingManager.java JXPathBindingManager.java
  Log:
  replaced the ProcessingException with BindingException
  
  Revision  Changes    Path
  1.2       +1 -2      cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/BindingManager.java
  
  Index: BindingManager.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/BindingManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BindingManager.java	22 Jul 2003 11:52:30 -0000	1.1
  +++ BindingManager.java	24 Jul 2003 12:57:57 -0000	1.2
  @@ -50,7 +50,6 @@
   */
   package org.apache.cocoon.woody.binding;
   
  -import org.apache.cocoon.ProcessingException;
   import org.apache.excalibur.source.Source;
   
   /**
  @@ -73,6 +72,6 @@
        * Creates a binding from the XML config found at source parameter.
        */
       public Binding createBinding(Source bindingFile)
  -        throws ProcessingException;
  +        throws BindingException;
   
   }
  
  
  
  1.4       +4 -3      cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXPathBindingManager.java
  
  Index: JXPathBindingManager.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXPathBindingManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JXPathBindingManager.java	24 Jul 2003 12:39:17 -0000	1.3
  +++ JXPathBindingManager.java	24 Jul 2003 12:57:57 -0000	1.4
  @@ -60,7 +60,6 @@
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.woody.util.DomHelper;
   import org.apache.cocoon.woody.datatype.DatatypeManager;
   import org.apache.excalibur.source.Source;
  @@ -120,7 +119,7 @@
       }
   
       public Binding createBinding(Source bindSrc)
  -        throws ProcessingException {
  +        throws BindingException {
           try {
               Document doc =
                   DomHelper.parse(new InputSource(bindSrc.getURI()));
  @@ -134,8 +133,10 @@
                   getLogger().debug("Root Element of said binding file is in wrong namespace.");
               }
               return newBinding;
  +        } catch (BindingException e) {
  +            throw e;
           } catch (Exception e) {
  -            throw new ProcessingException("Could not create binding.", e);
  +            throw new BindingException("Error creating binding from " + bindSrc.getURI(), e);
           }
       }