Fix jnlp files jar names and removed main attribute of jar ref

<module>.[win|x11|osx].jar  -> <module>.os.[win|x11|osx].jar

nativewindow.os.windows.jar -> nativewindow.os.win.jar
newt.broadcomegl.jar        -> newt.hw.broadcomegl.jar
newt.intelgdl.jar           -> newt.hw.intelgdl.jar

removed non existing jnlp file for config gl2es12.

3 files changed, 12 insertions, 12 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index 8503550ec..7459a8836 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -275,7 +275,7 @@
         <property name="nativewindow.core.jar"         value="${build.nativewindow}/nativewindow.core.jar" />
         <property name="nativewindow.awt.jar"          value="${build.nativewindow}/nativewindow.awt.jar"  />
         <property name="nativewindow.os.x11.jar"       value="${build.nativewindow}/nativewindow.os.x11.jar"  />
-        <property name="nativewindow.os.windows.jar"   value="${build.nativewindow}/nativewindow.os.windows.jar"  />
+        <property name="nativewindow.os.win.jar"       value="${build.nativewindow}/nativewindow.os.win.jar"  />
         
         <property name="jogl.core.jar"                  value="${build.jogl}/jogl.core.jar" />
         <property name="jogl.cg.jar"                    value="${build.jogl}/jogl.cg.jar" />
@@ -310,13 +310,13 @@
         <property name="newt.os.win.jar"                value="${build.newt}/newt.os.win.jar" />
         <property name="newt.os.osx.jar"                value="${build.newt}/newt.os.osx.jar" />
         <property name="newt.ogl.jar"                   value="${build.newt}/newt.ogl.jar" />
-        <property name="newt.broadcomegl.jar"           value="${build.newt}/newt.broadcomegl.jar" />
-        <property name="newt.intelgdl.jar"              value="${build.newt}/newt.intelgdl.jar" />
+        <property name="newt.hw.broadcomegl.jar"        value="${build.newt}/newt.hw.broadcomegl.jar" />
+        <property name="newt.hw.intelgdl.jar"           value="${build.newt}/newt.hw.intelgdl.jar" />
 
         <!-- Atomic CDC JARS -->
         <property name="nativewindow.core.cdc.jar"       value="${build.nativewindow}/nativewindow.core.cdc.jar" />
         <property name="nativewindow.os.x11.cdc.jar"     value="${build.nativewindow}/nativewindow.os.x11.cdc.jar"  />
-        <property name="nativewindow.os.windows.cdc.jar" value="${build.nativewindow}/nativewindow.os.windows.cdc.jar"  />
+        <property name="nativewindow.os.win.cdc.jar"     value="${build.nativewindow}/nativewindow.os.win.cdc.jar"  />
 
         <property name="jogl.core.cdc.jar"              value="${build.jogl}/jogl.core.cdc.jar" />
         <property name="jogl.gles1.cdc.jar"             value="${build.jogl}/jogl.gles1.cdc.jar" />
@@ -337,8 +337,8 @@
         <property name="newt.os.win.cdc.jar"            value="${build.newt}/newt.os.win.cdc.jar" />
         <property name="newt.os.osx.cdc.jar"            value="${build.newt}/newt.os.osx.cdc.jar" />
         <property name="newt.ogl.cdc.jar"               value="${build.newt}/newt.ogl.cdc.jar" />
-        <property name="newt.broadcomegl.cdc.jar"       value="${build.newt}/newt.broadcomegl.cdc.jar" />
-        <property name="newt.intelgdl.cdc.jar"          value="${build.newt}/newt.intelgdl.cdc.jar" />
+        <property name="newt.hw.broadcomegl.cdc.jar"    value="${build.newt}/newt.hw.broadcomegl.cdc.jar" />
+        <property name="newt.hw.intelgdl.cdc.jar"       value="${build.newt}/newt.hw.intelgdl.cdc.jar" />
 
         <!-- The location and name of the configuration ANT file that will 
            - validate to ensure that all user-define variables are set. -->
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index c7e04dbbb..be8f6a7a2 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -734,13 +734,13 @@
     </target>
 
     <target name="build-jars-windows" depends="setup-manifestfile">
-        <jar manifest="tempversion" destfile="${nativewindow.os.windows.jar}" filesonly="true">
+        <jar manifest="tempversion" destfile="${nativewindow.os.win.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.windows}" />
         </jar>
     </target>
     <target name="build-jars-windows-cdc" depends="setup-manifestfile-cdc">
-        <jar manifest="tempversion-cdc" destfile="${nativewindow.os.windows.cdc.jar}" filesonly="true">
+        <jar manifest="tempversion-cdc" destfile="${nativewindow.os.win.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.windows}" />
         </jar>
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 7f33f9c2a..5ac6c7eed 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -609,14 +609,14 @@
             <fileset dir="${classes}"
                      includes="${java.part.opengl}"/>
         </jar>
-        <jar manifest="tempversion" destfile="${newt.broadcomegl.jar}" filesonly="true">
+        <jar manifest="tempversion" destfile="${newt.hw.broadcomegl.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.broadcomegl}"/>
         </jar>
     </target>
 
     <target name="build-jars-driver" depends="setup-manifestfile">
-        <jar manifest="tempversion" destfile="${newt.intelgdl.jar}" filesonly="true">
+        <jar manifest="tempversion" destfile="${newt.hw.intelgdl.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.intelgdl}"/>
         </jar>
@@ -627,14 +627,14 @@
             <fileset dir="${classes-cdc}"
                      includes="${java.part.opengl}"/>
         </jar>
-        <jar manifest="tempversion-cdc" destfile="${newt.broadcomegl.cdc.jar}" filesonly="true">
+        <jar manifest="tempversion-cdc" destfile="${newt.hw.broadcomegl.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.broadcomegl}"/>
         </jar>
     </target>
 
     <target name="build-jars-driver-cdc" depends="setup-manifestfile-cdc">
-        <jar manifest="tempversion-cdc" destfile="${newt.intelgdl.cdc.jar}" filesonly="true">
+        <jar manifest="tempversion-cdc" destfile="${newt.hw.intelgdl.cdc.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.intelgdl}"/>
         </jar>