Merge with mbien's 2ea8c93d5fd27207872b97c964e3f8af5ac850c6

4 files changed, 16 insertions, 16 deletions

diff --git a/make/build.xml b/make/build.xml
index 9460b3f..db6de19 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -31,19 +31,19 @@
   </target>
 
   <target name="setup-excludes-2" unless="gluegen.nsig">
-    <property name="gluegen.excludes" value="com/sun/gluegen/runtime/BufferFactoryInternal.java,com/sun/gluegen/nativesig/**" />
+    <property name="gluegen.excludes" value="com/jogamp/gluegen/runtime/BufferFactoryInternal.java,com/sun/gluegen/nativesig/**" />
   </target>
 
   <target name="setup.javase">
-    <copy file="../src/java/com/sun/gluegen/runtime/BufferFactory.java.javase" tofile="${src.generated.java}/com/sun/gluegen/runtime/BufferFactory.java" />
-    <copy file="../src/java/com/sun/gluegen/runtime/StructAccessor.java.javase" tofile="${src.generated.java}/com/sun/gluegen/runtime/StructAccessor.java" />
-    <copy file="../src/java/com/sun/gluegen/runtime/PointerBuffer.java.javase" tofile="${src.generated.java}/com/sun/gluegen/runtime/PointerBuffer.java" />
+    <copy file="../src/java/com/jogamp/gluegen/runtime/BufferFactory.java.javase" tofile="${src.generated.java}/com/jogamp/gluegen/runtime/BufferFactory.java" />
+    <copy file="../src/java/com/jogamp/gluegen/runtime/StructAccessor.java.javase" tofile="${src.generated.java}/com/jogamp/gluegen/runtime/StructAccessor.java" />
+    <copy file="../src/java/com/jogamp/gluegen/runtime/PointerBuffer.java.javase" tofile="${src.generated.java}/com/jogamp/gluegen/runtime/PointerBuffer.java" />
   </target>
 
   <target name="setup.javacdc">
-    <copy file="../src/java/com/sun/gluegen/runtime/BufferFactory.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/gluegen/runtime/BufferFactory.java" />
-    <copy file="../src/java/com/sun/gluegen/runtime/StructAccessor.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/gluegen/runtime/StructAccessor.java" />
-    <copy file="../src/java/com/sun/gluegen/runtime/PointerBuffer.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/gluegen/runtime/PointerBuffer.java" />
+    <copy file="../src/java/com/jogamp/gluegen/runtime/BufferFactory.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/gluegen/runtime/BufferFactory.java" />
+    <copy file="../src/java/com/jogamp/gluegen/runtime/StructAccessor.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/gluegen/runtime/StructAccessor.java" />
+    <copy file="../src/java/com/jogamp/gluegen/runtime/PointerBuffer.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/gluegen/runtime/PointerBuffer.java" />
   </target>
 
   <target name="init" depends="gluegen.properties.load.user,setup-excludes-1,setup-excludes-2">
@@ -413,7 +413,7 @@
     <copy todir="${classes-cdc}">
         <fileset dir="${classes}"
                  includes="com/** net/**" 
-                 excludes="com/sun/gluegen/runtime/** com/sun/gluegen/test/**" />
+                 excludes="com/jogamp/gluegen/runtime/** com/sun/gluegen/test/**" />
     </copy>
 
     <javac destdir="${classes-cdc}"
@@ -483,7 +483,7 @@
     <!-- Build GlueGen using the generated Java files along with the
       - original source. -->
 
-    <property name="gluegen-rt.classes" value="com/sun/gluegen/runtime/**"/>
+    <property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/>
 
     <!--compile gluegen-rt with source=1.4 first-->
     <javac destdir="${classes}"
@@ -534,8 +534,8 @@
     <!-- Build gluegen-rt.jar. -->
     <jar destfile="${build}/gluegen-rt.jar" manifest="${build}/Manifest-rt.temp">
       <fileset dir="${classes}">
-        <include name="com/sun/gluegen/runtime/*.class" />
-        <include name="com/sun/gluegen/runtime/opengl/*.class" />
+        <include name="com/jogamp/gluegen/runtime/*.class" />
+        <include name="com/jogamp/gluegen/runtime/opengl/*.class" />
       </fileset>
     </jar>
 
@@ -550,8 +550,8 @@
     <!-- Build gluegen-rt-cdc.jar. -->
     <jar destfile="${build}/gluegen-rt-cdc.jar" manifest="${build}/Manifest-rt-cdc.temp">
       <fileset dir="${classes-cdc}">
-        <include name="com/sun/gluegen/runtime/*.class" />
-        <include name="com/sun/gluegen/runtime/opengl/*.class" />
+        <include name="com/jogamp/gluegen/runtime/*.class" />
+        <include name="com/jogamp/gluegen/runtime/opengl/*.class" />
       </fileset>
     </jar>
 
diff --git a/make/dynlink-macosx.cfg b/make/dynlink-macosx.cfg
index 8ba4c51..cdeb556 100755
--- a/make/dynlink-macosx.cfg
+++ b/make/dynlink-macosx.cfg
@@ -1,6 +1,6 @@
 Style AllStatic
 JavaClass MacOSXDynamicLinkerImpl
-Package com.sun.gluegen.runtime
+Package com.jogamp.gluegen.runtime
 Implements MacOSXDynamicLinkerImpl DynamicLinker
 JavaOutputDir ../src/java
 NativeOutputDir ../src/native/macosx
diff --git a/make/dynlink-unix.cfg b/make/dynlink-unix.cfg
index d762c8f..c93e701 100755
--- a/make/dynlink-unix.cfg
+++ b/make/dynlink-unix.cfg
@@ -1,6 +1,6 @@
 Style AllStatic
 JavaClass UnixDynamicLinkerImpl
-Package com.sun.gluegen.runtime
+Package com.jogamp.gluegen.runtime
 Implements UnixDynamicLinkerImpl DynamicLinker
 JavaOutputDir ../src/java
 NativeOutputDir ../src/native/unix
diff --git a/make/dynlink-windows.cfg b/make/dynlink-windows.cfg
index fe69e1c..8626039 100755
--- a/make/dynlink-windows.cfg
+++ b/make/dynlink-windows.cfg
@@ -1,6 +1,6 @@
 Style AllStatic
 JavaClass WindowsDynamicLinkerImpl
-Package com.sun.gluegen.runtime
+Package com.jogamp.gluegen.runtime
 Implements WindowsDynamicLinkerImpl DynamicLinker
 JavaOutputDir ../src/java
 NativeOutputDir ../src/native/windows