Fix copyright/author tagsedge

36 files changed, 108 insertions, 50 deletions

diff --git a/.classpath b/.classpath
index 49ad63b..77db55c 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gensrc/java"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jogamp"/>
diff --git a/resources/cl-buffer-if.cfg b/resources/cl-buffer-if.cfg
index 2230672..197ef54 100644
--- a/resources/cl-buffer-if.cfg
+++ b/resources/cl-buffer-if.cfg
@@ -4,7 +4,7 @@ Style InterfaceOnly
 
 ClassJavadoc CLBufferBinding /**
 ClassJavadoc CLBufferBinding  * Java bindings to OpenCL buffers.
-ClassJavadoc CLBufferBinding  * @author Michael Bien
+ClassJavadoc CLBufferBinding  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CLBufferBinding  */
 JavaClass CLBufferBinding
 
diff --git a/resources/cl-common.cfg b/resources/cl-common.cfg
index 36c5d66..d89643b 100644
--- a/resources/cl-common.cfg
+++ b/resources/cl-common.cfg
@@ -107,7 +107,7 @@ RenameJavaMethod image_channel_data_type imageChannelDataType
 
 ClassJavadoc CLImageFormatImpl /**
 ClassJavadoc CLImageFormatImpl  * Struct accessor for cl_image_format.
-ClassJavadoc CLImageFormatImpl  * @author Michael Bien
+ClassJavadoc CLImageFormatImpl  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CLImageFormatImpl  */
 
 
diff --git a/resources/cl-context-if.cfg b/resources/cl-context-if.cfg
index c1609a7..0e9a561 100644
--- a/resources/cl-context-if.cfg
+++ b/resources/cl-context-if.cfg
@@ -7,7 +7,7 @@ Import com.jogamp.opencl.CLErrorHandler
 
 ClassJavadoc CLContextBinding /**
 ClassJavadoc CLContextBinding  * Java bindings to OpenCL contexts.
-ClassJavadoc CLContextBinding  * @author Michael Bien
+ClassJavadoc CLContextBinding  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CLContextBinding  */
 JavaClass CLContextBinding
 
diff --git a/resources/cl-device-if.cfg b/resources/cl-device-if.cfg
index 054cbdb..a32476c 100644
--- a/resources/cl-device-if.cfg
+++ b/resources/cl-device-if.cfg
@@ -4,7 +4,7 @@ Style InterfaceOnly
 
 ClassJavadoc CLDeviceBinding /**
 ClassJavadoc CLDeviceBinding  * Java bindings to OpenCL devices.
-ClassJavadoc CLDeviceBinding  * @author Michael Bien
+ClassJavadoc CLDeviceBinding  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CLDeviceBinding  */
 JavaClass CLDeviceBinding
 
diff --git a/resources/cl-event-if.cfg b/resources/cl-event-if.cfg
index 73a9c77..87b55bf 100644
--- a/resources/cl-event-if.cfg
+++ b/resources/cl-event-if.cfg
@@ -6,7 +6,7 @@ import com.jogamp.opencl.llb.impl.CLEventCallback
 
 ClassJavadoc CLEventBinding /**
 ClassJavadoc CLEventBinding  * Java bindings to OpenCL events.
-ClassJavadoc CLEventBinding  * @author Michael Bien
+ClassJavadoc CLEventBinding  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CLEventBinding  */
 JavaClass CLEventBinding
 
@@ -14,4 +14,4 @@ IgnoreNot .*CreateUserEvent.*|.*GetEventInfo.*|.*GetEventProfilingInfo.*|.*SetUs
 
 CustomJavaCode CLEventBinding
 CustomJavaCode CLEventBinding  /** Interface to C language function: <br> <code> int32_t {@native clSetEventCallback}(cl_event event, cl_int command_exec_callback_type, void (CL_CALLBACK  *pfn_event_notify) (cl_event event, cl_int event_command_exec_status, void *user_data), void *user_data); </code>    */
-CustomJavaCode CLEventBinding  public int clSetEventCallback(long event, int type, CLEventCallback cb);
\ No newline at end of file
+CustomJavaCode CLEventBinding  public int clSetEventCallback(long event, int type, CLEventCallback cb);
diff --git a/resources/cl-if.cfg b/resources/cl-if.cfg
index 94c9677..d97b3a7 100644
--- a/resources/cl-if.cfg
+++ b/resources/cl-if.cfg
@@ -4,7 +4,7 @@ Style InterfaceOnly
 
 ClassJavadoc CL /**
 ClassJavadoc CL  * Java bindings to OpenCL, the Open Computing Language.
-ClassJavadoc CL  * @author Michael Bien
+ClassJavadoc CL  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CL  */
 JavaClass CL
 
