CVS: jfor/src/org/jfor/jfor/rtflib/rtfdoc IRtfPageNumberCitationContainer.java,1.1,1.2 RtfPageNumberCitation.java,1.1,1.2

Update of /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc
In directory usw-pr-cvs1:/tmp/cvs-serv21367/src/org/jfor/jfor/rtflib/rtfdoc

Modified Files:
	IRtfPageNumberCitationContainer.java 
	RtfPageNumberCitation.java 
Log Message:
license corrected

Index: IRtfPageNumberCitationContainer.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IRtfPageNumberCitationContainer.java	29 Jul 2002 13:50:20 -0000	1.1
--- IRtfPageNumberCitationContainer.java	29 Jul 2002 14:39:53 -0000	1.2
***************
*** 6,35 ****
   * jfor - Open-Source XSL-FO to RTF converter - see www.jfor.org
   *
!  * The contents of this file are subject to the Mozilla Public
!  * License Version 1.1 (the "License"); you may not use this file
!  * except in compliance with the License. You may obtain a copy of
!  * the License at http://www.mozilla.org/MPL/
   *
!  * Software distributed under the License is distributed on an "AS
!  * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
!  * implied. See the License for the specific language governing
!  * rights and limitations under the License.
   *
!  * The Original Code is the contents of this java source file, as distributed
!  * on www.sourceforge.net/projects/jfor and/or www.jfor.org.
   *
!  * The Initial Developer of the Original Code is Bertrand Delacrétaz,
!  * codeconsult, Cugy/Lausanne, Switzerland [email protected].
!  * Portions created by Bertrand Delacrétaz are Copyright (C) 2001 codeconsult,
!  * Bertrand Delacrétaz. All Rights Reserved.
   *
   * Contributor(s):
   * Christopher Scott, [email protected]
-  * Portions created by Christopher Scott are Coypright (C) 2001
-  * Westinghouse Electric Company. All Rights Reserved.
-  *
   * Boris Poudérous, [email protected]
-  * Portions created by Boris Poudérous are Coypright (C) 2002
-  * All Rights Reserved.
  -----------------------------------------------------------------------------*/
  
--- 6,55 ----
   * jfor - Open-Source XSL-FO to RTF converter - see www.jfor.org
   *
!  * ====================================================================
!  * jfor Apache-Style Software License.
!  * Copyright (c) 2002 by the jfor project. 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.
   *
!  * 2. Redistributions in binary form must reproduce the above copyright
!  * notice, this list of conditions and the following disclaimer in
!  * the documentation and/or other materials provided with the
!  * distribution.
!  *
!  * 3. The end-user documentation included with the redistribution,
!  * if any, must include the following acknowledgment:
!  * "This product includes software developed
!  * by the jfor project (http://www.jfor.org)."
!  * Alternately, this acknowledgment may appear in the software itself,
!  * if and wherever such third-party acknowledgments normally appear.
!  *
!  * 4. The name "jfor" must not be used to endorse
!  * or promote products derived from this software without prior written
!  * permission.  For written permission, please contact [email protected].
   *
+  * 5. Products derived from this software may not be called "jfor",
+  * nor may "jfor" appear in their name, without prior written
+  * permission of [email protected].
+  *
+  * 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 JFOR PROJECT 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.
+  * ====================================================================
   * Contributor(s):
   * Christopher Scott, [email protected]
   * Boris Poudérous, [email protected]
  -----------------------------------------------------------------------------*/
  

Index: RtfPageNumberCitation.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc/RtfPageNumberCitation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RtfPageNumberCitation.java	29 Jul 2002 13:50:20 -0000	1.1
--- RtfPageNumberCitation.java	29 Jul 2002 14:39:53 -0000	1.2
***************
*** 7,36 ****
   * jfor - Open-Source XSL-FO to RTF converter - see www.jfor.org
   *
!  * The contents of this file are subject to the Mozilla Public
!  * License Version 1.1 (the "License"); you may not use this file
!  * except in compliance with the License. You may obtain a copy of
!  * the License at http://www.mozilla.org/MPL/
   *
!  * Software distributed under the License is distributed on an "AS
!  * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
!  * implied. See the License for the specific language governing
!  * rights and limitations under the License.
   *
!  * The Original Code is the contents of this java source file, as distributed
!  * on www.sourceforge.net/projects/jfor and/or www.jfor.org.
   *
!  * The Initial Developer of the Original Code is Bertrand Delacrétaz,
!  * codeconsult, Cugy/Lausanne, Switzerland [email protected].
!  * Portions created by Bertrand Delacrétaz are Copyright (C) 2001 codeconsult,
!  * Bertrand Delacrétaz. All Rights Reserved.
   *
   * Contributor(s):
   * Christopher Scott, [email protected]
-  * Portions created by Christopher Scott are Coypright (C) 2001
-  * Westinghouse Electric Company. All Rights Reserved.
-  *
   * Boris Poudérous, [email protected]
-  * Portions created by Boris Poudérous are Coypright (C) 2002
-  * All Rights Reserved.
  -----------------------------------------------------------------------------*/
  
--- 7,56 ----
   * jfor - Open-Source XSL-FO to RTF converter - see www.jfor.org
   *
!  * ====================================================================
!  * jfor Apache-Style Software License.
!  * Copyright (c) 2002 by the jfor project. 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.
   *
!  * 2. Redistributions in binary form must reproduce the above copyright
!  * notice, this list of conditions and the following disclaimer in
!  * the documentation and/or other materials provided with the
!  * distribution.
!  *
!  * 3. The end-user documentation included with the redistribution,
!  * if any, must include the following acknowledgment:
!  * "This product includes software developed
!  * by the jfor project (http://www.jfor.org)."
!  * Alternately, this acknowledgment may appear in the software itself,
!  * if and wherever such third-party acknowledgments normally appear.
!  *
!  * 4. The name "jfor" must not be used to endorse
!  * or promote products derived from this software without prior written
!  * permission.  For written permission, please contact [email protected].
   *
+  * 5. Products derived from this software may not be called "jfor",
+  * nor may "jfor" appear in their name, without prior written
+  * permission of [email protected].
+  *
+  * 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 JFOR PROJECT 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.
+  * ====================================================================
   * Contributor(s):
   * Christopher Scott, [email protected]
   * Boris Poudérous, [email protected]
  -----------------------------------------------------------------------------*/
  



-------------------------------------------------------
This sf.net email is sponsored by: Dice - The leading online job board
for high-tech professionals. Search and apply for tech jobs today!
http://seeker.dice.com/seeker.epl?rel_code=31