From c95bc87835319758c10f56ea2cd12093efc3c9c0 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 15 Dec 2010 02:56:37 +0100
Subject: 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.
---
 jnlp-files/jogl-core.jnlp            |  2 +-
 jnlp-files/jogl-gl2es12.jnlp         | 48 ------------------------------------
 jnlp-files/nativewindow-all-awt.jnlp |  4 +--
 jnlp-files/nativewindow-awt.jnlp     |  4 +--
 jnlp-files/nativewindow.jnlp         | 28 ++++++++++-----------
 jnlp-files/newt-all-awt.jnlp         |  2 +-
 jnlp-files/newt-all-noawt.jnlp       |  2 +-
 jnlp-files/newt-awt.jnlp             |  2 +-
 jnlp-files/newt-jogl.jnlp            |  2 +-
 jnlp-files/newt.jnlp                 | 30 +++++++++++-----------
 make/build-common.xml                | 12 ++++-----
 make/build-nativewindow.xml          |  4 +--
 make/build-newt.xml                  |  8 +++---
 13 files changed, 50 insertions(+), 98 deletions(-)
 delete mode 100644 jnlp-files/jogl-gl2es12.jnlp

diff --git a/jnlp-files/jogl-core.jnlp b/jnlp-files/jogl-core.jnlp
index dca293720..ee0a247b4 100644
--- a/jnlp-files/jogl-core.jnlp
+++ b/jnlp-files/jogl-core.jnlp
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jogl.core.jar" main="true"/>
+      <jar href="jogl.core.jar">
       <jar href="jogl.util.jar" download="lazy"/>
 
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
diff --git a/jnlp-files/jogl-gl2es12.jnlp b/jnlp-files/jogl-gl2es12.jnlp
deleted file mode 100644
index 92fa621cf..000000000
--- a/jnlp-files/jogl-gl2es12.jnlp
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/"
-      href="jogl-gl2es12.jnlp">
-  <information>
-    <title>Java(tm) Binding to the OpenGL(r) API (GL2ES12)</title>
-    <vendor>JogAmp Community</vendor>
-    <homepage href="http://jogamp.org/"/>
-    <description>Java Binding to the OpenGL API - JSR-231 2.0.0 - GL2ES12</description>
-    <description kind="short">Java programming language binding for the OpenGL 3D graphics API - GL2ES12.</description>
-    <offline-allowed/>
-  </information>
-  <update check="background" policy="always"/>
-  <security>
-      <all-permissions/>
-  </security>
-    <resources>
-      <jar href="jogl.glu.mipmap.jar" download="lazy"/>
-      <jar href="jogl.glu.tess.jar" download="lazy"/>
-
-      <jar href="jogl.util.fixedfuncemu.jar" download="lazy"/>
-
-      <!-- jar href="jogl.sdk.jar" /-->
-
-      <extension name="jogl-core" href="JOGL_CODEBASE_TAG/jogl-core.jnlp" />
-    </resources>
-
-    <resources os="Mobile-Embedded">
-      <jar href="jogl.egl.jar" />
-      <jar href="jogl.gles1.jar" />
-      <jar href="jogl.gles1.dbg.jar" download="lazy"/>
-      <jar href="jogl.gles2.jar" />
-      <jar href="jogl.gles2.dbg.jar" download="lazy"/>
-    </resources>
-    <resources os="Windows">
-      <jar href="jogl.gl2es12.win.jar" />
-      <jar href="jogl.gl2es12.dbg.jar" download="lazy"/>
-    </resources>
-    <resources os="SunOS Linux">
-      <jar href="jogl.gl2es12.x11.jar" />
-      <jar href="jogl.gl2es12.dbg.jar" download="lazy"/>
-    </resources>
-    <resources os="Mac OS X">
-      <jar href="jogl.gl2es12.osx.jar" />
-      <jar href="jogl.gl2es12.dbg.jar" download="lazy"/>
-    </resources>
-
-  <component-desc />
-</jnlp>
diff --git a/jnlp-files/nativewindow-all-awt.jnlp b/jnlp-files/nativewindow-all-awt.jnlp
index 5273c2c88..6eec6dc3e 100644
--- a/jnlp-files/nativewindow-all-awt.jnlp
+++ b/jnlp-files/nativewindow-all-awt.jnlp
@@ -4,7 +4,7 @@
   <information>
     <title>Java(tm) NativeWindow Interface API (ALL.AWT)</title>
     <vendor>JogAmp Community</vendor>
