cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation XIncludeTransformer.java

2004-05-28 Thread mpo 
mpo 2004/05/28 15:07:55

  Modified:src/java/org/apache/cocoon/transformation
XIncludeTransformer.java
  Log:
  Silly typo fix...
  
  Revision  ChangesPath
  1.20  +2 -2  
cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- XIncludeTransformer.java  22 Mar 2004 13:41:44 -  1.19
  +++ XIncludeTransformer.java  28 May 2004 22:07:55 -  1.20
  @@ -397,7 +397,7 @@
   xmlConsumer.setDocumentLocator(locator);
   } catch (ResourceNotFoundException e) {
   useFallback = true;
  -fallBackException = new CascadingException("Resouce 
not found: " + url.getURI());
  +fallBackException = new CascadingException("Resource 
not found: " + url.getURI());
   getLogger().error("xIncluded resource not found: " + 
url.getURI(), e);
   } catch (ParseException e) {
   // this exception is thrown in case of an invalid 
xpointer expression

cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation XIncludeTransformer.java

2004-03-22 Thread joerg 
joerg   2004/03/22 05:41:45

  Modified:src/java/org/apache/cocoon/transformation
XIncludeTransformer.java
  Log:
  thanks to Roy Huang: the second AbstractXMLProducer "consequence" - if there 
is a third one I will revert all, but I grepped for super.setConsumer() and 
found no other candidate
  
  Revision  ChangesPath
  1.19  +3 -2  
cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- XIncludeTransformer.java  5 Mar 2004 13:02:59 -   1.18
  +++ XIncludeTransformer.java  22 Mar 2004 13:41:44 -  1.19
  @@ -79,7 +79,8 @@
   this.xIncludePipe = new XIncludePipe();
   this.xIncludePipe.enableLogging(getLogger());
   this.xIncludePipe.init(null);
  -super.setConsumer(xIncludePipe);
  +super.setContentHandler(xIncludePipe);
  +super.setLexicalHandler(xIncludePipe);
   }
   
   public void setConsumer(XMLConsumer consumer) {

cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation XIncludeTransformer.java

2004-02-20 Thread sylvain 
sylvain 2004/02/20 10:46:49

  Modified:src/java/org/apache/cocoon/transformation
XIncludeTransformer.java
  Log:
  Robustify against buggy SAX events with a null namespace URI
  
  Revision  ChangesPath
  1.16  +3 -3  
cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- XIncludeTransformer.java  15 Feb 2004 10:07:35 -  1.15
  +++ XIncludeTransformer.java  20 Feb 2004 18:46:49 -  1.16
  @@ -179,7 +179,7 @@
   }
   
   public void startElement(String uri, String name, String raw, 
Attributes attr) throws SAXException {
  -if (xIncludeLevel == 1 && useFallback && 
name.equals(XINCLUDE_FALLBACK_ELEMENT) && uri.equals(XINCLUDE_NAMESPACE_URI)) {
  +if (xIncludeLevel == 1 && useFallback && 
XINCLUDE_NAMESPACE_URI.equals(uri) && XINCLUDE_FALLBACK_ELEMENT.equals(name)) {
   fallbackLevel++;
   
   // don't need these anymore
  @@ -193,7 +193,7 @@
   }
   
   xmlBaseSupport.startElement(uri, name, raw, attr);
  -if (uri.equals(XINCLUDE_NAMESPACE_URI)) {
  +if (XINCLUDE_NAMESPACE_URI.equals(uri)) {
   if (XINCLUDE_INCLUDE_ELEMENT.equals(name)) {
   String href = 
attr.getValue("",XINCLUDE_INCLUDE_ELEMENT_HREF_ATTRIBUTE);
   if (href == null) {

cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation XIncludeTransformer.java

2004-02-15 Thread bruno 
bruno   2004/02/15 02:07:35

  Modified:src/java/org/apache/cocoon/transformation
XIncludeTransformer.java
  Log:
  improved error handling (don't hide the exception)
  
  Revision  ChangesPath
  1.15  +2 -2  
cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- XIncludeTransformer.java  13 Feb 2004 14:36:43 -  1.14
  +++ XIncludeTransformer.java  15 Feb 2004 10:07:35 -  1.15
  @@ -236,7 +236,7 @@
   fallBackException = null;
   fallbackLevel = 0;
   getLogger().error("Exception occured during xinclude 
processing, and did not find a fallback element.", localFallBackException);
  -throw new SAXException("Exception occured during 
xinclude processing, and did not find a fallback element: " + 
localFallBackException.getMessage());
  +throw new SAXException("Exception occured during 
xinclude processing, and did not find a fallback element.", 
localFallBackException);
   }
   return;
   }

cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation XIncludeTransformer.java

2004-02-13 Thread vgritsenko 
vgritsenko2004/02/13 06:36:43

  Modified:src/java/org/apache/cocoon/transformation
XIncludeTransformer.java
  Log:
  wrap long lines
  
  Revision  ChangesPath
  1.14  +4 -4  
cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- XIncludeTransformer.java  8 Feb 2004 11:30:38 -   1.13
  +++ XIncludeTransformer.java  13 Feb 2004 14:36:43 -  1.14
  @@ -79,9 +79,9 @@
   
   /**
* Implementation of an XInclude transformer. It supports xml:base 
attributes,
  - * xpointer fragment identifiers (see the xpointer package to see what 
exactly is supported),
  - * fallback elements, and does xinclude processing on the included content 
and on the content
  - * of fallback elements (with loop inclusion detection).
  + * XPointer fragment identifiers (see the xpointer package to see what 
exactly is
  + * supported), fallback elements, and does xinclude processing on the 
included content
  + * and on the content of fallback elements (with loop inclusion detection).
*
* @author mailto:[EMAIL PROTECTED]">Donald Ball (wrote the 
original version)
* @version CVS $Id$

cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation XIncludeTransformer.java

2004-02-08 Thread bruno 
bruno   2004/02/08 03:30:38

  Modified:src/java/org/apache/cocoon/transformation
XIncludeTransformer.java
  Log:
  Versions 1.11 disabled the following line:
  } else if (xIncludeLevel > 0 && fallbackLevel < 1) {
  in case the element was not in the XInclude namespace, fixed that.
  
  Revision  ChangesPath
  1.13  +20 -21
cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- XIncludeTransformer.java  7 Feb 2004 15:20:09 -   1.12
  +++ XIncludeTransformer.java  8 Feb 2004 11:30:38 -   1.13
  @@ -179,32 +179,32 @@
   }
   
   public void startElement(String uri, String name, String raw, 
Attributes attr) throws SAXException {
  +if (xIncludeLevel == 1 && useFallback && 
name.equals(XINCLUDE_FALLBACK_ELEMENT) && uri.equals(XINCLUDE_NAMESPACE_URI)) {
  +fallbackLevel++;
  +
  +// don't need these anymore
  +useFallback = false;
  +fallBackException = null;
  +
  +return;
  +} else if (xIncludeLevel > 0 && fallbackLevel < 1) {
  +xIncludeLevel++;
  +return;
  +}
  +
  +xmlBaseSupport.startElement(uri, name, raw, attr);
   if (uri.equals(XINCLUDE_NAMESPACE_URI)) {
  -if (xIncludeLevel == 1 && useFallback && 
name.equals(XINCLUDE_FALLBACK_ELEMENT)) {
  -fallbackLevel++;
  -
  -// don't need these anymore
  -useFallback = false;
  -fallBackException = null;
  -
  -return;
  -} else if (xIncludeLevel > 0 && fallbackLevel < 1) {
  -xIncludeLevel++;
  -return;
  -}
  -
  -xmlBaseSupport.startElement(uri, name, raw, attr);
   if (XINCLUDE_INCLUDE_ELEMENT.equals(name)) {
   String href = 
attr.getValue("",XINCLUDE_INCLUDE_ELEMENT_HREF_ATTRIBUTE);
   if (href == null) {
   throw new SAXException(raw + " must have a 'href' 
attribute at " + getLocation());
   }
  -
  +
   String parse = 
attr.getValue("",XINCLUDE_INCLUDE_ELEMENT_PARSE_ATTRIBUTE);
  -
  +
   if (null == parse) parse="xml";
   xIncludeLevel++;
  -
  +
   try {
   processXIncludeElement(href, parse);
   } catch (ProcessingException e) {
  @@ -216,11 +216,10 @@
   }
   return;
   }
  -
  +
   throw new SAXException("Unknown XInclude element " + raw + " 
at " + getLocation());
  -
  +
   } else {
  -xmlBaseSupport.startElement(uri, name, raw, attr);
   super.startElement(uri,name,raw,attr);
   }
   }

cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation XIncludeTransformer.java

2003-09-22 Thread upayavira 
upayavira2003/09/22 13:10:47

  Modified:src/blocks/mail/java/org/apache/cocoon/mail
MailContentHandlerDelegate.java
   src/blocks/woody/java/org/apache/cocoon/woody/formmodel
AbstractWidgetDefinitionBuilder.java
   src/java/org/apache/cocoon/transformation
XIncludeTransformer.java
  Log:
  unkown-->unknown
  
  Revision  ChangesPath
  1.5   +5 -5  
cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailContentHandlerDelegate.java
  
  Index: MailContentHandlerDelegate.java
  ===
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailContentHandlerDelegate.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MailContentHandlerDelegate.java   24 Mar 2003 14:33:56 -  1.4
  +++ MailContentHandlerDelegate.java   22 Sep 2003 20:10:46 -  1.5
  @@ -657,7 +657,7 @@
   } else if (o instanceof InputStream) {
   encodeInputStreamForXML((InputStream) o);
   } else {
  -// unkown type
  +// unknown type
   InputStream is = part.getInputStream();
   encodeInputStreamForXML(is);
   }
  
  
  
  1.4   +1 -1  
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AbstractWidgetDefinitionBuilder.java
  
  Index: AbstractWidgetDefinitionBuilder.java
  ===
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AbstractWidgetDefinitionBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractWidgetDefinitionBuilder.java  16 Jul 2003 13:59:36 -  
1.3
  +++ AbstractWidgetDefinitionBuilder.java  22 Sep 2003 20:10:47 -  
1.4
  @@ -100,7 +100,7 @@
   try {
   builder = 
(WidgetDefinitionBuilder)widgetDefinitionBuilderSelector.select(widgetName);
   } catch (ServiceException e) {
  -throw new CascadingException("Unkown kind of widget \"" + 
widgetName + "\" specified at " + DomHelper.getLocation(widgetDefinition), e);
  +throw new CascadingException("Unknown kind of widget \"" + 
widgetName + "\" specified at " + DomHelper.getLocation(widgetDefinition), e);
   }
   return builder.buildWidgetDefinition(widgetDefinition);
   }
  
  
  
  1.8   +2 -2  
cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XIncludeTransformer.java  4 Jul 2003 13:55:09 -   1.7
  +++ XIncludeTransformer.java  22 Sep 2003 20:10:47 -  1.8
  @@ -363,7 +363,7 @@
   // an empty href is a reference to the current document -- 
this can be different than the current base
   if (href.equals("")) {
   if (this.href == null)
  -throw new SAXException("XIncludeTransformer: 
encountered empty href (= href pointing to the current document) but the 
location of the current document is unkown.");
  +throw new SAXException("XIncludeTransformer: 
encountered empty href (= href pointing to the current document) but the 
location of the current document is unknown.");
   int fragmentIdentifierPos2 = this.href.indexOf('#');
   if (fragmentIdentifierPos2 != -1)
   href = this.href.substring(0, 
fragmentIdentifierPos2);