diff --git a/mozilla/java/plugins/README b/mozilla/java/plugins/README
index d143f1e9554..5de6b7c038c 100644
--- a/mozilla/java/plugins/README
+++ b/mozilla/java/plugins/README
@@ -143,3 +143,62 @@ also remove pluginreg.dat
 in C:\Projects\chaff\pluglet-1-1-a1\
 
 find netbeans -name private -prune -o -type f -exec cp {} "/cygdrive/c/Projects/mozilla/MOZILLA_NIH/FIREFOX_2_0_0_3_RELEASE/mozilla/java/plugins/dist/{}" ;
+
+
+Compiled from "Concat.java"
+public class org.apache.tools.ant.taskdefs.Concat extends org.apache.tools.ant.Task{
+public org.apache.tools.ant.taskdefs.Concat();
+  Signature: ()V
+public void setDestfile(java.io.File);
+  Signature: (Ljava/io/File;)V
+public void setAppend(boolean);
+  Signature: (Z)V
+public void setEncoding(java.lang.String);
+  Signature: (Ljava/lang/String;)V
+public void setOutputEncoding(java.lang.String);
+  Signature: (Ljava/lang/String;)V
+public void setForce(boolean);
+  Signature: (Z)V
+public org.apache.tools.ant.types.Path createPath();
+  Signature: ()Lorg/apache/tools/ant/types/Path;
+public void addFileset(org.apache.tools.ant.types.FileSet);
+  Signature: (Lorg/apache/tools/ant/types/FileSet;)V
+public void addFilelist(org.apache.tools.ant.types.FileList);
+  Signature: (Lorg/apache/tools/ant/types/FileList;)V
+public void addFilterChain(org.apache.tools.ant.types.FilterChain);
+  Signature: (Lorg/apache/tools/ant/types/FilterChain;)V
+public void addText(java.lang.String);
+  Signature: (Ljava/lang/String;)V
+public void addHeader(org.apache.tools.ant.taskdefs.Concat$TextElement);
+  Signature: (Lorg/apache/tools/ant/taskdefs/Concat$TextElement;)V
+public void addFooter(org.apache.tools.ant.taskdefs.Concat$TextElement);
+  Signature: (Lorg/apache/tools/ant/taskdefs/Concat$TextElement;)V
+public void setFixLastLine(boolean);
+  Signature: (Z)V
+public void setEol(org.apache.tools.ant.taskdefs.FixCRLF$CrLf);
+  Signature: (Lorg/apache/tools/ant/taskdefs/FixCRLF$CrLf;)V
+public void setWriter(java.io.Writer);
+  Signature: (Ljava/io/Writer;)V
+public void setBinary(boolean);
+  Signature: (Z)V
+public void execute();
+  Signature: ()V
+public void reset();
+  Signature: ()V
+static org.apache.tools.ant.util.FileUtils access$200();
+  Signature: ()Lorg/apache/tools/ant/util/FileUtils;
+static java.lang.String access$300(org.apache.tools.ant.taskdefs.Concat);
+  Signature: (Lorg/apache/tools/ant/taskdefs/Concat;)Ljava/lang/String;
+static java.util.Vector access$400(org.apache.tools.ant.taskdefs.Concat);
+  Signature: (Lorg/apache/tools/ant/taskdefs/Concat;)Ljava/util/Vector;
+static java.lang.String access$500(org.apache.tools.ant.taskdefs.Concat);
+  Signature: (Lorg/apache/tools/ant/taskdefs/Concat;)Ljava/lang/String;
+static boolean access$600(org.apache.tools.ant.taskdefs.Concat);
+  Signature: (Lorg/apache/tools/ant/taskdefs/Concat;)Z
+static {};
+  Signature: ()V
+}
+
+javap
+C:\PROGRA~1\netbeans-5.5.1>
+
diff --git a/mozilla/java/plugins/dist/build.xml b/mozilla/java/plugins/dist/build.xml
index b1d633d73b4..e25906e951b 100644
--- a/mozilla/java/plugins/dist/build.xml
+++ b/mozilla/java/plugins/dist/build.xml
@@ -282,9 +282,9 @@
 
     <!-- Populate the netbeans Source Packages -->
 
-    <copy todir="${dist.home}/test/manual/src/main/java">
-      <fileset dir="${basedir}/dummy-main/src/main/java">
-        <include name="**/*.java" />
+    <copy todir="${dist.home}/test/manual/src/main">
+      <fileset dir="${basedir}/dummy-main/src/main/">
+        <include name="**/*.*" />
       </fileset>
     </copy>
 
@@ -293,6 +293,11 @@
       </fileset>
     </copy>
 
