[gentoo-commits] gentoo-x86 commit in licenses: JDOM

[Ulrich Mueller (ulm)]

ulm         13/01/01 19:04:47

  Modified:             JDOM
  Log:
  Change to license template. This covers JDOM, jaxen, saxpath, and werken.xpath licenses.

Revision  Changes    Path
1.2                  licenses/JDOM

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/JDOM?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/JDOM?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/JDOM?r1=1.1&r2=1.2

Index: JDOM
===================================================================
RCS file: /var/cvsroot/gentoo-x86/licenses/JDOM,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JDOM	8 Jul 2002 20:21:41 -0000	1.1
+++ JDOM	1 Jan 2013 19:04:47 -0000	1.2
@@ -1,56 +1,48 @@
-/*-- 
-
- $Id: JDOM,v 1.1 2002/07/08 20:21:41 blizzy Exp $
-
- Copyright (C) 2000-2002 Brett McLaughlin & Jason Hunter.
- 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 disclaimer that follows 
-    these conditions in the documentation and/or other materials 
-    provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
-    derived from this software without prior written permission.  For
-    written permission, please contact license@××××.org.
- 
- 4. Products derived from this software may not be called "JDOM", nor
-    may "JDOM" appear in their name, without prior written permission
-    from the JDOM Project Management (pm@××××.org).
- 
- In addition, we request (but do not require) that you include in the 
- end-user documentation provided with the redistribution and/or in the 
- software itself an acknowledgement equivalent to the following:
-     "This product includes software developed by the
-      JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos 
- available at http://www.jdom.org/images/logos.
-
- 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 JDOM AUTHORS OR THE PROJECT
- 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.
-
- This software consists of voluntary contributions made by many 
- individuals on behalf of the JDOM Project and was originally 
- created by Brett McLaughlin <brett@××××.org> and 
- Jason Hunter <jhunter@××××.org>.  For more information on the 
- JDOM Project, please see <http://www.jdom.org/>.
- 
- */
+Copyright (C) <years> <copyright holder>.
+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 disclaimer that follows
+   these conditions in the documentation and/or other materials
+   provided with the distribution.
+
+3. The name "<program>" must not be used to endorse or promote products
+   derived from this software without prior written permission.  For
+   written permission, please contact <e-mail address>.
+
+4. Products derived from this software may not be called "<program>",
+   nor may "<program>" appear in their name, without prior written
+   permission from <copyright holder> (<e-mail address>).
+
+In addition, we request (but do not require) that you include in the
+end-user documentation provided with the redistribution and/or in the
+software itself an acknowledgement equivalent to the following:
+    "This product includes software developed by
+     <copyright holder> (<address>)."
+Alternatively, the acknowledgment may be graphical using the logos
+available at <address>
+
+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 <copyright holder> OR THE PROJECT
+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.
+
+[This software consists of voluntary contributions made by many
+individuals on behalf of the <program> Project and was originally
+created by <authors>.  For more information on the <program> Project,
+please see <address>.]