# HG changeset patch
# User Jesse Glick <jglick@netbeans.org>
# Date 1300915062 14400
# Node ID cf80c1d5c3ea776c5481b6bd16a6063035a7a4a3
# Parent  c85dcf71e4243c978b3fd9358bdb766489492843
Really making tests compilable.

diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.dataconnectivity/nbproject/genfiles.properties
--- a/visualweb.dataconnectivity/nbproject/genfiles.properties	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.dataconnectivity/nbproject/genfiles.properties	Wed Mar 23 17:17:42 2011 -0400
@@ -1,5 +1,5 @@
 # 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=0f11031e
+nbproject/build-impl.xml.data.CRC32=64f87e9d
 nbproject/build-impl.xml.script.CRC32=1fddeb1c
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.dataconnectivity/nbproject/project.xml
--- a/visualweb.dataconnectivity/nbproject/project.xml	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.dataconnectivity/nbproject/project.xml	Wed Mar 23 17:17:42 2011 -0400
@@ -349,9 +349,13 @@
                 <test-type>
                     <name>unit</name>
                     <test-dependency>
-                        <code-name-base>org.openide.util</code-name-base>
+                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
                         <compile-dependency/>
-                        <test/>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+                        <recursive/>
+                        <compile-dependency/>
                     </test-dependency>
                 </test-type>
             </test-dependencies>
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/MockOpenProjectsTrampoline.java
--- a/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/MockOpenProjectsTrampoline.java	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/MockOpenProjectsTrampoline.java	Wed Mar 23 17:17:42 2011 -0400
@@ -114,4 +114,8 @@
     public Future<Project[]> openProjectsAPI() {
         throw new UnsupportedOperationException("Not supported yet.");
     }
+    @Override
+    public void openAPI(Project[] prjcts, boolean bln, boolean bln1) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
 }
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/SetupProject.java
--- a/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/SetupProject.java	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/SetupProject.java	Wed Mar 23 17:17:42 2011 -0400
@@ -55,6 +55,7 @@
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectManager;
 import org.netbeans.api.project.ui.OpenProjects;
+import org.netbeans.junit.MockServices;
 import org.openide.filesystems.FileLock;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
@@ -63,12 +64,6 @@
 import org.openide.util.Lookup;
 import org.openide.util.LookupEvent;
 import org.openide.util.LookupListener;