+    <copy todir="${dist.home}/samples/simple">
+      <fileset dir="${source.home}/examples/simple">
+      </fileset>
+    </copy>
+
     <copy todir="${dist.home}/samples/">
       <fileset dir="${source.home}/examples">
          <include name="index.html" />
diff --git a/mozilla/java/plugins/dist/dummy-main/src/main/resources/plugin-prefs.js b/mozilla/java/plugins/dist/dummy-main/src/main/resources/plugin-prefs.js
new file mode 100644
index 00000000000..446a282929e
--- /dev/null
+++ b/mozilla/java/plugins/dist/dummy-main/src/main/resources/plugin-prefs.js
@@ -0,0 +1,4 @@
+user_pref("plugin.allow_alien_star_handler", true);
+user_pref("plugin.default_plugin_disabled", false);
+user_pref("plugin.override_internal_types", true);
+
diff --git a/mozilla/java/plugins/dist/netbeans/build.xml b/mozilla/java/plugins/dist/netbeans/build.xml
index 5e9b5da406f..3da1230261b 100644
--- a/mozilla/java/plugins/dist/netbeans/build.xml
+++ b/mozilla/java/plugins/dist/netbeans/build.xml
@@ -170,14 +170,16 @@
             <and>
                 <available file="${browser.bin.dir}/${so.prefix}xpcom.${so.extension}" />
                 <available file="${jdkhome.nospaces}/jre/bin/${so.prefix}java.${so.extension}" />
+                <available file="${user.profile.dir}/prefs.js" />
             </and>
         </condition>
 
         <condition property="did.copy.firefox.dat.files">
-          <and>
+          <or>
             <available file="tmp/firefox.dat/components/compreg.dat" />
             <available file="tmp/firefox.dat/components/xpti.dat" />
-          </and>
+            <available file="tmp/firefox.dat/prefs.js" />
+          </or>
         </condition>
         
         <uptodate property="do.copy.binaries">
@@ -200,6 +202,12 @@ to the installation of the JDK, in the pluglet.properties file,
 and that the path to this directory
 has no spaces?  The current value of this property is:
 ${jdkhome.nospaces}.
+
+Have you verified that the property user.profile.dir has been set
+to the fully qualified path to the Firefox profile directory
+in which the file "prefs.js" resides?  The current value of this
+ property is: ${user.profile.dir}.
+
     </fail>
         
     </target>
@@ -222,21 +230,34 @@ ${jdkhome.nospaces}.
             <include name="**/compreg.dat" />
             <include name="**/xpti.dat" />
           </fileset>
+          <fileset dir="${user.profile.dir}">
+            <include name="prefs.js" />
+          </fileset>
         </copy>
+        <concat destfile="${user.profile.dir}/prefs.js" append="true">
+          <fileset dir="../test/manual/src/main/resources">
+            <include name="plugin-prefs.js" />
+          </fileset>
+        </concat>
     </target>
 
     <target name="restore.firefox.dat.files" if="did.copy.firefox.dat.files">
-        <copy todir="${browser.bin.dir}">
+        <copy overwrite="true" todir="${browser.bin.dir}">
           <fileset dir="tmp/firefox.dat">
             <include name="**/compreg.dat" />
             <include name="**/xpti.dat" />
           </fileset>
         </copy>
+        <copy overwrite="true" todir="${user.profile.dir}">
+          <fileset dir="tmp/firefox.dat">
+            <include name="prefs.js" />
+          </fileset>
+        </copy>
     </target>
 
 
 
-    <target name="-post-clean">
+    <target name="-post-clean" depends="-pre-init">
         <delete>
             <fileset dir="${browser.bin.dir}" 
                      includes="${bin.artifacts.pattern}"/>
@@ -256,6 +277,7 @@ ${jdkhome.nospaces}.
         </delete>
         
         <antcall target="restore.firefox.dat.files" />
+        <delete dir="tmp/firefox.dat" />
     </target>
 
     <target name="run" depends="-init-check,-pre-init,-post-init">
@@ -298,6 +320,24 @@ ${jdkhome.nospaces}.
 
       <exec os="Windows XP" dir="${browser.bin.dir}" executable="firefox" 
 		       failonerror="yes">
+        <env key="PATH" 
+             path="${jdkhome.nospaces}/jre/bin/client"
+        />
+        <env key="Path" 
+             path="${jdkhome.nospaces}/jre/bin/client"
+        />
+        <env key="path" 
+             path="${jdkhome.nospaces}/jre/bin/client"
+        />
+        <env key="CLASSPATH" 
+             path="${run.classpath}" 
+        />
+        <env key="NSPR_LOG_MODULES"
+             value="sync,nppluglet:5,pluglets:5"
+        />
+        <env key="NSPR_LOG_FILE"
+             value="${basedir}/${build.dir}/logfile.txt"
+        />
         <arg value="file://${basedir}/../samples/index.html" />
       </exec>
 
