portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/modules/PollPortlet/src/java/org/apache/jetspeed/portal/util/poll Answer.java AnswerGroup.java PollMapBuilder.java Question.java
Date Wed, 07 Mar 2001 07:12:39 GMT
taylor      01/03/06 23:12:39

  Modified:    modules/CocoonPortlet/src/java/org/apache/jetspeed/portal/controllers
                        CocoonPortletController.java
               modules/CocoonPortlet/src/java/org/apache/jetspeed/portal/portlets
                        CocoonPortlet.java
               modules/CocoonPortlet/src/java/org/apache/jetspeed/portal/util/customizer
                        PSMLManager.java
               modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon
                        Cocoon.java CocoonService.java
                        JetspeedCocoonService.java SAXPIFilter.java
               modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/servlet
                        JetspeedHttpSession.java JetspeedServletConfig.java
                        JetspeedServletRequest.java
                        JetspeedServletResponse.java
               modules/PollPortlet/src/java/org/apache/jetspeed/portal/portlets
                        PollPortlet.java
               modules/PollPortlet/src/java/org/apache/jetspeed/portal/util/poll
                        Answer.java AnswerGroup.java PollMapBuilder.java
                        Question.java
  Log:
  update license
  
  Revision  Changes    Path
  1.3       +38 -35    jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/portal/controllers/CocoonPortletController.java
  
  Index: CocoonPortletController.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/portal/controllers/CocoonPortletController.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CocoonPortletController.java	2000/12/22 13:25:45	1.2
  +++ CocoonPortletController.java	2001/03/07 07:12:26	1.3
  @@ -1,6 +1,8 @@
  -/*
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -14,39 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. Every modification must be notified to the Java Apache Project
  - *    and redistribution of the modified code without prior notification
  - *    is not permitted in any form.
  - *
  - * 4. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  - *    Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 (INCLUDING, 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.
  - *
  - * License version 1.0
  - *
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   
   package org.apache.jetspeed.portal.controllers;
  @@ -86,7 +89,7 @@
   be well-formed XML (when using ECS this must be either XML or XHTML).
   
   @author <A HREF="mailto:luta.raphael@networks.vivendi.net">RaphaŽl Luta</A>
  -@version $Id: CocoonPortletController.java,v 1.2 2000/12/22 13:25:45 luta Exp $
  +@version $Id: CocoonPortletController.java,v 1.3 2001/03/07 07:12:26 taylor Exp $
   */
   public class CocoonPortletController extends AbstractPortletController {
   
  
  
  
  1.3       +38 -35    jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/portal/portlets/CocoonPortlet.java
  
  Index: CocoonPortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/portal/portlets/CocoonPortlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CocoonPortlet.java	2000/12/22 13:25:46	1.2
  +++ CocoonPortlet.java	2001/03/07 07:12:27	1.3
  @@ -1,6 +1,8 @@
  -/*
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -14,39 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. Every modification must be notified to the Java Apache Project
  - *    and redistribution of the modified code without prior notification
  - *    is not permitted in any form.
  - *
  - * 4. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  - *    Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 (INCLUDING, 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.
  - *
  - * License version 1.0
  - *
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   
   package org.apache.jetspeed.portal.portlets;
  @@ -93,7 +96,7 @@
   
   
   @author <A HREF="mailto:luta.raphael@networks.vivendi.net">RaphaŽl Luta</A>
  -@version $Id: CocoonPortlet.java,v 1.2 2000/12/22 13:25:46 luta Exp $
  +@version $Id: CocoonPortlet.java,v 1.3 2001/03/07 07:12:27 taylor Exp $
   */
   public class CocoonPortlet extends AbstractPortlet {
   
  
  
  
  1.3       +38 -35    jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/portal/util/customizer/PSMLManager.java
  
  Index: PSMLManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/portal/util/customizer/PSMLManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PSMLManager.java	2000/12/22 13:25:46	1.2
  +++ PSMLManager.java	2001/03/07 07:12:28	1.3
  @@ -1,6 +1,8 @@
  -/*
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -14,39 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. Every modification must be notified to the Java Apache Project
  - *    and redistribution of the modified code without prior notification
  - *    is not permitted in any form.
  - *
  - * 4. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  - *    Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 (INCLUDING, 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.
  - *
  - * License version 1.0
  - *
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   
   package org.apache.jetspeed.portal.portlets.util.customizer;
  @@ -57,7 +60,7 @@
   Handles parsing out a 2 PSML files and merging their changes.
   
   @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -@version $Id: PSMLManager.java,v 1.2 2000/12/22 13:25:46 luta Exp $ 
  +@version $Id: PSMLManager.java,v 1.3 2001/03/07 07:12:28 taylor Exp $ 
   */
   public class PSMLManager {
       
  
  
  
  1.3       +38 -35    jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/Cocoon.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Cocoon.java	2000/12/22 13:25:47	1.2
  +++ Cocoon.java	2001/03/07 07:12:29	1.3
  @@ -1,6 +1,8 @@
  -/*
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  - * Copyright ( c ) 1998 The Java Apache Project.  All rights reserved.
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -14,39 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. Every modification must be notified to the Java Apache Project
  - *    and redistribution of the modified code without prior notification
  - *    is not permitted in any form.
  - *
  - * 4. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    ( http://java.apache.org/)."
  - *
  - * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  - *    Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    ( http://java.apache.org/)."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 ( INCLUDING, 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.
  - *
  - * License version 1.0
  - *
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   
   package org.apache.jetspeed.services.cocoon;
  @@ -59,7 +62,7 @@
    * Static accessor class for CocoonService.
    *
    * @author <A HREF ="mailto:luta.raphael@networks.vivendi.net">RaphaŽl Luta</A>
  - * @version $Id: Cocoon.java,v 1.2 2000/12/22 13:25:47 luta Exp $
  + * @version $Id: Cocoon.java,v 1.3 2001/03/07 07:12:29 taylor Exp $
    */
   public class Cocoon {
   
  
  
  
  1.3       +38 -35    jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/CocoonService.java
  
  Index: CocoonService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/CocoonService.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CocoonService.java	2000/12/22 13:25:48	1.2
  +++ CocoonService.java	2001/03/07 07:12:29	1.3
  @@ -1,6 +1,8 @@
  -/*
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  - * Copyright ( c ) 1998 The Java Apache Project.  All rights reserved.
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -14,39 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. Every modification must be notified to the Java Apache Project
  - *    and redistribution of the modified code without prior notification
  - *    is not permitted in any form.
  - *
  - * 4. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    ( http://java.apache.org/)."
  - *
  - * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  - *    Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    ( http://java.apache.org/)."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 ( INCLUDING, 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.
  - *
  - * License version 1.0
  - *
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   
   package org.apache.jetspeed.services.cocoon;
  @@ -61,7 +64,7 @@
    * @author <A HREF ="mailto:luta.raphael@networks.vivendi.net">RaphaŽl Luta</A>
    * @author <A HREF="mailto:jeffprickett@mindspring.com">Jeff Prickett</A> 
    * @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  - * @version $Id: CocoonService.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  + * @version $Id: CocoonService.java,v 1.3 2001/03/07 07:12:29 taylor Exp $
    */
   public interface CocoonService extends Service {
   
  
  
  
  1.3       +38 -35    jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/JetspeedCocoonService.java
  
  Index: JetspeedCocoonService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/JetspeedCocoonService.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JetspeedCocoonService.java	2000/12/22 13:25:48	1.2
  +++ JetspeedCocoonService.java	2001/03/07 07:12:29	1.3
  @@ -1,6 +1,8 @@
  -/*
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  - * Copyright ( c ) 1998 The Java Apache Project.  All rights reserved.
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -14,39 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. Every modification must be notified to the Java Apache Project
  - *    and redistribution of the modified code without prior notification
  - *    is not permitted in any form.
  - *
  - * 4. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    ( http://java.apache.org/)."
  - *
  - * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  - *    Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    ( http://java.apache.org/)."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 ( INCLUDING, 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.
  - *
  - * License version 1.0
  - *
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   
   package org.apache.jetspeed.services.cocoon;
  @@ -73,7 +76,7 @@
    * @author <A HREF ="mailto:luta.raphael@networks.vivendi.net">RaphaŽl Luta</A>
    * @author <A HREF="mailto:jeffprickett@mindspring.com">Jeff Prickett</A> 
    * @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  - * @version $Id: JetspeedCocoonService.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  + * @version $Id: JetspeedCocoonService.java,v 1.3 2001/03/07 07:12:29 taylor Exp $
    */
   public class JetspeedCocoonService 
       extends TurbineBaseService
  
  
  
  1.3       +56 -53    jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/SAXPIFilter.java
  
  Index: SAXPIFilter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/SAXPIFilter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SAXPIFilter.java	2000/12/22 13:25:48	1.2
  +++ SAXPIFilter.java	2001/03/07 07:12:30	1.3
  @@ -1,6 +1,8 @@
  -/*
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -14,39 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. Every modification must be notified to the Java Apache Project
  - *    and redistribution of the modified code without prior notification
  - *    is not permitted in any form.
  - *
  - * 4. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  - *    Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 (INCLUDING, 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.
  - *
  - * License version 1.0
  - *
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   
   package org.apache.jetspeed.services.cocoon;
  @@ -68,7 +71,7 @@
   output stream.
   WARNING: This behavior will be modified in the future.
   
  -@version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +@version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
   */
   public class SAXPIFilter extends HandlerBase {
   
  @@ -88,7 +91,7 @@
       In this mode the parser may be used as a simple well-formedness checker.
   
       @param outPW the printWriter where to output parsed data
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public SAXPIFilter(PrintWriter outPW) throws UnsupportedEncodingException {
           this(outPW,false,null);
  @@ -100,7 +103,7 @@
   
       @param outPW the printWriter where to output parsed data
       @param strip configure the parser to strip PIs if strip is true
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public SAXPIFilter(PrintWriter outPW, boolean strip) throws UnsupportedEncodingException {
           this( outPW, strip, null );
  @@ -113,7 +116,7 @@
       @param outPW the printWriter where to output parsed data
       @param strip configure the parser to strip PIs if strip is true
       @param PI string reprensenting the PI to be output after the document declaration
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public SAXPIFilter(PrintWriter outPW, boolean strip, String PI) throws UnsupportedEncodingException {
           this.out=outPW;
  @@ -141,7 +144,7 @@
       Parse and output the content of the URL given as parameter.
   
       @param uri URL where to fetch the document to be parsed
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public void print(String uri) {
   
  @@ -163,7 +166,7 @@
       Parse and output the content of the stream
   
       @param in a content InputStream
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public void print(InputStream in) {
   
  @@ -185,7 +188,7 @@
       Parse and output the content of the reader
   
       @param in a content Reader
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public void print(Reader in) {
   
  @@ -206,7 +209,7 @@
       /**
       SAX Handler implementation
   
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public void processingInstruction(String target, String data) {
   
  @@ -247,7 +250,7 @@
       /**
       SAX Handler implementation
   
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public void startDocument() {
   
  @@ -260,7 +263,7 @@
       /**
       SAX Handler implementation
   
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public void startElement(String name, AttributeList attrs) {
   
  @@ -283,7 +286,7 @@
       /**
       SAX Handler implementation
   
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public void characters(char ch[], int start, int length) {
   
  @@ -294,7 +297,7 @@
       /**
       SAX Handler implementation
   
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public void ignorableWhitespace(char ch[], int start, int length) {
   
  @@ -305,7 +308,7 @@
       /**
       SAX Handler implementation
   
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public void endElement(String name) {
   
  @@ -318,7 +321,7 @@
       /**
       SAX Handler implementation
   
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public void endDocument() {
   
  @@ -329,7 +332,7 @@
       /**
       SAX Handler implementation
   
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public void warning(SAXParseException ex) {
           System.err.println("[Warning] "+
  @@ -340,7 +343,7 @@
       /**
       SAX Handler implementation
   
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public void error(SAXParseException ex) {
           System.err.println("[Error] "+
  @@ -351,7 +354,7 @@
       /**
       SAX Handler implementation
   
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       public void fatalError(SAXParseException ex) throws SAXException {
           System.err.println("[Fatal Error] "+
  @@ -363,7 +366,7 @@
       /**
       Retrieves the error location in the input stream
   
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       private String getLocationString(SAXParseException ex) {
           StringBuffer str = new StringBuffer();
  @@ -387,7 +390,7 @@
       /**
       Escapes characters data
   
  -    @version $Id: SAXPIFilter.java,v 1.2 2000/12/22 13:25:48 luta Exp $
  +    @version $Id: SAXPIFilter.java,v 1.3 2001/03/07 07:12:30 taylor Exp $
       */
       protected String normalize(String s) {
           StringBuffer str = new StringBuffer();
  
  
  
  1.3       +38 -35    jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/servlet/JetspeedHttpSession.java
  
  Index: JetspeedHttpSession.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/servlet/JetspeedHttpSession.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JetspeedHttpSession.java	2000/12/22 13:25:49	1.2
  +++ JetspeedHttpSession.java	2001/03/07 07:12:32	1.3
  @@ -1,52 +1,55 @@
  -/*
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, 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. 
  + *    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. Every modification must be notified to the Java Apache Project
  - *    and redistribution of the modified code without prior notification
  - *    is not permitted in any form.
  - *
  - * 4. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed 
  - *    Project" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 (INCLUDING, 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.
  - *
  - * License version 1.0
  - *
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   
   package org.apache.jetspeed.services.cocoon.servlet;
  
  
  
  1.3       +37 -39    jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/servlet/JetspeedServletConfig.java
  
  Index: JetspeedServletConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/servlet/JetspeedServletConfig.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JetspeedServletConfig.java	2000/12/22 13:25:49	1.2
  +++ JetspeedServletConfig.java	2001/03/07 07:12:32	1.3
  @@ -1,6 +1,9 @@
  -/*
  - * Copyright (c) 1997-1999 The Java Apache Project.  All rights reserved.
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
  + *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
    * are met:
  @@ -13,45 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache
  - *    Project for use in the Apache JServ servlet engine project
  - *    <http://java.apache.org/>."
  - *
  - * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
  - *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
  - *    "Java Apache Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 5. Products derived from this software may not be called "Apache JServ"
  - *    nor may "Apache" nor "Apache JServ" appear in their names without
  - *    prior written permission of the Java Apache Project.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache
  - *    Project for use in the Apache JServ servlet engine project
  - *    <http://java.apache.org/>."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 (INCLUDING, 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.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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 Java Apache Group. For more information
  - * on the Java Apache Project and the Apache JServ Servlet Engine project,
  - * please see <http://java.apache.org/>.
  - *
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   package org.apache.jetspeed.services.cocoon.servlet;
   
  @@ -67,7 +65,7 @@
   a framework that uses Servlets.  AKA Cocoon or Turbine.
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: JetspeedServletConfig.java,v 1.2 2000/12/22 13:25:49 luta Exp $
  +@version $Id: JetspeedServletConfig.java,v 1.3 2001/03/07 07:12:32 taylor Exp $
   */
   public class JetspeedServletConfig implements ServletConfig {
      
  
  
  
  1.3       +39 -41    jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/servlet/JetspeedServletRequest.java
  
  Index: JetspeedServletRequest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/servlet/JetspeedServletRequest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JetspeedServletRequest.java	2000/12/22 13:25:50	1.2
  +++ JetspeedServletRequest.java	2001/03/07 07:12:32	1.3
  @@ -1,6 +1,9 @@
  -/*
  - * Copyright (c) 1997-1999 The Java Apache Project.  All rights reserved.
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
  + *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
    * are met:
  @@ -13,45 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache
  - *    Project for use in the Apache JServ servlet engine project
  - *    <http://java.apache.org/>."
  - *
  - * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
  - *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
  - *    "Java Apache Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 5. Products derived from this software may not be called "Apache JServ"
  - *    nor may "Apache" nor "Apache JServ" appear in their names without
  - *    prior written permission of the Java Apache Project.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache
  - *    Project for use in the Apache JServ servlet engine project
  - *    <http://java.apache.org/>."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 (INCLUDING, 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.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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 Java Apache Group. For more information
  - * on the Java Apache Project and the Apache JServ Servlet Engine project,
  - * please see <http://java.apache.org/>.
  - *
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   package org.apache.jetspeed.services.cocoon.servlet;
   
  @@ -88,7 +86,7 @@
   return 
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: JetspeedServletRequest.java,v 1.2 2000/12/22 13:25:50 luta Exp $
  +@version $Id: JetspeedServletRequest.java,v 1.3 2001/03/07 07:12:32 taylor Exp $
   */
   public class JetspeedServletRequest implements HttpServletRequest {
       //public class JetspeedServletRequest extends CocoonServletRequest {
  @@ -173,7 +171,7 @@
       @param pc PortletConfig to be stored in the JetspeedServletRequest
   
       @author <A HREF="mailto:neeme@one.lv">Neeme Praks</A>
  -    @version $Id: JetspeedServletRequest.java,v 1.2 2000/12/22 13:25:50 luta Exp $
  +    @version $Id: JetspeedServletRequest.java,v 1.3 2001/03/07 07:12:32 taylor Exp $
       */
       /*public JetspeedServletRequest( String filePath,
                                      String document,
  @@ -187,7 +185,7 @@
       @return pc PortletConfig object stored in the request object
   
       @author <A HREF="mailto:neeme@one.lv">Neeme Praks</A>
  -    @version $Id: JetspeedServletRequest.java,v 1.2 2000/12/22 13:25:50 luta Exp $
  +    @version $Id: JetspeedServletRequest.java,v 1.3 2001/03/07 07:12:32 taylor Exp $
       */
       public PortletConfig getPortletConfig() {
           return pc;
  
  
  
  1.3       +37 -39    jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/servlet/JetspeedServletResponse.java
  
  Index: JetspeedServletResponse.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/servlet/JetspeedServletResponse.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JetspeedServletResponse.java	2000/12/22 13:25:50	1.2
  +++ JetspeedServletResponse.java	2001/03/07 07:12:33	1.3
  @@ -1,6 +1,9 @@
  -/*
  - * Copyright (c) 1997-1999 The Java Apache Project.  All rights reserved.
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
  + *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
    * are met:
  @@ -13,45 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache
  - *    Project for use in the Apache JServ servlet engine project
  - *    <http://java.apache.org/>."
  - *
  - * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
  - *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
  - *    "Java Apache Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 5. Products derived from this software may not be called "Apache JServ"
  - *    nor may "Apache" nor "Apache JServ" appear in their names without
  - *    prior written permission of the Java Apache Project.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache
  - *    Project for use in the Apache JServ servlet engine project
  - *    <http://java.apache.org/>."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 (INCLUDING, 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.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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 Java Apache Group. For more information
  - * on the Java Apache Project and the Apache JServ Servlet Engine project,
  - * please see <http://java.apache.org/>.
  - *
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   package org.apache.jetspeed.services.cocoon.servlet;
   
  @@ -72,7 +70,7 @@
   ServletResponse
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: JetspeedServletResponse.java,v 1.2 2000/12/22 13:25:50 luta Exp $
  +@version $Id: JetspeedServletResponse.java,v 1.3 2001/03/07 07:12:33 taylor Exp $
   */
   public class JetspeedServletResponse implements HttpServletResponse {
   
  
  
  
  1.3       +47 -44    jakarta-jetspeed/modules/PollPortlet/src/java/org/apache/jetspeed/portal/portlets/PollPortlet.java
  
  Index: PollPortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/PollPortlet/src/java/org/apache/jetspeed/portal/portlets/PollPortlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PollPortlet.java	2000/12/22 13:26:05	1.2
  +++ PollPortlet.java	2001/03/07 07:12:35	1.3
  @@ -1,6 +1,8 @@
  -/*
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -14,39 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. Every modification must be notified to the Java Apache Project
  - *    and redistribution of the modified code without prior notification
  - *    is not permitted in any form.
  - *
  - * 4. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  - *    Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 (INCLUDING, 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.
  - *
  - * License version 1.0
  - *
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   
   package org.apache.jetspeed.portal.portlets;
  @@ -80,7 +83,7 @@
   THIS IS CURRENTLY EXPERIMENTAL!!!
   
   @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -@version $Id: PollPortlet.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +@version $Id: PollPortlet.java,v 1.3 2001/03/07 07:12:35 taylor Exp $ 
   */
   public class PollPortlet extends AbstractPortlet {
   
  @@ -135,7 +138,7 @@
       
       @see Portlet.getContent
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: PollPortlet.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: PollPortlet.java,v 1.3 2001/03/07 07:12:35 taylor Exp $ 
       */
       public ConcreteElement getContent(RunData rundata) {
           
  @@ -262,7 +265,7 @@
       /**
       Get all available answers for this poll.
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: PollPortlet.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: PollPortlet.java,v 1.3 2001/03/07 07:12:35 taylor Exp $ 
       */
       public AnswerGroup getAnswerGroup() {
           return this.ag;
  @@ -271,7 +274,7 @@
       /**
       Set the question for this poll
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: PollPortlet.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: PollPortlet.java,v 1.3 2001/03/07 07:12:35 taylor Exp $ 
       */    
       public void setQuestion( Question question ) {
           this.question = question;
  @@ -280,7 +283,7 @@
       /**
       Get the question for this poll.
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: PollPortlet.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: PollPortlet.java,v 1.3 2001/03/07 07:12:35 taylor Exp $ 
       */
       public Question getQuestion() {
           return this.question;
  @@ -292,7 +295,7 @@
       /**
       Get the results of this poll and display them in a table format.
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: PollPortlet.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: PollPortlet.java,v 1.3 2001/03/07 07:12:35 taylor Exp $ 
       */
       private ConcreteElement getResults( RunData rundata ) {
           
  @@ -376,7 +379,7 @@
       Get a column for the vote table.
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: PollPortlet.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: PollPortlet.java,v 1.3 2001/03/07 07:12:35 taylor Exp $ 
       */    
       private TD getColumn( String data ) {
           
  @@ -389,7 +392,7 @@
       Get a column for the vote table.
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: PollPortlet.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: PollPortlet.java,v 1.3 2001/03/07 07:12:35 taylor Exp $ 
       */    
       private TD getColumn( ConcreteElement ce ) {
           
  @@ -404,7 +407,7 @@
       Returns true if this user/IP has already voted
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: PollPortlet.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: PollPortlet.java,v 1.3 2001/03/07 07:12:35 taylor Exp $ 
       */
       private boolean hasVoted( RunData rundata ) {
           
  @@ -434,7 +437,7 @@
       Set the current user's status to voted.
       
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: PollPortlet.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: PollPortlet.java,v 1.3 2001/03/07 07:12:35 taylor Exp $ 
       */
       public void setVoted( boolean voted, RunData rundata ) {
           
  
  
  
  1.3       +44 -41    jakarta-jetspeed/modules/PollPortlet/src/java/org/apache/jetspeed/portal/util/poll/Answer.java
  
  Index: Answer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/PollPortlet/src/java/org/apache/jetspeed/portal/util/poll/Answer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Answer.java	2000/12/22 13:26:05	1.2
  +++ Answer.java	2001/03/07 07:12:36	1.3
  @@ -1,6 +1,8 @@
  -/*
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -14,39 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. Every modification must be notified to the Java Apache Project
  - *    and redistribution of the modified code without prior notification
  - *    is not permitted in any form.
  - *
  - * 4. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  - *    Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 (INCLUDING, 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.
  - *
  - * License version 1.0
  - *
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   
   package org.apache.jetspeed.portal.portlets.util.poll;
  @@ -58,7 +61,7 @@
   Provides an Answer for a question.
   
   @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -@version $Id: Answer.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +@version $Id: Answer.java,v 1.3 2001/03/07 07:12:36 taylor Exp $ 
   */
   public class Answer extends BaseObject {
       
  @@ -70,7 +73,7 @@
       Create an answer with the specified title
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: Answer.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: Answer.java,v 1.3 2001/03/07 07:12:36 taylor Exp $ 
       */
       public Answer( String title, 
                      int id ) {
  @@ -82,7 +85,7 @@
       Set the vote count
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: Answer.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: Answer.java,v 1.3 2001/03/07 07:12:36 taylor Exp $ 
       */
       public void setVoteCount( int voteCount ) {
           this.voteCount = voteCount;
  @@ -92,7 +95,7 @@
       Get the vote count.
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: Answer.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: Answer.java,v 1.3 2001/03/07 07:12:36 taylor Exp $ 
       */
       public int getVoteCount() {
           return this.voteCount;
  @@ -102,7 +105,7 @@
       Get the title for this Answer... normally something like: "I really like peanuts"
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: Answer.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: Answer.java,v 1.3 2001/03/07 07:12:36 taylor Exp $ 
       */
       public String getTitle() {
           return this.title;
  @@ -112,7 +115,7 @@
       Get the ID for this Answer.
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: Answer.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: Answer.java,v 1.3 2001/03/07 07:12:36 taylor Exp $ 
       */
       public int getID() {
           return this.id;
  @@ -122,7 +125,7 @@
       Vote for this Answer, incrementing it's count by 1.
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: Answer.java,v 1.2 2000/12/22 13:26:05 luta Exp $ 
  +    @version $Id: Answer.java,v 1.3 2001/03/07 07:12:36 taylor Exp $ 
       */
       public void castVote() {
           ++this.voteCount;
  
  
  
  1.3       +44 -41    jakarta-jetspeed/modules/PollPortlet/src/java/org/apache/jetspeed/portal/util/poll/AnswerGroup.java
  
  Index: AnswerGroup.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/PollPortlet/src/java/org/apache/jetspeed/portal/util/poll/AnswerGroup.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AnswerGroup.java	2000/12/22 13:26:06	1.2
  +++ AnswerGroup.java	2001/03/07 07:12:37	1.3
  @@ -1,6 +1,8 @@
  -/*
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -14,39 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. Every modification must be notified to the Java Apache Project
  - *    and redistribution of the modified code without prior notification
  - *    is not permitted in any form.
  - *
  - * 4. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  - *    Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 (INCLUDING, 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.
  - *
  - * License version 1.0
  - *
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   
   package org.apache.jetspeed.portal.portlets.util.poll;
  @@ -55,7 +58,7 @@
   Groups answers together so that you can run queries on them.
   
   @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -@version $Id: AnswerGroup.java,v 1.2 2000/12/22 13:26:06 luta Exp $ 
  +@version $Id: AnswerGroup.java,v 1.3 2001/03/07 07:12:37 taylor Exp $ 
   */
   public class AnswerGroup {
       
  @@ -65,7 +68,7 @@
       Construct a group of answers with the given answer.
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: AnswerGroup.java,v 1.2 2000/12/22 13:26:06 luta Exp $ 
  +    @version $Id: AnswerGroup.java,v 1.3 2001/03/07 07:12:37 taylor Exp $ 
       */
       public AnswerGroup( Answer[] answers ) {
           this.answers = answers;
  @@ -75,7 +78,7 @@
       Get the answer that is currently the most popular (has the most votes).
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: AnswerGroup.java,v 1.2 2000/12/22 13:26:06 luta Exp $ 
  +    @version $Id: AnswerGroup.java,v 1.3 2001/03/07 07:12:37 taylor Exp $ 
       */
       public Answer getTopAnswer() {
           
  @@ -102,7 +105,7 @@
       Given an ID get an answer.
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: AnswerGroup.java,v 1.2 2000/12/22 13:26:06 luta Exp $ 
  +    @version $Id: AnswerGroup.java,v 1.3 2001/03/07 07:12:37 taylor Exp $ 
       */
       public Answer getAnswer( int id ) {
   
  @@ -120,7 +123,7 @@
       Get all the answers in the answer group
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: AnswerGroup.java,v 1.2 2000/12/22 13:26:06 luta Exp $ 
  +    @version $Id: AnswerGroup.java,v 1.3 2001/03/07 07:12:37 taylor Exp $ 
       */
       public Answer[] getAnswers() {
           return this.answers;
  @@ -130,7 +133,7 @@
       Given an answer get the percentage of people that have voted for this.
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: AnswerGroup.java,v 1.2 2000/12/22 13:26:06 luta Exp $ 
  +    @version $Id: AnswerGroup.java,v 1.3 2001/03/07 07:12:37 taylor Exp $ 
       */
       public int getPercentage( Answer answer ) {
           
  @@ -153,7 +156,7 @@
       Get the total of all the vote.
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: AnswerGroup.java,v 1.2 2000/12/22 13:26:06 luta Exp $ 
  +    @version $Id: AnswerGroup.java,v 1.3 2001/03/07 07:12:37 taylor Exp $ 
       */
       public int getTotal() {
           
  
  
  
  1.3       +36 -38    jakarta-jetspeed/modules/PollPortlet/src/java/org/apache/jetspeed/portal/util/poll/PollMapBuilder.java
  
  Index: PollMapBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/PollPortlet/src/java/org/apache/jetspeed/portal/util/poll/PollMapBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PollMapBuilder.java	2000/12/22 13:26:06	1.2
  +++ PollMapBuilder.java	2001/03/07 07:12:37	1.3
  @@ -1,6 +1,9 @@
  -/*
  - * Copyright (c) 1997-1999 The Java Apache Project.  All rights reserved.
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
  + *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
    * are met:
  @@ -13,45 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache
  - *    Project for use in the Apache JServ servlet engine project
  - *    <http://java.apache.org/>."
  - *
  - * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
  - *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
  - *    "Java Apache Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 5. Products derived from this software may not be called "Apache JServ"
  - *    nor may "Apache" nor "Apache JServ" appear in their names without
  - *    prior written permission of the Java Apache Project.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache
  - *    Project for use in the Apache JServ servlet engine project
  - *    <http://java.apache.org/>."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 (INCLUDING, 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.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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 Java Apache Group. For more information
  - * on the Java Apache Project and the Apache JServ Servlet Engine project,
  - * please see <http://java.apache.org/>.
  - *
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   
   package org.apache.jetspeed.portal.portlets.util.poll; 
  
  
  
  1.3       +40 -37    jakarta-jetspeed/modules/PollPortlet/src/java/org/apache/jetspeed/portal/util/poll/Question.java
  
  Index: Question.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/PollPortlet/src/java/org/apache/jetspeed/portal/util/poll/Question.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Question.java	2000/12/22 13:26:06	1.2
  +++ Question.java	2001/03/07 07:12:37	1.3
  @@ -1,6 +1,8 @@
  -/*
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -14,39 +16,40 @@
    *    the documentation and/or other materials provided with the
    *    distribution.
    *
  - * 3. Every modification must be notified to the Java Apache Project
  - *    and redistribution of the modified code without prior notification
  - *    is not permitted in any form.
  - *
  - * 4. All advertising materials mentioning features or use of this
  - *    software must display the following acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  - *    Project" must not be used to endorse or promote products
  - *    derived from this software without prior written permission.
  - *
  - * 6. Redistributions of any form whatsoever must retain the following
  - *    acknowledgment:
  - *    "This product includes software developed by the Java Apache Project
  - *    (http://java.apache.org/)."
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
  + * 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 "Apache" and "Apache Software Foundation" and
  + *     "Apache Jetspeed" 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" or
  + *    "Apache Jetspeed", 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 (INCLUDING, 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.
  - *
  - * License version 1.0
  - *
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
    */
   
   package org.apache.jetspeed.portal.portlets.util.poll;
  @@ -55,7 +58,7 @@
   Represents a question to be asked.
   
   @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -@version $Id: Question.java,v 1.2 2000/12/22 13:26:06 luta Exp $ 
  +@version $Id: Question.java,v 1.3 2001/03/07 07:12:37 taylor Exp $ 
   */
   public class Question {
       
  @@ -65,7 +68,7 @@
       Create a question
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: Question.java,v 1.2 2000/12/22 13:26:06 luta Exp $ 
  +    @version $Id: Question.java,v 1.3 2001/03/07 07:12:37 taylor Exp $ 
       */
       public Question( String title ) {
           this.title = title;
  @@ -75,7 +78,7 @@
       Get the title for this Answer... normally something like: "Do you like peanuts?"
   
       @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -    @version $Id: Question.java,v 1.2 2000/12/22 13:26:06 luta Exp $ 
  +    @version $Id: Question.java,v 1.3 2001/03/07 07:12:37 taylor Exp $ 
       */
       public String getTitle() {
           return this.title;
  
  
  

Mime
View raw message