1.1 --- a/visualweb.navigation/nbproject/project.xml Thu Aug 02 06:47:17 2007 +0000
1.2 +++ b/visualweb.navigation/nbproject/project.xml Thu Aug 02 06:57:43 2007 +0000
1.3 @@ -1,188 +1,225 @@
1.4 <?xml version="1.0" encoding="UTF-8"?>
1.5 <project xmlns="http://www.netbeans.org/ns/project/1">
1.6 -<type>org.netbeans.modules.apisupport.project</type>
1.7 -<configuration>
1.8 -<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
1.9 - <code-name-base>org.netbeans.modules.visualweb.navigation</code-name-base>
1.10 - <module-dependencies>
1.11 - <dependency>
1.12 + <type>org.netbeans.modules.apisupport.project</type>
1.13 + <configuration>
1.14 + <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
1.15 + <code-name-base>org.netbeans.modules.visualweb.navigation</code-name-base>
1.16 + <module-dependencies>
1.17 + <dependency>
1.18 + <code-name-base>org.netbeans.modules.projectapi</code-name-base>
1.19 + <build-prerequisite/>
1.20 + <compile-dependency/>
1.21 + <run-dependency>
1.22 + <release-version>1</release-version>
1.23 + <specification-version>1.12</specification-version>
1.24 + </run-dependency>
1.25 + </dependency>
1.26 + <dependency>
1.27 + <code-name-base>org.netbeans.modules.visualweb.api.insync</code-name-base>
1.28 + <build-prerequisite/>
1.29 + <compile-dependency/>
1.30 + <run-dependency>
1.31 + <release-version>1</release-version>
1.32 + <specification-version>2.0</specification-version>
1.33 + </run-dependency>
1.34 + </dependency>
1.35 + <dependency>
1.36 + <code-name-base>org.netbeans.modules.visualweb.api.portlet.dd</code-name-base>
1.37 + <build-prerequisite/>
1.38 + <compile-dependency/>
1.39 + <run-dependency>
1.40 + <release-version>1</release-version>
1.41 + <specification-version>2.0</specification-version>
1.42 + </run-dependency>
1.43 + </dependency>
1.44 + <dependency>
1.45 + <code-name-base>org.netbeans.modules.visualweb.designer.cssengine</code-name-base>
1.46 + <build-prerequisite/>
1.47 + <compile-dependency/>
1.48 + <run-dependency>
1.49 + <specification-version>2.0</specification-version>
1.50 + </run-dependency>
1.51 + </dependency>
1.52 + <dependency>
1.53 + <code-name-base>org.netbeans.modules.visualweb.designtime</code-name-base>
1.54 + <build-prerequisite/>
1.55 + <compile-dependency/>
1.56 + <run-dependency>
1.57 + <release-version>1</release-version>
1.58 + <specification-version>1.0</specification-version>
1.59 + </run-dependency>
1.60 + </dependency>
1.61 + <dependency>
1.62 + <code-name-base>org.netbeans.modules.visualweb.insync</code-name-base>
1.63 + <build-prerequisite/>
1.64 + <compile-dependency/>
1.65 + <run-dependency>
1.66 + <release-version>1</release-version>
1.67 + <specification-version>2.1</specification-version>
1.68 + </run-dependency>
1.69 + </dependency>
1.70 + <dependency>
1.71 + <code-name-base>org.netbeans.modules.visualweb.libs.javaee5</code-name-base>
1.72 + <build-prerequisite/>
1.73 + <compile-dependency/>
1.74 + <run-dependency>
1.75 + <specification-version>2.0</specification-version>
1.76 + </run-dependency>
1.77 + </dependency>
1.78 + <dependency>
1.79 + <code-name-base>org.netbeans.modules.visualweb.project.jsf</code-name-base>
1.80 + <build-prerequisite/>
1.81 + <compile-dependency/>
1.82 + <run-dependency>
1.83 + <release-version>1</release-version>
1.84 + <specification-version>2.0</specification-version>
1.85 + </run-dependency>
1.86 + </dependency>
1.87 + <dependency>
1.88 + <code-name-base>org.netbeans.modules.visualweb.xhtml</code-name-base>
1.89 + <build-prerequisite/>
1.90 + <compile-dependency/>
1.91 + <run-dependency>
1.92 + <specification-version>2.0</specification-version>
1.93 + </run-dependency>
1.94 + </dependency>
1.95 + <dependency>
1.96 + <code-name-base>org.netbeans.modules.web.jsf.navigation</code-name-base>
1.97 + <build-prerequisite/>
1.98 + <compile-dependency/>
1.99 + <run-dependency>
1.100 + <release-version>1</release-version>
1.101 + <specification-version>2.0</specification-version>
1.102 + </run-dependency>
1.103 + </dependency>
1.104 + <dependency>
1.105 + <code-name-base>org.openide.dialogs</code-name-base>
1.106 + <build-prerequisite/>
1.107 + <compile-dependency/>
1.108 + <run-dependency>
1.109 + <specification-version>7.3</specification-version>
1.110 + </run-dependency>
1.111 + </dependency>
1.112 + <dependency>
1.113 + <code-name-base>org.openide.explorer</code-name-base>
1.114 + <build-prerequisite/>
1.115 + <compile-dependency/>
1.116 + <run-dependency>
1.117 + <specification-version>6.8</specification-version>
1.118 + </run-dependency>
1.119 + </dependency>
1.120 + <dependency>
1.121 + <code-name-base>org.openide.filesystems</code-name-base>
1.122 + <build-prerequisite/>
1.123 + <compile-dependency/>
1.124 + <run-dependency>
1.125 + <specification-version>7.0</specification-version>
1.126 + </run-dependency>
1.127 + </dependency>
1.128 + <dependency>
1.129 + <code-name-base>org.openide.loaders</code-name-base>
1.130 + <build-prerequisite/>
1.131 + <compile-dependency/>
1.132 + <run-dependency>
1.133 + <specification-version>6.1</specification-version>
1.134 + </run-dependency>
1.135 + </dependency>
1.136 + <dependency>
1.137 + <code-name-base>org.openide.nodes</code-name-base>
1.138 + <build-prerequisite/>
1.139 + <compile-dependency/>
1.140 + <run-dependency>
1.141 + <specification-version>7.0.1</specification-version>
1.142 + </run-dependency>
1.143 + </dependency>
1.144 + <dependency>
1.145 + <code-name-base>org.openide.util</code-name-base>
1.146 + <build-prerequisite/>
1.147 + <compile-dependency/>
1.148 + <run-dependency>
1.149 + <specification-version>7.7.0.1</specification-version>
1.150 + </run-dependency>
1.151 + </dependency>
1.152 + </module-dependencies>
1.153 + <test-dependencies>
1.154 + <test-type>
1.155 + <name>unit</name>
1.156 + <test-dependency>
1.157 + <code-name-base>org.netbeans.modules.web.project</code-name-base>
1.158 + <compile-dependency/>
1.159 + <recursive/>
1.160 + </test-dependency>
1.161 + <test-dependency>
1.162 + <code-name-base>org.openide.util</code-name-base>
1.163 + <compile-dependency/>
1.164 + <test/>
1.165 + </test-dependency>
1.166 + <!--
1.167 + <test-dependency>
1.168 <code-name-base>org.netbeans.modules.projectapi</code-name-base>
1.169 - <build-prerequisite/>
1.170 - <compile-dependency/>
1.171 - <run-dependency>
1.172 - <release-version>1</release-version>
1.173 - <specification-version>1.12</specification-version>
1.174 - </run-dependency>
1.175 - </dependency>
1.176 - <dependency>
1.177 - <code-name-base>org.netbeans.modules.visualweb.api.insync</code-name-base>
1.178 - <build-prerequisite/>
1.179 - <compile-dependency/>
1.180 - <run-dependency>
1.181 - <release-version>1</release-version>
1.182 - <specification-version>2.0</specification-version>
1.183 - </run-dependency>
1.184 - </dependency>
1.185 - <dependency>
1.186 - <code-name-base>org.netbeans.modules.visualweb.api.portlet.dd</code-name-base>
1.187 - <build-prerequisite/>
1.188 - <compile-dependency/>
1.189 - <run-dependency>
1.190 - <release-version>1</release-version>
1.191 - <specification-version>2.0</specification-version>
1.192 - </run-dependency>
1.193 - </dependency>
1.194 - <dependency>
1.195 - <code-name-base>org.netbeans.modules.visualweb.designer.cssengine</code-name-base>
1.196 - <build-prerequisite/>
1.197 - <compile-dependency/>
1.198 - <run-dependency>
1.199 - <specification-version>2.0</specification-version>
1.200 - </run-dependency>
1.201 - </dependency>
1.202 - <dependency>
1.203 - <code-name-base>org.netbeans.modules.visualweb.designtime</code-name-base>
1.204 - <build-prerequisite/>
1.205 - <compile-dependency/>
1.206 - <run-dependency>
1.207 - <release-version>1</release-version>
1.208 - <specification-version>1.0</specification-version>
1.209 - </run-dependency>
1.210 - </dependency>
1.211 - <dependency>
1.212 - <code-name-base>org.netbeans.modules.visualweb.insync</code-name-base>
1.213 - <build-prerequisite/>
1.214 - <compile-dependency/>
1.215 - <run-dependency>
1.216 - <release-version>1</release-version>
1.217 - <specification-version>2.1</specification-version>
1.218 - </run-dependency>
1.219 - </dependency>
1.220 - <dependency>
1.221 - <code-name-base>org.netbeans.modules.visualweb.libs.javaee5</code-name-base>
1.222 - <build-prerequisite/>
1.223 - <compile-dependency/>
1.224 - <run-dependency>
1.225 - <specification-version>2.0</specification-version>
1.226 - </run-dependency>
1.227 - </dependency>
1.228 - <dependency>
1.229 - <code-name-base>org.netbeans.modules.visualweb.project.jsf</code-name-base>
1.230 - <build-prerequisite/>
1.231 - <compile-dependency/>
1.232 - <run-dependency>
1.233 - <release-version>1</release-version>
1.234 - <specification-version>2.0</specification-version>
1.235 - </run-dependency>
1.236 - </dependency>
1.237 - <dependency>
1.238 - <code-name-base>org.netbeans.modules.visualweb.xhtml</code-name-base>
1.239 - <build-prerequisite/>
1.240 - <compile-dependency/>
1.241 - <run-dependency>
1.242 - <specification-version>2.0</specification-version>
1.243 - </run-dependency>
1.244 - </dependency>
1.245 - <dependency>
1.246 - <code-name-base>org.netbeans.modules.web.jsf.navigation</code-name-base>
1.247 - <build-prerequisite/>
1.248 - <compile-dependency/>
1.249 - <run-dependency>
1.250 - <release-version>1</release-version>
1.251 - <specification-version>2.0</specification-version>
1.252 - </run-dependency>
1.253 - </dependency>
1.254 - <dependency>
1.255 - <code-name-base>org.openide.dialogs</code-name-base>
1.256 - <build-prerequisite/>
1.257 - <compile-dependency/>
1.258 - <run-dependency>
1.259 - <specification-version>7.3</specification-version>
1.260 - </run-dependency>
1.261 - </dependency>
1.262 - <dependency>
1.263 - <code-name-base>org.openide.explorer</code-name-base>
1.264 - <build-prerequisite/>
1.265 - <compile-dependency/>
1.266 - <run-dependency>
1.267 - <specification-version>6.8</specification-version>
1.268 - </run-dependency>
1.269 - </dependency>
1.270 - <dependency>
1.271 - <code-name-base>org.openide.filesystems</code-name-base>
1.272 - <build-prerequisite/>
1.273 - <compile-dependency/>
1.274 - <run-dependency>
1.275 - <specification-version>7.0</specification-version>
1.276 - </run-dependency>
1.277 - </dependency>
1.278 - <dependency>
1.279 - <code-name-base>org.openide.loaders</code-name-base>
1.280 - <build-prerequisite/>
1.281 - <compile-dependency/>
1.282 - <run-dependency>
1.283 - <specification-version>6.1</specification-version>
1.284 - </run-dependency>
1.285 - </dependency>
1.286 - <dependency>
1.287 - <code-name-base>org.openide.nodes</code-name-base>
1.288 - <build-prerequisite/>
1.289 - <compile-dependency/>
1.290 - <run-dependency>
1.291 - <specification-version>7.0.1</specification-version>
1.292 - </run-dependency>
1.293 - </dependency>
1.294 - <dependency>
1.295 - <code-name-base>org.openide.util</code-name-base>
1.296 - <build-prerequisite/>
1.297 - <compile-dependency/>
1.298 - <run-dependency>
1.299 - <specification-version>7.7.0.1</specification-version>
1.300 - </run-dependency>
1.301 - </dependency>
1.302 - </module-dependencies>
1.303 - <test-dependencies>
1.304 - <test-type>
1.305 - <name>unit</name>
1.306 - <test-dependency>
1.307 - <code-name-base>org.netbeans.modules.web.project</code-name-base>
1.308 - <compile-dependency/>
1.309 - <recursive/>
1.310 - </test-dependency>
1.311 - <test-dependency>
1.312 - <code-name-base>org.openide.util</code-name-base>
1.313 <compile-dependency/>
1.314 <test/>
1.315 </test-dependency>
1.316 - <test-dependency>
1.317 - <code-name-base>org.openide.loaders</code-name-base>
1.318 - <compile-dependency/>
1.319 - <test/>
1.320 - </test-dependency>
1.321 - <test-dependency>
1.322 - <code-name-base>org.netbeans.modules.web.jsf.navigation</code-name-base>
1.323 - <compile-dependency/>
1.324 - </test-dependency>
1.325 - <test-dependency>
1.326 - <code-name-base>org.netbeans.modules.web.jsf</code-name-base>
1.327 - <compile-dependency/>
1.328 - </test-dependency>
1.329 - <test-dependency>
1.330 - <code-name-base>org.netbeans.modules.visualweb.insync</code-name-base>
1.331 - <compile-dependency/>
1.332 - </test-dependency>
1.333 - <test-dependency>
1.334 - <code-name-base>org.netbeans.modules.visualweb.j2ee15classloaderprovider</code-name-base>
1.335 - <compile-dependency/>
1.336 - </test-dependency>
1.337 - <test-dependency>
1.338 - <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
1.339 - <compile-dependency/>
1.340 - </test-dependency>
1.341 - </test-type>
1.342 - </test-dependencies>
1.343 - <public-packages/>
1.344 -</data>
1.345 -<junit-version xmlns="http://www.netbeans.org/ns/junit/1" value="junit4"/>
1.346 -</configuration>
1.347 + -->
1.348 + <test-dependency>
1.349 + <code-name-base>org.openide.loaders</code-name-base>
1.350 + <compile-dependency/>
1.351 + <test/>
1.352 + </test-dependency>
1.353 + <test-dependency>
1.354 + <code-name-base>org.netbeans.modules.web.jsf.navigation</code-name-base>
1.355 + <compile-dependency/>
1.356 + </test-dependency>
1.357 + <test-dependency>
1.358 + <code-name-base>org.netbeans.modules.web.jsf</code-name-base>
1.359 + <compile-dependency/>
1.360 + </test-dependency>
1.361 +
1.362 + <test-dependency>
1.363 + <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
1.364 + <compile-dependency/>
1.365 + </test-dependency>
1.366 +
1.367 + <!-- INSYNC DEPENDENCIES -->
1.368 + <test-dependency>
1.369 + <code-name-base>org.netbeans.modules.visualweb.insync</code-name-base>
1.370 + <compile-dependency/>
1.371 + </test-dependency>
1.372 + <test-dependency>
1.373 + <code-name-base>org.netbeans.modules.visualweb.j2ee15classloaderprovider</code-name-base>
1.374 + <compile-dependency/>
1.375 + </test-dependency>
1.376 + <test-dependency>
1.377 + <code-name-base>org.netbeans.modules.visualweb.classloaderprovider</code-name-base>
1.378 + </test-dependency>
1.379 + <test-dependency>
1.380 + <code-name-base>org.netbeans.modules.visualweb.extension.openide</code-name-base>
1.381 + </test-dependency>
1.382 + <test-dependency>
1.383 + <code-name-base>org.netbeans.modules.visualweb.jsfsupport</code-name-base>
1.384 + <recursive/>
1.385 + </test-dependency>
1.386 + <test-dependency>
1.387 + <code-name-base>org.netbeans.modules.visualweb.libs.javaee5</code-name-base>
1.388 + </test-dependency>
1.389 + <test-dependency>
1.390 + <code-name-base>org.netbeans.modules.visualweb.libs.jsf.ri12</code-name-base>
1.391 + </test-dependency>
1.392 + <test-dependency>
1.393 + <code-name-base>org.netbeans.libs.xerces</code-name-base>
1.394 + </test-dependency>
1.395 + <!--
1.396 + <test-dependency>
1.397 + <code-name-base>org.netbeans.modules.visualweb.libs.portletapi</code-name-base>
1.398 + </test-dependency>
1.399 + <test-dependency>
1.400 + <code-name-base>org.netbeans.modules.visualweb.libs.commons.digester</code-name-base>
1.401 + </test-dependency>
1.402 + -->
1.403 + </test-type>
1.404 + </test-dependencies>
1.405 + <public-packages/>
1.406 + </data>
1.407 + <junit-version xmlns="http://www.netbeans.org/ns/junit/1" value="junit4"/>
1.408 + </configuration>
1.409 </project>
2.1 --- a/visualweb.navigation/test/unit/src/org/netbeans/modules/visualweb/navigation/VWPContentModelProviderTest.java Thu Aug 02 06:47:17 2007 +0000
2.2 +++ b/visualweb.navigation/test/unit/src/org/netbeans/modules/visualweb/navigation/VWPContentModelProviderTest.java Thu Aug 02 06:57:43 2007 +0000
2.3 @@ -53,10 +53,12 @@
2.4 protected void setUp() throws Exception {
2.5 super.setUp();
2.6 clearWorkDir();
2.7 - ClassLoader l = this.getClass().getClassLoader();
2.8 - //MockServices.setServices(VWPContentModelProvider.class, MockOpenProjectsTrampoline.class, J2EE15CommonClassloaderProvider.class);
2.9 + //ClassLoader l = this.getClass().getClassLoader();
2.10 + MockServices.setServices(VWPContentModelProvider.class, MockOpenProjectsTrampoline.class, J2EE15CommonClassloaderProvider.class);
2.11 //Lookup defaultLookup = Lookup.getDefault();
2.12 - MockLookup.setLookup(Lookups.fixed(l), Lookups.metaInfServices(l));
2.13 + //MockLookup.setLookup(Lookups.fixed(l), Lookups.metaInfServices(l));
2.14 +
2.15 +
2.16 openProject();
2.17 }
2.18
2.19 @@ -85,11 +87,14 @@
2.20
2.21 @Override
2.22 protected void tearDown() throws Exception {
2.23 + System.out.println("Tearing Down The Project");
2.24 destroyProject();
2.25 }
2.26
2.27 public void destroyProject() throws IOException {
2.28 + System.out.println("Deleting Project");
2.29 project.getProjectDirectory().delete();
2.30 + System.out.println("Clearing Work Directory");
2.31 clearWorkDir();
2.32 }
2.33