@@ -305,7 +345,6 @@ ${jdkhome.nospaces}.
 
     <target name="-post-compile">
         <!-- SimplePluglet -->
-<!--
         <jar jarfile="${build.dir}/SimplePluglet.jar">
             <manifest>
                 <attribute name="MIMEDescription" value="application/x-simple-pluglet"/>
@@ -323,7 +362,6 @@ ${jdkhome.nospaces}.
         <copy todir="${browser.bin.dir}/plugins" 
                         file="${build.dir}/SimplePluglet.jar" />
 
--->
                         
         <!-- JMFPlayer -->
         <jar jarfile="${build.dir}/jmfplayer.jar">
@@ -358,4 +396,24 @@ ${jdkhome.nospaces}.
 
     </target>
 
+    <target name="-init-macrodef-javac">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute name="srcdir" default="${src.java2.dir}:${src.java4.dir}"/>
+            <attribute name="destdir" default="${build.classes.dir}"/>
+            <attribute name="classpath" default="${javac.classpath}"/>
+            <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">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+
+
 </project>
diff --git a/mozilla/java/plugins/dist/netbeans/nbproject/build-impl.xml b/mozilla/java/plugins/dist/netbeans/nbproject/build-impl.xml
index aa4e1bc94cd..a1dd44d2b6a 100644
--- a/mozilla/java/plugins/dist/netbeans/nbproject/build-impl.xml
+++ b/mozilla/java/plugins/dist/netbeans/nbproject/build-impl.xml
@@ -65,8 +65,10 @@ is divided into following sections:
         </condition>
         <condition property="have.sources">
             <or>
+                <available file="${src.java3.dir}"/>
+                <available file="${src.java4.dir}"/>
+                <available file="${src.java2.dir}"/>
                 <available file="${src.java.dir}"/>
-                <available file="${src.java1.dir}"/>
             </or>
         </condition>
         <condition property="netbeans.home+have.tests">
@@ -94,8 +96,10 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init">
+        <fail unless="src.java3.dir">Must set src.java3.dir</fail>
+        <fail unless="src.java4.dir">Must set src.java4.dir</fail>
+        <fail unless="src.java2.dir">Must set src.java2.dir</fail>
         <fail unless="src.java.dir">Must set src.java.dir</fail>
-        <fail unless="src.java1.dir">Must set src.java1.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
         <fail unless="dist.dir">Must set dist.dir</fail>
         <fail unless="build.classes.dir">Must set build.classes.dir</fail>
@@ -116,7 +120,7 @@ is divided into following sections:
     </target>
     <target name="-init-macrodef-javac">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute name="srcdir" default="${src.java.dir}:${src.java1.dir}"/>
+            <attribute name="srcdir" default="${src.java3.dir}:${src.java4.dir}:${src.java2.dir}:${src.java.dir}"/>
             <attribute name="destdir" default="${build.classes.dir}"/>
             <attribute name="classpath" default="${javac.classpath}"/>
             <attribute name="debug" default="${javac.debug}"/>
@@ -241,8 +245,10 @@ is divided into following sections:
     <target name="-do-compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources">
         <j2seproject3:javac/>
         <copy todir="${build.classes.dir}">
+            <fileset dir="${src.java3.dir}" excludes="${build.classes.excludes}"/>
+            <fileset dir="${src.java4.dir}" excludes="${build.classes.excludes}"/>
+            <fileset dir="${src.java2.dir}" excludes="${build.classes.excludes}"/>
             <fileset dir="${src.java.dir}" excludes="${build.classes.excludes}"/>
-            <fileset dir="${src.java1.dir}" excludes="${build.classes.excludes}"/>
         </copy>
     </target>
     <target name="-post-compile">
@@ -392,10 +398,18 @@ is divided into following sections:
                 <path path="${javac.classpath}"/>
             </classpath>
             <sourcepath>
+                <pathelement location="${src.java3.dir}"/>
+                <pathelement location="${src.java4.dir}"/>
+                <pathelement location="${src.java2.dir}"/>
                 <pathelement location="${src.java.dir}"/>
-                <pathelement location="${src.java1.dir}"/>
             </sourcepath>
+            <packageset dir="${src.java3.dir}" includes="*/**"/>
+            <packageset dir="${src.java4.dir}" includes="*/**"/>
+            <packageset dir="${src.java2.dir}" includes="*/**"/>
             <packageset dir="${src.java.dir}" includes="*/**"/>
+            <fileset dir="${src.java3.dir}" includes="*.java"/>
+            <fileset dir="${src.java4.dir}" includes="*.java"/>
+            <fileset dir="${src.java2.dir}" includes="*.java"/>
             <fileset dir="${src.java.dir}" includes="*.java"/>
         </javadoc>
     </target>
