--- a/nashorn/make/nbproject/ide-targets.xml	Tue Dec 16 17:02:54 2014 +0100
+++ b/nashorn/make/nbproject/ide-targets.xml	Wed Dec 17 17:15:14 2014 +0530
@@ -32,9 +32,8 @@
         </nbjpdastart>
         <java classname="jdk.nashorn.tools.Shell" classpath="${run.test.classpath}" dir="samples" fork="true">
 	    <jvmarg line="-Dnashorn.optimistic"/>
-            <jvmarg line="${ext.class.path}"/> 
+            <jvmarg line="${boot.class.path}"/> 
             <jvmarg line="${run.test.jvmargs}"/>
-            <arg value="../samples/test.js"/>
             <jvmarg value="-Xdebug"/>
             <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
         </java>

--- a/nashorn/make/nbproject/project.xml	Tue Dec 16 17:02:54 2014 +0100
+++ b/nashorn/make/nbproject/project.xml	Wed Dec 17 17:15:14 2014 +0530
@@ -38,10 +38,6 @@
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
-                    <label>../src</label>
-                    <location>../src</location>
-                </source-folder>
-                <source-folder>
                     <label>../test/src</label>
                     <location>../test/src</location>
                 </source-folder>
@@ -50,21 +46,25 @@
                     <location>../buildtools/nasgen/src</location>
                 </source-folder>
                 <source-folder>
+                    <label>../src/jdk.scripting.nashorn/share/classes</label>
+                    <location>../src/jdk.scripting.nashorn/share/classes</location>
+                </source-folder>
+                <source-folder>
                     <label>../test/src</label>
                     <type>java</type>
                     <location>../test/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
-                    <label>../src</label>
+                    <label>../buildtools/nasgen/src</label>
                     <type>java</type>
-                    <location>../src</location>
+                    <location>../buildtools/nasgen/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
-                    <label>../buildtools/nasgen/src</label>
+                    <label>../src/jdk.scripting.nashorn/share/classes</label>
                     <type>java</type>
-                    <location>../buildtools/nasgen/src</location>
+                    <location>../src/jdk.scripting.nashorn/share/classes</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
             </folders>
@@ -132,12 +132,12 @@
                         <location>../test/src</location>
                     </source-folder>
                     <source-folder style="packages">
-                        <label>../src</label>
-                        <location>../src</location>
+                        <label>../buildtools/nasgen/src</label>
+                        <location>../buildtools/nasgen/src</location>
                     </source-folder>
                     <source-folder style="packages">
-                        <label>../buildtools/nasgen/src</label>
-                        <location>../buildtools/nasgen/src</location>
+                        <label>../src/jdk.scripting.nashorn/share/classes</label>
+                        <location>../src/jdk.scripting.nashorn/share/classes</location>
                     </source-folder>
                     <source-file>
                         <location>build.xml</location>
@@ -159,11 +159,7 @@
             <compilation-unit>
                 <package-root>../test/src</package-root>
                 <unit-tests/>
-                <classpath mode="compile">../test/lib/testng.jar:../build/classes:../src</classpath>
-                <source-level>1.7</source-level>
-            </compilation-unit>
-            <compilation-unit>
-                <package-root>../src</package-root>
+                <classpath mode="compile">../test/lib/testng.jar:../build/classes:../src/jdk.scripting.nashorn/share/classes</classpath>
                 <source-level>1.7</source-level>
             </compilation-unit>
             <compilation-unit>
@@ -171,6 +167,10 @@
                 <classpath mode="compile">../build/classes:../src</classpath>
                 <source-level>1.7</source-level>
             </compilation-unit>
+            <compilation-unit>
+                <package-root>../src/jdk.scripting.nashorn/share/classes</package-root>
+                <source-level>1.7</source-level>
+            </compilation-unit>
         </java-data>
     </configuration>
 </project>