diff --git a/resources/cl-image-if.cfg b/resources/cl-image-if.cfg
index 7d62834..611d1bf 100644
--- a/resources/cl-image-if.cfg
+++ b/resources/cl-image-if.cfg
@@ -6,7 +6,7 @@ Import com.jogamp.opencl.llb.impl.CLImageFormatImpl
 
 ClassJavadoc CLImageBinding /**
 ClassJavadoc CLImageBinding  * Java bindings to OpenCL images.
-ClassJavadoc CLImageBinding  * @author Michael Bien
+ClassJavadoc CLImageBinding  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CLImageBinding  */
 JavaClass CLImageBinding
 
diff --git a/resources/cl-impl.cfg b/resources/cl-impl.cfg
index 1f9240a..32a3099 100644
--- a/resources/cl-impl.cfg
+++ b/resources/cl-impl.cfg
@@ -8,7 +8,7 @@ Import com.jogamp.opencl.llb.gl.CLGL
 
 ClassJavadoc CLAbstractImpl /**
 ClassJavadoc CLAbstractImpl  * Java bindings to OpenCL, the Open Computing Language (generated).
-ClassJavadoc CLAbstractImpl  * @author Michael Bien
+ClassJavadoc CLAbstractImpl  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CLAbstractImpl  */
 
 ImplJavaClass CLAbstractImpl
diff --git a/resources/cl-kernel-if.cfg b/resources/cl-kernel-if.cfg
index 732ab85..be9d6aa 100644
--- a/resources/cl-kernel-if.cfg
+++ b/resources/cl-kernel-if.cfg
@@ -4,7 +4,7 @@ Style InterfaceOnly
 
 ClassJavadoc CLKernelBinding /**
 ClassJavadoc CLKernelBinding  * Java bindings to OpenCL kernels.
-ClassJavadoc CLKernelBinding  * @author Michael Bien
+ClassJavadoc CLKernelBinding  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CLKernelBinding  */
 JavaClass CLKernelBinding
 
diff --git a/resources/cl-mem-if.cfg b/resources/cl-mem-if.cfg
index aae750e..11c51d1 100644
--- a/resources/cl-mem-if.cfg
+++ b/resources/cl-mem-if.cfg
@@ -6,7 +6,7 @@ import com.jogamp.opencl.llb.impl.CLMemObjectDestructorCallback
 
 ClassJavadoc CLMemObjBinding /**
 ClassJavadoc CLMemObjBinding  * Java bindings to OpenCL memory objects.
-ClassJavadoc CLMemObjBinding  * @author Michael Bien
+ClassJavadoc CLMemObjBinding  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CLMemObjBinding  */
 JavaClass CLMemObjBinding
 
diff --git a/resources/cl-platform-if.cfg b/resources/cl-platform-if.cfg
index e66f5bd..1a355f3 100644
--- a/resources/cl-platform-if.cfg
+++ b/resources/cl-platform-if.cfg
@@ -4,7 +4,7 @@ Style InterfaceOnly
 
 ClassJavadoc CLPlatformBinding /**
 ClassJavadoc CLPlatformBinding  * Java bindings to OpenCL platforms.
-ClassJavadoc CLPlatformBinding  * @author Michael Bien
+ClassJavadoc CLPlatformBinding  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CLPlatformBinding  */
 JavaClass CLPlatformBinding
 
diff --git a/resources/cl-program-if.cfg b/resources/cl-program-if.cfg
index 251ade7..7b72272 100644
--- a/resources/cl-program-if.cfg
+++ b/resources/cl-program-if.cfg
@@ -6,7 +6,7 @@ Import com.jogamp.opencl.llb.impl.BuildProgramCallback
 
 ClassJavadoc CLProgramBinding /**
 ClassJavadoc CLProgramBinding  * Java bindings to OpenCL programs.
-ClassJavadoc CLProgramBinding  * @author Michael Bien
+ClassJavadoc CLProgramBinding  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CLProgramBinding  */
 JavaClass CLProgramBinding
 
diff --git a/resources/cl-queue-if.cfg b/resources/cl-queue-if.cfg
index a8f6584..171b933 100644
--- a/resources/cl-queue-if.cfg
+++ b/resources/cl-queue-if.cfg
@@ -4,7 +4,7 @@ Style InterfaceOnly
 
 ClassJavadoc CLCommandQueueBinding /**
 ClassJavadoc CLCommandQueueBinding  * Java bindings to OpenCL command queues.
-ClassJavadoc CLCommandQueueBinding  * @author Michael Bien
+ClassJavadoc CLCommandQueueBinding  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CLCommandQueueBinding  */
 JavaClass CLCommandQueueBinding
 
