Adapt to latest JAR/JNLP changes

4 files changed, 16 insertions, 10 deletions

diff --git a/jnlp-files/JRefract.jnlp b/jnlp-files/JRefract.jnlp
index fd37f1a..03ebb3f 100644
--- a/jnlp-files/JRefract.jnlp
+++ b/jnlp-files/JRefract.jnlp
@@ -12,10 +12,11 @@
 

     <resources>

       <j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>

+      <property name="sun.java2d.noddraw" value="true"/>

       <property name="sun.java2d.opengl" value="True"/>

       <!-- Temporary workaround for slowness in Windows NVidia drivers -->

-      <property name="swing.bufferPerWindow" value="false"/>

-      <property name="jogl.debug.GLJPanel" value="true"/>

+      <!-- property name="swing.bufferPerWindow" value="false"/ -->

+      <property name="jnlp.jogl.debug.GLJPanel" value="true"/>

       <jar href="jogl-demos.jar" main="true"/>

       <jar href="jogl-demos-util.jar" />

       <jar href="jogl-demos-data.jar" />

diff --git a/jnlp-files/JRefractNoOGL.jnlp b/jnlp-files/JRefractNoOGL.jnlp
index e86f505..add95d7 100644
--- a/jnlp-files/JRefractNoOGL.jnlp
+++ b/jnlp-files/JRefractNoOGL.jnlp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>

 <jnlp codebase="DEMO_CODEBASE_TAG"

-      href="JRefract.jnlp">

+      href="JRefractNoOGL.jnlp">

   <information>

     <title>JOGL JRefract Demo - no JOGL/Java2D Integration</title>

     <vendor>Sun Microsystems, Inc.</vendor>

diff --git a/jnlp-files/XTrans.jnlp b/jnlp-files/XTrans.jnlp
index a231ed1..859f87e 100644
--- a/jnlp-files/XTrans.jnlp
+++ b/jnlp-files/XTrans.jnlp
@@ -12,9 +12,10 @@
 

     <resources>

       <j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>

+      <property name="sun.java2d.noddraw" value="true"/>

       <property name="sun.java2d.opengl" value="True"/>

       <!-- Temporary workaround for slowness in Windows NVidia drivers -->

-      <property name="swing.bufferPerWindow" value="false"/>

+      <!-- property name="swing.bufferPerWindow" value="false"/ -->

       <jar href="jogl-demos.jar" main="true"/>

       <jar href="jogl-demos-util.jar" />

       <jar href="jogl-demos-data.jar" />

diff --git a/make/build.xml b/make/build.xml
index bc94d58..55caf36 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -73,10 +73,11 @@
         <property name="jogl.util.awt.jar"   value="../../jogl/${rootrel.build}/jogl/jogl.util.awt.jar" />
         <property name="jogl.util.fixedfuncemu.jar" value="../../jogl/${rootrel.build}/jogl/jogl.util.fixedfuncemu.jar" />
         <property name="jogl.util.gl2.jar"   value="../../jogl/${rootrel.build}/jogl/jogl.util.gl2.jar" />
-        <property name="nativewindow.core.jar"        value="../../jogl/${rootrel.build}/nativewindow/nativewindow.core.jar" />
-        <property name="nativewindow.x11.jar"         value="../../jogl/${rootrel.build}/nativewindow/nativewindow.x11.jar" />
-        <property name="nativewindow.awt.jar"         value="../../jogl/${rootrel.build}/nativewindow/nativewindow.awt.jar" />
-        <property name="newt.all.jar"        value="../../jogl/${rootrel.build}/newt/newt.all.jar" />
+        <property name="nativewindow.core.jar" value="../../jogl/${rootrel.build}/nativewindow/nativewindow.core.jar" />
+        <property name="nativewindow.x11.jar"  value="../../jogl/${rootrel.build}/nativewindow/nativewindow.x11.jar" />
+        <property name="nativewindow.awt.jar"  value="../../jogl/${rootrel.build}/nativewindow/nativewindow.awt.jar" />
+        <property name="newt.core.jar"       value="../../jogl/${rootrel.build}/newt/newt.core.jar" />
+        <property name="newt.ogl.jar"        value="../../jogl/${rootrel.build}/newt/newt.ogl.jar" />
         <property name="joal.jar"            value="../lib/joal.jar" />
         <property name="joal-demos.jar"      value="../lib/joal-demos.jar" />
         <property name="simple-xml.jar"      value="../lib/simple-xml-1.1.1.jar" />
@@ -129,7 +130,8 @@
             <pathelement location="${jogl.util.fixedfuncemu.jar}" />
             <pathelement location="${jogl.util.awt.jar}" />
             <pathelement location="${jogl.util.gl2.jar}" />
-            <pathelement location="${newt.all.jar}" />
+            <pathelement location="${newt.core.jar}" />
+            <pathelement location="${newt.ogl.jar}" />
             <pathelement location="${joal.jar}" />
             <pathelement location="${joal-demos.jar}" />
             <pathelement location="${simple-xml.jar}" />
@@ -189,6 +191,7 @@
         <mkdir dir="${classes}" />
         <path id="jogl-demos.classpath">
             <pathelement location="${nativewindow.core.jar}" />
+            <pathelement location="${nativewindow.x11.jar}" />
             <pathelement location="${jogl.core.jar}" />
             <pathelement location="${jogl.gles1.jar}" />
             <pathelement location="${jogl.gles1.dbg.jar}" />
@@ -197,7 +200,8 @@
             <pathelement location="${jogl.egl.jar}" />
             <pathelement location="${jogl.util.jar}" />
             <pathelement location="${jogl.util.fixedfuncemu.jar}" />
-            <pathelement location="${newt.all.jar}" />
+            <pathelement location="${newt.core.jar}" />
+            <pathelement location="${newt.ogl.jar}" />
         </path>
         <javac destdir="${classes}" includes="demos/GLInfo*,demos/es1/**,demos/es2/**" source="1.4" target="1.4" debug="true" debuglevel="source,lines"
                bootclasspath="../../gluegen/make/lib/cdc_fp.jar">