This commit was manufactured by cvs2svn to create branch 'JSR-231'.

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@312 232f8b59-042b-4e1e-8c03-345bb8c30851

9 files changed, 80 insertions, 0 deletions

diff --git a/make/cg-common-CustomJavaCode.java b/make/cg-common-CustomJavaCode.java
new file mode 100755
index 000000000..ba0df4ee9
--- /dev/null
+++ b/make/cg-common-CustomJavaCode.java
@@ -0,0 +1,44 @@
+static {
+  AccessController.doPrivileged(new PrivilegedAction() {
+    public Object run() {
+      try {
+        // Workaround so that these don't need to be in the system
+        // path but can be referenced from java.library.path
+        // (this is intended to help with Webstarted applications)
+        System.loadLibrary("cg");
+        System.loadLibrary("cgGL");
+      } catch (UnsatisfiedLinkError e) {
+        // Consider this non-fatal
+      }
+      // Load the actual Cg binding
+      System.loadLibrary("jogl_cg");
+      return null;
+    }
+  });
+}
+
+/** A convenience method which reads all available data from the InputStream and then calls cgCreateProgram. */
+public static CGprogram cgCreateProgramFromStream(CGcontext ctx, int program_type, java.io.InputStream stream, int profile, java.lang.String entry, java.lang.String[] args) throws java.io.IOException {
+  if (stream == null) {
+    throw new java.io.IOException("null stream");
+  }
+  stream = new java.io.BufferedInputStream(stream);
+  int avail = stream.available();
+  byte[] data = new byte[avail];
+  int numRead = 0;
+  int pos = 0;
+  do {
+    if (pos + avail > data.length) {
+      byte[] newData = new byte[pos + avail];
+      System.arraycopy(data, 0, newData, 0, pos);
+      data = newData;
+    }
+    numRead = stream.read(data, pos, avail);
+    if (numRead >= 0) {
+      pos += numRead;
+    }
+    avail = stream.available();
+  } while (avail > 0 && numRead >= 0);
+  String program = new String(data, 0, pos, "US-ASCII");
+  return cgCreateProgram(ctx, program_type, program, profile, entry, args);
+}
diff --git a/www/webstart/jogl-1-1.jar b/www/webstart/jogl-1-1.jar
new file mode 100644
index 000000000..e7a05b730
--- /dev/null
+++ b/www/webstart/jogl-1-1.jar
diff --git a/www/webstart/jogl-1-1.jnlp b/www/webstart/jogl-1-1.jnlp
new file mode 100755
index 000000000..25b0eb264
--- /dev/null
+++ b/www/webstart/jogl-1-1.jnlp
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp codebase="https://jogl.dev.java.net/webstart/"
+      href="jogl-1-1.jnlp">
+  <information>
+    <title>JOGL</title>
+    <vendor>Sun Microsystems, Inc.</vendor>
+    <homepage href="http://jogl.dev.java.net/"/>
+    <description>JOGL</description>
+    <description kind="short">Java programming language binding for the OpenGL 3D graphics API.</description>
+    <offline-allowed/>
+  </information>
+  <security>
+      <all-permissions/>
+  </security>
+
+    <resources>
+      <jar href="jogl-1-1.jar" />
+    </resources>
+    <resources os="Windows">
+      <nativelib href = "jogl-natives-win32-1-1.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparc">
+      <nativelib href = "jogl-natives-solsparc-1-1.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86">
+      <nativelib href = "jogl-natives-solx86-1-1.jar" />
+    </resources>
+    <resources os="Linux">
+      <nativelib href = "jogl-natives-linux-1-1.jar" />
+    </resources>
+    <resources os="Mac OS X">
+      <nativelib href = "jogl-natives-macosx-1-1.jar" />
+    </resources>
+
+  <component-desc />
+</jnlp>
diff --git a/www/webstart/jogl-natives-linux-1-1.jar b/www/webstart/jogl-natives-linux-1-1.jar
new file mode 100644
index 000000000..06850ff8a
--- /dev/null
+++ b/www/webstart/jogl-natives-linux-1-1.jar
diff --git a/www/webstart/jogl-natives-macosx-1-1.jar b/www/webstart/jogl-natives-macosx-1-1.jar
new file mode 100644
index 000000000..1823aacd6
--- /dev/null
+++ b/www/webstart/jogl-natives-macosx-1-1.jar
diff --git a/www/webstart/jogl-natives-solsparc-1-1.jar b/www/webstart/jogl-natives-solsparc-1-1.jar
new file mode 100644
index 000000000..b6aa71acc
--- /dev/null
+++ b/www/webstart/jogl-natives-solsparc-1-1.jar
diff --git a/www/webstart/jogl-natives-solx86-1-1.jar b/www/webstart/jogl-natives-solx86-1-1.jar
new file mode 100755
index 000000000..ec6ef5213
--- /dev/null
+++ b/www/webstart/jogl-natives-solx86-1-1.jar
diff --git a/www/webstart/jogl-natives-solx86.jar b/www/webstart/jogl-natives-solx86.jar
new file mode 100755
index 000000000..ec6ef5213
--- /dev/null
+++ b/www/webstart/jogl-natives-solx86.jar
diff --git a/www/webstart/jogl-natives-win32-1-1.jar b/www/webstart/jogl-natives-win32-1-1.jar
new file mode 100644
index 000000000..bb9b54b69
--- /dev/null
+++ b/www/webstart/jogl-natives-win32-1-1.jar