You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cocoon.apache.org by ri...@locus.apache.org on 2000/01/05 20:38:09 UTC

cvs commit: xml-cocoon/src/org/apache/cocoon/processor/xsp/library XSPSessionLibrary.java

ricardo     00/01/05 11:38:09

  Modified:    src/org/apache/cocoon/processor/xsp/library
                        XSPSessionLibrary.java
  Log:
  1.2:Fixed reference to XOBject. Added Apache license
  
  Revision  Changes    Path
  1.2       +56 -3     xml-cocoon/src/org/apache/cocoon/processor/xsp/library/XSPSessionLibrary.java
  
  Index: XSPSessionLibrary.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/processor/xsp/library/XSPSessionLibrary.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XSPSessionLibrary.java	2000/01/05 14:05:00	1.1
  +++ XSPSessionLibrary.java	2000/01/05 19:38:08	1.2
  @@ -1,3 +1,54 @@
  +/*
  +
  + ============================================================================
  +                   The Apache Software License, Version 1.1
  + ============================================================================
  + 
  +    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
  + 
  + Redistribution and use in source and binary forms, with or without modifica-
  + tion, are permitted provided that the following conditions are met:
  + 
  + 1. Redistributions of  source code must  retain the above copyright  notice,
  +    this list of conditions and the following disclaimer.
  + 
  + 2. Redistributions in binary form must reproduce the above copyright notice,
  +    this list of conditions and the following disclaimer in the documentation
  +    and/or other materials provided with the distribution.
  + 
  + 3. The end-user documentation included with the redistribution, if any, must
  +    include  the following  acknowledgment:  "This product includes  software
  +    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
  +    Alternately, this  acknowledgment may  appear in the software itself,  if
  +    and wherever such third-party acknowledgments normally appear.
  + 
  + 4. The names "Cocoon" and  "Apache Software Foundation"  must not be used to
  +    endorse  or promote  products derived  from this  software without  prior
  +    written permission. For written permission, please contact
  +    apache@apache.org.
  + 
  + 5. Products  derived from this software may not  be called "Apache", nor may
  +    "Apache" appear  in their name,  without prior written permission  of the
  +    Apache Software Foundation.
  + 
  + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  + FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  + APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
  + INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
  + DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
  + OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
  + ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  + (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  + 
  + This software  consists of voluntary contributions made  by many individuals
  + on  behalf of the Apache Software  Foundation and was  originally created by
  + Stefano Mazzocchi  <st...@apache.org>. For more  information on the Apache 
  + Software Foundation, please see <http://www.apache.org/>.
  + 
  + */
  +
   package org.apache.cocoon.processor.xsp.library;
   
   import java.io.*;
  @@ -12,7 +63,7 @@
   import javax.servlet.http.*;
   
   import org.apache.cocoon.processor.xsp.*;
  -import org.apache.cocoon.framework.DOMConvertible;
  +import org.apache.cocoon.framework.XObject;
   
   public class XSPSessionLibrary {
     // HttpSession
  @@ -47,8 +98,10 @@
   
       element.setAttribute("name", name);
   
  -    if (value instanceof DOMConvertible) {
  -      element.appendChild(((DOMConvertible) value).toXML(document));
  +    if (value instanceof XObject) {
  +      DocumentFragment fragment = document.createDocumentFragment();
  +      ((XObject) value).toDOM(fragment);
  +      element.appendChild(fragment);
       } else {
         element.appendChild(document.createTextNode(value.toString()));
       }