1.1 --- a/visualweb.dataconnectivity/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400
1.2 +++ b/visualweb.dataconnectivity/nbproject/genfiles.properties Wed Mar 23 17:17:42 2011 -0400
1.3 @@ -1,5 +1,5 @@
1.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
1.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
1.6 -nbproject/build-impl.xml.data.CRC32=0f11031e
1.7 +nbproject/build-impl.xml.data.CRC32=64f87e9d
1.8 nbproject/build-impl.xml.script.CRC32=1fddeb1c
1.9 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
2.1 --- a/visualweb.dataconnectivity/nbproject/project.xml Wed Mar 23 16:50:27 2011 -0400
2.2 +++ b/visualweb.dataconnectivity/nbproject/project.xml Wed Mar 23 17:17:42 2011 -0400
2.3 @@ -349,9 +349,13 @@
2.4 <test-type>
2.5 <name>unit</name>
2.6 <test-dependency>
2.7 - <code-name-base>org.openide.util</code-name-base>
2.8 + <code-name-base>org.netbeans.libs.junit4</code-name-base>
2.9 <compile-dependency/>
2.10 - <test/>
2.11 + </test-dependency>
2.12 + <test-dependency>
2.13 + <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
2.14 + <recursive/>
2.15 + <compile-dependency/>
2.16 </test-dependency>
2.17 </test-type>
2.18 </test-dependencies>
3.1 --- a/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/MockOpenProjectsTrampoline.java Wed Mar 23 16:50:27 2011 -0400
3.2 +++ b/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/MockOpenProjectsTrampoline.java Wed Mar 23 17:17:42 2011 -0400
3.3 @@ -114,4 +114,8 @@
3.4 public Future<Project[]> openProjectsAPI() {
3.5 throw new UnsupportedOperationException("Not supported yet.");
3.6 }
3.7 + @Override
3.8 + public void openAPI(Project[] prjcts, boolean bln, boolean bln1) {
3.9 + throw new UnsupportedOperationException("Not supported yet.");
3.10 + }
3.11 }
4.1 --- a/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/SetupProject.java Wed Mar 23 16:50:27 2011 -0400
4.2 +++ b/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/SetupProject.java Wed Mar 23 17:17:42 2011 -0400
4.3 @@ -55,6 +55,7 @@
4.4 import org.netbeans.api.project.Project;
4.5 import org.netbeans.api.project.ProjectManager;
4.6 import org.netbeans.api.project.ui.OpenProjects;
4.7 +import org.netbeans.junit.MockServices;
4.8 import org.openide.filesystems.FileLock;
4.9 import org.openide.filesystems.FileObject;
4.10 import org.openide.filesystems.FileUtil;
4.11 @@ -63,12 +64,6 @@
4.12 import org.openide.util.Lookup;
4.13 import org.openide.util.LookupEvent;
4.14 import org.openide.util.LookupListener;
4.15 -import org.openide.loaders.DataLoader;
4.16 -import org.openide.loaders.DataLoaderPool;
4.17 -import org.openide.util.Lookup;
4.18 -import org.openide.util.LookupEvent;
4.19 -import org.openide.util.LookupListener;
4.20 -import org.openide.util.test.MockLookup;
4.21
4.22 /**
4.23 *
4.24 @@ -100,9 +95,7 @@
4.25 throw new IOException("FileObject for project directory not valid");
4.26 }
4.27
4.28 - MockLookup.init();
4.29 - DataLoaderPool pool = new SetupProject.DefaultPool();
4.30 - MockLookup.setInstances(pool);
4.31 + MockServices.setServices(SetupProject.DefaultPool.class);
4.32 FileObject testApp = destFileObj.getFileObject("VWJavaEE5");
4.33 System.out.println("Children of VWJavaEE5:" + Arrays.toString(testApp.getChildren()));
4.34
5.1 --- a/visualweb.dataprovider/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400
5.2 +++ b/visualweb.dataprovider/nbproject/genfiles.properties Wed Mar 23 17:17:42 2011 -0400
5.3 @@ -1,5 +1,5 @@
5.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
5.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
5.6 -nbproject/build-impl.xml.data.CRC32=0c3be57b
5.7 +nbproject/build-impl.xml.data.CRC32=b2304c2c
5.8 nbproject/build-impl.xml.script.CRC32=51f08b07
5.9 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
6.1 --- a/visualweb.dataprovider/nbproject/project.xml Wed Mar 23 16:50:27 2011 -0400
6.2 +++ b/visualweb.dataprovider/nbproject/project.xml Wed Mar 23 17:17:42 2011 -0400
6.3 @@ -64,25 +64,29 @@
6.4 <test-type>
6.5 <name>qa-functional</name>
6.6 <test-dependency>
6.7 - <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
6.8 - <recursive/>
6.9 + <code-name-base>org.netbeans.libs.httpunit</code-name-base>
6.10 + <compile-dependency/>
6.11 + </test-dependency>
6.12 + <test-dependency>
6.13 + <code-name-base>org.netbeans.libs.junit4</code-name-base>
6.14 <compile-dependency/>
6.15 </test-dependency>
6.16 <test-dependency>
6.17 <code-name-base>org.netbeans.modules.visualweb.gravy</code-name-base>
6.18 - <compile-dependency/>
6.19 - </test-dependency>
6.20 - <test-dependency>
6.21 - <code-name-base>org.netbeans.modules.jellytools.platform</code-name-base>
6.22 + <recursive/>
6.23 <compile-dependency/>
6.24 </test-dependency>
6.25 </test-type>
6.26 <test-type>
6.27 <name>unit</name>
6.28 <test-dependency>
6.29 - <code-name-base>org.openide.util</code-name-base>
6.30 + <code-name-base>org.netbeans.libs.junit4</code-name-base>
6.31 <compile-dependency/>
6.32 - <test/>
6.33 + </test-dependency>
6.34 + <test-dependency>
6.35 + <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
6.36 + <recursive/>
6.37 + <compile-dependency/>
6.38 </test-dependency>
6.39 </test-type>
6.40 </test-dependencies>
7.1 --- a/visualweb.designer.decoration/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400
7.2 +++ b/visualweb.designer.decoration/nbproject/genfiles.properties Wed Mar 23 17:17:42 2011 -0400
7.3 @@ -1,5 +1,5 @@
7.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
7.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
7.6 -nbproject/build-impl.xml.data.CRC32=b9d703eb
7.7 +nbproject/build-impl.xml.data.CRC32=b95774a9
7.8 nbproject/build-impl.xml.script.CRC32=3ca92162
7.9 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
8.1 --- a/visualweb.designer/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400
8.2 +++ b/visualweb.designer/nbproject/genfiles.properties Wed Mar 23 17:17:42 2011 -0400
8.3 @@ -1,5 +1,5 @@
8.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
8.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
8.6 -nbproject/build-impl.xml.data.CRC32=a267fa7b
8.7 +nbproject/build-impl.xml.data.CRC32=551a6433
8.8 nbproject/build-impl.xml.script.CRC32=0c7fb42e
8.9 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
9.1 --- a/visualweb.designer/nbproject/project.xml Wed Mar 23 16:50:27 2011 -0400
9.2 +++ b/visualweb.designer/nbproject/project.xml Wed Mar 23 17:17:42 2011 -0400
9.3 @@ -195,6 +195,15 @@
9.4 <test-dependencies>
9.5 <test-type>
9.6 <name>unit</name>
9.7 + <test-dependency>
9.8 + <code-name-base>org.netbeans.libs.junit4</code-name-base>
9.9 + <compile-dependency/>
9.10 + </test-dependency>
9.11 + <test-dependency>
9.12 + <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
9.13 + <recursive/>
9.14 + <compile-dependency/>
9.15 + </test-dependency>
9.16 </test-type>
9.17 </test-dependencies>
9.18 <friend-packages>
10.1 --- a/visualweb.jsfsupport.components/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400
10.2 +++ b/visualweb.jsfsupport.components/nbproject/genfiles.properties Wed Mar 23 17:17:42 2011 -0400
10.3 @@ -1,5 +1,5 @@
10.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
10.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
10.6 -nbproject/build-impl.xml.data.CRC32=2799a99e
10.7 +nbproject/build-impl.xml.data.CRC32=6c464b73
10.8 nbproject/build-impl.xml.script.CRC32=0375fe76
10.9 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
11.1 --- a/visualweb.jsfsupport.components/nbproject/project.xml Wed Mar 23 16:50:27 2011 -0400
11.2 +++ b/visualweb.jsfsupport.components/nbproject/project.xml Wed Mar 23 17:17:42 2011 -0400
11.3 @@ -94,6 +94,20 @@
11.4 </run-dependency>
11.5 </dependency>
11.6 </module-dependencies>
11.7 + <test-dependencies>
11.8 + <test-type>
11.9 + <name>unit</name>
11.10 + <test-dependency>
11.11 + <code-name-base>org.netbeans.libs.junit4</code-name-base>
11.12 + <compile-dependency/>
11.13 + </test-dependency>
11.14 + <test-dependency>
11.15 + <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
11.16 + <recursive/>
11.17 + <compile-dependency/>
11.18 + </test-dependency>
11.19 + </test-type>
11.20 + </test-dependencies>
11.21 <friend-packages>
11.22 <friend>org.netbeans.modules.visualweb.complib</friend>
11.23 <friend>org.netbeans.modules.visualweb.j2ee14classloaderprovider</friend>
12.1 --- a/visualweb.navigation/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400
12.2 +++ b/visualweb.navigation/nbproject/genfiles.properties Wed Mar 23 17:17:42 2011 -0400
12.3 @@ -1,5 +1,5 @@
12.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
12.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
12.6 -nbproject/build-impl.xml.data.CRC32=f2edbf98
12.7 +nbproject/build-impl.xml.data.CRC32=0815b7b8
12.8 nbproject/build-impl.xml.script.CRC32=a39ce1cc
12.9 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
13.1 --- a/visualweb.navigation/nbproject/project.xml Wed Mar 23 16:50:27 2011 -0400
13.2 +++ b/visualweb.navigation/nbproject/project.xml Wed Mar 23 17:17:42 2011 -0400
13.3 @@ -207,40 +207,30 @@
13.4 <test-type>
13.5 <name>unit</name>
13.6 <test-dependency>
13.7 - <code-name-base>org.netbeans.modules.web.project</code-name-base>
13.8 - <recursive/>
13.9 + <code-name-base>org.netbeans.libs.junit4</code-name-base>
13.10 <compile-dependency/>
13.11 </test-dependency>
13.12 <test-dependency>
13.13 - <code-name-base>org.openide.util</code-name-base>
13.14 - <compile-dependency/>
13.15 - <test/>
13.16 - </test-dependency>
13.17 - <!--
13.18 - <test-dependency>
13.19 - <code-name-base>org.netbeans.modules.projectapi</code-name-base>
13.20 - <compile-dependency/>
13.21 - <test/>
13.22 - </test-dependency>
13.23 - -->
13.24 - <test-dependency>
13.25 - <code-name-base>org.openide.loaders</code-name-base>
13.26 - <compile-dependency/>
13.27 - <test/>
13.28 + <code-name-base>org.netbeans.libs.xerces</code-name-base>
13.29 </test-dependency>
13.30 <test-dependency>
13.31 - <code-name-base>org.netbeans.modules.web.jsf.navigation</code-name-base>
13.32 - <compile-dependency/>
13.33 - </test-dependency>
13.34 - <test-dependency>
13.35 - <code-name-base>org.netbeans.modules.web.jsf</code-name-base>
13.36 + <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
13.37 + <recursive/>
13.38 <compile-dependency/>
13.39 </test-dependency>
13.40 <test-dependency>
13.41 <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
13.42 <compile-dependency/>
13.43 </test-dependency>
13.44 - <!-- INSYNC DEPENDENCIES -->
13.45 + <test-dependency>
13.46 + <code-name-base>org.netbeans.modules.servletjspapi</code-name-base>
13.47 + </test-dependency>
13.48 + <test-dependency>
13.49 + <code-name-base>org.netbeans.modules.visualweb.classloaderprovider</code-name-base>
13.50 + </test-dependency>
13.51 + <test-dependency>
13.52 + <code-name-base>org.netbeans.modules.visualweb.extension.openide</code-name-base>
13.53 + </test-dependency>
13.54 <test-dependency>
13.55 <code-name-base>org.netbeans.modules.visualweb.insync</code-name-base>
13.56 <compile-dependency/>
13.57 @@ -250,32 +240,35 @@
13.58 <compile-dependency/>
13.59 </test-dependency>
13.60 <test-dependency>
13.61 - <code-name-base>org.netbeans.modules.visualweb.classloaderprovider</code-name-base>
13.62 - </test-dependency>
13.63 - <test-dependency>
13.64 - <code-name-base>org.netbeans.modules.visualweb.extension.openide</code-name-base>
13.65 - </test-dependency>
13.66 - <test-dependency>
13.67 <code-name-base>org.netbeans.modules.visualweb.jsfsupport</code-name-base>
13.68 <recursive/>
13.69 </test-dependency>
13.70 <test-dependency>
13.71 - <code-name-base>org.netbeans.modules.servletjspapi</code-name-base>
13.72 + <code-name-base>org.netbeans.modules.web.jsf</code-name-base>
13.73 + <compile-dependency/>
13.74 + </test-dependency>
13.75 + <test-dependency>
13.76 + <code-name-base>org.netbeans.modules.web.jsf.navigation</code-name-base>
13.77 + <compile-dependency/>
13.78 </test-dependency>
13.79 <test-dependency>
13.80 <code-name-base>org.netbeans.modules.web.jsf12</code-name-base>
13.81 </test-dependency>
13.82 <test-dependency>
13.83 - <code-name-base>org.netbeans.libs.xerces</code-name-base>
13.84 - </test-dependency>
13.85 - <!--
13.86 - <test-dependency>
13.87 - <code-name-base>org.netbeans.modules.visualweb.libs.portletapi</code-name-base>
13.88 + <code-name-base>org.netbeans.modules.web.project</code-name-base>
13.89 + <recursive/>
13.90 + <compile-dependency/>
13.91 </test-dependency>
13.92 <test-dependency>
13.93 - <code-name-base>org.netbeans.modules.visualweb.libs.commons.digester</code-name-base>
13.94 + <code-name-base>org.openide.loaders</code-name-base>
13.95 + <compile-dependency/>
13.96 + <test/>
13.97 </test-dependency>
13.98 - -->
13.99 + <test-dependency>
13.100 + <code-name-base>org.openide.util</code-name-base>
13.101 + <compile-dependency/>
13.102 + <test/>
13.103 + </test-dependency>
13.104 </test-type>
13.105 </test-dependencies>
13.106 <public-packages/>
14.1 --- a/visualweb.navigation/test/unit/src/org/netbeans/modules/visualweb/navigation/MockOpenProjectsTrampoline.java Wed Mar 23 16:50:27 2011 -0400
14.2 +++ b/visualweb.navigation/test/unit/src/org/netbeans/modules/visualweb/navigation/MockOpenProjectsTrampoline.java Wed Mar 23 17:17:42 2011 -0400
14.3 @@ -110,4 +110,8 @@
14.4 public Future<Project[]> openProjectsAPI() {
14.5 return null;
14.6 }
14.7 + @Override
14.8 + public void openAPI(Project[] prjcts, boolean bln, boolean bln1) {
14.9 + throw new UnsupportedOperationException("Not supported yet.");
14.10 + }
14.11 }
15.1 --- a/visualweb.project.jsfloader/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400
15.2 +++ b/visualweb.project.jsfloader/nbproject/genfiles.properties Wed Mar 23 17:17:42 2011 -0400
15.3 @@ -1,5 +1,5 @@
15.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
15.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
15.6 -nbproject/build-impl.xml.data.CRC32=2cc71e59
15.7 +nbproject/build-impl.xml.data.CRC32=56bb4629
15.8 nbproject/build-impl.xml.script.CRC32=62c14cb2
15.9 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
16.1 --- a/visualweb.project.jsfloader/nbproject/project.xml Wed Mar 23 16:50:27 2011 -0400
16.2 +++ b/visualweb.project.jsfloader/nbproject/project.xml Wed Mar 23 17:17:42 2011 -0400
16.3 @@ -266,9 +266,13 @@
16.4 <test-type>
16.5 <name>unit</name>
16.6 <test-dependency>
16.7 - <code-name-base>org.openide.util</code-name-base>
16.8 + <code-name-base>org.netbeans.libs.junit4</code-name-base>
16.9 <compile-dependency/>
16.10 - <test/>
16.11 + </test-dependency>
16.12 + <test-dependency>
16.13 + <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
16.14 + <recursive/>
16.15 + <compile-dependency/>
16.16 </test-dependency>
16.17 </test-type>
16.18 </test-dependencies>
17.1 --- a/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataObjectTest.java Wed Mar 23 16:50:27 2011 -0400
17.2 +++ b/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataObjectTest.java Wed Mar 23 17:17:42 2011 -0400
17.3 @@ -52,7 +52,6 @@
17.4 import org.openide.filesystems.FileUtil;
17.5 import org.openide.loaders.DataObject;
17.6 import org.openide.util.Lookup;
17.7 -import org.openide.util.test.MockLookup;
17.8
17.9 /**
17.10 *
17.11 @@ -82,8 +81,6 @@
17.12 super.tearDown();
17.13 project = null;
17.14 projectRoot = null;
17.15 -
17.16 - MockLookup.setInstances();
17.17 }
17.18
17.19 public void testFindPrimaryFile() throws Exception {
18.1 --- a/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataObjectTest.java Wed Mar 23 16:50:27 2011 -0400
18.2 +++ b/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataObjectTest.java Wed Mar 23 17:17:42 2011 -0400
18.3 @@ -53,7 +53,6 @@
18.4 import org.openide.filesystems.FileUtil;
18.5 import org.openide.loaders.DataObject;
18.6 import org.openide.util.Lookup;
18.7 -import org.openide.util.test.MockLookup;
18.8
18.9 /**
18.10 *
18.11 @@ -83,8 +82,6 @@
18.12 super.tearDown();
18.13 project = null;
18.14 projectRoot = null;
18.15 -
18.16 - MockLookup.setInstances();
18.17 }
18.18
18.19 public void testFindPrimaryFile() throws Exception {
19.1 --- a/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/MockOpenProjectsTrampoline.java Wed Mar 23 16:50:27 2011 -0400
19.2 +++ b/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/MockOpenProjectsTrampoline.java Wed Mar 23 17:17:42 2011 -0400
19.3 @@ -114,4 +114,8 @@
19.4 public Future<Project[]> openProjectsAPI() {
19.5 return null;
19.6 }
19.7 + @Override
19.8 + public void openAPI(Project[] prjcts, boolean bln, boolean bln1) {
19.9 + throw new UnsupportedOperationException("Not supported yet.");
19.10 + }
19.11 }
20.1 --- a/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/SetupUtils.java Wed Mar 23 16:50:27 2011 -0400
20.2 +++ b/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/SetupUtils.java Wed Mar 23 17:17:42 2011 -0400
20.3 @@ -55,6 +55,7 @@
20.4 import org.netbeans.api.project.Project;
20.5 import org.netbeans.api.project.ProjectManager;
20.6 import org.netbeans.api.project.ui.OpenProjects;
20.7 +import org.netbeans.junit.MockServices;
20.8 import org.netbeans.modules.visualweb.project.jsfloader.JsfJavaDataLoader;
20.9 import org.netbeans.modules.visualweb.project.jsfloader.JsfJspDataLoader;
20.10 import org.openide.filesystems.FileLock;
20.11 @@ -65,34 +66,18 @@
20.12 import org.openide.util.Lookup;
20.13 import org.openide.util.LookupEvent;
20.14 import org.openide.util.LookupListener;
20.15 -import org.openide.util.test.MockLookup;
20.16
20.17 /**
20.18 *
20.19 * @author quynguyen
20.20 */
20.21 public class SetupUtils {
20.22 - private static JsfJspDataLoader jspLoader = null;
20.23 - private static JsfJavaDataLoader javaLoader = null;
20.24 -
20.25 public static Project setup(File workDir) throws IOException {
20.26 File userDir = new File(workDir, "userdir");
20.27 userDir.mkdir();
20.28 System.getProperties().put("netbeans.user", userDir.getAbsolutePath());
20.29 -
20.30 - MockLookup.init();
20.31 - DataLoaderPool pool = new SetupUtils.DefaultPool();
20.32 - MockLookup.setInstances(pool);
20.33 -
20.34 - if (jspLoader == null) {
20.35 - jspLoader = new JsfJspDataLoader();
20.36 - }
20.37 -
20.38 - if (javaLoader == null) {
20.39 - javaLoader = new JsfJavaDataLoader();
20.40 - }
20.41 -
20.42 - MockLookup.setInstances(pool, jspLoader, javaLoader);
20.43 +
20.44 + MockServices.setServices(SetupUtils.DefaultPool.class, JsfJspDataLoader.class, JsfJavaDataLoader.class);
20.45
20.46 String zipResource = "VWJavaEE5.zip";
20.47 String zipPath = SetupUtils.class.getResource(zipResource).getPath();
20.48 @@ -123,11 +108,11 @@
20.49 }
20.50
20.51 public static JsfJavaDataLoader getJavaLoader() {
20.52 - return javaLoader;
20.53 + return JsfJavaDataLoader.findObject(JsfJavaDataLoader.class, true);
20.54 }
20.55
20.56 public static JsfJspDataLoader getJspLoader() {
20.57 - return jspLoader;
20.58 + return JsfJspDataLoader.findObject(JsfJspDataLoader.class, true);
20.59 }
20.60
20.61 private static void unZipFile(File archiveFile, FileObject destDir) throws IOException {
21.1 --- a/visualweb.web.ui.appbase/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400
21.2 +++ b/visualweb.web.ui.appbase/nbproject/genfiles.properties Wed Mar 23 17:17:42 2011 -0400
21.3 @@ -1,5 +1,5 @@
21.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
21.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
21.6 -nbproject/build-impl.xml.data.CRC32=fd170ed4
21.7 +nbproject/build-impl.xml.data.CRC32=31dbc26b
21.8 nbproject/build-impl.xml.script.CRC32=0ae287c6
21.9 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
22.1 --- a/visualweb.web.ui.appbase/nbproject/project.xml Wed Mar 23 16:50:27 2011 -0400
22.2 +++ b/visualweb.web.ui.appbase/nbproject/project.xml Wed Mar 23 17:17:42 2011 -0400
22.3 @@ -69,6 +69,20 @@
22.4 </run-dependency>
22.5 </dependency>
22.6 </module-dependencies>
22.7 + <test-dependencies>
22.8 + <test-type>
22.9 + <name>unit</name>
22.10 + <test-dependency>
22.11 + <code-name-base>org.netbeans.libs.junit4</code-name-base>
22.12 + <compile-dependency/>
22.13 + </test-dependency>
22.14 + <test-dependency>
22.15 + <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
22.16 + <recursive/>
22.17 + <compile-dependency/>
22.18 + </test-dependency>
22.19 + </test-type>
22.20 + </test-dependencies>
22.21 <public-packages/>
22.22 <class-path-extension>
22.23 <runtime-relative-path>ext/appbase.jar</runtime-relative-path>
23.1 --- a/visualweb.websvcmgr/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400
23.2 +++ b/visualweb.websvcmgr/nbproject/genfiles.properties Wed Mar 23 17:17:42 2011 -0400
23.3 @@ -1,5 +1,5 @@
23.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
23.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
23.6 -nbproject/build-impl.xml.data.CRC32=87240cfe
23.7 +nbproject/build-impl.xml.data.CRC32=b6b3587f
23.8 nbproject/build-impl.xml.script.CRC32=c13b62a3
23.9 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
24.1 --- a/visualweb.websvcmgr/nbproject/project.xml Wed Mar 23 16:50:27 2011 -0400
24.2 +++ b/visualweb.websvcmgr/nbproject/project.xml Wed Mar 23 17:17:42 2011 -0400
24.3 @@ -366,6 +366,10 @@
24.4 <test-type>
24.5 <name>qa-functional</name>
24.6 <test-dependency>
24.7 + <code-name-base>org.netbeans.libs.httpunit</code-name-base>
24.8 + <compile-dependency/>
24.9 + </test-dependency>
24.10 + <test-dependency>
24.11 <code-name-base>org.netbeans.libs.junit4</code-name-base>
24.12 <compile-dependency/>
24.13 </test-dependency>
25.1 --- a/visualweb.websvcmgr/test/qa-functional/src/org/netbeans/test/websvcmgr/WebServiceAcceptanceTest.java Wed Mar 23 16:50:27 2011 -0400
25.2 +++ b/visualweb.websvcmgr/test/qa-functional/src/org/netbeans/test/websvcmgr/WebServiceAcceptanceTest.java Wed Mar 23 17:17:42 2011 -0400
25.3 @@ -44,6 +44,8 @@
25.4
25.5 package org.netbeans.test.websvcmgr;
25.6
25.7 +import com.meterware.httpunit.WebConversation;
25.8 +import com.meterware.httpunit.WebResponse;
25.9 import org.netbeans.jemmy.operators.*;
25.10 import org.netbeans.junit.NbTestSuite;
25.11 import junit.framework.Test;
25.12 @@ -299,7 +301,6 @@
25.13 }
25.14
25.15 private void verifyHTTP(Project prj, String verificationString) {
25.16 - /* XXX httpunit not available anywhere
25.17 try {
25.18 WebConversation conversation = new WebConversation();
25.19 WebResponse response = null;
25.20 @@ -311,7 +312,6 @@
25.21 e.printStackTrace();
25.22 fail("Excetion in HTTP check : " + e);
25.23 }
25.24 - */
25.25 }
25.26
25.27 private void projectUndeployAndClose(Project prj) {
26.1 --- 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
26.2 +++ 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
26.3 @@ -53,7 +53,6 @@
26.4 import org.netbeans.jellytools.nodes.Node;
26.5 import org.netbeans.jellytools.modules.j2ee.nodes.J2eeServerNode;
26.6 import org.netbeans.junit.NbTestSuite;
26.7 -import org.netbeans.junit.ide.ProjectSupport;
26.8 import org.netbeans.modules.visualweb.gravy.Action;
26.9 import org.netbeans.modules.visualweb.gravy.EditorOperator;
26.10 import org.netbeans.modules.visualweb.gravy.TestUtils;
26.11 @@ -102,7 +101,7 @@
26.12 ComponentUtils.createProject(projectName);
26.13 // wait for project creation
26.14 TestUtils.wait(10000);
26.15 - ProjectSupport.waitScanFinished();
26.16 +// ProjectSupport.waitScanFinished();
26.17 projectDeployed = false;
26.18 // Workaround for issue
26.19 switchToJSPSource();
27.1 --- a/visualweb.xhtml/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400
27.2 +++ b/visualweb.xhtml/nbproject/genfiles.properties Wed Mar 23 17:17:42 2011 -0400
27.3 @@ -1,5 +1,5 @@
27.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
27.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
27.6 -nbproject/build-impl.xml.data.CRC32=212c3d73
27.7 +nbproject/build-impl.xml.data.CRC32=10fa9c82
27.8 nbproject/build-impl.xml.script.CRC32=37c9fcf3
27.9 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
28.1 --- a/visualweb.xhtml/nbproject/project.xml Wed Mar 23 16:50:27 2011 -0400
28.2 +++ b/visualweb.xhtml/nbproject/project.xml Wed Mar 23 17:17:42 2011 -0400
28.3 @@ -229,6 +229,20 @@
28.4 </run-dependency>
28.5 </dependency>
28.6 </module-dependencies>
28.7 + <test-dependencies>
28.8 + <test-type>
28.9 + <name>unit</name>
28.10 + <test-dependency>
28.11 + <code-name-base>org.netbeans.libs.junit4</code-name-base>
28.12 + <compile-dependency/>
28.13 + </test-dependency>
28.14 + <test-dependency>
28.15 + <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
28.16 + <recursive/>
28.17 + <compile-dependency/>
28.18 + </test-dependency>
28.19 + </test-type>
28.20 + </test-dependencies>
28.21 <friend-packages>
28.22 <friend>org.netbeans.modules.visualweb.complib</friend>
28.23 <friend>org.netbeans.modules.visualweb.designer</friend>