diff --git a/mozilla/java/plugins/netbeans/nbproject/build-impl.xml b/mozilla/java/plugins/netbeans/nbproject/build-impl.xml
index c3b36c6f9d9..3f886f147d4 100755
--- a/mozilla/java/plugins/netbeans/nbproject/build-impl.xml
+++ b/mozilla/java/plugins/netbeans/nbproject/build-impl.xml
@@ -44,6 +44,36 @@ is divided into following sections:
         <property file="nbproject/project.properties"/>
     </target>
     <target name="-do-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property">
+        <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
+        <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
+        <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
+        <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
+        <condition property="platform.javac" value="${platform.home}/bin/javac">
+            <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
+        </condition>
+        <property name="platform.javac" value="${platform.javac.tmp}"/>
+        <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
+        <condition property="platform.java" value="${platform.home}/bin/java">
+            <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
+        </condition>
+        <property name="platform.java" value="${platform.java.tmp}"/>
+        <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
+        <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
+            <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
+        </condition>
+        <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
+        <condition property="platform.invalid" value="true">
+            <or>
+                <contains string="${platform.javac}" substring="$${platforms."/>
+                <contains string="${platform.java}" substring="$${platforms."/>
+                <contains string="${platform.javadoc}" substring="$${platforms."/>
+            </or>
+        </condition>
+        <fail unless="platform.home">Must set platform.home</fail>
+        <fail unless="platform.bootcp">Must set platform.bootcp</fail>
+        <fail unless="platform.java">Must set platform.java</fail>
+        <fail unless="platform.javac">Must set platform.javac</fail>
+        <fail if="platform.invalid">Platform is not correctly set up</fail>
         <available file="${manifest.file}" property="manifest.available"/>
         <condition property="manifest.available+main.class">
             <and>
@@ -124,7 +154,7 @@ is divided into following sections:
             <attribute name="debug" default="${javac.debug}"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
+                <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" fork="yes" executable="${platform.javac}" tempdir="${java.io.tmpdir}" includeantruntime="false">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -138,7 +168,7 @@ is divided into following sections:
         <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute name="includes" default="**/*Test.java"/>
             <sequential>
-                <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
+                <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed" jvm="${platform.java}">
                     <batchtest todir="${build.test.results.dir}"/>
                     <classpath>
                         <path path="${run.test.classpath}"/>
@@ -164,6 +194,9 @@ is divided into following sections:
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
+                    <bootclasspath>
+                        <path path="${platform.bootcp}"/>
+                    </bootclasspath>
                 </nbjpdastart>
             </sequential>
         </macrodef>
@@ -182,7 +215,7 @@ is divided into following sections:
             <attribute name="classpath" default="${debug.classpath}"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java fork="true" classname="@{classname}" dir="${work.dir}">
+                <java fork="true" classname="@{classname}" dir="${work.dir}" jvm="${platform.java}">
                     <jvmarg value="-Xdebug"/>
                     <jvmarg value="-Xnoagent"/>
                     <jvmarg value="-Djava.compiler=none"/>
@@ -205,7 +238,7 @@ is divided into following sections:
             <attribute name="classname" default="${main.class}"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java fork="true" classname="@{classname}" dir="${work.dir}">
+                <java fork="true" classname="@{classname}" dir="${work.dir}" jvm="${platform.java}">
                     <jvmarg line="${run.jvmargs}"/>
                     <classpath>
                         <path path="${run.classpath}"/>
@@ -302,7 +335,7 @@ is divided into following sections:
             <path path="${run.classpath}"/>
             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
         </pathconvert>
