Bug 682 - Relocating javax.media.opengl.* -> com.jogamp.opengl.* (Part 1)

sed -i 's/javax\.media\.opengl/com\.jogamp\.opengl/g' `grep -Rl "javax\.media\.opengl" src`
sed -i 's/javax\.media\.nativewindow/com\.jogamp\.nativewindow/g' `grep -Rl "javax\.media\.nativewindow" src`
sed -i 's/javax\/media\//com\/jogamp\//g' `grep -Rl "javax/media/" src`
sed -i 's/javax\/media\//com\/jogamp\//g' `grep -Rl "javax/media/" doc`

Manually edited all occurences within make/**

49 files changed, 210 insertions, 210 deletions

diff --git a/src/jogl/classes/javax/media/opengl/DebugGL2.java b/src/jogl/classes/javax/media/opengl/DebugGL2.java
index e0d24c4a1..dc0f0df50 100644
--- a/src/jogl/classes/javax/media/opengl/DebugGL2.java
+++ b/src/jogl/classes/javax/media/opengl/DebugGL2.java
@@ -1,4 +1,4 @@
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 /**
  * <p>
diff --git a/src/jogl/classes/javax/media/opengl/DebugGL3.java b/src/jogl/classes/javax/media/opengl/DebugGL3.java
index 678e800f6..6b27d207b 100644
--- a/src/jogl/classes/javax/media/opengl/DebugGL3.java
+++ b/src/jogl/classes/javax/media/opengl/DebugGL3.java
@@ -1,4 +1,4 @@
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 /**
  * <p>
diff --git a/src/jogl/classes/javax/media/opengl/DebugGL3bc.java b/src/jogl/classes/javax/media/opengl/DebugGL3bc.java
index 2636e9428..d92f6043f 100644
--- a/src/jogl/classes/javax/media/opengl/DebugGL3bc.java
+++ b/src/jogl/classes/javax/media/opengl/DebugGL3bc.java
@@ -1,4 +1,4 @@
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 /**
  * <p>
diff --git a/src/jogl/classes/javax/media/opengl/DebugGL4.java b/src/jogl/classes/javax/media/opengl/DebugGL4.java
index c4f8764cb..76f5a4ac3 100644
--- a/src/jogl/classes/javax/media/opengl/DebugGL4.java
+++ b/src/jogl/classes/javax/media/opengl/DebugGL4.java
@@ -1,4 +1,4 @@
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 /**
  * <p>
diff --git a/src/jogl/classes/javax/media/opengl/DebugGLES2.java b/src/jogl/classes/javax/media/opengl/DebugGLES2.java
index c4e06f347..e2b280515 100644
--- a/src/jogl/classes/javax/media/opengl/DebugGLES2.java
+++ b/src/jogl/classes/javax/media/opengl/DebugGLES2.java
@@ -1,4 +1,4 @@
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 /**
  * <p>
diff --git a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
index 1991ad7d0..88a88087f 100644
--- a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
+++ b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
@@ -38,13 +38,13 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
-import javax.media.nativewindow.NativeWindowException;
+import com.jogamp.nativewindow.NativeWindowException;
 
 import java.util.List;
 
-import javax.media.nativewindow.CapabilitiesImmutable;
+import com.jogamp.nativewindow.CapabilitiesImmutable;
 
 import com.jogamp.common.ExceptionUtils;
 import com.jogamp.common.util.PropertyAccess;
diff --git a/src/jogl/classes/javax/media/opengl/FPSCounter.java b/src/jogl/classes/javax/media/opengl/FPSCounter.java
index 4997258e0..a3b7ccb70 100644
--- a/src/jogl/classes/javax/media/opengl/FPSCounter.java
+++ b/src/jogl/classes/javax/media/opengl/FPSCounter.java
@@ -25,7 +25,7 @@
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.io.PrintStream;
 
diff --git a/src/jogl/classes/javax/media/opengl/GLAnimatorControl.java b/src/jogl/classes/javax/media/opengl/GLAnimatorControl.java
index d14ada48b..549efd569 100644
--- a/src/jogl/classes/javax/media/opengl/GLAnimatorControl.java
+++ b/src/jogl/classes/javax/media/opengl/GLAnimatorControl.java
@@ -26,11 +26,11 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 /**
  * An animator control interface,
- * which implementation may drive a {@link javax.media.opengl.GLAutoDrawable} animation.
+ * which implementation may drive a {@link com.jogamp.opengl.GLAutoDrawable} animation.
  */
 public interface GLAnimatorControl extends FPSCounter {
     /**
diff --git a/src/jogl/classes/javax/media/opengl/GLArrayData.java b/src/jogl/classes/javax/media/opengl/GLArrayData.java
index 97f58a92a..ea2dfb0f3 100644
--- a/src/jogl/classes/javax/media/opengl/GLArrayData.java
+++ b/src/jogl/classes/javax/media/opengl/GLArrayData.java
@@ -26,11 +26,11 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.nio.Buffer;
 
-import javax.media.opengl.fixedfunc.GLPointerFunc;
+import com.jogamp.opengl.fixedfunc.GLPointerFunc;
 
 /**
  *
diff --git a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java
index bded88d20..385acf082 100644
--- a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java
+++ b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java
@@ -38,11 +38,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.util.List;
 
-import javax.media.nativewindow.NativeSurface;
+import com.jogamp.nativewindow.NativeSurface;
 
 import com.jogamp.common.util.locks.RecursiveLock;
 
@@ -63,7 +63,7 @@ import jogamp.opengl.Debug;
     <h5><a name="initialization">GLAutoDrawable Initialization</a></h5>
     <p>
     The implementation shall initialize itself as soon as possible,
-    which is only possible <i>after</i> the attached {@link javax.media.nativewindow.NativeSurface NativeSurface} becomes visible and and is realized.<br>
+    which is only possible <i>after</i> the attached {@link com.jogamp.nativewindow.NativeSurface NativeSurface} becomes visible and and is realized.<br>
     The following initialization sequence should be implemented:
     <ul>
         <li> Create the  {@link GLDrawable} with the requested {@link GLCapabilities}</li>
@@ -81,11 +81,11 @@ import jogamp.opengl.Debug;
     <p>
     Another implementation detail is the {@link GLDrawable} reconfiguration. One use case is where a window is being
     dragged to another screen with a different pixel configuration, ie {@link GLCapabilities}. The implementation
-    shall be able to detect such cases in conjunction with the associated {@link javax.media.nativewindow.NativeSurface NativeSurface}.<br/>
+    shall be able to detect such cases in conjunction with the associated {@link com.jogamp.nativewindow.NativeSurface NativeSurface}.<br/>
     For example, AWT's {@link java.awt.Canvas} 's {@link java.awt.Canvas#getGraphicsConfiguration getGraphicsConfiguration()}
-    is capable to determine a display device change. This is demonstrated within {@link javax.media.opengl.awt.GLCanvas}'s
-    and NEWT's <code>AWTCanvas</code> {@link javax.media.opengl.awt.GLCanvas#getGraphicsConfiguration getGraphicsConfiguration()}
-    specialization. Another demonstration is NEWT's {@link javax.media.nativewindow.NativeWindow NativeWindow}
+    is capable to determine a display device change. This is demonstrated within {@link com.jogamp.opengl.awt.GLCanvas}'s
+    and NEWT's <code>AWTCanvas</code> {@link com.jogamp.opengl.awt.GLCanvas#getGraphicsConfiguration getGraphicsConfiguration()}
+    specialization. Another demonstration is NEWT's {@link com.jogamp.nativewindow.NativeWindow NativeWindow}
     implementation on the Windows platform, which utilizes the native platform's <i>MonitorFromWindow(HWND)</i> function.<br/>
     All OpenGL resources shall be regenerated, while the drawable's {@link GLCapabilities} has
     to be chosen again. The following protocol shall be satisfied.
@@ -342,12 +342,12 @@ public interface GLAutoDrawable extends GLDrawable {
   public GLEventListener removeGLEventListener(GLEventListener listener);
 
   /**
-   * Registers the usage of an animator, an {@link javax.media.opengl.GLAnimatorControl} implementation.
+   * Registers the usage of an animator, an {@link com.jogamp.opengl.GLAnimatorControl} implementation.
    * The animator will be queried whether it's animating, ie periodically issuing {@link #display()} calls or not.
    * <p>
    * This method shall be called by an animator implementation only,<br>
-   * e.g. {@link com.jogamp.opengl.util.Animator#add(javax.media.opengl.GLAutoDrawable)}, passing it's control implementation,<br>
-   * and {@link com.jogamp.opengl.util.Animator#remove(javax.media.opengl.GLAutoDrawable)}, passing <code>null</code>.
+   * e.g. {@link com.jogamp.opengl.util.Animator#add(com.jogamp.opengl.GLAutoDrawable)}, passing it's control implementation,<br>
+   * and {@link com.jogamp.opengl.util.Animator#remove(com.jogamp.opengl.GLAutoDrawable)}, passing <code>null</code>.
    * </p>
    * <p>
    * Impacts {@link #display()} and {@link #invoke(boolean, GLRunnable)} semantics.</p><br>
@@ -359,15 +359,15 @@ public interface GLAutoDrawable extends GLDrawable {
    * @throws GLException if an animator is already registered.
    * @see #display()
    * @see #invoke(boolean, GLRunnable)
-   * @see javax.media.opengl.GLAnimatorControl
+   * @see com.jogamp.opengl.GLAnimatorControl
    */
   public abstract void setAnimator(GLAnimatorControl animatorControl) throws GLException;
 
   /**
-   * @return the registered {@link javax.media.opengl.GLAnimatorControl} implementation, using this <code>GLAutoDrawable</code>.
+   * @return the registered {@link com.jogamp.opengl.GLAnimatorControl} implementation, using this <code>GLAutoDrawable</code>.
    *
-   * @see #setAnimator(javax.media.opengl.GLAnimatorControl)
-   * @see javax.media.opengl.GLAnimatorControl
+   * @see #setAnimator(com.jogamp.opengl.GLAnimatorControl)
+   * @see com.jogamp.opengl.GLAnimatorControl
    */
   public GLAnimatorControl getAnimator();
 
@@ -504,15 +504,15 @@ public interface GLAutoDrawable extends GLDrawable {
    * <ul>
    *     <li> Calling {@link GLEventListener#display display(..)} for all
    *          registered {@link GLEventListener}s. </li>
-   *     <li> Executes all one-shot {@link javax.media.opengl.GLRunnable GLRunnable},
+   *     <li> Executes all one-shot {@link com.jogamp.opengl.GLRunnable GLRunnable},
    *          enqueued via {@link #invoke(boolean, GLRunnable)}.</li>
    * </ul></p>
    * <p>
-   * May be called periodically by a running {@link javax.media.opengl.GLAnimatorControl} implementation,<br>
-   * which must register itself with {@link #setAnimator(javax.media.opengl.GLAnimatorControl)}.</p>
+   * May be called periodically by a running {@link com.jogamp.opengl.GLAnimatorControl} implementation,<br>
+   * which must register itself with {@link #setAnimator(com.jogamp.opengl.GLAnimatorControl)}.</p>
    * <p>
    * Called automatically by the window system toolkit upon receiving a repaint() request, <br>
-   * except an {@link javax.media.opengl.GLAnimatorControl} implementation {@link javax.media.opengl.GLAnimatorControl#isAnimating()}.</p>
+   * except an {@link com.jogamp.opengl.GLAnimatorControl} implementation {@link com.jogamp.opengl.GLAnimatorControl#isAnimating()}.</p>
    * <p>
    * This routine may also be called manually for better control over the
    * rendering process. It is legal to call another GLAutoDrawable's
@@ -525,7 +525,7 @@ public interface GLAutoDrawable extends GLDrawable {
    * actual {@link GLEventListener#display display(..)} calls,
    * in case this has not been done yet.</p>
    *
-   * @see #setAnimator(javax.media.opengl.GLAnimatorControl)
+   * @see #setAnimator(com.jogamp.opengl.GLAnimatorControl)
    */
   public void display();
 
@@ -598,8 +598,8 @@ public interface GLAutoDrawable extends GLDrawable {
    *     <tr><td>Toolkit</td>  <td>GLAutoDrawable Implementation</td>            <td>~</td>      <td>Return Type of getUpstreamWidget()</td</tr>
    *     <tr><td>NEWT</td>     <td>{@link com.jogamp.newt.opengl.GLWindow}</td>  <td>has a</td>  <td>{@link com.jogamp.newt.Window}</td</tr>
    *     <tr><td>SWT</td>      <td>{@link com.jogamp.opengl.swt.GLCanvas}</td>   <td>is a</td>   <td>{@link org.eclipse.swt.widgets.Canvas}</td</tr>
-   *     <tr><td>AWT</td>      <td>{@link javax.media.opengl.awt.GLCanvas}</td>  <td>is a</td>   <td>{@link java.awt.Canvas}</td</tr>
-   *     <tr><td>AWT</td>      <td>{@link javax.media.opengl.awt.GLJPanel}</td>  <td>is a</td>   <td>{@link javax.swing.JPanel}</td</tr>
+   *     <tr><td>AWT</td>      <td>{@link com.jogamp.opengl.awt.GLCanvas}</td>  <td>is a</td>   <td>{@link java.awt.Canvas}</td</tr>
+   *     <tr><td>AWT</td>      <td>{@link com.jogamp.opengl.awt.GLJPanel}</td>  <td>is a</td>   <td>{@link javax.swing.JPanel}</td</tr>
    * </table>
    * However, the result may be other object types than the listed above
    * due to new supported toolkits.
diff --git a/src/jogl/classes/javax/media/opengl/GLBase.java b/src/jogl/classes/javax/media/opengl/GLBase.java
index 802da3b6c..19b7808fc 100644
--- a/src/jogl/classes/javax/media/opengl/GLBase.java
+++ b/src/jogl/classes/javax/media/opengl/GLBase.java
@@ -27,7 +27,7 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 /**
  * <P>The base interface from which all GL profiles derive, providing
diff --git a/src/jogl/classes/javax/media/opengl/GLBufferStorage.java b/src/jogl/classes/javax/media/opengl/GLBufferStorage.java
index 1101ed31b..5db97d42f 100644
--- a/src/jogl/classes/javax/media/opengl/GLBufferStorage.java
+++ b/src/jogl/classes/javax/media/opengl/GLBufferStorage.java
@@ -25,7 +25,7 @@
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
diff --git a/src/jogl/classes/javax/media/opengl/GLCapabilities.java b/src/jogl/classes/javax/media/opengl/GLCapabilities.java
index 0d65d35cb..02aa47119 100644
--- a/src/jogl/classes/javax/media/opengl/GLCapabilities.java
+++ b/src/jogl/classes/javax/media/opengl/GLCapabilities.java
@@ -38,10 +38,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
-import javax.media.nativewindow.Capabilities;
-import javax.media.nativewindow.CapabilitiesImmutable;
+import com.jogamp.nativewindow.Capabilities;
+import com.jogamp.nativewindow.CapabilitiesImmutable;
 
 /** Specifies a set of OpenGL capabilities.<br>
     At creation time of a {@link GLDrawable} using {@link GLDrawableFactory},
diff --git a/src/jogl/classes/javax/media/opengl/GLCapabilitiesChooser.java b/src/jogl/classes/javax/media/opengl/GLCapabilitiesChooser.java
index 2e0bec1f9..9911d1314 100644
--- a/src/jogl/classes/javax/media/opengl/GLCapabilitiesChooser.java
+++ b/src/jogl/classes/javax/media/opengl/GLCapabilitiesChooser.java
@@ -38,14 +38,14 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.util.List;
 
-import javax.media.nativewindow.CapabilitiesImmutable;
-import javax.media.nativewindow.CapabilitiesChooser;
+import com.jogamp.nativewindow.CapabilitiesImmutable;
+import com.jogamp.nativewindow.CapabilitiesChooser;
 
-import javax.media.opengl.GLCapabilitiesImmutable;
+import com.jogamp.opengl.GLCapabilitiesImmutable;
 
 /** Provides a mechanism by which applications can customize the
     window type selection for a given {@link GLCapabilities}.
diff --git a/src/jogl/classes/javax/media/opengl/GLCapabilitiesImmutable.java b/src/jogl/classes/javax/media/opengl/GLCapabilitiesImmutable.java
index dc28539a0..25081a521 100644
--- a/src/jogl/classes/javax/media/opengl/GLCapabilitiesImmutable.java
+++ b/src/jogl/classes/javax/media/opengl/GLCapabilitiesImmutable.java
@@ -26,15 +26,15 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
-import javax.media.nativewindow.CapabilitiesImmutable;
+import com.jogamp.nativewindow.CapabilitiesImmutable;
 
 /**
  * Specifies an immutable set of OpenGL capabilities.<br>
  *
- * @see javax.media.opengl.GLCapabilities
- * @see javax.media.nativewindow.CapabilitiesImmutable
+ * @see com.jogamp.opengl.GLCapabilities
+ * @see com.jogamp.nativewindow.CapabilitiesImmutable
  */
 public interface GLCapabilitiesImmutable extends CapabilitiesImmutable {
     /**
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index f6c5a3245..6366c4e37 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.nio.IntBuffer;
 import java.util.HashMap;
@@ -47,8 +47,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import javax.media.nativewindow.AbstractGraphicsDevice;
-import javax.media.nativewindow.NativeSurface;
+import com.jogamp.nativewindow.AbstractGraphicsDevice;
+import com.jogamp.nativewindow.NativeSurface;
 
 import jogamp.opengl.Debug;
 import jogamp.opengl.GLContextImpl;
@@ -677,7 +677,7 @@ public abstract class GLContext {
    *
    * @param glFunctionName the name of the OpenGL function (e.g., use
    * "glPolygonOffsetEXT" or "glPolygonOffset" to check if the {@link
-   * javax.media.opengl.GL#glPolygonOffset(float,float)} is available).
+   * com.jogamp.opengl.GL#glPolygonOffset(float,float)} is available).
    */
   public abstract boolean isFunctionAvailable(String glFunctionName);
 
@@ -709,7 +709,7 @@ public abstract class GLContext {
       space-separated list of available extensions.
       Can only be called while this context is current.
       This is equivalent to
-      {@link javax.media.opengl.GL#glGetString(int) glGetString}({@link javax.media.opengl.GL#GL_EXTENSIONS GL_EXTENSIONS})
+      {@link com.jogamp.opengl.GL#glGetString(int) glGetString}({@link com.jogamp.opengl.GL#GL_EXTENSIONS GL_EXTENSIONS})
    */
   public abstract String getGLExtensionsString();
 
@@ -1615,12 +1615,12 @@ public abstract class GLContext {
   //
 
   /**
-   * @see #getDeviceVersionAvailableKey(javax.media.nativewindow.AbstractGraphicsDevice, int, int)
+   * @see #getDeviceVersionAvailableKey(com.jogamp.nativewindow.AbstractGraphicsDevice, int, int)
    */
   protected static final IdentityHashMap<String, Integer> deviceVersionAvailable = new IdentityHashMap<String, Integer>();
 
   /**
-   * @see #getUniqueDeviceString(javax.media.nativewindow.AbstractGraphicsDevice)
+   * @see #getUniqueDeviceString(com.jogamp.nativewindow.AbstractGraphicsDevice)
    */
   private static final IdentityHashMap<String, String> deviceVersionsAvailableSet = new IdentityHashMap<String, String>();
 
@@ -1664,7 +1664,7 @@ public abstract class GLContext {
   /**
    * Called by {@link jogamp.opengl.GLContextImpl#createContextARBMapVersionsAvailable(int,int)} not intended to be used by
    * implementations. However, if {@link jogamp.opengl.GLContextImpl#createContextARB(long, boolean)} is not being used within
-   * {@link javax.media.opengl.GLDrawableFactory#getOrCreateSharedContext(javax.media.nativewindow.AbstractGraphicsDevice)},
+   * {@link com.jogamp.opengl.GLDrawableFactory#getOrCreateSharedContext(com.jogamp.nativewindow.AbstractGraphicsDevice)},
    * GLProfile has to map the available versions.
    *
    * @param reqMajor Key Value either 1, 2, 3 or 4
diff --git a/src/jogl/classes/javax/media/opengl/GLDebugListener.java b/src/jogl/classes/javax/media/opengl/GLDebugListener.java
index ec7f7cec1..30e1a49c2 100644
--- a/src/jogl/classes/javax/media/opengl/GLDebugListener.java
+++ b/src/jogl/classes/javax/media/opengl/GLDebugListener.java
@@ -25,7 +25,7 @@
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 /**
  * Listener for {@link GLDebugMessage}s.
diff --git a/src/jogl/classes/javax/media/opengl/GLDebugMessage.java b/src/jogl/classes/javax/media/opengl/GLDebugMessage.java
index 325345012..a8868026b 100644
--- a/src/jogl/classes/javax/media/opengl/GLDebugMessage.java
+++ b/src/jogl/classes/javax/media/opengl/GLDebugMessage.java
@@ -25,7 +25,7 @@
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import com.jogamp.common.os.Platform;
 
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawable.java b/src/jogl/classes/javax/media/opengl/GLDrawable.java
index 5c881ab73..c801ba463 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawable.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawable.java
@@ -38,11 +38,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
-import javax.media.nativewindow.AbstractGraphicsConfiguration;
-import javax.media.nativewindow.NativeSurface;
-import javax.media.nativewindow.NativeSurfaceHolder;
+import com.jogamp.nativewindow.AbstractGraphicsConfiguration;
+import com.jogamp.nativewindow.NativeSurface;
+import com.jogamp.nativewindow.NativeSurfaceHolder;
 
 
 /** An abstraction for an OpenGL rendering target. A GLDrawable's
@@ -229,7 +229,7 @@ public interface GLDrawable extends NativeSurfaceHolder {
    * <i>and</i> while it's {@link NativeSurface surface} is being {@link NativeSurface#lockSurface() locked}.
    * <p>
    * It is usually identical to the underlying windowing toolkit {@link NativeSurface surface}'s
-   * {@link javax.media.nativewindow.NativeSurface#getSurfaceHandle() handle}
+   * {@link com.jogamp.nativewindow.NativeSurface#getSurfaceHandle() handle}
    * or an intermediate layer to suite GL, e.g. an EGL surface.
    * </p>
    * <p>
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index dabd3531b..07c3e77e0 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,21 +48,21 @@ import com.jogamp.common.util.ReflectionUtil;
 import com.jogamp.opengl.GLAutoDrawableDelegate;
 import com.jogamp.opengl.GLRendererQuirks;
 
-import javax.media.nativewindow.AbstractGraphicsDevice;
-import javax.media.nativewindow.AbstractGraphicsScreen;
-import javax.media.nativewindow.AbstractGraphicsConfiguration;
-import javax.media.nativewindow.CapabilitiesImmutable;
-import javax.media.nativewindow.NativeSurface;
-import javax.media.nativewindow.NativeWindowFactory;
-import javax.media.nativewindow.ProxySurface;
-import javax.media.nativewindow.UpstreamSurfaceHook;
+import com.jogamp.nativewindow.AbstractGraphicsDevice;
+import com.jogamp.nativewindow.AbstractGraphicsScreen;
+import com.jogamp.nativewindow.AbstractGraphicsConfiguration;
+import com.jogamp.nativewindow.CapabilitiesImmutable;
+import com.jogamp.nativewindow.NativeSurface;
+import com.jogamp.nativewindow.NativeWindowFactory;
+import com.jogamp.nativewindow.ProxySurface;
+import com.jogamp.nativewindow.UpstreamSurfaceHook;
 
 import jogamp.opengl.Debug;
 
 /** <p> Provides a virtual machine- and operating system-independent
     mechanism for creating {@link GLDrawable}s.
     </p>
-    <p> The {@link javax.media.opengl.GLCapabilities} objects passed
+    <p> The {@link com.jogamp.opengl.GLCapabilities} objects passed
     in to the various factory methods are used as a hint for the
     properties of the returned drawable. The default capabilities
     selection algorithm (equivalent to passing in a null {@link
@@ -82,8 +82,8 @@ import jogamp.opengl.Debug;
     raising a {@link GLException}. The semantics of the rejection
     process are (unfortunately) left unspecified for now. The current
     implementation will cause a {@link GLException} to be raised
-    during the first repaint of the {@link javax.media.opengl.awt.GLCanvas} or {@link
-    javax.media.opengl.awt.GLJPanel} if the capabilities can not be met.<br>
+    during the first repaint of the {@link com.jogamp.opengl.awt.GLCanvas} or {@link
+    com.jogamp.opengl.awt.GLJPanel} if the capabilities can not be met.<br>
     {@link GLOffscreenAutoDrawable} are created lazily,
     see {@link #createOffscreenAutoDrawable(AbstractGraphicsDevice, GLCapabilitiesImmutable, GLCapabilitiesChooser, int, int) createOffscreenAutoDrawable(..)}.
     </p>
@@ -468,7 +468,7 @@ public abstract class GLDrawableFactory {
    * due to implementation constraints, ie using the shared resource.
    *
    * @param device which {@link AbstractGraphicsDevice#getConnection() connection} denotes the shared the target device, may be <code>null</code> for the platform's default device.
-   * @return A list of {@link javax.media.opengl.GLCapabilitiesImmutable}'s, maybe empty if none is available.
+   * @return A list of {@link com.jogamp.opengl.GLCapabilitiesImmutable}'s, maybe empty if none is available.
    */
   public final List<GLCapabilitiesImmutable> getAvailableCapabilities(AbstractGraphicsDevice device) {
       device = validateDevice(device);
@@ -511,9 +511,9 @@ public abstract class GLDrawableFactory {
    *
    * @see #canCreateGLPbuffer(AbstractGraphicsDevice, GLProfile)
    * @see GLContext#isFBOAvailable(AbstractGraphicsDevice, GLProfile)
-   * @see javax.media.opengl.GLCapabilities#isOnscreen()
-   * @see javax.media.opengl.GLCapabilities#isFBO()
-   * @see javax.media.opengl.GLCapabilities#isPBuffer()
+   * @see com.jogamp.opengl.GLCapabilities#isOnscreen()
+   * @see com.jogamp.opengl.GLCapabilities#isFBO()
+   * @see com.jogamp.opengl.GLCapabilities#isPBuffer()
    * @see GraphicsConfigurationFactory#chooseGraphicsConfiguration(CapabilitiesImmutable, CapabilitiesImmutable, CapabilitiesChooser, AbstractGraphicsScreen, int)
    */
   public abstract GLDrawable createGLDrawable(NativeSurface target)
@@ -589,7 +589,7 @@ public abstract class GLDrawableFactory {
    * @param deviceReq which {@link AbstractGraphicsDevice#getConnection() connection} denotes the shared device to be used, may be <code>null</code> for the platform's default device.
    * @param createNewDevice if <code>true</code> a new independent device instance is created from the <code>deviceReq</code>, otherwise <code>deviceReq</code> is used as-is and must be valid!
    * @param capsRequested the desired {@link GLCapabilitiesImmutable}, incl. it's {@link GLProfile}.
-   *                      For shared context, same {@link GLCapabilitiesImmutable#getVisualID(javax.media.nativewindow.VisualIDHolder.VIDType)}
+   *                      For shared context, same {@link GLCapabilitiesImmutable#getVisualID(com.jogamp.nativewindow.VisualIDHolder.VIDType)}
    *                      across shared drawables will yield best compatibility.
    * @param chooser the custom chooser, may be null for default
    * @return the created and realized <i>dummy</i> {@link GLAutoDrawable} instance
@@ -650,7 +650,7 @@ public abstract class GLDrawableFactory {
    * @param deviceReq which {@link AbstractGraphicsDevice#getConnection() connection} denotes the shared device to be used, may be <code>null</code> for the platform's default device.
    * @param createNewDevice if <code>true</code> a new independent device instance is created from the <code>deviceReq</code>, otherwise <code>deviceReq</code> is used as-is and must be valid!
    * @param capsRequested the desired {@link GLCapabilitiesImmutable}, incl. it's {@link GLProfile}.
-   *                      For shared context, same {@link GLCapabilitiesImmutable#getVisualID(javax.media.nativewindow.VisualIDHolder.VIDType) visual ID}
+   *                      For shared context, same {@link GLCapabilitiesImmutable#getVisualID(com.jogamp.nativewindow.VisualIDHolder.VIDType) visual ID}
    *                      or {@link GLCapabilitiesImmutable caps}
    *                      across shared drawables will yield best compatibility.
    * @param chooser the custom chooser, may be null for default
@@ -728,7 +728,7 @@ public abstract class GLDrawableFactory {
    * context in an external (third-party) OpenGL-based library. This
    * GLContext object may be used to draw into this preexisting
    * context using its {@link GL} and {@link
-   * javax.media.opengl.glu.GLU} objects. New contexts created through
+   * com.jogamp.opengl.glu.GLU} objects. New contexts created through
    * {@link GLDrawable}s may share textures and display lists with
    * this external context. </P>
    *
diff --git a/src/jogl/classes/javax/media/opengl/GLEventListener.java b/src/jogl/classes/javax/media/opengl/GLEventListener.java
index 995ca2620..8c5dfd3b3 100644
--- a/src/jogl/classes/javax/media/opengl/GLEventListener.java
+++ b/src/jogl/classes/javax/media/opengl/GLEventListener.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.util.EventListener;
 
diff --git a/src/jogl/classes/javax/media/opengl/GLException.java b/src/jogl/classes/javax/media/opengl/GLException.java
index acf7cdec0..843934ab2 100644
--- a/src/jogl/classes/javax/media/opengl/GLException.java
+++ b/src/jogl/classes/javax/media/opengl/GLException.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 /** A generic exception for OpenGL errors used throughout the binding
     as a substitute for {@link RuntimeException}. */
diff --git a/src/jogl/classes/javax/media/opengl/GLFBODrawable.java b/src/jogl/classes/javax/media/opengl/GLFBODrawable.java
index 524c77e9d..69358743e 100644
--- a/src/jogl/classes/javax/media/opengl/GLFBODrawable.java
+++ b/src/jogl/classes/javax/media/opengl/GLFBODrawable.java
@@ -26,9 +26,9 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
-import javax.media.nativewindow.NativeWindowException;
+import com.jogamp.nativewindow.NativeWindowException;
 
 import com.jogamp.opengl.FBObject;
 import com.jogamp.opengl.FBObject.Colorbuffer;
diff --git a/src/jogl/classes/javax/media/opengl/GLOffscreenAutoDrawable.java b/src/jogl/classes/javax/media/opengl/GLOffscreenAutoDrawable.java
index 62d10d4cb..a2d0f5fdb 100644
--- a/src/jogl/classes/javax/media/opengl/GLOffscreenAutoDrawable.java
+++ b/src/jogl/classes/javax/media/opengl/GLOffscreenAutoDrawable.java
@@ -26,9 +26,9 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
-import javax.media.nativewindow.NativeWindowException;
+import com.jogamp.nativewindow.NativeWindowException;
 
 import com.jogamp.opengl.FBObject;
 
diff --git a/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java b/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java
index ab12ba17c..8d8b0428b 100644
--- a/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java
@@ -34,7 +34,7 @@
  * facility.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.lang.reflect.*;
 import java.util.StringTokenizer;
@@ -57,13 +57,13 @@ public class GLPipelineFactory {
      * Sample code which installs a Debug and Trace pipeline
      * automatic w/ user defined interface, here: GL2ES2:
      * <pre>
-     *     gl = drawable.setGL( GLPipelineFactory.create("javax.media.opengl.Debug", GL2ES2.class, gl, null) );
-     *     gl = drawable.setGL( GLPipelineFactory.create("javax.media.opengl.Trace", GL2ES2.class, gl, new Object[] { System.err } ) );
+     *     gl = drawable.setGL( GLPipelineFactory.create("com.jogamp.opengl.Debug", GL2ES2.class, gl, null) );
+     *     gl = drawable.setGL( GLPipelineFactory.create("com.jogamp.opengl.Trace", GL2ES2.class, gl, new Object[] { System.err } ) );
      * </pre>
      * or automatic w/ automatic defined class:
      * <pre>
-     *     gl = drawable.setGL( GLPipelineFactory.create("javax.media.opengl.Debug",         null, gl, null) );
-     *     gl = drawable.setGL( GLPipelineFactory.create("javax.media.opengl.Trace",         null, gl, new Object[] { System.err } ) );
+     *     gl = drawable.setGL( GLPipelineFactory.create("com.jogamp.opengl.Debug",         null, gl, null) );
+     *     gl = drawable.setGL( GLPipelineFactory.create("com.jogamp.opengl.Trace",         null, gl, new Object[] { System.err } ) );
      * </pre>
      * </p>
      *
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 9df2a84d6..a36a21ad5 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -35,7 +35,7 @@
  * facility.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import jogamp.opengl.Debug;
 import jogamp.opengl.GLDrawableFactoryImpl;
@@ -56,9 +56,9 @@ import com.jogamp.nativewindow.NativeWindowVersion;
 import com.jogamp.opengl.GLRendererQuirks;
 import com.jogamp.opengl.JoglVersion;
 
-import javax.media.nativewindow.AbstractGraphicsDevice;
-import javax.media.nativewindow.NativeWindowFactory;
-import javax.media.opengl.fixedfunc.GLPointerFunc;
+import com.jogamp.nativewindow.AbstractGraphicsDevice;
+import com.jogamp.nativewindow.NativeWindowFactory;
+import com.jogamp.opengl.fixedfunc.GLPointerFunc;
 
 import java.lang.reflect.Constructor;
 import java.security.AccessController;
@@ -261,7 +261,7 @@ public class GLProfile {
     /**
      * Manual shutdown method, may be called after your last JOGL use
      * within the running JVM.<br>
-     * It releases all temporary created resources, ie issues {@link javax.media.opengl.GLDrawableFactory#shutdown()}.<br>
+     * It releases all temporary created resources, ie issues {@link com.jogamp.opengl.GLDrawableFactory#shutdown()}.<br>
      * The shutdown implementation is called via the JVM shutdown hook, if not manually invoked.<br>
      * <p>
      * This method shall not need to be called for other reasons than issuing a proper shutdown of resources at a defined time.
@@ -1075,7 +1075,7 @@ public class GLProfile {
         return usesNativeGLES2(profileImpl) || usesNativeGLES1(profileImpl);
     }
 
-    /** @return {@link javax.media.nativewindow.NativeWindowFactory#isAWTAvailable()} and
+    /** @return {@link com.jogamp.nativewindow.NativeWindowFactory#isAWTAvailable()} and
         JOGL's AWT part */
     public static boolean isAWTAvailable() { return isAWTAvailable; }
 
@@ -1093,17 +1093,17 @@ public class GLProfile {
             return "GL_FLOAT";
         case GL.GL_FIXED:
             return "GL_FIXED";
-        case javax.media.opengl.GL2ES2.GL_INT:
+        case com.jogamp.opengl.GL2ES2.GL_INT:
             return "GL_INT";
         case GL.GL_UNSIGNED_INT:
             return "GL_UNSIGNED_INT";
-        case javax.media.opengl.GL2GL3.GL_DOUBLE:
+        case com.jogamp.opengl.GL2GL3.GL_DOUBLE:
             return "GL_DOUBLE";
-        case javax.media.opengl.GL2.GL_2_BYTES:
+        case com.jogamp.opengl.GL2.GL_2_BYTES:
             return "GL_2_BYTES";
-        case javax.media.opengl.GL2.GL_3_BYTES:
+        case com.jogamp.opengl.GL2.GL_3_BYTES:
             return "GL_3_BYTES";
-        case javax.media.opengl.GL2.GL_4_BYTES:
+        case com.jogamp.opengl.GL2.GL_4_BYTES:
             return "GL_4_BYTES";
         }
         return null;
@@ -1333,18 +1333,18 @@ public class GLProfile {
             case GL.GL_FLOAT:
             case GL.GL_FIXED:
                 return true;
-            case javax.media.opengl.GL2ES2.GL_INT:
+            case com.jogamp.opengl.GL2ES2.GL_INT:
             case GL.GL_UNSIGNED_INT:
                 if( isGL2ES2() ) {
                     return true;
                 }
-            case javax.media.opengl.GL2GL3.GL_DOUBLE:
+            case com.jogamp.opengl.GL2GL3.GL_DOUBLE:
                 if( isGL3() ) {
                     return true;
                 }
-            case javax.media.opengl.GL2.GL_2_BYTES:
-            case javax.media.opengl.GL2.GL_3_BYTES:
-            case javax.media.opengl.GL2.GL_4_BYTES:
+            case com.jogamp.opengl.GL2.GL_2_BYTES:
+            case com.jogamp.opengl.GL2.GL_3_BYTES:
+            case com.jogamp.opengl.GL2.GL_4_BYTES:
                 if( isGL2() ) {
                     return true;
                 }
@@ -1479,9 +1479,9 @@ public class GLProfile {
                     case GL.GL_UNSIGNED_SHORT:
                     case GL.GL_SHORT:
                     case GL.GL_FLOAT:
-                    case javax.media.opengl.GL2ES2.GL_INT:
+                    case com.jogamp.opengl.GL2ES2.GL_INT:
                     case GL.GL_UNSIGNED_INT:
-                    case javax.media.opengl.GL2GL3.GL_DOUBLE:
+                    case com.jogamp.opengl.GL2GL3.GL_DOUBLE:
                         break;
                     default:
                         if(throwException) {
@@ -1508,8 +1508,8 @@ public class GLProfile {
                         switch(type) {
                             case GL.GL_SHORT:
                             case GL.GL_FLOAT:
-                            case javax.media.opengl.GL2ES2.GL_INT:
-                            case javax.media.opengl.GL2GL3.GL_DOUBLE:
+                            case com.jogamp.opengl.GL2ES2.GL_INT:
+                            case com.jogamp.opengl.GL2GL3.GL_DOUBLE:
                                 break;
                             default:
                                 if(throwException) {
@@ -1535,8 +1535,8 @@ public class GLProfile {
                             case GL.GL_BYTE:
                             case GL.GL_SHORT:
                             case GL.GL_FLOAT:
-                            case javax.media.opengl.GL2ES2.GL_INT:
-                            case javax.media.opengl.GL2GL3.GL_DOUBLE:
+                            case com.jogamp.opengl.GL2ES2.GL_INT:
+                            case com.jogamp.opengl.GL2GL3.GL_DOUBLE:
                                 break;
                             default:
                                 if(throwException) {
@@ -1562,9 +1562,9 @@ public class GLProfile {
                             case GL.GL_UNSIGNED_SHORT:
                             case GL.GL_SHORT:
                             case GL.GL_FLOAT:
-                            case javax.media.opengl.GL2ES2.GL_INT:
+                            case com.jogamp.opengl.GL2ES2.GL_INT:
                             case GL.GL_UNSIGNED_INT:
-                            case javax.media.opengl.GL2GL3.GL_DOUBLE:
+                            case com.jogamp.opengl.GL2GL3.GL_DOUBLE:
                                 break;
                             default:
                                 if(throwException) {
@@ -1588,8 +1588,8 @@ public class GLProfile {
                         switch(type) {
                             case GL.GL_SHORT:
                             case GL.GL_FLOAT:
-                            case javax.media.opengl.GL2ES2.GL_INT:
-                            case javax.media.opengl.GL2GL3.GL_DOUBLE:
+                            case com.jogamp.opengl.GL2ES2.GL_INT:
+                            case com.jogamp.opengl.GL2GL3.GL_DOUBLE:
                                 break;
                             default:
                                 if(throwException) {
@@ -1727,7 +1727,7 @@ public class GLProfile {
         final ClassLoader classloader = GLProfile.class.getClassLoader();
 
         isAWTAvailable = NativeWindowFactory.isAWTAvailable() &&
-                         ReflectionUtil.isClassAvailable("javax.media.opengl.awt.GLCanvas", classloader) ; // JOGL
+                         ReflectionUtil.isClassAvailable("com.jogamp.opengl.awt.GLCanvas", classloader) ; // JOGL
 
         initGLCtorImpl();
 
diff --git a/src/jogl/classes/javax/media/opengl/GLRunnable.java b/src/jogl/classes/javax/media/opengl/GLRunnable.java
index ad68662ce..97a72d6cd 100644
--- a/src/jogl/classes/javax/media/opengl/GLRunnable.java
+++ b/src/jogl/classes/javax/media/opengl/GLRunnable.java
@@ -26,12 +26,12 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 /**
  * <p>
  * Declares a one-shot OpenGL command usable for injection
- * via {@link GLAutoDrawable#invoke(boolean, javax.media.opengl.GLRunnable)}.<br>
+ * via {@link GLAutoDrawable#invoke(boolean, com.jogamp.opengl.GLRunnable)}.<br>
  * {@link GLAutoDrawable} executes the GLRunnables within it's {@link GLAutoDrawable#display() display()}
  * method after all registered {@link GLEventListener}s
  * {@link GLEventListener#display(GLAutoDrawable) display(GLAutoDrawable)}
diff --git a/src/jogl/classes/javax/media/opengl/GLRunnable2.java b/src/jogl/classes/javax/media/opengl/GLRunnable2.java
index 5f0393257..4b0c63da0 100644
--- a/src/jogl/classes/javax/media/opengl/GLRunnable2.java
+++ b/src/jogl/classes/javax/media/opengl/GLRunnable2.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 /**
  * <p>
diff --git a/src/jogl/classes/javax/media/opengl/GLSharedContextSetter.java b/src/jogl/classes/javax/media/opengl/GLSharedContextSetter.java
index b8aef126b..852ebcaa7 100644
--- a/src/jogl/classes/javax/media/opengl/GLSharedContextSetter.java
+++ b/src/jogl/classes/javax/media/opengl/GLSharedContextSetter.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import com.jogamp.opengl.GLRendererQuirks;
 
@@ -45,7 +45,7 @@ import com.jogamp.opengl.GLRendererQuirks;
  * i.e. the <i>slave</i> {@link GLAutoDrawable} will not be realized before their associated <i>master</i>.
  * </p>
  * <p>
- * Using the nearest or same {@link GLCapabilitiesImmutable#getVisualID(javax.media.nativewindow.VisualIDHolder.VIDType) visual ID}
+ * Using the nearest or same {@link GLCapabilitiesImmutable#getVisualID(com.jogamp.nativewindow.VisualIDHolder.VIDType) visual ID}
  * or {@link GLCapabilitiesImmutable caps} across the shared {@link GLDrawable}s will yield best compatibility.
  * </p>
  * <h5><a name="lifecycle">Lifecycle Considerations</a></h5>
@@ -70,7 +70,7 @@ import com.jogamp.opengl.GLRendererQuirks;
  * <i>or</i> the <i>slaves</i> validate whether the resources are still valid.
  * </p>
  * <p>
- * To simplify above lifecycle issues, one may use a {@link GLDrawableFactory#createDummyDrawable(javax.media.nativewindow.AbstractGraphicsDevice, boolean, GLCapabilitiesImmutable, GLCapabilitiesChooser) dummy}
+ * To simplify above lifecycle issues, one may use a {@link GLDrawableFactory#createDummyDrawable(com.jogamp.nativewindow.AbstractGraphicsDevice, boolean, GLCapabilitiesImmutable, GLCapabilitiesChooser) dummy}
  * {@link GLDrawable} and it's {@link GLContext} as the <i>master</i> of all shared <i>slave</i> {@link GLContext}.
  * Since this <i>dummy instance</i> does not depend on any native windowing system, it can be controlled easily w/o being <i>in sight</i>.<br>
  * Below code creates a {@link GLAutoDrawable} based on a <i>dummy GLDrawable</i>:
diff --git a/src/jogl/classes/javax/media/opengl/GLUniformData.java b/src/jogl/classes/javax/media/opengl/GLUniformData.java
index 47f07539b..44f7f29c7 100644
--- a/src/jogl/classes/javax/media/opengl/GLUniformData.java
+++ b/src/jogl/classes/javax/media/opengl/GLUniformData.java
@@ -1,5 +1,5 @@
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/javax/media/opengl/Threading.java b/src/jogl/classes/javax/media/opengl/Threading.java
index c8d8d0071..852c8081f 100644
--- a/src/jogl/classes/javax/media/opengl/Threading.java
+++ b/src/jogl/classes/javax/media/opengl/Threading.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import jogamp.opengl.ThreadingImpl;
 
@@ -147,7 +147,7 @@ public class Threading {
         return ThreadingImpl.getMode();
     }
 
-    /** If an implementation of the javax.media.opengl APIs offers a
+    /** If an implementation of the com.jogamp.opengl APIs offers a
         multithreading option but the default behavior is single-threading,
         this API provides a mechanism for end users to disable single-threading
         in this implementation.  Users are strongly discouraged from
@@ -189,7 +189,7 @@ public class Threading {
     }
 
     /** Executes the passed Runnable on the single thread used for all
-        OpenGL work in this javax.media.opengl API implementation. It is
+        OpenGL work in this com.jogamp.opengl API implementation. It is
         not specified exactly which thread is used for this
         purpose. This method should only be called if the single-thread
         model is in use and if the current thread is not the OpenGL
diff --git a/src/jogl/classes/javax/media/opengl/TraceGL2.java b/src/jogl/classes/javax/media/opengl/TraceGL2.java
index 94d391d43..1609398e7 100644
--- a/src/jogl/classes/javax/media/opengl/TraceGL2.java
+++ b/src/jogl/classes/javax/media/opengl/TraceGL2.java
@@ -1,4 +1,4 @@
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.io.PrintStream;
 
diff --git a/src/jogl/classes/javax/media/opengl/TraceGL3.java b/src/jogl/classes/javax/media/opengl/TraceGL3.java
index 96e655902..fd95d6392 100644
--- a/src/jogl/classes/javax/media/opengl/TraceGL3.java
+++ b/src/jogl/classes/javax/media/opengl/TraceGL3.java
@@ -1,4 +1,4 @@
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.io.PrintStream;
 
diff --git a/src/jogl/classes/javax/media/opengl/TraceGL3bc.java b/src/jogl/classes/javax/media/opengl/TraceGL3bc.java
index 2a8590236..7daa9e392 100644
--- a/src/jogl/classes/javax/media/opengl/TraceGL3bc.java
+++ b/src/jogl/classes/javax/media/opengl/TraceGL3bc.java
@@ -1,4 +1,4 @@
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.io.PrintStream;
 
diff --git a/src/jogl/classes/javax/media/opengl/TraceGL4.java b/src/jogl/classes/javax/media/opengl/TraceGL4.java
index d48f9926a..b0c817105 100644
--- a/src/jogl/classes/javax/media/opengl/TraceGL4.java
+++ b/src/jogl/classes/javax/media/opengl/TraceGL4.java
@@ -1,4 +1,4 @@
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.io.PrintStream;
 
diff --git a/src/jogl/classes/javax/media/opengl/TraceGLES2.java b/src/jogl/classes/javax/media/opengl/TraceGLES2.java
index b58f169a7..7c7956b68 100644
--- a/src/jogl/classes/javax/media/opengl/TraceGLES2.java
+++ b/src/jogl/classes/javax/media/opengl/TraceGLES2.java
@@ -1,4 +1,4 @@
-package javax.media.opengl;
+package com.jogamp.opengl;
 
 import java.io.PrintStream;
 
diff --git a/src/jogl/classes/javax/media/opengl/awt/AWTGLAutoDrawable.java b/src/jogl/classes/javax/media/opengl/awt/AWTGLAutoDrawable.java
index 2698678af..6e273e4e6 100644
--- a/src/jogl/classes/javax/media/opengl/awt/AWTGLAutoDrawable.java
+++ b/src/jogl/classes/javax/media/opengl/awt/AWTGLAutoDrawable.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.opengl.awt;
+package com.jogamp.opengl.awt;
 
-import javax.media.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLAutoDrawable;
 
 public interface AWTGLAutoDrawable extends GLAutoDrawable, ComponentEvents {
   /** Requests a new width and height for this AWTGLAutoDrawable. */
diff --git a/src/jogl/classes/javax/media/opengl/awt/ComponentEvents.java b/src/jogl/classes/javax/media/opengl/awt/ComponentEvents.java
index 5feaa5760..996776c9b 100644
--- a/src/jogl/classes/javax/media/opengl/awt/ComponentEvents.java
+++ b/src/jogl/classes/javax/media/opengl/awt/ComponentEvents.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.opengl.awt;
+package com.jogamp.opengl.awt;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.awt.event.*;
 import java.beans.PropertyChangeListener;
 
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index a3b84a838..11d217535 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.opengl.awt;
+package com.jogamp.opengl.awt;
 
 import java.beans.Beans;
 import java.lang.reflect.Method;
@@ -61,32 +61,32 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.media.nativewindow.AbstractGraphicsConfiguration;
-import javax.media.nativewindow.OffscreenLayerOption;
-import javax.media.nativewindow.ScalableSurface;
-import javax.media.nativewindow.VisualIDHolder;
-import javax.media.nativewindow.WindowClosingProtocol;
-import javax.media.nativewindow.AbstractGraphicsDevice;
-import javax.media.nativewindow.AbstractGraphicsScreen;
-import javax.media.nativewindow.GraphicsConfigurationFactory;
-import javax.media.nativewindow.NativeSurface;
-import javax.media.nativewindow.NativeWindowFactory;
-import javax.media.opengl.GL;
-import javax.media.opengl.GLAnimatorControl;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLCapabilitiesChooser;
-import javax.media.opengl.GLCapabilitiesImmutable;
-import javax.media.opengl.GLContext;
-import javax.media.opengl.GLDrawable;
-import javax.media.opengl.GLDrawableFactory;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLOffscreenAutoDrawable;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.GLRunnable;
-import javax.media.opengl.GLSharedContextSetter;
-import javax.media.opengl.Threading;
+import com.jogamp.nativewindow.AbstractGraphicsConfiguration;
+import com.jogamp.nativewindow.OffscreenLayerOption;
+import com.jogamp.nativewindow.ScalableSurface;
+import com.jogamp.nativewindow.VisualIDHolder;
+import com.jogamp.nativewindow.WindowClosingProtocol;
+import com.jogamp.nativewindow.AbstractGraphicsDevice;
+import com.jogamp.nativewindow.AbstractGraphicsScreen;
+import com.jogamp.nativewindow.GraphicsConfigurationFactory;
+import com.jogamp.nativewindow.NativeSurface;
+import com.jogamp.nativewindow.NativeWindowFactory;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLAnimatorControl;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLCapabilitiesChooser;
+import com.jogamp.opengl.GLCapabilitiesImmutable;
+import com.jogamp.opengl.GLContext;
+import com.jogamp.opengl.GLDrawable;
+import com.jogamp.opengl.GLDrawableFactory;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLException;
+import com.jogamp.opengl.GLOffscreenAutoDrawable;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.GLRunnable;
+import com.jogamp.opengl.GLSharedContextSetter;
+import com.jogamp.opengl.Threading;
 
 import com.jogamp.common.GlueGenVersion;
 import com.jogamp.common.util.VersionUtil;
@@ -225,7 +225,7 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing
       See details about <a href="#contextSharing">OpenGL context sharing</a>.
       </p>
    * @throws GLException if no GLCapabilities are given and no default profile is available for the default desktop device.
-   * @see GLCanvas#GLCanvas(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser, javax.media.opengl.GLContext, java.awt.GraphicsDevice)
+   * @see GLCanvas#GLCanvas(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser, com.jogamp.opengl.GLContext, java.awt.GraphicsDevice)
    */
   public GLCanvas(final GLCapabilitiesImmutable capsReqUser) throws GLException {
     this(capsReqUser, null, null);
@@ -1358,7 +1358,7 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing
    * The drawable and context handle are null'ed as well, assuming {@link #destroy()} has been called already.
    * </p>
    *
-   * @see #chooseGraphicsConfiguration(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser, java.awt.GraphicsDevice)
+   * @see #chooseGraphicsConfiguration(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser, java.awt.GraphicsDevice)
    */
   private final Runnable disposeJAWTWindowAndAWTDeviceOnEDT = new Runnable() {
     @Override
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
index 65c4c5537..91b2f5e0c 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.opengl.awt;
+package com.jogamp.opengl.awt;
 
 import java.awt.Color;
 import java.awt.EventQueue;
@@ -58,32 +58,32 @@ import java.beans.Beans;
 import java.nio.IntBuffer;
 import java.util.List;
 
-import javax.media.nativewindow.AbstractGraphicsDevice;
-import javax.media.nativewindow.NativeSurface;
-import javax.media.nativewindow.ScalableSurface;
-import javax.media.nativewindow.SurfaceUpdatedListener;
-import javax.media.nativewindow.WindowClosingProtocol;
-import javax.media.nativewindow.util.PixelFormat;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GL2ES3;
-import javax.media.opengl.GL2GL3;
-import javax.media.opengl.GLAnimatorControl;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLCapabilitiesChooser;
-import javax.media.opengl.GLCapabilitiesImmutable;
-import javax.media.opengl.GLContext;
-import javax.media.opengl.GLDrawable;
-import javax.media.opengl.GLDrawableFactory;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLFBODrawable;
-import javax.media.opengl.GLOffscreenAutoDrawable;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.GLRunnable;
-import javax.media.opengl.GLSharedContextSetter;
-import javax.media.opengl.Threading;
+import com.jogamp.nativewindow.AbstractGraphicsDevice;
+import com.jogamp.nativewindow.NativeSurface;
+import com.jogamp.nativewindow.ScalableSurface;
+import com.jogamp.nativewindow.SurfaceUpdatedListener;
+import com.jogamp.nativewindow.WindowClosingProtocol;
+import com.jogamp.nativewindow.util.PixelFormat;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GL2ES3;
+import com.jogamp.opengl.GL2GL3;
+import com.jogamp.opengl.GLAnimatorControl;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLCapabilitiesChooser;
+import com.jogamp.opengl.GLCapabilitiesImmutable;
+import com.jogamp.opengl.GLContext;
+import com.jogamp.opengl.GLDrawable;
+import com.jogamp.opengl.GLDrawableFactory;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLException;
+import com.jogamp.opengl.GLFBODrawable;
+import com.jogamp.opengl.GLOffscreenAutoDrawable;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.GLRunnable;
+import com.jogamp.opengl.GLSharedContextSetter;
+import com.jogamp.opengl.Threading;
 import javax.swing.JPanel;
 
 import jogamp.nativewindow.SurfaceScaleUtils;
diff --git a/src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java b/src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
index 001f4f05b..cf7b9da46 100644
--- a/src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
+++ b/src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
@@ -27,7 +27,7 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.opengl.fixedfunc;
+package com.jogamp.opengl.fixedfunc;
 
 public interface GLLightingFunc {
   public static final int GL_LIGHT0 = 0x4000;
diff --git a/src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java b/src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
index 87a23d12a..90f13faf1 100644
--- a/src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
+++ b/src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
@@ -27,11 +27,11 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.opengl.fixedfunc;
+package com.jogamp.opengl.fixedfunc;
 
 import java.nio.*;
 
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
 
 /**
  * Subset of OpenGL fixed function pipeline's matrix operations.
diff --git a/src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java b/src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
index 4aff24b36..852d4ebba 100644
--- a/src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
+++ b/src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
@@ -27,9 +27,9 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.opengl.fixedfunc;
+package com.jogamp.opengl.fixedfunc;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 
 public interface GLPointerFunc {
   public static final int GL_VERTEX_ARRAY = 0x8074;
diff --git a/src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFuncUtil.java b/src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFuncUtil.java
index 3264062e8..cb1ff3827 100644
--- a/src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFuncUtil.java
+++ b/src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFuncUtil.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.opengl.fixedfunc;
+package com.jogamp.opengl.fixedfunc;
 
 public class GLPointerFuncUtil {
     public static final String mgl_Vertex = "mgl_Vertex";
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUnurbs.java b/src/jogl/classes/javax/media/opengl/glu/GLUnurbs.java
index 2641115d0..0dbd54674 100644
--- a/src/jogl/classes/javax/media/opengl/glu/GLUnurbs.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUnurbs.java
@@ -1,4 +1,4 @@
-package javax.media.opengl.glu;
+package com.jogamp.opengl.glu;
 
 /**
  * Wrapper for a GLU NURBS object.
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java b/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java
index 49451a34b..45b2d054d 100644
--- a/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java
@@ -1,6 +1,6 @@
-package javax.media.opengl.glu;
+package com.jogamp.opengl.glu;
 
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
 import com.jogamp.opengl.util.ImmModeSink;
 
 /**
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellator.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellator.java
index f98bbe158..ce9fda8e7 100644
--- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellator.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellator.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package javax.media.opengl.glu;
+package com.jogamp.opengl.glu;
 
 /**
  * The <b>GLUtessellator</b> object is used to hold the data, such as the
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
index 0f05619a4..c616bca38 100644
--- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package javax.media.opengl.glu;
+package com.jogamp.opengl.glu;
 
 /**
  * <b>GLUtessellatorCallback</b> interface provides methods that the user will
@@ -63,7 +63,7 @@ package javax.media.opengl.glu;
 public interface GLUtessellatorCallback {
   /**
    * The <b>begin</b> callback method is invoked like
-   * {@link javax.media.opengl.GL#glBegin glBegin} to indicate the start of a
+   * {@link com.jogamp.opengl.GL#glBegin glBegin} to indicate the start of a
    * (triangle) primitive. The method takes a single argument of type int. If
    * the <b>GLU_TESS_BOUNDARY_ONLY</b> property is set to <b>GL_FALSE</b>, then
    * the argument is set to either <b>GL_TRIANGLE_FAN</b>,
@@ -104,7 +104,7 @@ public interface GLUtessellatorCallback {
 
   /**
    * The <b>edgeFlag</b> callback method is similar to
-   * {@link javax.media.opengl.GL#glEdgeFlag glEdgeFlag}. The method takes
+   * {@link com.jogamp.opengl.GL#glEdgeFlag glEdgeFlag}. The method takes
    * a single boolean boundaryEdge that indicates which edges lie on the
    * polygon boundary. If the boundaryEdge is <b>GL_TRUE</b>, then each vertex
    * that follows begins an edge that lies on the polygon boundary, that is,
@@ -149,7 +149,7 @@ public interface GLUtessellatorCallback {
   /**
    * The <b>vertex</b> callback method is invoked between the {@link
    * #begin begin} and {@link #end end} callback methods.  It is
-   * similar to {@link javax.media.opengl.GL#glVertex3f glVertex3f},
+   * similar to {@link com.jogamp.opengl.GL#glVertex3f glVertex3f},
    * and it defines the vertices of the triangles created by the
    * tessellation process.  The method takes a reference as its only
    * argument. This reference is identical to the opaque reference
@@ -186,7 +186,7 @@ public interface GLUtessellatorCallback {
 
   /**
    * The end callback serves the same purpose as
-   * {@link javax.media.opengl.GL#glEnd glEnd}. It indicates the end of a
+   * {@link com.jogamp.opengl.GL#glEnd glEnd}. It indicates the end of a
    * primitive and it takes no arguments.
    *
    * @see GLU#gluTessCallback           gluTessCallback
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
index c293fbe18..b9503f12e 100644
--- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
@@ -50,7 +50,7 @@
 ** Java Port: Pepijn Van Eeckhoudt, July 2003
 ** Java Port: Nathan Parker Burg, August 2003
 */
-package javax.media.opengl.glu;
+package com.jogamp.opengl.glu;
 
 /**
  * The <b>GLUtessellatorCallbackAdapter</b> provides a default implementation of