[jboss-cvs] JBossAS SVN: r81310 - projects/naming/branches/Branch_5_0/jnpserver/src/main/java/org/jboss/naming.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2008-11-19 13:22:56 -0500 (Wed, 19 Nov 2008)
New Revision: 81310

Modified:
   projects/naming/branches/Branch_5_0/jnpserver/src/main/java/org/jboss/naming/JndiPermission.java
Log:
Correct the copyright header usage per counsel from Richard Fontana(rfontana at redhat.com)


Modified: projects/naming/branches/Branch_5_0/jnpserver/src/main/java/org/jboss/naming/JndiPermission.java
===================================================================
--- projects/naming/branches/Branch_5_0/jnpserver/src/main/java/org/jboss/naming/JndiPermission.java	2008-11-19 18:20:31 UTC (rev 81309)
+++ projects/naming/branches/Branch_5_0/jnpserver/src/main/java/org/jboss/naming/JndiPermission.java	2008-11-19 18:22:56 UTC (rev 81310)
@@ -1,4 +1,9 @@
-/*
+/* 
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -21,27 +26,27 @@
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
- */
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
  *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
+ * The text of the Classpath Exception, as provided by Sun
+ * Microsystems, Inc. to the original version of this code, and
+ * extended by Red Hat Middleware LLC to its modifications, follows:
+ * 
+ * Linking this library statically or dynamically with other modules
+ * is making a combined work based on this library. Thus, the terms
+ * and conditions of the GNU General Public License cover the whole
+ * combination.
  *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ * As a special exception, the copyright holders of this library give
+ * you permission to link this library with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also meet,
+ * for each linked independent module, the terms and conditions of the
+ * license of that module. An independent module is a module which is
+ * not derived from or based on this library. If you modify this
+ * library, you may extend this exception to your version of the
+ * library, but you are not obligated to do so. If you do not wish to
+ * do so, delete this exception statement from your version. 
  */
 package org.jboss.naming;