24 files changed, 44 insertions, 44 deletions
diff --git a/jnlp-files/CustomText.jnlp b/jnlp-files/CustomText.jnlp
index 418a203..b81fb94 100644
--- a/jnlp-files/CustomText.jnlp
+++ b/jnlp-files/CustomText.jnlp
@@ -3,8 +3,8 @@
       href="CustomText.jnlp">
   <information>
     <title>Custom Text</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>Custom Text</description>
     <description kind="short">Advanced demo of TextRenderer, showing use of a custom RenderDelegate for fancy Java 2D font rendering effects.</description>
     <offline-allowed/>
diff --git a/jnlp-files/FlyingText.jnlp b/jnlp-files/FlyingText.jnlp
index e036696..148d194 100644
--- a/jnlp-files/FlyingText.jnlp
+++ b/jnlp-files/FlyingText.jnlp
@@ -3,8 +3,8 @@
       href="FlyingText.jnlp">
   <information>
     <title>Flying Text</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>Flying Text</description>
     <description kind="short">Advanced demo of TextRenderer, showing animated and colored text with drop shadows.</description>
     <offline-allowed/>
diff --git a/jnlp-files/Gears.jnlp b/jnlp-files/Gears.jnlp
index cbbd9bd..994529c 100755
--- a/jnlp-files/Gears.jnlp
+++ b/jnlp-files/Gears.jnlp
@@ -3,8 +3,8 @@
       href="Gears.jnlp">
   <information>
     <title>JOGL Gears Demo</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>Gears Demo</description>
     <description kind="short">Brian Paul's Gears demo ported to Java and JOGL.</description>
     <offline-allowed/>
diff --git a/jnlp-files/HDR.jnlp b/jnlp-files/HDR.jnlp
index 5368186..bc2d30b 100755
--- a/jnlp-files/HDR.jnlp
+++ b/jnlp-files/HDR.jnlp
@@ -3,8 +3,8 @@
       href="HDR.jnlp">
   <information>
     <title>JOGL High Dynamic Range Rendering Demo</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>High Dynamic Range Rendering Demo</description>
     <description kind="short">NVidia's High Dynamic Range (HDR) rendering demo ported to Java and JOGL.</description>
     <offline-allowed/>
diff --git a/jnlp-files/HWShadowmapsSimple.jnlp b/jnlp-files/HWShadowmapsSimple.jnlp
index 2973a46..294f3aa 100644
--- a/jnlp-files/HWShadowmapsSimple.jnlp
+++ b/jnlp-files/HWShadowmapsSimple.jnlp
@@ -3,8 +3,8 @@
       href="HWShadowmapsSimple.jnlp">
   <information>
     <title>JOGL Hardware Shadow Maps Demo</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>HWShadowmapsSimple Demo</description>
     <description kind="short">NVidia's HWShadowmapsSimple demo ported to Java and JOGL.</description>
     <offline-allowed/>
diff --git a/jnlp-files/InfiniteShadowVolumes.jnlp b/jnlp-files/InfiniteShadowVolumes.jnlp
index 7133af8..772d26d 100644
--- a/jnlp-files/InfiniteShadowVolumes.jnlp
+++ b/jnlp-files/InfiniteShadowVolumes.jnlp
@@ -3,8 +3,8 @@
       href="InfiniteShadowVolumes.jnlp">
   <information>
     <title>JOGL Infinite Shadow Volumes Demo</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>InfiniteShadowVolumes Demo</description>
     <description kind="short">NVidia's InfiniteShadowVolumes demo ported to Java and JOGL.</description>
     <offline-allowed/>
diff --git a/jnlp-files/JRefract.jnlp b/jnlp-files/JRefract.jnlp
index a923ea7..8a5af91 100644
--- a/jnlp-files/JRefract.jnlp
+++ b/jnlp-files/JRefract.jnlp
@@ -3,8 +3,8 @@
       href="JRefract.jnlp">
   <information>
     <title>JOGL JRefract Demo - JOGL/Java2D Integration</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>JRefract Demo</description>
     <description kind="short">Variant of NVidia's vtxprog_refract demo illustrating JOGL's hardware-accelerated Swing component and integration with Java2D's OpenGL pipeline.</description>
     <offline-allowed/>
diff --git a/jnlp-files/JRefractNoOGL.jnlp b/jnlp-files/JRefractNoOGL.jnlp
index 115c094..7bce38a 100644
--- a/jnlp-files/JRefractNoOGL.jnlp
+++ b/jnlp-files/JRefractNoOGL.jnlp
@@ -3,8 +3,8 @@
       href="JRefractNoOGL.jnlp">
   <information>
     <title>JOGL JRefract Demo - no JOGL/Java2D Integration</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>JRefract Demo</description>
     <description kind="short">Variant of NVidia's vtxprog_refract demo illustrating JOGL's hardware-accelerated Swing component.</description>
     <offline-allowed/>