diff --git a/mozilla/java/plugins/dist/netbeans/nbproject/genfiles.properties b/mozilla/java/plugins/dist/netbeans/nbproject/genfiles.properties
index f759bd20df0..d5c43ee1b02 100644
--- a/mozilla/java/plugins/dist/netbeans/nbproject/genfiles.properties
+++ b/mozilla/java/plugins/dist/netbeans/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=2166795e
 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=67c232e0
-nbproject/build-impl.xml.script.CRC32=91a68d9b
+nbproject/build-impl.xml.data.CRC32=d4798e9a
+nbproject/build-impl.xml.script.CRC32=ba079247
 nbproject/build-impl.xml.stylesheet.CRC32=65d7ca21
diff --git a/mozilla/java/plugins/dist/netbeans/nbproject/project.properties b/mozilla/java/plugins/dist/netbeans/nbproject/project.properties
index cb15885c8ef..1ab4adaffe0 100644
--- a/mozilla/java/plugins/dist/netbeans/nbproject/project.properties
+++ b/mozilla/java/plugins/dist/netbeans/nbproject/project.properties
@@ -19,6 +19,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
 file.reference.main-java=../test/manual/src/main/java
 file.reference.main-java-1=../samples/jmfplayer/src/main/java
 file.reference.main-java-2=../src/main/java
+file.reference.main-java-3=../samples/simple/src/main/java
 file.reference.pluglet-1_1_a1.jar=../lib/pluglet-1_1_a1.jar
 jar.compress=false
 javac.classpath=\
@@ -47,11 +48,13 @@ javadoc.windowtitle=
 # Property libs.JMF.classpath is set here just to make sharing of project simpler.
 # The library definition has always preference over this property.
 libs.JMF.classpath=../../../../JMF2.1.1e/lib/jmf.jar
+main.class=pluglet.Pluglet
 meta.inf.dir=${src.dir}/META-INF
 platform.active=default_platform
 run.classpath=\
     ${javac.classpath}:\
-    ${build.classes.dir}
+    ${build.classes.dir}:\
+    ${libs.JMF.classpath}
 # Space-separated list of JVM arguments used when running the project
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
 # or test-sys-prop.name=value to set system properties for unit tests):
@@ -61,4 +64,6 @@ run.test.classpath=\
     ${build.test.classes.dir}
 src.dir=${file.reference.main-java}
 src.java.dir=${file.reference.main-java}
-src.java1.dir=${file.reference.main-java-1}
+src.java2.dir=${file.reference.main-java-1}
+src.java3.dir=${file.reference.main-java-2}
+src.java4.dir=${file.reference.main-java-3}
diff --git a/mozilla/java/plugins/dist/netbeans/nbproject/project.xml b/mozilla/java/plugins/dist/netbeans/nbproject/project.xml
index e944e784b0b..e2b1086e20d 100644
--- a/mozilla/java/plugins/dist/netbeans/nbproject/project.xml
+++ b/mozilla/java/plugins/dist/netbeans/nbproject/project.xml
@@ -6,9 +6,10 @@
             <name>pluglet</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <source-roots>
-                <root id="src.java3.dir" name="dummy-main"/>
+                <root id="src.java3.dir" name="Core Sources"/>
+                <root id="src.java4.dir" name="simple-sample"/>
                 <root id="src.java2.dir" name="jmfplayer sample"/>
-                <root id="src.java.dir" name="Core Sources"/>
+                <root id="src.java.dir" name="dummy-main"/>
             </source-roots>
             <test-roots/>
         </data>
diff --git a/mozilla/java/plugins/dist/netbeans/pluglet.properties b/mozilla/java/plugins/dist/netbeans/pluglet.properties
index 06c9274c67b..797132c58e0 100644
--- a/mozilla/java/plugins/dist/netbeans/pluglet.properties
+++ b/mozilla/java/plugins/dist/netbeans/pluglet.properties
@@ -3,5 +3,6 @@ bin.artifacts.pattern=${so.prefix}plugletjni.${so.extension},components/${so.pre
 
 #Make this point to the bin directory of your firefox installation
 browser.bin.dir=C:\\Projects\\mozilla\\MOZILLA_NIH\\FIREFOX_2_0_0_3_RELEASE\\mozilla\\firefox-win32_d.obj\\dist\\bin
+user.profile.dir=${user.home}/APPLIC~1/Mozilla/Firefox/Profiles/2t6hklzc.default
 #Make this point at your JDKHOME without spaces
 jdkhome.nospaces=C:\\PROGRA~1\\Java\\jdk1.5.0_12