Renamed com.sun.gluegen -> com.jogamp.gluegen

4 files changed, 16 insertions, 18 deletions

diff --git a/make/Manifest b/make/Manifest
index 1677feb..6dd4840 100755
--- a/make/Manifest
+++ b/make/Manifest
@@ -1,2 +1,2 @@
-Main-Class: com.sun.gluegen.GlueGen
+Main-Class: com.jogamp.gluegen.GlueGen
 Class-Path: antlr.jar
diff --git a/make/build-junit.xml b/make/build-junit.xml
index 82f87a1..7c70200 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -87,9 +87,9 @@
         <echo message="build_t.lib: ${build_t.lib} "/>
 
         <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT -->
-        <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask"
+        <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
                  classpathref="gluegen.classpath" />
-        <taskdef name="staticglgen" classname="com.sun.gluegen.ant.StaticGLGenTask"
+        <taskdef name="staticglgen" classname="com.jogamp.gluegen.ant.StaticGLGenTask"
                  classpathref="gluegen.classpath" />
     </target>
 
@@ -259,7 +259,7 @@
                  config="${test.junit.generation.dir}/test1-gluegen.cfg"
                  literalInclude="${test.junit.generation.dir}"
                  includeRefid="stub.includes.fileset.test"
-                 emitter="com.sun.gluegen.JavaEmitter">
+                 emitter="com.jogamp.gluegen.JavaEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
 
@@ -268,7 +268,7 @@
                  config="${test.junit.generation.dir}/test1p1-gluegen.cfg"
                  literalInclude="${test.junit.generation.dir}"
                  includeRefid="stub.includes.fileset.test"
-                 emitter="com.sun.gluegen.JavaEmitter">
+                 emitter="com.jogamp.gluegen.JavaEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
 
@@ -277,7 +277,7 @@
                  config="${test.junit.generation.dir}/test1p2-gluegen.cfg"
                  literalInclude="${test.junit.generation.dir}"
                  includeRefid="stub.includes.fileset.test"
-                 emitter="com.sun.gluegen.procaddress.ProcAddressEmitter">
+                 emitter="com.jogamp.gluegen.procaddress.ProcAddressEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
     </target>
diff --git a/make/build.xml b/make/build.xml
index 113614f..9638c96 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -35,7 +35,7 @@
   </target>
 
   <target name="setup-excludes-2" unless="gluegen.nsig">
-    <property name="gluegen.excludes" value="com/jogamp/gluegen/runtime/BufferFactoryInternal.java,com/sun/gluegen/nativesig/**" />
+    <property name="gluegen.excludes" value="com/jogamp/gluegen/runtime/BufferFactoryInternal.java,com/jogamp/gluegen/nativesig/**" />
   </target>
 
   <target name="init" depends="gluegen.properties.load.user,setup-excludes-1,setup-excludes-2">
@@ -77,13 +77,13 @@
     </path>
     
     <!-- The location of the GlueGen source and the C grammar files. -->
-    <property name="gluegen" value="${src.java}/com/sun/gluegen" />
+    <property name="gluegen" value="${src.java}/com/jogamp/gluegen" />
     <property name="c.grammar" value="${gluegen}/cgram" />
     <property name="j.grammar" value="${gluegen}/jgram" />
         
     <!-- The resulting location of the generated Java files from the
       - C grammar via ANTLR. -->
-    <property name="gluegen.build" value="${src.generated.java}/com/sun/gluegen" />
+    <property name="gluegen.build" value="${src.generated.java}/com/jogamp/gluegen" />
     <property name="generated.java.from.c.grammar" value="${gluegen.build}/cgram" />
     <property name="generated.java.from.j.grammar" value="${gluegen.build}/jgram" />
   </target>
@@ -142,26 +142,26 @@
       <pathelement location="${antlr.jar}" />
     </path>
     <!-- Define the GlueGen task we just built -->