-    <homepage href="http://nativewindow.dev.java.net/"/>
+    <homepage href="http://jogamp.org/"/>
     <description>Java API for a binding to a native windowing system - 2.0 - ALL.AWT</description>
     <description kind="short">Java API for a binding to a native windowing system - 2.0 - ALL.AWT</description>
     <offline-allowed/>
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="nativewindow.all.jar" main="true" />
+      <jar href="nativewindow.all.jar"/>
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
     </resources>
 
diff --git a/jnlp-files/nativewindow-awt.jnlp b/jnlp-files/nativewindow-awt.jnlp
index b7a5c0f88..b11182ea2 100644
--- a/jnlp-files/nativewindow-awt.jnlp
+++ b/jnlp-files/nativewindow-awt.jnlp
@@ -4,7 +4,7 @@
   <information>
     <title>Java(tm) NativeWindow Interface API (AWT)</title>
     <vendor>JogAmp Community</vendor>
-    <homepage href="http://nativewindow.dev.java.net/"/>
+    <homepage href="http://jogamp.org/"/>
     <description>Java API for a binding to a native windowing system - 2.0 - AWT</description>
     <description kind="short">Java API for a binding to a native windowing system - 2.0 - AWT</description>
     <offline-allowed/>
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="nativewindow.awt.jar" main="true" />
+      <jar href="nativewindow.awt.jar"/>
       <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow.jnlp" />
     </resources>
 
diff --git a/jnlp-files/nativewindow.jnlp b/jnlp-files/nativewindow.jnlp
index 8af99a57c..707082da8 100644
--- a/jnlp-files/nativewindow.jnlp
+++ b/jnlp-files/nativewindow.jnlp
@@ -4,7 +4,7 @@
   <information>
     <title>Java(tm) NativeWindow Interface API (CORE)</title>
     <vendor>JogAmp Community</vendor>
-    <homepage href="http://nativewindow.dev.java.net/"/>
+    <homepage href="http://jogamp.org/"/>
     <description>Java API for a binding to a native windowing system - 2.0 - CORE</description>
     <description kind="short">Java API for a binding to a native windowing system - 2.0 - CORE</description>
     <offline-allowed/>
@@ -14,56 +14,56 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="nativewindow.core.jar" main="true" />
+      <jar href="nativewindow.core.jar" />
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
-      <jar href="nativewindow.os.windows.jar" main="true" />
+      <jar href="nativewindow.os.win.jar" />
       <nativelib href = "nativewindow-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-      <jar href="nativewindow.os.windows.jar" main="true" />
+      <jar href="nativewindow.os.win.jar" />
       <nativelib href = "nativewindow-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-      <jar href="nativewindow.os.windows.jar" main="true" />
+      <jar href="nativewindow.os.win.jar" />
       <nativelib href = "nativewindow-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-      <jar href="nativewindow.os.x11.jar" main="true" />
+      <jar href="nativewindow.os.x11.jar" />
       <nativelib href = "nativewindow-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-      <jar href="nativewindow.os.x11.jar" main="true" />
+      <jar href="nativewindow.os.x11.jar" />
       <nativelib href = "nativewindow-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-      <jar href="nativewindow.os.x11.jar" main="true" />
+      <jar href="nativewindow.os.x11.jar" />
       <nativelib href = "nativewindow-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-      <jar href="nativewindow.os.x11.jar" main="true" />
+      <jar href="nativewindow.os.x11.jar" />
       <nativelib href = "nativewindow-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-      <jar href="nativewindow.os.x11.jar" main="true" />
+      <jar href="nativewindow.os.x11.jar" />
       <nativelib href = "nativewindow-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-      <jar href="nativewindow.os.x11.jar" main="true" />
+      <jar href="nativewindow.os.x11.jar" />
       <nativelib href = "nativewindow-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-      <jar href="nativewindow.os.x11.jar" main="true" />
+      <jar href="nativewindow.os.x11.jar" />
       <nativelib href = "nativewindow-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
-      <jar href="nativewindow.os.x11.jar" main="true" />
+      <jar href="nativewindow.os.x11.jar" />
       <nativelib href = "nativewindow-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-      <jar href="nativewindow.os.x11.jar" main="true" />
+      <jar href="nativewindow.os.x11.jar" />
       <nativelib href = "nativewindow-natives-linux-amd64.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
