Bug 682 - Relocating javax.media.opengl.* -> com.jogamp.opengl.*

11 files changed, 19 insertions, 19 deletions

diff --git a/make/resources/android/AndroidManifest-jocl.xml b/make/resources/android/AndroidManifest-jocl.xml
index 2f39c9ab..7fbf04dd 100644
--- a/make/resources/android/AndroidManifest-jocl.xml
+++ b/make/resources/android/AndroidManifest-jocl.xml
@@ -4,7 +4,7 @@
       package="com.jogamp.opencl">
 
     <uses-library android:name="com.jogamp.common" android:required="true" />
-    <uses-library android:name="javax.media.opengl" android:required="true" />
+    <uses-library android:name="com.jogamp.opengl" android:required="true" />
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
 
diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml
index bad971e5..b09b081a 100644
--- a/make/resources/android/AndroidManifest-test.xml
+++ b/make/resources/android/AndroidManifest-test.xml
@@ -4,7 +4,7 @@
       package="com.jogamp.opencl.test">
 
     <uses-library android:name="com.jogamp.common" android:required="true" />
-    <uses-library android:name="javax.media.opengl" android:required="true" />
+    <uses-library android:name="com.jogamp.opengl" android:required="true" />
     <uses-library android:name="com.jogamp.opencl" android:required="true" />
     <uses-library android:name="jogamp.android.launcher" android:required="true" />
 
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 19dff678..a839c171 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -119,12 +119,12 @@ function testawt() {
 #testnoawt com.jogamp.opencl.CLCommandQueueTest $*
 #testnoawt com.jogamp.opencl.CLExceptionTest $*
 #testnoawt com.jogamp.opencl.CLImageTest $*
-testnoawt com.jogamp.opencl.CLProgramTest $*
+#testnoawt com.jogamp.opencl.CLProgramTest $*
 #testnoawt com.jogamp.opencl.HighLevelBindingTest $*
 #testnoawt com.jogamp.opencl.LowLevelBindingTest $*
 #testnoawt com.jogamp.opencl.TestJoclVersion $*
 #testnoawt com.jogamp.opencl.TestUtils $*
-#testnoawt com.jogamp.opencl.gl.CLGLTest $*
+testnoawt com.jogamp.opencl.gl.CLGLTest $*
 #testnoawt com.jogamp.opencl.util.concurrent.CLMultiContextTest $*
 
 
diff --git a/src/com/jogamp/opencl/gl/CLGLBuffer.java b/src/com/jogamp/opencl/gl/CLGLBuffer.java
index 59aacd9f..11d3a553 100644
--- a/src/com/jogamp/opencl/gl/CLGLBuffer.java
+++ b/src/com/jogamp/opencl/gl/CLGLBuffer.java
@@ -35,7 +35,7 @@ import com.jogamp.opencl.CLException;
 import com.jogamp.opencl.llb.gl.CLGL;
 
 import java.nio.Buffer;
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GLContext;
 
 
 /**
diff --git a/src/com/jogamp/opencl/gl/CLGLContext.java b/src/com/jogamp/opencl/gl/CLGLContext.java
index 2564a82d..befa9158 100644
--- a/src/com/jogamp/opencl/gl/CLGLContext.java
+++ b/src/com/jogamp/opencl/gl/CLGLContext.java
@@ -30,7 +30,7 @@ package com.jogamp.opencl.gl;
 
 import java.nio.Buffer;
 
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GLContext;
 
 import jogamp.opengl.GLContextImpl;
 import jogamp.opengl.egl.EGLContext;
diff --git a/src/com/jogamp/opencl/gl/CLGLImage2d.java b/src/com/jogamp/opencl/gl/CLGLImage2d.java
index 19cd51bf..93c0bc3a 100644
--- a/src/com/jogamp/opencl/gl/CLGLImage2d.java
+++ b/src/com/jogamp/opencl/gl/CLGLImage2d.java
@@ -39,7 +39,7 @@ import com.jogamp.opencl.llb.impl.CLImageFormatImpl;
 
 import java.nio.Buffer;
 
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GLContext;
 
 /**
  * 2D OpenCL image representing an OpenGL renderbuffer.
diff --git a/src/com/jogamp/opencl/gl/CLGLObject.java b/src/com/jogamp/opencl/gl/CLGLObject.java
index 6e86a810..0898cbc1 100644
--- a/src/com/jogamp/opencl/gl/CLGLObject.java
+++ b/src/com/jogamp/opencl/gl/CLGLObject.java
@@ -32,7 +32,7 @@
 package com.jogamp.opencl.gl;
 
 import com.jogamp.opencl.CLMemory.GLObjectType;
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GLContext;
 
 /**
  *
diff --git a/src/com/jogamp/opencl/gl/CLGLTexture3d.java b/src/com/jogamp/opencl/gl/CLGLTexture3d.java
index 6d832479..2b389252 100644
--- a/src/com/jogamp/opencl/gl/CLGLTexture3d.java
+++ b/src/com/jogamp/opencl/gl/CLGLTexture3d.java
@@ -39,7 +39,7 @@ import com.jogamp.opencl.llb.impl.CLImageFormatImpl;
 
 import java.nio.Buffer;
 
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GLContext;
 
 /**
  * 3D OpenCL image representing an 3D OpenGL texture.
diff --git a/src/com/jogamp/opencl/util/CLPlatformFilters.java b/src/com/jogamp/opencl/util/CLPlatformFilters.java
index 8c22306a..46a7295b 100644
--- a/src/com/jogamp/opencl/util/CLPlatformFilters.java
+++ b/src/com/jogamp/opencl/util/CLPlatformFilters.java
@@ -33,8 +33,8 @@ import com.jogamp.opencl.CLDevice;
 import com.jogamp.opencl.CLPlatform;
 import com.jogamp.opencl.CLVersion;
 import java.util.Arrays;
-import javax.media.opengl.GL;
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLContext;
 
 /**
  * Pre-defined filters.
diff --git a/src/jogamp/opencl/os/android/JoclVersionActivityLauncher.java b/src/jogamp/opencl/os/android/JoclVersionActivityLauncher.java
index 549477ea..093743b7 100644
--- a/src/jogamp/opencl/os/android/JoclVersionActivityLauncher.java
+++ b/src/jogamp/opencl/os/android/JoclVersionActivityLauncher.java
@@ -11,7 +11,7 @@ public class JoclVersionActivityLauncher extends Activity {
        public void onCreate(final Bundle savedInstanceState) {
            super.onCreate(savedInstanceState);
 
-           final Uri uri = Uri.parse("launch://jogamp.org/jogamp.opencl.os.android.JoclVersionActivity?sys=com.jogamp.common&sys=javax.media.opengl&sys=com.jogamp.opencl&pkg=com.jogamp.opencl.test&jogamp.debug=all&jocl.debug=all");
+           final Uri uri = Uri.parse("launch://jogamp.org/jogamp.opencl.os.android.JoclVersionActivity?sys=com.jogamp.common&sys=com.jogamp.opengl&sys=com.jogamp.opencl&pkg=com.jogamp.opencl.test&jogamp.debug=all&jocl.debug=all");
            final Intent intent = new Intent("org.jogamp.launcher.action.LAUNCH_ACTIVITY_NORMAL", uri);
            Log.d(getClass().getSimpleName(), "Launching Activity: "+intent);
            startActivity (intent);
diff --git a/test/com/jogamp/opencl/gl/CLGLTest.java b/test/com/jogamp/opencl/gl/CLGLTest.java
index c7905352..21b4893e 100644
--- a/test/com/jogamp/opencl/gl/CLGLTest.java
+++ b/test/com/jogamp/opencl/gl/CLGLTest.java
@@ -38,8 +38,8 @@ import com.jogamp.opencl.CLCommandQueue;
 import com.jogamp.opencl.CLKernel;
 import com.jogamp.opencl.CLProgram;
 
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLException;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLException;
 
 import com.jogamp.opencl.CLDevice;
 import com.jogamp.newt.NewtFactory;
@@ -57,11 +57,11 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.GLContext;
-import javax.media.opengl.fixedfunc.GLPointerFunc;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.GLContext;
+import com.jogamp.opengl.fixedfunc.GLPointerFunc;
 
 import org.junit.FixMethodOrder;
 import org.junit.Test;