cvs commit: xml-cocoon/src/org/apache/cocoon/xml/dom DOMBuilder.java DOMStreamer.java

[prussell]

prussell    01/01/23 09:59:45

  Modified:    src/org/apache/cocoon/xml/dom Tag: xml-cocoon2
                        DOMBuilder.java DOMStreamer.java
  Log:
  Applied two patches from Carsten Ziegeler to fix xmlns attribute behaviour
  in DOMStreamer and DOMBuilder.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.9   +2 -2      
xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMBuilder.java
  
  Index: DOMBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMBuilder.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- DOMBuilder.java   2001/01/22 21:56:56     1.1.2.8
  +++ DOMBuilder.java   2001/01/23 17:59:39     1.1.2.9
  @@ -40,7 +40,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/01/22 21:56:56 $
  + * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/01/23 17:59:39 $
    */
   public class DOMBuilder implements XMLConsumer, Loggable {
       protected Logger log;
  @@ -269,7 +269,7 @@
               String aloc=a.getLocalName(x);
               String araw=a.getQName(x);
               String aval=a.getValue(x);
  -            if (araw.startsWith("xmlns:")==false) {
  +            if (araw.startsWith("xmlns:")==false && 
araw.equals("xmlns")==false) {
                   NamespacesTable.Name 
k=this.namespaces.resolve(auri,araw,null,aloc);
                   // Set the attribute into the element
                   auri=k.getPrefix().length()==0 ? null : k.getUri();
  
  
  
  1.1.2.4   +3 -2      
xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMStreamer.java
  
  Index: DOMStreamer.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMStreamer.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- DOMStreamer.java  2001/01/03 15:38:23     1.1.2.3
  +++ DOMStreamer.java  2001/01/23 17:59:41     1.1.2.4
  @@ -37,7 +37,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/01/03 15:38:23 $
  + * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/01/23 17:59:41 $
    */
   public class DOMStreamer extends AbstractXMLProducer {
   
  @@ -191,7 +191,8 @@
                   if (raw.length()>5) prefix=raw.substring(6);
                   nslist.addElement(prefix);
                   super.contentHandler.startPrefixMapping(prefix,val);
  -            } else atts.addAttribute(uri,loc,raw,"CDATA",val);
  +            } 
  +            atts.addAttribute(uri,loc,raw,"CDATA",val);
           }
           // Get and normalize values for the Element
           String uri=n.getNamespaceURI(); uri=(uri==null)?"":uri;