-        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+        <echo>${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
     </target>
     <target name="-do-jar-with-libraries" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available">
         <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
@@ -327,7 +360,7 @@ is divided into following sections:
         </copylibs>
         <echo>To run this application from the command line without Ant, try:</echo>
         <property name="dist.jar.resolved" location="${dist.jar}"/>
-        <echo>java -jar "${dist.jar.resolved}"</echo>
+        <echo>${platform.java} -jar "${dist.jar.resolved}"</echo>
     </target>
     <target name="-post-jar">
         <!-- Empty placeholder for easier customization. -->
@@ -390,7 +423,7 @@ is divided into following sections:
     -->
     <target name="-javadoc-build" depends="init">
         <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
+        <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true" executable="${platform.javadoc}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
diff --git a/mozilla/java/plugins/netbeans/nbproject/genfiles.properties b/mozilla/java/plugins/netbeans/nbproject/genfiles.properties
index b5984e6a63f..ae114ba4d0a 100755
--- a/mozilla/java/plugins/netbeans/nbproject/genfiles.properties
+++ b/mozilla/java/plugins/netbeans/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=4cc13411
 build.xml.stylesheet.CRC32=240b97a2
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=88453c61
-nbproject/build-impl.xml.script.CRC32=cc42387b
+nbproject/build-impl.xml.data.CRC32=c09404ce
+nbproject/build-impl.xml.script.CRC32=d63e7ed7
 nbproject/build-impl.xml.stylesheet.CRC32=20b9345e
diff --git a/mozilla/java/plugins/netbeans/nbproject/project.properties b/mozilla/java/plugins/netbeans/nbproject/project.properties
index 65968eb6174..ba8acad7dc2 100755
--- a/mozilla/java/plugins/netbeans/nbproject/project.properties
+++ b/mozilla/java/plugins/netbeans/nbproject/project.properties
@@ -20,11 +20,10 @@ file.reference.examples-EmptyMainClass=../examples/EmptyMainClass
 file.reference.main-java=../examples/simple/src/main/java
 file.reference.main-java-1=../examples/jmf-player/src/main/java
 file.reference.main-java-2=../examples/jmfplayer/src/main/java
-file.reference.pluglet-1_1_a1.jar=../lib/pluglet-1_1_a1.jar
 jar.compress=false
 javac.classpath=\
-    ${file.reference.pluglet-1_1_a1.jar}:\
-    ${libs.JMF.classpath}
+    ${libs.JMF.classpath}:\
+    ${file.reference.pluglet-1_1_a2.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -48,7 +47,7 @@ javadoc.windowtitle=
 main.class=EmptyMainClass
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
+platform.active=Java_HotSpot_TM__Client_VM_1.5.0_11-b03
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
diff --git a/mozilla/java/plugins/netbeans/nbproject/project.xml b/mozilla/java/plugins/netbeans/nbproject/project.xml
index 838ebc5fc8d..4950959195f 100755
--- a/mozilla/java/plugins/netbeans/nbproject/project.xml
+++ b/mozilla/java/plugins/netbeans/nbproject/project.xml
@@ -5,6 +5,7 @@
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
             <name>pluglet</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
+            <explicit-platform explicit-source-supported="true"/>
             <source-roots>
                 <root id="src.EmptyMainClass.dir" name="EmptyMainClass"/>
                 <root id="src.java.dir" name="SimplePluglet"/>
diff --git a/mozilla/java/plugins/release/build.xml b/mozilla/java/plugins/release/build.xml
index 5546093a58a..12b506593e3 100755
--- a/mozilla/java/plugins/release/build.xml
+++ b/mozilla/java/plugins/release/build.xml
@@ -32,8 +32,8 @@
   <property name="name" value="pluglet"/>
   <property name="major.version" value="1" />
   <property name="minor.version" value="1" />
-  <property name="release.version" value="a1" />
-  <property name="release.version.full" value="alpha_1" />
+  <property name="release.version" value="a2" />
+  <property name="release.version.full" value="alpha_2" />
   <property name="version" 
             value="${major.version}_${minor.version}_${release.version}"/>
   <property name="full.version" value="${major.version}_${minor.version}_${release.version.full}"/>
@@ -61,12 +61,12 @@
     <antcall target="compile.all" />
     <antcall target="build.dist.jar" />
     <antcall target="copy.binaries" />
-<!--
-    <antcall target="copy.test.src" />
-    <antcall target="copy.core.src" />
     <antcall target="copy.build.support" />
-    <antcall target="build.javadocs" />
+    <antcall target="copy.test.src" />
     <antcall target="build.zip" />
+<!--
+    <antcall target="copy.core.src" />
+    <antcall target="build.javadocs" />
 -->
   </target>
 
@@ -218,34 +218,17 @@
 
   <target name="copy.test.src" depends="prepare">
 
-    <!-- Populate the netbeans Test Packages -->
-
-    <copy todir="${dist.home}/test/automated/src/main/java">
-      <fileset dir="${source.home}/webclient/test/automated/src/classes">
-        <exclude name="**/*Bookmark*.java" />
-        <exclude name="**/*Preferences*.java" />
-        <exclude name="**/*Profile*.java" />
-      </fileset>
-      <fileset dir="${basedir}/mcp-test/src/test/java">
-        <include name="**/*.java" />
-      </fileset>
-    </copy>
-    <copy todir="${dist.home}/test/automated/src/main/resources">
-      <fileset dir="${source.home}/webclient/test/automated/src/test">
-         <exclude name="*basic*/" />
-      </fileset>
-    </copy>
-
     <!-- Populate the netbeans Source Packages -->
 
-    <copy todir="${dist.home}/test/manual/src/main/java">
-      <fileset dir="${source.home}/webclient/test/manual/src/classes" />
-      <fileset dir="${basedir}/mcp-test/src/main/java">
-        <include name="**/*.java" />
+    <copy todir="${dist.home}">
+      <fileset dir="${basedir}/..">
+        <include name="examples/simple/**/*.*" />
+        <include name="examples/jmfplayer/**/*.*" />
+        <include name="examples/EmptyMainClass/**/*.*" />
+        <include name="examples/index.html" />
       </fileset>
     </copy>
 
-
   </target>
 
   <target name="copy.core.src" depends="prepare">
@@ -275,13 +258,15 @@
 
   <target name="copy.build.support" depends="prepare">
     <copy todir="${dist.home}/netbeans">
-      <fileset dir="${basedir}/netbeans" />
+      <fileset dir="${basedir}/../netbeans" />
     </copy>
+    <copy file="${mozdocdir}/java-plugins/release-notes/${full.version}.html" todir="${dist.home}" />
+    <copy file="${mozdocdir}/java-plugins/release-notes/${full.version}-detail.html" todir="${dist.home}" />
+<!--
     <copy todir="${dist.home}/non-ide">
       <fileset dir="${basedir}/non-ide" />
     </copy>
-    <copy file="${mozdocdir}/webclient/release-notes/${full.version}.html" todir="${dist.home}" />
-    <copy file="${mozdocdir}/webclient/release-notes/${full.version}-detail.html" todir="${dist.home}" />
+-->
   </target>
 
   <target name="build.javadocs" depends="prepare,uptodate"