--- old/make/netbeans/common/closed-share-view.ent	2011-08-02 17:05:32.000000000 -0700
+++ new/make/netbeans/common/closed-share-view.ent	2011-08-02 17:05:32.000000000 -0700
@@ -31,8 +31,8 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<source-folder style="packages">
-    <label>Closed-Source Packages</label>
+<source-folder style="tree">
+    <label>Closed Sources</label>
     <location>${root}/src/closed/share/classes</location>
     <includes>${includes}</includes>
     <excludes>${excludes}</excludes>
--- old/make/netbeans/common/java-data-native.ent	2011-08-02 17:05:34.000000000 -0700
+++ new/make/netbeans/common/java-data-native.ent	2011-08-02 17:05:34.000000000 -0700
@@ -41,4 +41,9 @@
         <javadoc-built-to>${root}/build/javadoc/${name}</javadoc-built-to>
         <source-level>1.7</source-level>
     </compilation-unit>
+    <compilation-unit>
+        <package-root>${root}/test</package-root>
+        <unit-tests/>
+        <source-level>1.7</source-level>
+    </compilation-unit>
 </java-data>
--- old/make/netbeans/common/java-data-no-native.ent	2011-08-02 17:05:36.000000000 -0700
+++ new/make/netbeans/common/java-data-no-native.ent	2011-08-02 17:05:36.000000000 -0700
@@ -39,4 +39,9 @@
         <javadoc-built-to>${root}/build/javadoc/${name}</javadoc-built-to>
         <source-level>1.7</source-level>
     </compilation-unit>
+    <compilation-unit>
+        <package-root>${root}/test</package-root>
+        <unit-tests/>
+        <source-level>1.7</source-level>
+    </compilation-unit>
 </java-data>
--- old/make/netbeans/common/jtreg-view.ent	2011-08-02 17:05:38.000000000 -0700
+++ new/make/netbeans/common/jtreg-view.ent	2011-08-02 17:05:37.000000000 -0700
@@ -31,7 +31,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<source-folder style="packages">
+<source-folder style="tree">
     <label>Tests</label>
     <location>${root}/test</location>
     <includes>${jtreg.tests}</includes>
--- old/make/netbeans/common/sample-view.ent	2011-08-02 17:05:40.000000000 -0700
+++ new/make/netbeans/common/sample-view.ent	2011-08-02 17:05:39.000000000 -0700
@@ -31,7 +31,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<source-folder style="packages">
+<source-folder style="tree">
     <label>Samples</label>
     <location>${root}/src/share/sample</location>
     <includes>${samples}</includes>
--- old/make/netbeans/common/share-view.ent	2011-08-02 17:05:42.000000000 -0700
+++ new/make/netbeans/common/share-view.ent	2011-08-02 17:05:41.000000000 -0700
@@ -31,7 +31,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<source-folder style="packages">
+<source-folder style="tree">
     <label>Sources for All Platforms</label>
     <location>${root}/src/share/classes</location>
     <includes>${includes}</includes>
--- old/make/netbeans/common/unix-view.ent	2011-08-02 17:05:44.000000000 -0700
+++ new/make/netbeans/common/unix-view.ent	2011-08-02 17:05:43.000000000 -0700
@@ -35,7 +35,7 @@
   UNIX is a registered trademark in the United States and other countries,
   exclusively licensed through X/Open Company, Ltd.
 -->
-<source-folder style="packages">
+<source-folder style="tree">
     <label>Sources for Unix® Platform</label>
     <location>${root}/src/solaris/classes</location>
     <includes>${includes}</includes>
--- old/make/netbeans/common/windows-view.ent	2011-08-02 17:05:46.000000000 -0700
+++ new/make/netbeans/common/windows-view.ent	2011-08-02 17:05:45.000000000 -0700
@@ -31,7 +31,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<source-folder style="packages">
+<source-folder style="tree">
     <label>Sources for Windows Platform</label>
     <location>${root}/src/windows/classes</location>
     <includes>${includes}</includes>
--- old/make/netbeans/j2se/nbproject/project.xml	2011-08-02 17:05:48.000000000 -0700
+++ new/make/netbeans/j2se/nbproject/project.xml	2011-08-02 17:05:47.000000000 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -36,11 +36,13 @@
     <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
     <!ENTITY unix-sources SYSTEM "../../common/unix-sources.ent">
     <!ENTITY windows-sources SYSTEM "../../common/windows-sources.ent">
+    <!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
     <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
     <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
     <!ENTITY share-view SYSTEM "../../common/share-view.ent">
     <!ENTITY unix-view SYSTEM "../../common/unix-view.ent">
     <!ENTITY windows-view SYSTEM "../../common/windows-view.ent">
+    <!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
     <!ENTITY file-view SYSTEM "../../common/file-view.ent">
     <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
     <!ENTITY java-data-native SYSTEM "../../common/java-data-native.ent">
@@ -59,6 +61,7 @@
                 &unix-sources;
                 &windows-sources;
                 &build-folder;
+		&jtreg-sources;
             </folders>
             <ide-actions>
                 <action name="build">
@@ -82,6 +85,7 @@
                     &share-view;
                     &unix-view;
                     &windows-view;
+                    &jtreg-view;
                     &file-view;
                 </items>
                 <context-menu>