From a4958803924b5bd2120d4e74527ac232643df519 Mon Sep 17 00:00:00 2001
From: "edburns%acm.org" <edburns%acm.org>
Date: Mon, 10 Sep 2007 20:02:32 +0000
Subject: [PATCH] resolve_dependencies

---
 java/plugins/dist/netbeans/nbproject/build-impl.xml  |  8 +-------
 .../dist/netbeans/nbproject/genfiles.properties      |  6 +++---
 .../dist/netbeans/nbproject/project.properties       | 12 +++++++-----
 java/plugins/dist/netbeans/nbproject/project.xml     |  5 ++---
 java/plugins/dist/netbeans/pluglet.properties        |  6 +++---
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/java/plugins/dist/netbeans/nbproject/build-impl.xml b/java/plugins/dist/netbeans/nbproject/build-impl.xml
index 3f886f147d4..72ac158fc53 100644
--- a/java/plugins/dist/netbeans/nbproject/build-impl.xml
+++ b/java/plugins/dist/netbeans/nbproject/build-impl.xml
@@ -95,7 +95,6 @@ is divided into following sections:
         </condition>
         <condition property="have.sources">
             <or>
-                <available file="${src.EmptyMainClass.dir}"/>
                 <available file="${src.java.dir}"/>
                 <available file="${src.java2.dir}"/>
             </or>
@@ -125,7 +124,6 @@ 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.EmptyMainClass.dir">Must set src.EmptyMainClass.dir</fail>
         <fail unless="src.java.dir">Must set src.java.dir</fail>
         <fail unless="src.java2.dir">Must set src.java2.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
@@ -148,7 +146,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.EmptyMainClass.dir}:${src.java.dir}:${src.java2.dir}"/>
+            <attribute name="srcdir" default="${src.java.dir}:${src.java2.dir}"/>
             <attribute name="destdir" default="${build.classes.dir}"/>
             <attribute name="classpath" default="${javac.classpath}"/>
             <attribute name="debug" default="${javac.debug}"/>
@@ -276,7 +274,6 @@ 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.EmptyMainClass.dir}" excludes="${build.classes.excludes}"/>
             <fileset dir="${src.java.dir}" excludes="${build.classes.excludes}"/>
             <fileset dir="${src.java2.dir}" excludes="${build.classes.excludes}"/>
         </copy>
@@ -428,14 +425,11 @@ is divided into following sections:
                 <path path="${javac.classpath}"/>
             </classpath>
             <sourcepath>
-                <pathelement location="${src.EmptyMainClass.dir}"/>
                 <pathelement location="${src.java.dir}"/>
                 <pathelement location="${src.java2.dir}"/>
             </sourcepath>
-            <packageset dir="${src.EmptyMainClass.dir}" includes="*/**"/>
             <packageset dir="${src.java.dir}" includes="*/**"/>
             <packageset dir="${src.java2.dir}" includes="*/**"/>
-            <fileset dir="${src.EmptyMainClass.dir}" includes="*.java"/>
             <fileset dir="${src.java.dir}" includes="*.java"/>
             <fileset dir="${src.java2.dir}" includes="*.java"/>
         </javadoc>
diff --git a/java/plugins/dist/netbeans/nbproject/genfiles.properties b/java/plugins/dist/netbeans/nbproject/genfiles.properties
index ae114ba4d0a..870a263555a 100644
--- a/java/plugins/dist/netbeans/nbproject/genfiles.properties
+++ b/java/plugins/dist/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=c09404ce
-nbproject/build-impl.xml.script.CRC32=d63e7ed7
-nbproject/build-impl.xml.stylesheet.CRC32=20b9345e
+nbproject/build-impl.xml.data.CRC32=f51cc540
+nbproject/build-impl.xml.script.CRC32=d0159abd
+nbproject/build-impl.xml.stylesheet.CRC32=65d7ca21
diff --git a/java/plugins/dist/netbeans/nbproject/project.properties b/java/plugins/dist/netbeans/nbproject/project.properties
index ba8acad7dc2..73129e0a7ba 100644
--- a/java/plugins/dist/netbeans/nbproject/project.properties
+++ b/java/plugins/dist/netbeans/nbproject/project.properties
@@ -20,10 +20,13 @@ 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.main-java-3=../samples/jmfplayer/src/main/java
+file.reference.main-java-4=../src/main/java
+file.reference.pluglet-1_1_a1.jar=../lib/pluglet-1_1_a1.jar
 jar.compress=false
 javac.classpath=\
     ${libs.JMF.classpath}:\
-    ${file.reference.pluglet-1_1_a2.jar}
+    ${file.reference.pluglet-1_1_a1.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -47,7 +50,7 @@ javadoc.windowtitle=
 main.class=EmptyMainClass
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
-platform.active=Java_HotSpot_TM__Client_VM_1.5.0_11-b03
+platform.active=Java_HotSpot_TM__Client_VM_1.5.0_12-b04
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
@@ -58,6 +61,5 @@ run.jvmargs=
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
-src.EmptyMainClass.dir=${file.reference.examples-EmptyMainClass}
-src.java.dir=${file.reference.main-java}
-src.java2.dir=${file.reference.main-java-2}
+src.java.dir=${file.reference.main-java-3}
+src.java2.dir=${file.reference.main-java-4}
diff --git a/java/plugins/dist/netbeans/nbproject/project.xml b/java/plugins/dist/netbeans/nbproject/project.xml
index 4950959195f..81d4efb9487 100644
--- a/java/plugins/dist/netbeans/nbproject/project.xml
+++ b/java/plugins/dist/netbeans/nbproject/project.xml
@@ -7,9 +7,8 @@
             <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"/>
-                <root id="src.java2.dir" name="jmfplayer"/>
+                <root id="src.java.dir" name="jmfplayer sample"/>
+                <root id="src.java2.dir" name="Core Sources"/>
             </source-roots>
             <test-roots/>
         </data>
diff --git a/java/plugins/dist/netbeans/pluglet.properties b/java/plugins/dist/netbeans/pluglet.properties
index 6cc9955a1a6..1c84859695f 100644
--- a/java/plugins/dist/netbeans/pluglet.properties
+++ b/java/plugins/dist/netbeans/pluglet.properties
@@ -1,7 +1,7 @@
 bin.artifacts.pattern=${so.prefix}plugletjni.${so.extension},components/${so.prefix}pluglet.${so.extension},components/pluglet.xpt,plugins/np${so.prefix}pluglet.${so.extension},plugins/SimplePluglet.jar,plugins/jmfplayer.jar
 #debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=y
 
-#Make this point to the bin directory of your XULRUNNER installation
-browser.bin.dir=C:\\Projects\\chaff\\pluglet-1-1-alpha-1\\ff1509
+#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
 #Make this point at your JDKHOME without spaces
-jdkhome.nospaces=C:\\PROGRA~1\\Java\\jdk1.6.0
+jdkhome.nospaces=C:\\PROGRA~1\\Java\\jdk1.6.0_01