diff --git a/resources/cl-sampler-if.cfg b/resources/cl-sampler-if.cfg
index f6382a5..5329b7f 100644
--- a/resources/cl-sampler-if.cfg
+++ b/resources/cl-sampler-if.cfg
@@ -4,7 +4,7 @@ Style InterfaceOnly
 
 ClassJavadoc CLSamplerBinding /**
 ClassJavadoc CLSamplerBinding  * Java bindings to OpenCL sampler objects.
-ClassJavadoc CLSamplerBinding  * @author Michael Bien
+ClassJavadoc CLSamplerBinding  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CLSamplerBinding  */
 JavaClass CLSamplerBinding
 
diff --git a/resources/clgl-if.cfg b/resources/clgl-if.cfg
index 2f193c7..e21005d 100644
--- a/resources/clgl-if.cfg
+++ b/resources/clgl-if.cfg
@@ -10,7 +10,7 @@ Style InterfaceOnly
 ClassJavadoc CLGL /**
 ClassJavadoc CLGL  * Java bindings to OpenCL, the Open Computing Language.
 ClassJavadoc CLGL  * OpenGL - OpenCL interoperability.
-ClassJavadoc CLGL  * @author Michael Bien
+ClassJavadoc CLGL  * @author Michael Bien, GlueGen, et al.
 ClassJavadoc CLGL  */
 JavaClass CLGL
 
diff --git a/src/com/jogamp/opencl/CLBuffer.java b/src/com/jogamp/opencl/CLBuffer.java
index 9972141..873256e 100644
--- a/src/com/jogamp/opencl/CLBuffer.java
+++ b/src/com/jogamp/opencl/CLBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 - 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2009 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -42,7 +42,7 @@ import static com.jogamp.opencl.CLException.*;
 
 /**
  * OpenCL buffer object wrapping an optional NIO buffer.
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 public class CLBuffer<B extends Buffer> extends CLMemory<B> {
 
diff --git a/src/com/jogamp/opencl/CLCommandQueue.java b/src/com/jogamp/opencl/CLCommandQueue.java
index eedb0bd..2e21ca0 100644
--- a/src/com/jogamp/opencl/CLCommandQueue.java
+++ b/src/com/jogamp/opencl/CLCommandQueue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 - 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2009 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -56,7 +56,7 @@ import static com.jogamp.opencl.util.CLUtil.*;
  * form multiple Threads will require the application to perform appropriate synchronization.
  * </p>
  * @see CLDevice#createCommandQueue(com.jogamp.opencl.CLCommandQueue.Mode...)
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 public class CLCommandQueue extends CLObjectResource {
 
diff --git a/src/com/jogamp/opencl/CLContext.java b/src/com/jogamp/opencl/CLContext.java
index 7073e5d..e3b83ae 100644
--- a/src/com/jogamp/opencl/CLContext.java
+++ b/src/com/jogamp/opencl/CLContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 - 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2009 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -79,7 +79,7 @@ import static java.util.Collections.*;
  * concurrency:<br/>
  * CLContext is threadsafe.
  * 
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 public class CLContext extends CLObjectResource {
 
diff --git a/src/com/jogamp/opencl/CLEvent.java b/src/com/jogamp/opencl/CLEvent.java
index d1bfeff..7537cfd 100644
--- a/src/com/jogamp/opencl/CLEvent.java
+++ b/src/com/jogamp/opencl/CLEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 - 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2009 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -43,7 +43,7 @@ import static com.jogamp.opencl.CLException.*;
  * measure execution time of a command.
  * Profiling of OpenCL commands can be enabled by using a {@link com.jogamp.opencl.CLCommandQueue} created with
  * {@link com.jogamp.opencl.CLCommandQueue.Mode#PROFILING_MODE}.
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 public class CLEvent extends CLObjectResource {
 
diff --git a/src/com/jogamp/opencl/CLEventList.java b/src/com/jogamp/opencl/CLEventList.java
index 53136e2..f07bf0a 100644
--- a/src/com/jogamp/opencl/CLEventList.java
+++ b/src/com/jogamp/opencl/CLEventList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 - 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2009 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -35,7 +35,7 @@ import java.util.Iterator;
 
 /**
  * Fixed size list for storing CLEvents.
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 public final class CLEventList implements CLResource, AutoCloseable, Iterable<CLEvent> {
 
diff --git a/src/com/jogamp/opencl/CLImage.java b/src/com/jogamp/opencl/CLImage.java
index e2daff9..32aa30d 100644
--- a/src/com/jogamp/opencl/CLImage.java
+++ b/src/com/jogamp/opencl/CLImage.java
@@ -37,7 +37,7 @@ import static com.jogamp.opencl.llb.CL.*;
 
 /**
  *
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 public abstract class CLImage<B extends Buffer> extends CLMemory<B>  {
 
diff --git a/src/com/jogamp/opencl/CLKernel.java b/src/com/jogamp/opencl/CLKernel.java
index 135174c..e54fb25 100644
--- a/src/com/jogamp/opencl/CLKernel.java
+++ b/src/com/jogamp/opencl/CLKernel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 - 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2009 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -48,7 +48,7 @@ import static com.jogamp.common.os.Platform.*;
  * CLKernel is not threadsafe.
  * @see CLProgram#createCLKernel(java.lang.String)
  * @see CLProgram#createCLKernels()
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 public class CLKernel extends CLObjectResource implements Cloneable {
 
diff --git a/src/com/jogamp/opencl/CLMemory.java b/src/com/jogamp/opencl/CLMemory.java
index 281d042..c736abe 100644
--- a/src/com/jogamp/opencl/CLMemory.java
+++ b/src/com/jogamp/opencl/CLMemory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 - 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2009 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -45,7 +45,7 @@ import static com.jogamp.opencl.llb.gl.CLGL.*;
 /**
  * Common superclass for all OpenCL memory types.
  * Represents an OpenCL memory object and wraps an optional NIO buffer.
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 public abstract class CLMemory <B extends Buffer> extends CLObjectResource {
     
diff --git a/src/com/jogamp/opencl/CLObject.java b/src/com/jogamp/opencl/CLObject.java
index 58a6333..5a57dc3 100644
--- a/src/com/jogamp/opencl/CLObject.java
+++ b/src/com/jogamp/opencl/CLObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 - 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2009 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
diff --git a/src/com/jogamp/opencl/CLObjectResource.java b/src/com/jogamp/opencl/CLObjectResource.java
index fcea22c..031199e 100644
--- a/src/com/jogamp/opencl/CLObjectResource.java
+++ b/src/com/jogamp/opencl/CLObjectResource.java
@@ -1,4 +1,32 @@
 /*
+ * Copyright (c) 2011 JogAmp Community. 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.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS 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 JogAmp Community OR
+ * 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.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+
+/*
  * Created on Saturday, June 18 2011 02:36
  */
 package com.jogamp.opencl;
