[cairo-commit] CairoJava/test/org/cairographics/cairo/test TestCairo.java, 1.5, 1.6 TestCairoImage.java, 1.6, 1.7

[Charles Tuckey]

Committed by: ctuckey

Update of /cvs/cairo/CairoJava/test/org/cairographics/cairo/test
In directory gabe:/tmp/cvs-serv25473/test/org/cairographics/cairo/test

Modified Files:
	TestCairo.java TestCairoImage.java 
Log Message:
Changed licensing test.



Index: TestCairo.java
===================================================================
RCS file: /cvs/cairo/CairoJava/test/org/cairographics/cairo/test/TestCairo.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TestCairo.java	30 Apr 2004 17:56:29 -0000	1.5
+++ TestCairo.java	26 Oct 2004 15:49:34 -0000	1.6
@@ -1,18 +1,39 @@
 /*
  * $Id$
  * 
- * Copyright (C) 2003 Verano
- * 
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Verano not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Verano makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without express or
- * implied warranty.
+ * Copyright (C) 2003, 2004 Verano
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.1
+ *
+ * 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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo java library.
+ *
+ * The Initial Developer of the Original Code is Verano, Inc.
+ *
+ * Contributor(s):
+ *      Soorya Kuloor (skuloor at verano.com)
+ *      Charles Tuckey (ctuckey at verano.com)
+ *
  *
  * VERANO MAKES NO REPRESENTATIONS OR WARRANTIES OR COVENANTS, EITHER
  * EXPRESS OR IMPLIED, WITH RESPECT TO THIS SOFTWARE, INCLUDING

Index: TestCairoImage.java
===================================================================
RCS file: /cvs/cairo/CairoJava/test/org/cairographics/cairo/test/TestCairoImage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- TestCairoImage.java	3 Jun 2004 22:27:03 -0000	1.6
+++ TestCairoImage.java	26 Oct 2004 15:49:34 -0000	1.7
@@ -1,18 +1,39 @@
 /*
  * $Id$
  * 
- * Copyright (C) 2003 Verano
- * 
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Verano not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Verano makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without express or
- * implied warranty.
+ * Copyright (C) 2003, 2004 Verano
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.1
+ *
+ * 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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo java library.
+ *
+ * The Initial Developer of the Original Code is Verano, Inc.
+ *
+ * Contributor(s):
+ *      Soorya Kuloor (skuloor at verano.com)
+ *      Charles Tuckey (ctuckey at verano.com)
+ *
  *
  * VERANO MAKES NO REPRESENTATIONS OR WARRANTIES OR COVENANTS, EITHER
  * EXPRESS OR IMPLIED, WITH RESPECT TO THIS SOFTWARE, INCLUDING