diff --git a/jnlp-files/newt-all-awt.jnlp b/jnlp-files/newt-all-awt.jnlp
index f063ae1b9..910491f60 100644
--- a/jnlp-files/newt-all-awt.jnlp
+++ b/jnlp-files/newt-all-awt.jnlp
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="newt.all.jar" main="true"/>
+      <jar href="newt.all.jar" />
       <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
     </resources>
 
diff --git a/jnlp-files/newt-all-noawt.jnlp b/jnlp-files/newt-all-noawt.jnlp
index 63ff48e3b..ebf9c42a3 100644
--- a/jnlp-files/newt-all-noawt.jnlp
+++ b/jnlp-files/newt-all-noawt.jnlp
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="newt.all-noawt.jar" main="true"/>
+      <jar href="newt.all-noawt.jar" />
       <extension name="jogl-all-noawt" href="JOGL_CODEBASE_TAG/jogl-all-noawt.jnlp" />
     </resources>
 
diff --git a/jnlp-files/newt-awt.jnlp b/jnlp-files/newt-awt.jnlp
index 02f25786a..652630c8c 100644
--- a/jnlp-files/newt-awt.jnlp
+++ b/jnlp-files/newt-awt.jnlp
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="newt.awt.jar" main="true"/>
+      <jar href="newt.awt.jar" />
       <extension name="nativewindow-awt" href="JOGL_CODEBASE_TAG/nativewindow-awt.jnlp" />
       <extension name="newt" href="JOGL_CODEBASE_TAG/newt.jnlp" />
     </resources>
diff --git a/jnlp-files/newt-jogl.jnlp b/jnlp-files/newt-jogl.jnlp
index ee95a1faa..1201e5cdd 100644
--- a/jnlp-files/newt-jogl.jnlp
+++ b/jnlp-files/newt-jogl.jnlp
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="newt.ogl.jar" main="true"/>
+      <jar href="newt.ogl.jar" />
       <extension name="newt" href="JOGL_CODEBASE_TAG/newt.jnlp" />
       <extension name="jogl-core" href="JOGL_CODEBASE_TAG/jogl-core.jnlp" />
     </resources>
diff --git a/jnlp-files/newt.jnlp b/jnlp-files/newt.jnlp
index ce4ed6f28..4e97526d8 100644
--- a/jnlp-files/newt.jnlp
+++ b/jnlp-files/newt.jnlp
@@ -14,64 +14,64 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="newt.core.jar" main="true" />
+      <jar href="newt.core.jar" />
       <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
-      <jar href="newt.win.jar" main="true" />
+      <jar href="newt.os.win.jar" />
       <nativelib href = "newt-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-      <jar href="newt.win.jar" main="true" />
+      <jar href="newt.os.win.jar" />
       <nativelib href = "newt-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-      <jar href="newt.win.jar" main="true" />
+      <jar href="newt.os.win.jar" />
       <nativelib href = "newt-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-      <jar href="newt.x11.jar" main="true" />
+      <jar href="newt.os.x11.jar" />
       <nativelib href = "newt-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-      <jar href="newt.x11.jar" main="true" />
+      <jar href="newt.os.x11.jar" />
       <nativelib href = "newt-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-      <jar href="newt.x11.jar" main="true" />
+      <jar href="newt.os.x11.jar" />
       <nativelib href = "newt-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-      <jar href="newt.x11.jar" main="true" />
+      <jar href="newt.os.x11.jar" />
       <nativelib href = "newt-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-      <jar href="newt.x11.jar" main="true" />
+      <jar href="newt.os.x11.jar" />
       <nativelib href = "newt-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-      <jar href="newt.x11.jar" main="true" />
+      <jar href="newt.os.x11.jar" />
       <nativelib href = "newt-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-      <jar href="newt.x11.jar" main="true" />
+      <jar href="newt.os.x11.jar" />
       <nativelib href = "newt-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
-      <jar href="newt.x11.jar" main="true" />
+      <jar href="newt.os.x11.jar" />
       <nativelib href = "newt-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-      <jar href="newt.x11.jar" main="true" />
+      <jar href="newt.os.x11.jar" />
       <nativelib href = "newt-natives-linux-amd64.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
-      <jar href="newt.osx.jar" main="true" />
+      <jar href="newt.os.osx.jar" />
       <nativelib href = "newt-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
-      <jar href="newt.osx.jar" main="true" />
+      <jar href="newt.os.osx.jar" />
       <nativelib href = "newt-natives-macosx-universal.jar" />
     </resources>
 
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>
-- 
cgit v1.2.3