@@ -7,7 +35,7 @@ import com.jogamp.common.AutoCloseable;
 
 /**
  * Releasable resource with an CL object ID.
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 abstract class CLObjectResource extends CLObject implements CLResource, AutoCloseable {
 
@@ -30,8 +58,8 @@ abstract class CLObjectResource extends CLObject implements CLResource, AutoClos
     }
 
     /**
-     * Implementation detail.
-     * TODO remove as soon we have extension methods.
+     * Implementation detail, satisfying {@link AutoCloseable}.
+     * Might be remove as soon we have extension methods, but shall validate with Java 1.5 specs.
      * @deprecated This method is not intended to be called from client code.
      * @see java.lang.AutoCloseable
      */
diff --git a/src/com/jogamp/opencl/CLPlatform.java b/src/com/jogamp/opencl/CLPlatform.java
index bd93caa..7a4f6b4 100644
--- a/src/com/jogamp/opencl/CLPlatform.java
+++ b/src/com/jogamp/opencl/CLPlatform.java
@@ -99,7 +99,7 @@ import static com.jogamp.opencl.llb.CL.*;
  * concurrency:<br/>
  * CLPlatform is threadsafe.
  * 
- * @author Michael Bien
+ * @author Michael Bien, et al.
  * @see #initialize()
  * @see #getDefault()
  * @see #listCLPlatforms()