diff --git a/jnlp-files/ParticleEngine.jnlp b/jnlp-files/ParticleEngine.jnlp
index 7dbdacc..b13b2eb 100644
--- a/jnlp-files/ParticleEngine.jnlp
+++ b/jnlp-files/ParticleEngine.jnlp
@@ -4,7 +4,7 @@
   <information>
     <title>JOGL Particle Engine Demo</title>
     <vendor>Ben Chappell</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>Particle Engine Demo</description>
     <description kind="short">Particle Engine demonstration written in Java using JOGL.</description>
     <offline-allowed/>
diff --git a/jnlp-files/ProceduralTexturePhysics.jnlp b/jnlp-files/ProceduralTexturePhysics.jnlp
index 6c58ed9..6076629 100644
--- a/jnlp-files/ProceduralTexturePhysics.jnlp
+++ b/jnlp-files/ProceduralTexturePhysics.jnlp
@@ -3,8 +3,8 @@
       href="ProceduralTexturePhysics.jnlp">
   <information>
     <title>JOGL Procedural Texture Physics Demo</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>ProceduralTexturePhysics Demo</description>
     <description kind="short">NVidia's ProceduralTexturePhysics demo ported to Java and JOGL.</description>
     <offline-allowed/>
diff --git a/jnlp-files/TestTextRenderer.jnlp b/jnlp-files/TestTextRenderer.jnlp
index 4cbe064..a46a277 100644
--- a/jnlp-files/TestTextRenderer.jnlp
+++ b/jnlp-files/TestTextRenderer.jnlp
@@ -3,8 +3,8 @@
       href="TestTextRenderer.jnlp">
   <information>
     <title>TextRenderer Test</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>TextRenderer Test</description>
     <description kind="short">Simple test of TextRenderer, with text overlaid on Gears demo.</description>
     <offline-allowed/>
diff --git a/jnlp-files/TextCube.jnlp b/jnlp-files/TextCube.jnlp
index 2f2f5fa..25f1336 100644
--- a/jnlp-files/TextCube.jnlp
+++ b/jnlp-files/TextCube.jnlp
@@ -3,8 +3,8 @@
       href="TextCube.jnlp">
   <information>
     <title>Text Cube</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>Text Cube</description>
     <description kind="short">Shows how to use the TextRenderer to draw 2D text in 3D.</description>
     <offline-allowed/>
diff --git a/jnlp-files/TextFlow.jnlp b/jnlp-files/TextFlow.jnlp
index a0bb8c9..7b79aac 100644
--- a/jnlp-files/TextFlow.jnlp
+++ b/jnlp-files/TextFlow.jnlp
@@ -3,8 +3,8 @@
       href="TextFlow.jnlp">
   <information>
     <title>Text Flow</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>Text Flow</description>
     <description kind="short">Shows how to use the TextRenderer to draw dynamically flowing text.</description>
     <offline-allowed/>
diff --git a/jnlp-files/VertexArrayRange.jnlp b/jnlp-files/VertexArrayRange.jnlp
index a5febea..edc5b53 100644
--- a/jnlp-files/VertexArrayRange.jnlp
+++ b/jnlp-files/VertexArrayRange.jnlp
@@ -3,8 +3,8 @@
       href="VertexArrayRange.jnlp">
   <information>
     <title>JOGL Vertex Array Range Demo</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>VertexArrayRange Demo</description>
     <description kind="short">NVidia's vertex_array_range demo ported to Java and JOGL.</description>
     <offline-allowed/>
diff --git a/jnlp-files/VertexBufferObject.jnlp b/jnlp-files/VertexBufferObject.jnlp
index 9432d73..035e0af 100644
--- a/jnlp-files/VertexBufferObject.jnlp
+++ b/jnlp-files/VertexBufferObject.jnlp
@@ -3,8 +3,8 @@
       href="VertexBufferObject.jnlp">
   <information>
     <title>JOGL Vertex Buffer Object Demo</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>VertexBufferObject Demo</description>
     <description kind="short">NVidia's vertex_array_range demo ported to Java, JOGL, and ARB_vertex_buffer_object.</description>
     <offline-allowed/>
diff --git a/jnlp-files/VertexProgRefract.jnlp b/jnlp-files/VertexProgRefract.jnlp
index 317394d..1b0830b 100644
--- a/jnlp-files/VertexProgRefract.jnlp
+++ b/jnlp-files/VertexProgRefract.jnlp
@@ -3,8 +3,8 @@
       href="VertexProgRefract.jnlp">
   <information>
     <title>JOGL VertexProgRefract Demo</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>VertexProgRefract Demo</description>
     <description kind="short">NVidia's vtxprog_refract demo ported to Java and JOGL.</description>
     <offline-allowed/>
diff --git a/jnlp-files/VertexProgWarp.jnlp b/jnlp-files/VertexProgWarp.jnlp
index edfcea6..3d9c8d0 100644
--- a/jnlp-files/VertexProgWarp.jnlp
+++ b/jnlp-files/VertexProgWarp.jnlp
@@ -3,8 +3,8 @@
       href="VertexProgWarp.jnlp">
   <information>
     <title>JOGL VertexProgWarp Demo</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>VertexProgWarp Demo</description>
     <description kind="short">NVidia's vtxprog_warp demo ported to Java and JOGL.</description>
     <offline-allowed/>
