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/**

28 files changed, 172 insertions, 172 deletions

diff --git a/make/config/jogl/egl-common.cfg b/make/config/jogl/egl-common.cfg
index 62694da53..b30abf742 100644
--- a/make/config/jogl/egl-common.cfg
+++ b/make/config/jogl/egl-common.cfg
@@ -5,8 +5,8 @@ GLHeader EGL/eglext.h
 
 # Imports needed by all glue code
 Import java.util.*
-Import javax.media.opengl.*
-Import javax.media.opengl.fixedfunc.*
+Import com.jogamp.opengl.*
+Import com.jogamp.opengl.fixedfunc.*
 Import jogamp.opengl.*
 
 # Treat all of the EGL types as opaque longs
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index d5c45314e..9101d36c9 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -23,8 +23,8 @@ GLHeader GL/glext-20130207.h
 
 # Imports needed by all glue code
 Import java.util.*
-Import javax.media.opengl.*
-Import javax.media.opengl.fixedfunc.*
+Import com.jogamp.opengl.*
+Import com.jogamp.opengl.fixedfunc.*
 Import jogamp.opengl.*
 
 #####################################################################
diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg
index b66b18bfd..cc87a879e 100644
--- a/make/config/jogl/gl-es1.cfg
+++ b/make/config/jogl/gl-es1.cfg
@@ -2,16 +2,16 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/es1
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES1.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLMatrixFunc.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLPointerFunc.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLLightingFunc.java
 
 # There are a few routines we don't handle yet
 Ignore glGetBufferPointervOES
-Package javax.media.opengl
+Package com.jogamp.opengl
 Style InterfaceAndImpl
 JavaClass GLES1
 #Extends GLES1 GLBase
@@ -83,8 +83,8 @@ IncludeAs CustomJavaCode GLES1Impl gl-impl-CustomJavaCode-gles1.java
 IncludeAs CustomJavaCode GLES1Impl gl-impl-CustomJavaCode-embedded.java
 IncludeAs CustomCCode gl-impl-CustomCCode-gles1.c
 
-Import javax.media.opengl.GLES1
-Import javax.media.opengl.GLES2
-Import javax.media.opengl.GL2
+Import com.jogamp.opengl.GLES1
+Import com.jogamp.opengl.GLES2
+Import com.jogamp.opengl.GL2
 Import com.jogamp.common.nio.Buffers
 Import com.jogamp.opengl.util.GLBuffers
diff --git a/make/config/jogl/gl-es3-impl.cfg b/make/config/jogl/gl-es3-impl.cfg
index 00929765d..22acdbdeb 100644
--- a/make/config/jogl/gl-es3-impl.cfg
+++ b/make/config/jogl/gl-es3-impl.cfg
@@ -2,14 +2,14 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/es3
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GLES2.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL4ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GLES3.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GLES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL4ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GLES3.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
 
 Style ImplOnly
 ImplPackage jogamp.opengl.es3
@@ -73,15 +73,15 @@ IncludeAs CustomJavaCode GLES3Impl gl-impl-CustomJavaCode-embedded.java
 IncludeAs CustomJavaCode GLES3Impl gl-impl-CustomJavaCode-gl2_es2.java
 IncludeAs CustomCCode gl-impl-CustomCCode-gles3.c
 
-Import javax.media.opengl.GLBase
-Import javax.media.opengl.GL
-Import javax.media.opengl.GL2ES2
-Import javax.media.opengl.GL2ES3
-Import javax.media.opengl.GL3ES3
-Import javax.media.opengl.GL4ES3
-Import javax.media.opengl.GLES3
-Import javax.media.opengl.GLArrayData
-Import javax.media.opengl.GLUniformData
+Import com.jogamp.opengl.GLBase
+Import com.jogamp.opengl.GL
+Import com.jogamp.opengl.GL2ES2
+Import com.jogamp.opengl.GL2ES3
+Import com.jogamp.opengl.GL3ES3
+Import com.jogamp.opengl.GL4ES3
+Import com.jogamp.opengl.GLES3
+Import com.jogamp.opengl.GLArrayData
+Import com.jogamp.opengl.GLUniformData
 Import com.jogamp.common.nio.Buffers
 Import com.jogamp.opengl.util.GLBuffers
 Import java.io.PrintStream
diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg
index 344b4776a..668fc3427 100644
--- a/make/config/jogl/gl-gl4bc.cfg
+++ b/make/config/jogl/gl-gl4bc.cfg
@@ -2,23 +2,23 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/gl4
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL4ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2GL3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL4.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3bc.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
-
-Package javax.media.opengl
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES1.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL4ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2GL3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL4.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3bc.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLMatrixFunc.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLPointerFunc.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLLightingFunc.java
+
+Package com.jogamp.opengl
 Style InterfaceAndImpl
 JavaClass GL4bc
 #Extends GL4bc GLBase
@@ -163,18 +163,18 @@ IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-gl2_es2.java
 
 IncludeAs CustomCCode gl-impl-CustomCCode-gl4bc.c
 
-Import javax.media.opengl.GLES1
-Import javax.media.opengl.GLES2
-Import javax.media.opengl.GL2ES1
-Import javax.media.opengl.GL2ES2
-Import javax.media.opengl.GL2ES3
-Import javax.media.opengl.GL3ES3
-Import javax.media.opengl.GL4ES3
-Import javax.media.opengl.GL2GL3
-Import javax.media.opengl.GL2
-Import javax.media.opengl.GL3
-Import javax.media.opengl.GL3bc
-Import javax.media.opengl.GL4
+Import com.jogamp.opengl.GLES1
+Import com.jogamp.opengl.GLES2
+Import com.jogamp.opengl.GL2ES1
+Import com.jogamp.opengl.GL2ES2
+Import com.jogamp.opengl.GL2ES3
+Import com.jogamp.opengl.GL3ES3
+Import com.jogamp.opengl.GL4ES3
+Import com.jogamp.opengl.GL2GL3
+Import com.jogamp.opengl.GL2
+Import com.jogamp.opengl.GL3
+Import com.jogamp.opengl.GL3bc
+Import com.jogamp.opengl.GL4
 Import com.jogamp.common.nio.Buffers
 Import com.jogamp.opengl.util.GLBuffers
 Import java.io.PrintStream
diff --git a/make/config/jogl/gl-if-es2.cfg b/make/config/jogl/gl-if-es2.cfg
index 052722f40..23e392e9f 100644
--- a/make/config/jogl/gl-if-es2.cfg
+++ b/make/config/jogl/gl-if-es2.cfg
@@ -2,11 +2,11 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/es2
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
 
-Package javax.media.opengl
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GLES2
 #Extends GLES2 GLBase
diff --git a/make/config/jogl/gl-if-es3.cfg b/make/config/jogl/gl-if-es3.cfg
index 66fd52597..80273e4cf 100644
--- a/make/config/jogl/gl-if-es3.cfg
+++ b/make/config/jogl/gl-if-es3.cfg
@@ -1,15 +1,15 @@
 # This .cfg file is used to generate the GL interface.
 JavaOutputDir gensrc/classes
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GLES2.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL4ES3.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GLES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL4ES3.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
 
-Package javax.media.opengl
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GLES3
 #Extends GLES3 GLBase
diff --git a/make/config/jogl/gl-if-gl.cfg b/make/config/jogl/gl-if-gl.cfg
index 5c9e4caa2..d552e5a31 100644
--- a/make/config/jogl/gl-if-gl.cfg
+++ b/make/config/jogl/gl-if-gl.cfg
@@ -1,10 +1,10 @@
 # This .cfg file is used to generate the GL interface and implementing class.
-Package javax.media.opengl
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GL
 Extends GL GLBase
 
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
 
 HierarchicalNativeOutput false
 Include gl-common.cfg
diff --git a/make/config/jogl/gl-if-gl2.cfg b/make/config/jogl/gl-if-gl2.cfg
index 0120bd674..85c7cbe15 100644
--- a/make/config/jogl/gl-if-gl2.cfg
+++ b/make/config/jogl/gl-if-gl2.cfg
@@ -2,17 +2,17 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/gl2
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2GL3.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
-
-Package javax.media.opengl
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES1.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2GL3.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLMatrixFunc.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLPointerFunc.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLLightingFunc.java
+
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GL2
 #Extends GL2 GLBase
diff --git a/make/config/jogl/gl-if-gl2_es1.cfg b/make/config/jogl/gl-if-gl2_es1.cfg
index b533e83c3..1d517b731 100644
--- a/make/config/jogl/gl-if-gl2_es1.cfg
+++ b/make/config/jogl/gl-if-gl2_es1.cfg
@@ -1,5 +1,5 @@
 # This .cfg file is used to generate the GL interface and implementing class.
-Package javax.media.opengl
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GL2ES1
 #Extends GL2ES1 GLBase
@@ -8,11 +8,11 @@ Extends GL2ES1 GLMatrixFunc
 Extends GL2ES1 GLPointerFunc
 Extends GL2ES1 GLLightingFunc
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLMatrixFunc.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLPointerFunc.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLLightingFunc.java
 
 HierarchicalNativeOutput false
 Include gl-common.cfg
diff --git a/make/config/jogl/gl-if-gl2_es2.cfg b/make/config/jogl/gl-if-gl2_es2.cfg
index db5489d06..3c4dbbb64 100644
--- a/make/config/jogl/gl-if-gl2_es2.cfg
+++ b/make/config/jogl/gl-if-gl2_es2.cfg
@@ -2,10 +2,10 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
 
-Package javax.media.opengl
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GL2ES2
 #Extends GL2ES2 GLBase
diff --git a/make/config/jogl/gl-if-gl2_es3.cfg b/make/config/jogl/gl-if-gl2_es3.cfg
index 112bc5434..2390652c4 100644
--- a/make/config/jogl/gl-if-gl2_es3.cfg
+++ b/make/config/jogl/gl-if-gl2_es3.cfg
@@ -2,18 +2,18 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl
 
-Package javax.media.opengl
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GL2ES3
 #Extends GL2ES3 GLBase
 #Extends GL2ES3 GL
 Extends GL2ES3 GL2ES2
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
 
-ExtendedInterfaceSymbolsOnly ../build-temp/gluegen-set/javax/media/opengl/GL2ES3Subset.java
+ExtendedInterfaceSymbolsOnly ../build-temp/gluegen-set/com/jogamp/opengl/GL2ES3Subset.java
 
 HierarchicalNativeOutput false
 Include gl-common.cfg
diff --git a/make/config/jogl/gl-if-gl2_gl3.cfg b/make/config/jogl/gl-if-gl2_gl3.cfg
index 532a670e6..8e88a116e 100644
--- a/make/config/jogl/gl-if-gl2_gl3.cfg
+++ b/make/config/jogl/gl-if-gl2_gl3.cfg
@@ -1,5 +1,5 @@
 # This .cfg file is used to generate the GL interface and implementing class.
-Package javax.media.opengl
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GL2GL3
 #Extends GL2GL3 GLBase
@@ -7,12 +7,12 @@ JavaClass GL2GL3
 #Extends GL2GL3 GL2ES2
 Extends GL2GL3 GL2ES3
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
 
-ExtendedInterfaceSymbolsOnly ../build-temp/gluegen-set/javax/media/opengl/GL2GL3Subset.java
+ExtendedInterfaceSymbolsOnly ../build-temp/gluegen-set/com/jogamp/opengl/GL2GL3Subset.java
 
 HierarchicalNativeOutput false
 Include gl-common.cfg
diff --git a/make/config/jogl/gl-if-gl2es3-subset.cfg b/make/config/jogl/gl-if-gl2es3-subset.cfg
index 3e325e065..a7ecdce8d 100644
--- a/make/config/jogl/gl-if-gl2es3-subset.cfg
+++ b/make/config/jogl/gl-if-gl2es3-subset.cfg
@@ -1,7 +1,7 @@
 # This .cfg file is used to generate the common GL2 ES3 set
 JavaOutputDir ../../build-temp/gluegen-set
 
-Package javax.media.opengl
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GL2ES3Subset
 Include gl-common.cfg
diff --git a/make/config/jogl/gl-if-gl2gl3-subset.cfg b/make/config/jogl/gl-if-gl2gl3-subset.cfg
index ecb384ca3..1fae977e5 100644
--- a/make/config/jogl/gl-if-gl2gl3-subset.cfg
+++ b/make/config/jogl/gl-if-gl2gl3-subset.cfg
@@ -1,7 +1,7 @@
 # This .cfg file is used to generate the common GL2 GL3 set
 JavaOutputDir ../../build-temp/gluegen-set
 
-Package javax.media.opengl
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GL2GL3Subset
 Include gl-common.cfg
diff --git a/make/config/jogl/gl-if-gl3.cfg b/make/config/jogl/gl-if-gl3.cfg
index d472fbc29..3dbf86918 100644
--- a/make/config/jogl/gl-if-gl3.cfg
+++ b/make/config/jogl/gl-if-gl3.cfg
@@ -2,14 +2,14 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/gl3
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2GL3.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2GL3.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
 
-Package javax.media.opengl
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GL3
 #Extends GL3 GLBase
diff --git a/make/config/jogl/gl-if-gl3_es3.cfg b/make/config/jogl/gl-if-gl3_es3.cfg
index a25d9112a..16e194b80 100644
--- a/make/config/jogl/gl-if-gl3_es3.cfg
+++ b/make/config/jogl/gl-if-gl3_es3.cfg
@@ -2,7 +2,7 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl
 
-Package javax.media.opengl
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GL3ES3
 #Extends GL3ES3 GLBase
@@ -10,10 +10,10 @@ JavaClass GL3ES3
 #Extends GL3ES3 GL2ES2
 Extends GL3ES3 GL2ES3
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
 
 HierarchicalNativeOutput false
 Include gl-common.cfg
diff --git a/make/config/jogl/gl-if-gl3bc.cfg b/make/config/jogl/gl-if-gl3bc.cfg
index 5172c726c..7a1a1c7b3 100644
--- a/make/config/jogl/gl-if-gl3bc.cfg
+++ b/make/config/jogl/gl-if-gl3bc.cfg
@@ -2,20 +2,20 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/gl3
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2GL3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
-
-Package javax.media.opengl
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES1.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2GL3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLMatrixFunc.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLPointerFunc.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLLightingFunc.java
+
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GL3bc
 #Extends GL3bc GLBase
diff --git a/make/config/jogl/gl-if-gl4.cfg b/make/config/jogl/gl-if-gl4.cfg
index 144c10ad2..07645ac26 100644
--- a/make/config/jogl/gl-if-gl4.cfg
+++ b/make/config/jogl/gl-if-gl4.cfg
@@ -2,16 +2,16 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/gl4
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL4ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2GL3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL4ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2GL3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
 
-Package javax.media.opengl
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GL4
 #Extends GL4 GLBase
diff --git a/make/config/jogl/gl-if-gl4_es3.cfg b/make/config/jogl/gl-if-gl4_es3.cfg
index 6233d530a..556be2b88 100644
--- a/make/config/jogl/gl-if-gl4_es3.cfg
+++ b/make/config/jogl/gl-if-gl4_es3.cfg
@@ -2,7 +2,7 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl
 
-Package javax.media.opengl
+Package com.jogamp.opengl
 Style InterfaceOnly
 JavaClass GL4ES3
 #Extends GL4ES3 GLBase
@@ -11,12 +11,12 @@ JavaClass GL4ES3
 #Extends GL4ES3 GL2ES3
 Extends GL4ES3 GL3ES3
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
 
 HierarchicalNativeOutput false
 Include gl-common.cfg
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-common.java b/make/config/jogl/gl-impl-CustomJavaCode-common.java
index 6db08efa7..503c125f0 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-common.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-common.java
@@ -88,7 +88,7 @@
     }
 
     /**
-     * @see javax.media.opengl.GLContext#setSwapInterval(int)
+     * @see com.jogamp.opengl.GLContext#setSwapInterval(int)
      */
     @Override
     public final void setSwapInterval(int interval) {
@@ -96,7 +96,7 @@
     }
 
     /**
-     * @see javax.media.opengl.GLContext#getSwapInterval()
+     * @see com.jogamp.opengl.GLContext#getSwapInterval()
      */
     @Override
     public final int getSwapInterval() {
diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java
index e8047d9d7..c6b892bf6 100644
--- a/make/config/jogl/glu-CustomJavaCode-base.java
+++ b/make/config/jogl/glu-CustomJavaCode-base.java
@@ -84,8 +84,8 @@ static {
     Class _gl2es1Class=null;
     try {
         final ClassLoader cl = GLU.class.getClassLoader();
-        _gl2Class = Class.forName("javax.media.opengl.glu.gl2.GLUgl2", false, cl);
-        _gl2es1Class = Class.forName("javax.media.opengl.glu.gl2es1.GLUgl2es1", false, cl);
+        _gl2Class = Class.forName("com.jogamp.opengl.glu.gl2.GLUgl2", false, cl);
+        _gl2es1Class = Class.forName("com.jogamp.opengl.glu.gl2es1.GLUgl2es1", false, cl);
     } catch (Throwable t) {}
     gl2Class = _gl2Class;
     gl2es1Class = _gl2es1Class;
@@ -389,7 +389,7 @@ public static final void gluTessNormal(GLUtessellator tessellator, double x, dou
  *
  * <b>GLU_TESS_BEGIN</b>
  * <UL>
- *   The begin callback is invoked like {@link javax.media.opengl.GL#glBegin
+ *   The begin callback is invoked like {@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
@@ -418,7 +418,7 @@ public static final void gluTessNormal(GLUtessellator tessellator, double x, dou
  * <b>GLU_TESS_EDGE_FLAG</b>
  * <UL>
  *   The edge flag callback 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,
@@ -453,7 +453,7 @@ public static final void gluTessNormal(GLUtessellator tessellator, double x, dou
  * <b>GLU_TESS_VERTEX</b>
  * <UL>
  *   The vertex callback is invoked between the begin and end callbacks. It is
- *   similar to {@link javax.media.opengl.GL#glVertex3f glVertex3f}, and it
+ *   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 provided by the user when
@@ -480,7 +480,7 @@ public static final void gluTessNormal(GLUtessellator tessellator, double x, dou
  * <b>GLU_TESS_END</b>
  * <UL>
  *   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. The method prototype for this
  *   callback is:
  * </UL>
@@ -638,9 +638,9 @@ public static final void gluTessNormal(GLUtessellator tessellator, double x, dou
  * @param aCallback
  *        Specifies the callback object to be called.
  *
- * @see javax.media.opengl.GL#glBegin              glBegin
- * @see javax.media.opengl.GL#glEdgeFlag           glEdgeFlag
- * @see javax.media.opengl.GL#glVertex3f           glVertex3f
+ * @see com.jogamp.opengl.GL#glBegin              glBegin
+ * @see com.jogamp.opengl.GL#glEdgeFlag           glEdgeFlag
+ * @see com.jogamp.opengl.GL#glVertex3f           glVertex3f
  * @see #gluNewTess          gluNewTess
  * @see #gluErrorString      gluErrorString
  * @see #gluTessVertex       gluTessVertex
diff --git a/make/config/jogl/glu-base.cfg b/make/config/jogl/glu-base.cfg
index 05aa2110e..542f8afef 100644
--- a/make/config/jogl/glu-base.cfg
+++ b/make/config/jogl/glu-base.cfg
@@ -4,7 +4,7 @@ JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl
 
 Style ImplOnly
-ImplPackage javax.media.opengl.glu
+ImplPackage com.jogamp.opengl.glu
 ImplJavaClass GLU
 AccessControl GLU PUBLIC
 
diff --git a/make/config/jogl/glu-common.cfg b/make/config/jogl/glu-common.cfg
index 85d556b77..45535d21d 100644
--- a/make/config/jogl/glu-common.cfg
+++ b/make/config/jogl/glu-common.cfg
@@ -9,8 +9,8 @@ TagNativeBinding true
 #
 # Imports needed by all glue code
 #
-Import javax.media.opengl.*
-Import javax.media.opengl.glu.*
+Import com.jogamp.opengl.*
+Import com.jogamp.opengl.glu.*
 import com.jogamp.opengl.util.glsl.ShaderState
 Import jogamp.opengl.*
 Import jogamp.opengl.glu.*
diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg
index 696e07050..c3a10a900 100644
--- a/make/config/jogl/glu-gl2.cfg
+++ b/make/config/jogl/glu-gl2.cfg
@@ -4,7 +4,7 @@ JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/gl2
 
 Style ImplOnly
-ImplPackage javax.media.opengl.glu.gl2
+ImplPackage com.jogamp.opengl.glu.gl2
 ImplJavaClass GLUgl2
 ParentClass GLUgl2 GLU
 
@@ -24,10 +24,10 @@ CustomCCode   #include <inttypes.h>
 CustomCCode #endif
 
 EmitProcAddressTable true
-ProcAddressTablePackage   javax.media.opengl.glu.gl2
+ProcAddressTablePackage   com.jogamp.opengl.glu.gl2
 ProcAddressTableClassName GLUgl2ProcAddressTable
 GetProcAddressTableExpr   getGLUProcAddressTable()
-AccessControl javax.media.opengl.glu.gl2.GLUgl2ProcAddressTable PACKAGE_PRIVATE
+AccessControl com.jogamp.opengl.glu.gl2.GLUgl2ProcAddressTable PACKAGE_PRIVATE
 
 CustomCCode /* Include the OpenGL GLU header */
 CustomCCode #include <GL/glu.h>
@@ -45,7 +45,7 @@ Import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver
 Import jogamp.opengl.glu.gl2.nurbs.*
 Import jogamp.opengl.glu.mipmap.Mipmap
 Import jogamp.opengl.glu.gl2.*
-Import javax.media.opengl.GL2
+Import com.jogamp.opengl.GL2
 Import jogamp.opengl.gl2.ProjectDouble
 
 #
diff --git a/make/config/jogl/glu-gl2es1.cfg b/make/config/jogl/glu-gl2es1.cfg
index ef9405fac..98217da1f 100644
--- a/make/config/jogl/glu-gl2es1.cfg
+++ b/make/config/jogl/glu-gl2es1.cfg
@@ -4,7 +4,7 @@ JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/gl2es1
 
 Style ImplOnly
-ImplPackage javax.media.opengl.glu.gl2es1
+ImplPackage com.jogamp.opengl.glu.gl2es1
 ImplJavaClass GLUgl2es1
 ParentClass GLUgl2es1 GLU
 
@@ -20,7 +20,7 @@ Ignore gluScaleImage
 IncludeAs CustomJavaCode GLUgl2es1 glu-CustomJavaCode-gl2es1.java
 ManualStaticInitCall GLUgl2es1
 
-Import javax.media.opengl.GLES1
+Import com.jogamp.opengl.GLES1
 Import jogamp.opengl.glu.mipmap.Mipmap
 
 
diff --git a/make/config/nativewindow/win32-lib.cfg b/make/config/nativewindow/win32-lib.cfg
index 26c744a80..9c60348d2 100644
--- a/make/config/nativewindow/win32-lib.cfg
+++ b/make/config/nativewindow/win32-lib.cfg
@@ -22,8 +22,8 @@ Opaque long HPBUFFERARB
 Opaque long HPBUFFEREXT
 Opaque long void **
 
-Import javax.media.nativewindow.util.Point
-Import javax.media.nativewindow.NativeWindowException
+Import com.jogamp.nativewindow.util.Point
+Import com.jogamp.nativewindow.NativeWindowException
 Import jogamp.nativewindow.NWJNILibLoader
 import jogamp.nativewindow.Debug
 
diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg
index ed8c13b54..8104b4697 100644
--- a/make/config/nativewindow/x11-lib.cfg
+++ b/make/config/nativewindow/x11-lib.cfg
@@ -12,7 +12,7 @@ NativeOutputDir gensrc/native/X11
 # Imports needed by all glue code
 Import java.nio.*
 Import java.util.*
-Import javax.media.nativewindow.util.Point
+Import com.jogamp.nativewindow.util.Point
 
 # XID needs to be treated as a long for 32/64 bit compatibility
 Opaque long XID