diff --git a/src/com/jogamp/opencl/CLProgram.java b/src/com/jogamp/opencl/CLProgram.java
index d373d5d..3919d37 100644
--- a/src/com/jogamp/opencl/CLProgram.java
+++ b/src/com/jogamp/opencl/CLProgram.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 - 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2009 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -58,7 +58,7 @@ import static com.jogamp.common.nio.Buffers.*;
  * @see CLContext#createProgram(java.io.InputStream)
  * @see CLContext#createProgram(java.lang.String)
  * @see CLContext#createProgram(java.util.Map)
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 public class CLProgram extends CLObjectResource {
 
diff --git a/src/com/jogamp/opencl/CLResource.java b/src/com/jogamp/opencl/CLResource.java
index cd14c59..578ba92 100644
--- a/src/com/jogamp/opencl/CLResource.java
+++ b/src/com/jogamp/opencl/CLResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 - 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2009 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
diff --git a/src/com/jogamp/opencl/CLSampler.java b/src/com/jogamp/opencl/CLSampler.java
index f19f58d..fe780ac 100644
--- a/src/com/jogamp/opencl/CLSampler.java
+++ b/src/com/jogamp/opencl/CLSampler.java
@@ -41,7 +41,7 @@ import static com.jogamp.opencl.util.CLUtil.*;
 /**
  * Object representing an OpenCL sampler.
  * @see CLContext#createSampler(com.jogamp.opencl.CLSampler.AddressingMode, com.jogamp.opencl.CLSampler.FilteringMode, boolean)
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 public class CLSampler extends CLObjectResource {
 
diff --git a/src/com/jogamp/opencl/JOCLJNILibLoader.java b/src/com/jogamp/opencl/JOCLJNILibLoader.java
index 6f56223..4ee99f1 100644
--- a/src/com/jogamp/opencl/JOCLJNILibLoader.java
+++ b/src/com/jogamp/opencl/JOCLJNILibLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 - 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2009 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
diff --git a/src/com/jogamp/opencl/gl/CLGLContext.java b/src/com/jogamp/opencl/gl/CLGLContext.java
index dcddd3d..6194d88 100644
--- a/src/com/jogamp/opencl/gl/CLGLContext.java
+++ b/src/com/jogamp/opencl/gl/CLGLContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 - 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2009 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -47,7 +47,7 @@ import static com.jogamp.opencl.llb.gl.CLGL.*;
 
 /**
  * OpenCL Context supporting JOGL-JOCL interoperablity.
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 public final class CLGLContext extends CLContext {
 
diff --git a/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java b/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java
index 36718f1..e0bd7bd 100644
--- a/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java
+++ b/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java
@@ -1,6 +1,35 @@
 /*
+ * Copyright (c) 2011 JogAmp Community. 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.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS 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 JogAmp Community OR
+ * 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.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+
+/*
  * Created on Wednesday, May 25 2011 00:57
  */
+
 package com.jogamp.opencl.impl;
 
 import java.nio.IntBuffer;
@@ -16,7 +45,7 @@ import static com.jogamp.opencl.CLException.*;
 
 /**
  *
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 public class CLTLAccessorFactory implements CLAccessorFactory {
 
diff --git a/src/com/jogamp/opencl/llb/impl/CLImpl.java b/src/com/jogamp/opencl/llb/impl/CLImpl.java
index 0713ac4..253e19e 100644
--- a/src/com/jogamp/opencl/llb/impl/CLImpl.java
+++ b/src/com/jogamp/opencl/llb/impl/CLImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 - 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2009 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -43,7 +43,7 @@ import static com.jogamp.common.nio.Buffers.*;
 
 /**
  * Java bindings to OpenCL, the Open Computing Language.
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 public class CLImpl extends CLAbstractImpl {
 
diff --git a/src/com/jogamp/opencl/util/CLBuildListener.java b/src/com/jogamp/opencl/util/CLBuildListener.java
index acd53a5..d21109f 100644
--- a/src/com/jogamp/opencl/util/CLBuildListener.java
+++ b/src/com/jogamp/opencl/util/CLBuildListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 - 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2009 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -39,7 +39,7 @@ import com.jogamp.opencl.CLProgram;
  * has been built (successfully or unsuccessfully).<br/>
  * Note1: registering a build callback can make {@link com.jogamp.opencl.llb.CL#clBuildProgram} non blocking (OpenCL implementation dependent).<br/>
  * Note2: the thread which calls this method is unspecified. The Application should ensure propper synchronization.
- * @author Michael Bien
+ * @author Michael Bien, et al.
  * @see com.jogamp.opencl.llb.CL#clBuildProgram(long, int, com.jogamp.common.nio.PointerBuffer, java.lang.String, com.jogamp.opencl.llb.impl.BuildProgramCallback)
  */
 public interface CLBuildListener {
diff --git a/test/com/jogamp/opencl/LowLevelBindingTest.java b/test/com/jogamp/opencl/LowLevelBindingTest.java
index c8e27a6..9a5e034 100644
--- a/test/com/jogamp/opencl/LowLevelBindingTest.java
+++ b/test/com/jogamp/opencl/LowLevelBindingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 JogAmp Community. All rights reserved.
+ * Copyright (c) 2010 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -57,7 +57,7 @@ import static com.jogamp.opencl.TestUtils.*;
 
 /**
  * Test testing the low level bindings.
- * @author Michael Bien
+ * @author Michael Bien, et al.
  */
 public class LowLevelBindingTest {