diff --git a/jnlp-files/XTrans.jnlp b/jnlp-files/XTrans.jnlp
index e92eb4a..076808d 100644
--- a/jnlp-files/XTrans.jnlp
+++ b/jnlp-files/XTrans.jnlp
@@ -3,8 +3,8 @@
       href="XTrans.jnlp">
   <information>
     <title>JOGL XTrans (Accelerated Transition) Demo - JOGL/Java2D Integration</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>XTrans Demo</description>
     <description kind="short">Demo showing OpenGL-accelerated animated transitions of Swing components using the Java2D/JOGL bridge.</description>
     <offline-allowed/>
diff --git a/jnlp-files/applet-gears.jnlp b/jnlp-files/applet-gears.jnlp
index cbe93a7..e70ef0d 100644
--- a/jnlp-files/applet-gears.jnlp
+++ b/jnlp-files/applet-gears.jnlp
@@ -2,8 +2,8 @@
 <jnlp codebase="DEMO_CODEBASE_TAG" href="applet-gears.jnlp">
   <information>
     <title>JOGL JNLP Applet Gears Demo</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>Gears Demo </description>
     <description kind="short">Brian Paul's Gears demo ported to Java and JOGL.</description>
     <offline-allowed/>
diff --git a/jnlp-files/jogl-newt-applet-runner.jnlp b/jnlp-files/jogl-newt-applet-runner.jnlp
index f8a8ea2..25becb8 100644
--- a/jnlp-files/jogl-newt-applet-runner.jnlp
+++ b/jnlp-files/jogl-newt-applet-runner.jnlp
@@ -2,8 +2,8 @@
 <jnlp codebase="DEMO_CODEBASE_TAG" href="jogl-newt-applet-runner.jnlp">
   <information>
     <title>JOGL NEWT JNLP Applet Runner</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>JOGL NEWT JNLP Applet Runner</description>
     <offline-allowed/>
   </information>
diff --git a/jnlp-files/version.jnlp b/jnlp-files/version.jnlp
index 4f6d4ee..8d07c08 100644
--- a/jnlp-files/version.jnlp
+++ b/jnlp-files/version.jnlp
@@ -3,8 +3,8 @@
       href="version.jnlp">
   <information>
     <title>JOGL Version Info</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/jogl-demos/"/>
     <description>Version Info</description>
     <offline-allowed/>
   </information>
diff --git a/src/redbook/master-applet.jnlp b/src/redbook/master-applet.jnlp
index 3e49332..ea2cb5e 100644
--- a/src/redbook/master-applet.jnlp
+++ b/src/redbook/master-applet.jnlp
@@ -14,7 +14,7 @@
 <!--${JNLP.RESOURCES.MAIN.JAR}-->
 <!--${JNLP.RESOURCES.JARS}-->
 <!--${JNLP.RESOURCES.EXTENSIONS}-->
-        <extension name="jogl-all-awt" href="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-all-awt.jnlp" />
+        <extension name="jogl-all-awt" href="http://jogamp.org/deployment/webstart/jogl-all-awt.jnlp" />
     </resources>
     <applet-desc main-class="${jnlp.main.class}" name="${APPLICATION.TITLE}"
         width="${jnlp.applet.width}" height="${jnlp.applet.height}">
diff --git a/src/redbook/nbproject/build-jogl-template-impl.xml b/src/redbook/nbproject/build-jogl-template-impl.xml
index 1f69eb2..ab63feb 100644
--- a/src/redbook/nbproject/build-jogl-template-impl.xml
+++ b/src/redbook/nbproject/build-jogl-template-impl.xml
@@ -138,7 +138,7 @@
     <target name="-jogl-template-patch-master-jnlp" depends="-jogl-template-check-master-jnlp" if="is.jnlp.unpatched">
         <replace file="master-${jnlp.descriptor}.jnlp">
             <replacetoken><![CDATA[</resources>]]></replacetoken>
-            <replacevalue><![CDATA[    <extension name="jogl-all-awt" href="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-all-awt.jnlp" />
+            <replacevalue><![CDATA[    <extension name="jogl-all-awt" href="http://jogamp.org/deployment/webstart/jogl-all-awt.jnlp" />
     </resources>]]></replacevalue>
         </replace>
     </target>
diff --git a/src/redbook/nbproject/project.properties b/src/redbook/nbproject/project.properties
index 173b026..c1ee26d 100644
--- a/src/redbook/nbproject/project.properties
+++ b/src/redbook/nbproject/project.properties
@@ -15,7 +15,7 @@
 # or test-sys-prop.name=value to set system properties for unit tests):
 run.jvmargs=-Djava.library.path="lib" -Djava.security.policy=applet.policy
 
-jogl.webres=http://download.java.net/media/jogl/builds/nightly
+jogl.webres=http://jogamp.org/deployment/builds-nightly
 
 source.reference.jogl.all.jar=jogl-dist/jogl-2.0-src.zip
 source.reference.gluegen-rt.jar=jogl-dist/gluegen-rt-2.0-src.zip