-import org.openide.loaders.DataLoader;
-import org.openide.loaders.DataLoaderPool;
-import org.openide.util.Lookup;
-import org.openide.util.LookupEvent;
-import org.openide.util.LookupListener;
-import org.openide.util.test.MockLookup;
 
 /**
  *
@@ -100,9 +95,7 @@
             throw new IOException("FileObject for project directory not valid");
         }
         
-        MockLookup.init();
-        DataLoaderPool pool = new SetupProject.DefaultPool();
-        MockLookup.setInstances(pool);
+        MockServices.setServices(SetupProject.DefaultPool.class);
         FileObject testApp = destFileObj.getFileObject("VWJavaEE5");
         System.out.println("Children of VWJavaEE5:" + Arrays.toString(testApp.getChildren()));
                 
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.dataprovider/nbproject/genfiles.properties
--- a/visualweb.dataprovider/nbproject/genfiles.properties	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.dataprovider/nbproject/genfiles.properties	Wed Mar 23 17:17:42 2011 -0400
@@ -1,5 +1,5 @@
 # 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=0c3be57b
+nbproject/build-impl.xml.data.CRC32=b2304c2c
 nbproject/build-impl.xml.script.CRC32=51f08b07
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.dataprovider/nbproject/project.xml
--- a/visualweb.dataprovider/nbproject/project.xml	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.dataprovider/nbproject/project.xml	Wed Mar 23 17:17:42 2011 -0400
@@ -64,25 +64,29 @@
                 <test-type>
                     <name>qa-functional</name>
                     <test-dependency>
-                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
-                        <recursive/>
+                        <code-name-base>org.netbeans.libs.httpunit</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
                         <compile-dependency/>
                     </test-dependency>
                     <test-dependency>
                         <code-name-base>org.netbeans.modules.visualweb.gravy</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.jellytools.platform</code-name-base>
+                        <recursive/>
                         <compile-dependency/>
                     </test-dependency>
                 </test-type>
                 <test-type>
                     <name>unit</name>
                     <test-dependency>
-                        <code-name-base>org.openide.util</code-name-base>
+                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
                         <compile-dependency/>
-                        <test/>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+                        <recursive/>
+                        <compile-dependency/>
                     </test-dependency>
                 </test-type>
             </test-dependencies>
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.designer.decoration/nbproject/genfiles.properties
--- a/visualweb.designer.decoration/nbproject/genfiles.properties	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.designer.decoration/nbproject/genfiles.properties	Wed Mar 23 17:17:42 2011 -0400
@@ -1,5 +1,5 @@
 # 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=b9d703eb
+nbproject/build-impl.xml.data.CRC32=b95774a9
 nbproject/build-impl.xml.script.CRC32=3ca92162
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.designer/nbproject/genfiles.properties
--- a/visualweb.designer/nbproject/genfiles.properties	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.designer/nbproject/genfiles.properties	Wed Mar 23 17:17:42 2011 -0400
@@ -1,5 +1,5 @@
 # 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=a267fa7b
+nbproject/build-impl.xml.data.CRC32=551a6433
 nbproject/build-impl.xml.script.CRC32=0c7fb42e
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.designer/nbproject/project.xml
--- a/visualweb.designer/nbproject/project.xml	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.designer/nbproject/project.xml	Wed Mar 23 17:17:42 2011 -0400
@@ -195,6 +195,15 @@
             <test-dependencies>
                 <test-type>
                     <name>unit</name>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+                        <recursive/>
+                        <compile-dependency/>
+                    </test-dependency>
                 </test-type>
             </test-dependencies>
             <friend-packages>
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.jsfsupport.components/nbproject/genfiles.properties
--- a/visualweb.jsfsupport.components/nbproject/genfiles.properties	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.jsfsupport.components/nbproject/genfiles.properties	Wed Mar 23 17:17:42 2011 -0400
@@ -1,5 +1,5 @@
 # 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=2799a99e
+nbproject/build-impl.xml.data.CRC32=6c464b73
 nbproject/build-impl.xml.script.CRC32=0375fe76
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.jsfsupport.components/nbproject/project.xml
--- a/visualweb.jsfsupport.components/nbproject/project.xml	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.jsfsupport.components/nbproject/project.xml	Wed Mar 23 17:17:42 2011 -0400
@@ -94,6 +94,20 @@
                     </run-dependency>
                 </dependency>
             </module-dependencies>
+            <test-dependencies>
+                <test-type>
+                    <name>unit</name>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+                        <recursive/>
+                        <compile-dependency/>
+                    </test-dependency>
+                </test-type>
+            </test-dependencies>
             <friend-packages>
                 <friend>org.netbeans.modules.visualweb.complib</friend>
                 <friend>org.netbeans.modules.visualweb.j2ee14classloaderprovider</friend>
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.navigation/nbproject/genfiles.properties
--- a/visualweb.navigation/nbproject/genfiles.properties	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.navigation/nbproject/genfiles.properties	Wed Mar 23 17:17:42 2011 -0400
@@ -1,5 +1,5 @@
 # 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=f2edbf98
+nbproject/build-impl.xml.data.CRC32=0815b7b8
 nbproject/build-impl.xml.script.CRC32=a39ce1cc
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.navigation/nbproject/project.xml
--- a/visualweb.navigation/nbproject/project.xml	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.navigation/nbproject/project.xml	Wed Mar 23 17:17:42 2011 -0400
@@ -207,40 +207,30 @@
                 <test-type>
                     <name>unit</name>
                     <test-dependency>
-                        <code-name-base>org.netbeans.modules.web.project</code-name-base>
-                        <recursive/>
+                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
                         <compile-dependency/>
                     </test-dependency>
                     <test-dependency>
-                        <code-name-base>org.openide.util</code-name-base>
-                        <compile-dependency/>
-                        <test/>
-                    </test-dependency>
-                    <!--
-        <test-dependency>
-            <code-name-base>org.netbeans.modules.projectapi</code-name-base>
-            <compile-dependency/>
-            <test/>
-        </test-dependency>
-        -->
-                    <test-dependency>
-                        <code-name-base>org.openide.loaders</code-name-base>
-                        <compile-dependency/>
-                        <test/>
+                        <code-name-base>org.netbeans.libs.xerces</code-name-base>
                     </test-dependency>
                     <test-dependency>
-                        <code-name-base>org.netbeans.modules.web.jsf.navigation</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.web.jsf</code-name-base>
+                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+                        <recursive/>
                         <compile-dependency/>
                     </test-dependency>
                     <test-dependency>
                         <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
                         <compile-dependency/>
                     </test-dependency>
-                    <!-- INSYNC DEPENDENCIES -->
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.servletjspapi</code-name-base>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.visualweb.classloaderprovider</code-name-base>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.visualweb.extension.openide</code-name-base>
+                    </test-dependency>
                     <test-dependency>
                         <code-name-base>org.netbeans.modules.visualweb.insync</code-name-base>
                         <compile-dependency/>
@@ -250,32 +240,35 @@
                         <compile-dependency/>
                     </test-dependency>
                     <test-dependency>
-                        <code-name-base>org.netbeans.modules.visualweb.classloaderprovider</code-name-base>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.visualweb.extension.openide</code-name-base>
-                    </test-dependency>
-                    <test-dependency>
                         <code-name-base>org.netbeans.modules.visualweb.jsfsupport</code-name-base>
                         <recursive/>
                     </test-dependency>
                     <test-dependency>
-                        <code-name-base>org.netbeans.modules.servletjspapi</code-name-base>
+                        <code-name-base>org.netbeans.modules.web.jsf</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.web.jsf.navigation</code-name-base>
+                        <compile-dependency/>
                     </test-dependency>
                     <test-dependency>
                         <code-name-base>org.netbeans.modules.web.jsf12</code-name-base>
                     </test-dependency>
                     <test-dependency>
-                        <code-name-base>org.netbeans.libs.xerces</code-name-base>
-                    </test-dependency>
-                    <!--
-                    <test-dependency>                        
-                        <code-name-base>org.netbeans.modules.visualweb.libs.portletapi</code-name-base>
+                        <code-name-base>org.netbeans.modules.web.project</code-name-base>
+                        <recursive/>
+                        <compile-dependency/>
                     </test-dependency>
                     <test-dependency>
-                        <code-name-base>org.netbeans.modules.visualweb.libs.commons.digester</code-name-base>
+                        <code-name-base>org.openide.loaders</code-name-base>
+                        <compile-dependency/>
+                        <test/>
                     </test-dependency>
-                    -->
+                    <test-dependency>
+                        <code-name-base>org.openide.util</code-name-base>
+                        <compile-dependency/>
+                        <test/>
+                    </test-dependency>
                 </test-type>
             </test-dependencies>
             <public-packages/>
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.navigation/test/unit/src/org/netbeans/modules/visualweb/navigation/MockOpenProjectsTrampoline.java
--- a/visualweb.navigation/test/unit/src/org/netbeans/modules/visualweb/navigation/MockOpenProjectsTrampoline.java	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.navigation/test/unit/src/org/netbeans/modules/visualweb/navigation/MockOpenProjectsTrampoline.java	Wed Mar 23 17:17:42 2011 -0400
@@ -110,4 +110,8 @@
     public Future<Project[]> openProjectsAPI() {
         return null;
     }
+    @Override
+    public void openAPI(Project[] prjcts, boolean bln, boolean bln1) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
 }
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.project.jsfloader/nbproject/genfiles.properties
--- a/visualweb.project.jsfloader/nbproject/genfiles.properties	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.project.jsfloader/nbproject/genfiles.properties	Wed Mar 23 17:17:42 2011 -0400
@@ -1,5 +1,5 @@
 # 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=2cc71e59
+nbproject/build-impl.xml.data.CRC32=56bb4629
 nbproject/build-impl.xml.script.CRC32=62c14cb2
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.project.jsfloader/nbproject/project.xml
--- a/visualweb.project.jsfloader/nbproject/project.xml	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.project.jsfloader/nbproject/project.xml	Wed Mar 23 17:17:42 2011 -0400
@@ -266,9 +266,13 @@
                 <test-type>
                     <name>unit</name>
                     <test-dependency>
-                        <code-name-base>org.openide.util</code-name-base>
+                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
                         <compile-dependency/>
-                        <test/>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+                        <recursive/>
+                        <compile-dependency/>
                     </test-dependency>
                 </test-type>
             </test-dependencies>
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataObjectTest.java
--- a/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataObjectTest.java	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataObjectTest.java	Wed Mar 23 17:17:42 2011 -0400
@@ -52,7 +52,6 @@
 import org.openide.filesystems.FileUtil;
 import org.openide.loaders.DataObject;
 import org.openide.util.Lookup;
-import org.openide.util.test.MockLookup;
 
 /**
  *
@@ -82,8 +81,6 @@
         super.tearDown();
         project = null;
         projectRoot = null;
-        
-        MockLookup.setInstances();
     }
 
     public void testFindPrimaryFile() throws Exception {
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataObjectTest.java
--- a/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataObjectTest.java	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataObjectTest.java	Wed Mar 23 17:17:42 2011 -0400
@@ -53,7 +53,6 @@
 import org.openide.filesystems.FileUtil;
 import org.openide.loaders.DataObject;
 import org.openide.util.Lookup;
-import org.openide.util.test.MockLookup;
 
 /**
  *
@@ -83,8 +82,6 @@
         super.tearDown();
         project = null;
         projectRoot = null;
-        
-        MockLookup.setInstances();
     }
 
     public void testFindPrimaryFile() throws Exception {
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/MockOpenProjectsTrampoline.java
--- a/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/MockOpenProjectsTrampoline.java	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/MockOpenProjectsTrampoline.java	Wed Mar 23 17:17:42 2011 -0400
@@ -114,4 +114,8 @@
     public Future<Project[]> openProjectsAPI() {
         return null;
     }
+    @Override
+    public void openAPI(Project[] prjcts, boolean bln, boolean bln1) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
 }
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/SetupUtils.java
--- a/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/SetupUtils.java	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/SetupUtils.java	Wed Mar 23 17:17:42 2011 -0400
@@ -55,6 +55,7 @@
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectManager;
 import org.netbeans.api.project.ui.OpenProjects;
+import org.netbeans.junit.MockServices;
 import org.netbeans.modules.visualweb.project.jsfloader.JsfJavaDataLoader;
 import org.netbeans.modules.visualweb.project.jsfloader.JsfJspDataLoader;
 import org.openide.filesystems.FileLock;
@@ -65,34 +66,18 @@
 import org.openide.util.Lookup;
 import org.openide.util.LookupEvent;
 import org.openide.util.LookupListener;
-import org.openide.util.test.MockLookup;
 
 /**
  *
  * @author quynguyen
  */
 public class SetupUtils {
-    private static JsfJspDataLoader jspLoader = null;
-    private static JsfJavaDataLoader javaLoader = null;
-    
     public static Project setup(File workDir) throws IOException {
         File userDir = new File(workDir, "userdir");
         userDir.mkdir();
         System.getProperties().put("netbeans.user", userDir.getAbsolutePath());
-        
-        MockLookup.init();
-        DataLoaderPool pool = new SetupUtils.DefaultPool();
-        MockLookup.setInstances(pool);
-        
-        if (jspLoader == null) {
-            jspLoader = new JsfJspDataLoader();
-        }
-        
-        if (javaLoader == null) {
-            javaLoader = new JsfJavaDataLoader();
-        }
-        
-        MockLookup.setInstances(pool, jspLoader, javaLoader);
+
+        MockServices.setServices(SetupUtils.DefaultPool.class, JsfJspDataLoader.class, JsfJavaDataLoader.class);
         
         String zipResource = "VWJavaEE5.zip";
         String zipPath = SetupUtils.class.getResource(zipResource).getPath();
@@ -123,11 +108,11 @@
     }
 
     public static JsfJavaDataLoader getJavaLoader() {
-        return javaLoader;
+        return JsfJavaDataLoader.findObject(JsfJavaDataLoader.class, true);
     }
 
     public static JsfJspDataLoader getJspLoader() {
-        return jspLoader;
+        return JsfJspDataLoader.findObject(JsfJspDataLoader.class, true);
     }
     
     private static void unZipFile(File archiveFile, FileObject destDir) throws IOException {
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.web.ui.appbase/nbproject/genfiles.properties
--- a/visualweb.web.ui.appbase/nbproject/genfiles.properties	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.web.ui.appbase/nbproject/genfiles.properties	Wed Mar 23 17:17:42 2011 -0400
@@ -1,5 +1,5 @@
 # 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=fd170ed4
+nbproject/build-impl.xml.data.CRC32=31dbc26b
 nbproject/build-impl.xml.script.CRC32=0ae287c6
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.web.ui.appbase/nbproject/project.xml
--- a/visualweb.web.ui.appbase/nbproject/project.xml	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.web.ui.appbase/nbproject/project.xml	Wed Mar 23 17:17:42 2011 -0400
@@ -69,6 +69,20 @@
                     </run-dependency>
                 </dependency>
             </module-dependencies>
+            <test-dependencies>
+                <test-type>
+                    <name>unit</name>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+                        <recursive/>
+                        <compile-dependency/>
+                    </test-dependency>
+                </test-type>
+            </test-dependencies>
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>ext/appbase.jar</runtime-relative-path>
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.websvcmgr/nbproject/genfiles.properties
--- a/visualweb.websvcmgr/nbproject/genfiles.properties	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.websvcmgr/nbproject/genfiles.properties	Wed Mar 23 17:17:42 2011 -0400
@@ -1,5 +1,5 @@
 # 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=87240cfe
+nbproject/build-impl.xml.data.CRC32=b6b3587f
 nbproject/build-impl.xml.script.CRC32=c13b62a3
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.websvcmgr/nbproject/project.xml
--- a/visualweb.websvcmgr/nbproject/project.xml	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.websvcmgr/nbproject/project.xml	Wed Mar 23 17:17:42 2011 -0400
@@ -366,6 +366,10 @@
                 <test-type>
                     <name>qa-functional</name>
                     <test-dependency>
+                        <code-name-base>org.netbeans.libs.httpunit</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
+                    <test-dependency>
                         <code-name-base>org.netbeans.libs.junit4</code-name-base>
                         <compile-dependency/>
                     </test-dependency>
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.websvcmgr/test/qa-functional/src/org/netbeans/test/websvcmgr/WebServiceAcceptanceTest.java
--- a/visualweb.websvcmgr/test/qa-functional/src/org/netbeans/test/websvcmgr/WebServiceAcceptanceTest.java	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.websvcmgr/test/qa-functional/src/org/netbeans/test/websvcmgr/WebServiceAcceptanceTest.java	Wed Mar 23 17:17:42 2011 -0400
@@ -44,6 +44,8 @@
 
 package org.netbeans.test.websvcmgr;
 
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebResponse;
 import org.netbeans.jemmy.operators.*;
 import org.netbeans.junit.NbTestSuite;
 import junit.framework.Test;
@@ -299,7 +301,6 @@
     }
 
     private void verifyHTTP(Project prj, String verificationString) {
-        /* XXX httpunit not available anywhere
         try {
             WebConversation conversation = new WebConversation();
             WebResponse response = null;
@@ -311,7 +312,6 @@
             e.printStackTrace();
             fail("Excetion in HTTP check : " + e);
         }
-         */
     }
 
     private void projectUndeployAndClose(Project prj) {
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/composite/CompositeComponentsTest.java
--- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/composite/CompositeComponentsTest.java	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/composite/CompositeComponentsTest.java	Wed Mar 23 17:17:42 2011 -0400
@@ -53,7 +53,6 @@
 import org.netbeans.jellytools.nodes.Node;
 import org.netbeans.jellytools.modules.j2ee.nodes.J2eeServerNode;
 import org.netbeans.junit.NbTestSuite;
-import org.netbeans.junit.ide.ProjectSupport;
 import org.netbeans.modules.visualweb.gravy.Action;
 import org.netbeans.modules.visualweb.gravy.EditorOperator;
 import org.netbeans.modules.visualweb.gravy.TestUtils;
@@ -102,7 +101,7 @@
         ComponentUtils.createProject(projectName);
         // wait for project creation
         TestUtils.wait(10000);
-        ProjectSupport.waitScanFinished();
+//        ProjectSupport.waitScanFinished();
         projectDeployed = false;
         // Workaround for issue
         switchToJSPSource();
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.xhtml/nbproject/genfiles.properties
--- a/visualweb.xhtml/nbproject/genfiles.properties	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.xhtml/nbproject/genfiles.properties	Wed Mar 23 17:17:42 2011 -0400
@@ -1,5 +1,5 @@
 # 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=212c3d73
+nbproject/build-impl.xml.data.CRC32=10fa9c82
 nbproject/build-impl.xml.script.CRC32=37c9fcf3
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
diff -r c85dcf71e424 -r cf80c1d5c3ea visualweb.xhtml/nbproject/project.xml
--- a/visualweb.xhtml/nbproject/project.xml	Wed Mar 23 16:50:27 2011 -0400
+++ b/visualweb.xhtml/nbproject/project.xml	Wed Mar 23 17:17:42 2011 -0400
@@ -229,6 +229,20 @@
                     </run-dependency>
                 </dependency>
             </module-dependencies>
+            <test-dependencies>
+                <test-type>
+                    <name>unit</name>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+                        <recursive/>
+                        <compile-dependency/>
+                    </test-dependency>
+                </test-type>
+            </test-dependencies>
             <friend-packages>
                 <friend>org.netbeans.modules.visualweb.complib</friend>
                 <friend>org.netbeans.modules.visualweb.designer</friend>