-    <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask"
+    <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
              classpathref="gluegen.classpath" />
 
     <!-- Execute it against all of the OSs' header files -->
     <gluegen src="stub_includes/windows/dynamic-linker.h"
              config="dynlink-windows.cfg"
              includeRefId="stub.includes.fileset.windows"
-             emitter="com.sun.gluegen.JavaEmitter">
+             emitter="com.jogamp.gluegen.JavaEmitter">
       <classpath refid="gluegen.classpath" />
     </gluegen>
     <gluegen src="stub_includes/unix/dynamic-linker.h"
              config="dynlink-unix.cfg"
              includeRefId="stub.includes.fileset.unix"
-             emitter="com.sun.gluegen.JavaEmitter">
+             emitter="com.jogamp.gluegen.JavaEmitter">
       <classpath refid="gluegen.classpath" />
     </gluegen>
     <gluegen src="stub_includes/macosx/dynamic-linker.h"
              config="dynlink-macosx.cfg"
              includeRefId="stub.includes.fileset.macosx"
-             emitter="com.sun.gluegen.JavaEmitter">
+             emitter="com.jogamp.gluegen.JavaEmitter">
       <classpath refid="gluegen.classpath" />
     </gluegen>
   </target>
@@ -410,7 +410,7 @@
     <copy todir="${classes-cdc}">
         <fileset dir="${classes}"
                  includes="com/** net/**" 
-                 excludes="com/jogamp/gluegen/runtime/** com/sun/gluegen/test/**" />
+                 excludes="com/jogamp/gluegen/runtime/** com/jogamp/gluegen/test/**" />
     </copy>
 
           <!-- bootclasspath="${javac.bootclasspath-cdc.jar}"-->
@@ -612,7 +612,6 @@
     <jar destfile="${build}/gluegen-rt.jar" manifest="${build}/Manifest-rt.temp">
       <fileset dir="${classes}">
         <include name="com/jogamp/gluegen/runtime/*.class" />
-        <include name="com/jogamp/gluegen/runtime/opengl/*.class" />
         <include name="com/jogamp/common/**" />
       </fileset>
     </jar>
@@ -630,7 +629,6 @@
     <jar destfile="${build}/gluegen-rt-cdc.jar" manifest="${build}/Manifest-rt-cdc.temp">
       <fileset dir="${classes-cdc}">
         <include name="com/jogamp/gluegen/runtime/*.class" />
-        <include name="com/jogamp/gluegen/runtime/opengl/*.class" />
         <include name="com/jogamp/common/impl/*.class" />
         <include name="com/jogamp/common/jvm/*.class" />
         <include name="com/jogamp/common/util/*.class" />
@@ -682,7 +680,7 @@
           <jvmarg value="-Dgluegen.user.compiler.file=${gluegen.user.compiler.file}"/>
           <batchtest todir="${build}/test/results">
               <fileset dir="${build}/test/build/classes">
-                  <include name="com/sun/gluegen/**Test*"/>
+                  <include name="com/jogamp/gluegen/**Test*"/>
                   <include name="com/jogamp/common/nio/**Test*"/>
                   <include name="com/jogamp/common/util/**Test*"/>
                   <include name="com/jogamp/common/util/locks/**Test*"/>
diff --git a/make/validate-properties.xml b/make/validate-properties.xml
index 42fd16f..9d29bc8 100755
--- a/make/validate-properties.xml
+++ b/make/validate-properties.xml
@@ -11,7 +11,7 @@
        - we can not overwrite it.
       -->
     <target name="java.class.path.validate">
-        <available property="gluegen.jar.on.class.path" classname="com.sun.gluegen.GlueGen" />
+        <available property="gluegen.jar.on.class.path" classname="com.jogamp.gluegen.GlueGen" />
         <fail if="gluegen.jar.on.class.path">
     *******************************************************************
     ** Your CLASSPATH environment variable appears to be set (some   **