diff -r 8497d0a2f749 j2ee.common/manifest.mf
--- a/j2ee.common/manifest.mf	Mon Jun 25 09:20:29 2012 +1200
+++ b/j2ee.common/manifest.mf	Mon Jun 25 21:45:33 2012 +0200
@@ -2,5 +2,5 @@
 OpenIDE-Module: org.netbeans.modules.j2ee.common/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/common/Bundle.properties
 OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
-OpenIDE-Module-Specification-Version: 1.72
+OpenIDE-Module-Specification-Version: 1.73
 AutoUpdate-Show-In-Client: false
diff -r 8497d0a2f749 j2ee.common/src/org/netbeans/modules/j2ee/common/project/WhiteListUpdater.java
--- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/WhiteListUpdater.java	Mon Jun 25 09:20:29 2012 +1200
+++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/WhiteListUpdater.java	Mon Jun 25 21:45:33 2012 +0200
@@ -80,14 +80,21 @@
     private WhiteListUpdater(Project p, PropertyEvaluator eval) {
         this.p = p;
         this.eval = eval;
-        lastWhiteList = getServerWhiteList();
-        eval.addPropertyChangeListener(this);
     }
 
     public static WhiteListUpdater createWhiteListUpdater(Project p, PropertyEvaluator e) {
         return new WhiteListUpdater(p, e);
     }
 
+    public void enable() {
+        lastWhiteList = getServerWhiteList();
+        eval.addPropertyChangeListener(this);        
+    }
+    
+    public void disable() {
+        eval.removePropertyChangeListener(this);       
+    }
+
     private void updateWhitelist(final String oldWhiteListId, final String newWhiteListId) {
         rp.post(new Runnable() {
             @Override
diff -r 8497d0a2f749 web.project/nbproject/project.xml
--- a/web.project/nbproject/project.xml	Mon Jun 25 09:20:29 2012 +1200
+++ b/web.project/nbproject/project.xml	Mon Jun 25 21:45:33 2012 +0200
@@ -170,7 +170,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.62</specification-version>
+                        <specification-version>1.73</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r 8497d0a2f749 web.project/src/org/netbeans/modules/web/project/WebProject.java
--- a/web.project/src/org/netbeans/modules/web/project/WebProject.java	Mon Jun 25 09:20:29 2012 +1200
+++ b/web.project/src/org/netbeans/modules/web/project/WebProject.java	Mon Jun 25 21:45:33 2012 +0200
@@ -227,7 +227,7 @@
     private final WebProjectLibrariesModifierImpl libMod;
     private final ClassPathProviderImpl cpProvider;
     private ClassPathUiSupport.Callback classPathUiSupportCallback;
-    private WhiteListUpdater whiteListUpdater;
+    private final WhiteListUpdater whiteListUpdater;
     
     private AntBuildExtender buildExtender;
 
@@ -851,6 +851,8 @@
         protected void projectOpened() {
             evaluator().addPropertyChangeListener(WebProject.this.webModule);
 
+            whiteListUpdater.enable();
+
             WebLogicalViewProvider logicalViewProvider = (WebLogicalViewProvider) WebProject.this.getLookup().lookup (WebLogicalViewProvider.class);
             if (logicalViewProvider != null) {
                 logicalViewProvider.initialize();
@@ -1203,6 +1205,8 @@
         protected void projectClosed() {
             evaluator().removePropertyChangeListener(WebProject.this.webModule);
 
+            whiteListUpdater.disable();
+            
             webPagesFileWatch.reset();
             webInfFileWatch.reset();