# HG changeset patch
# User Milos Kleint <mkleint@netbeans.org>
# Date 1225895728 -3600
# Node ID 26081654191c49bc5450487f33af0bc8027a3bde
# Parent  f84dd9421ee5a9733b03a2ee68088805962c2f5e
#152392 rewrite modules to use the new annotation LookupProvider.Register

diff -r f84dd9421ee5 -r 26081654191c groovy.support/src/org/netbeans/modules/groovy/support/GroovyLookupProvider.java
--- a/groovy.support/src/org/netbeans/modules/groovy/support/GroovyLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/groovy.support/src/org/netbeans/modules/groovy/support/GroovyLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -53,7 +53,7 @@
  * @author Martin Adamek
  */
 public class GroovyLookupProvider implements LookupProvider {
-
+    @LookupProvider.Register(projectType="org-netbeans-modules-java-j2seproject")
     public static GroovyLookupProvider createJavaSE() {
         return new GroovyLookupProvider();
     }
diff -r f84dd9421ee5 -r 26081654191c groovy.support/src/org/netbeans/modules/groovy/support/resources/layer.xml
--- a/groovy.support/src/org/netbeans/modules/groovy/support/resources/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/groovy.support/src/org/netbeans/modules/groovy/support/resources/layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -41,11 +41,6 @@
                     </file>
                 </folder>
             </folder>
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-groovy-support-GroovyLookupProvider.instance">
-                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.groovy.support.GroovyLookupProvider.createJavaSE"/>
-                </file>
-            </folder>
         </folder>
     </folder>
     <folder name="Editors">
diff -r f84dd9421ee5 -r 26081654191c hibernate/src/org/netbeans/modules/hibernate/resources/layer.xml
--- a/hibernate/src/org/netbeans/modules/hibernate/resources/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/hibernate/src/org/netbeans/modules/hibernate/resources/layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -351,16 +351,6 @@
         </folder>
     </folder>
     <folder name="Projects">
-        <folder name="org-netbeans-modules-java-j2seproject">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.hibernate.service.HibernateProjectLookupExtender.instance"/>
-            </folder>
-        </folder>
-        <folder name="org-netbeans-modules-maven">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.hibernate.service.HibernateProjectLookupExtender.instance"/>
-            </folder>
-        </folder>
         <folder name="org-netbeans-modules-ant-freeform">
             <folder name="Lookup">
                 <file name="org.netbeans.modules.hibernate.service.HibernateProjectLookupExtender.instance">
diff -r f84dd9421ee5 -r 26081654191c hibernate/src/org/netbeans/modules/hibernate/service/HibernateProjectLookupExtender.java
--- a/hibernate/src/org/netbeans/modules/hibernate/service/HibernateProjectLookupExtender.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/hibernate/src/org/netbeans/modules/hibernate/service/HibernateProjectLookupExtender.java	Wed Nov 05 15:35:28 2008 +0100
@@ -54,6 +54,7 @@
  * 
  * @author Vadiraj Deshpande (Vadiraj.Deshpande@Sun.COM)
  */
+@LookupProvider.Register(projectType={"org-netbeans-modules-maven","org-netbeans-modules-java-j2seproject"})
 public class HibernateProjectLookupExtender implements LookupProvider {
 
     public Lookup createAdditionalLookup(Lookup baseContext) {
diff -r f84dd9421ee5 -r 26081654191c maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenApisupportLookupProvider.java
--- a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenApisupportLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenApisupportLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -51,7 +51,7 @@
  * extending the default maven project lookup.
  * @author  Milos Kleint 
  */
-
+@LookupProvider.Register(projectType="org-netbeans-modules-maven")
 public class MavenApisupportLookupProvider implements LookupProvider {
     
     /** Creates a new instance of MavenApisupportLookupProvider */
diff -r f84dd9421ee5 -r 26081654191c maven.apisupport/src/org/netbeans/modules/maven/apisupport/layer.xml
--- a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven.apisupport/src/org/netbeans/modules/maven/apisupport/layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -55,9 +55,6 @@
                     <attr name="repoIndexUrl" stringvalue="http://deadlock.netbeans.org/maven2/.index/netbeans/"/>
                 </file>
             </folder>
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-maven-apisupport-MavenApisupportLookupProvider.instance"/>
-            </folder>
             <folder name="Nodes">
                 <file name="org-netbeans-modules-maven-apisupport-ImportantFilesNodeFactory.instance">
                     <attr name="position" intvalue="650"/>
diff -r f84dd9421ee5 -r 26081654191c maven.gsf/src/org/netbeans/modules/maven/gsf/LookupProviderImpl.java
--- a/maven.gsf/src/org/netbeans/modules/maven/gsf/LookupProviderImpl.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven.gsf/src/org/netbeans/modules/maven/gsf/LookupProviderImpl.java	Wed Nov 05 15:35:28 2008 +0100
@@ -50,6 +50,7 @@
  *
  * @author mkleint
  */
+@LookupProvider.Register(projectType="org-netbeans-modules-maven")
 public class LookupProviderImpl implements LookupProvider {
 
     public Lookup createAdditionalLookup(Lookup baseContext) {
diff -r f84dd9421ee5 -r 26081654191c maven.gsf/src/org/netbeans/modules/maven/gsf/layer.xml
--- a/maven.gsf/src/org/netbeans/modules/maven/gsf/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven.gsf/src/org/netbeans/modules/maven/gsf/layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -45,9 +45,6 @@
 <filesystem>
      <folder name="Projects">
         <folder name="org-netbeans-modules-maven">
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-maven-gsf-LookupProviderImpl.instance"/>
-            </folder>
             <folder name="Nodes">
                 <file name="org-netbeans-modules-maven-gsf-SourcesNodeFactory.instance">
                     <attr name="position" intvalue="139"/>
diff -r f84dd9421ee5 -r 26081654191c maven.j2ee/src/org/netbeans/modules/maven/j2ee/J2eeLookupProvider.java
--- a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/J2eeLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/J2eeLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -57,7 +57,7 @@
  * extending the default maven project lookup.
  * @author  Milos Kleint
  */
-
+@LookupProvider.Register(projectType="org-netbeans-modules-maven")
 public class J2eeLookupProvider implements LookupProvider {
     
     /** Creates a new instance of J2eeLookupProvider */
diff -r f84dd9421ee5 -r 26081654191c maven.j2ee/src/org/netbeans/modules/maven/j2ee/layer.xml
--- a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -46,9 +46,6 @@
 <filesystem>
     <folder name="Projects">
         <folder name="org-netbeans-modules-maven">
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-maven-j2ee-J2eeLookupProvider.instance"/>
-            </folder>  
             <folder name="Customizer">
                 <file name="org-netbeans-modules-maven-webframeworks-WebFrameworksPanelProvider.instance">
                     <attr name="position" intvalue="257"/>
diff -r f84dd9421ee5 -r 26081654191c maven.persistence/manifest.mf
--- a/maven.persistence/manifest.mf	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven.persistence/manifest.mf	Wed Nov 05 15:35:28 2008 +0100
@@ -1,7 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.maven.persistence/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/persistence/Bundle.properties
-OpenIDE-Module-Layer: org/netbeans/modules/maven/persistence/layer.xml
 OpenIDE-Module-Public-Packages: -
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module-Specification-Version: 1.1
diff -r f84dd9421ee5 -r 26081654191c maven.persistence/src/org/netbeans/modules/maven/persistence/PersistenceLookupProvider.java
--- a/maven.persistence/src/org/netbeans/modules/maven/persistence/PersistenceLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven.persistence/src/org/netbeans/modules/maven/persistence/PersistenceLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -48,7 +48,7 @@
  * extending the default maven project lookup.
  * @author  Milos Kleint 
  */
-
+@LookupProvider.Register(projectType="org-netbeans-modules-maven")
 public class PersistenceLookupProvider implements LookupProvider {
     
     /** Creates a new instance of J2eeLookupProvider */
diff -r f84dd9421ee5 -r 26081654191c maven.persistence/src/org/netbeans/modules/maven/persistence/layer.xml
--- a/maven.persistence/src/org/netbeans/modules/maven/persistence/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
-particular file as subject to the "Classpath" exception as provided
-by Sun in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 2008 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-
-
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd">
-<filesystem>
-    <folder name="Projects">
-        <folder name="org-netbeans-modules-maven">
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-maven-persistence-PersistenceLookupProvider.instance"/>
-            </folder>
-        </folder>
-    </folder>
-</filesystem>
diff -r f84dd9421ee5 -r 26081654191c maven.profiler/manifest.mf
--- a/maven.profiler/manifest.mf	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven.profiler/manifest.mf	Wed Nov 05 15:35:28 2008 +0100
@@ -1,7 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.maven.profiler/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/profiler/Bundle.properties
-OpenIDE-Module-Layer: org/netbeans/modules/maven/profiler/layer.xml
 OpenIDE-Module-Public-Packages: -
 OpenIDE-Module-Specification-Version: 1.1
 AutoUpdate-Show-In-Client: false
diff -r f84dd9421ee5 -r 26081654191c maven.profiler/src/org/netbeans/modules/maven/profiler/LookupProviderImpl.java
--- a/maven.profiler/src/org/netbeans/modules/maven/profiler/LookupProviderImpl.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven.profiler/src/org/netbeans/modules/maven/profiler/LookupProviderImpl.java	Wed Nov 05 15:35:28 2008 +0100
@@ -49,6 +49,7 @@
  *
  * @author mkleint
  */
+@LookupProvider.Register(projectType="org-netbeans-modules-maven")
 public class LookupProviderImpl implements LookupProvider {
 
     public Lookup createAdditionalLookup(Lookup baseContext) {
diff -r f84dd9421ee5 -r 26081654191c maven.profiler/src/org/netbeans/modules/maven/profiler/layer.xml
--- a/maven.profiler/src/org/netbeans/modules/maven/profiler/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
-particular file as subject to the "Classpath" exception as provided
-by Sun in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 2008 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd">
-<filesystem>
-    
-    <folder name="Projects">
-        <folder name="org-netbeans-modules-maven">
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-maven-profiler-LookupProviderImpl.instance"/>
-            </folder>
-        </folder>
-    </folder>
- 
-</filesystem>
diff -r f84dd9421ee5 -r 26081654191c maven.spring/manifest.mf
--- a/maven.spring/manifest.mf	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven.spring/manifest.mf	Wed Nov 05 15:35:28 2008 +0100
@@ -1,7 +1,6 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.modules.maven.spring/1
-OpenIDE-Module-Layer: org/netbeans/modules/maven/spring/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/spring/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.1
 
diff -r f84dd9421ee5 -r 26081654191c maven.spring/src/org/netbeans/modules/maven/spring/MavenSpringLookupProvider.java
--- a/maven.spring/src/org/netbeans/modules/maven/spring/MavenSpringLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven.spring/src/org/netbeans/modules/maven/spring/MavenSpringLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -49,6 +49,7 @@
  *
  * @author mkleint
  */
+@LookupProvider.Register(projectType="org-netbeans-modules-maven")
 public class MavenSpringLookupProvider implements LookupProvider {
 
     public Lookup createAdditionalLookup(Lookup baseContext) {
diff -r f84dd9421ee5 -r 26081654191c maven.spring/src/org/netbeans/modules/maven/spring/layer.xml
--- a/maven.spring/src/org/netbeans/modules/maven/spring/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven.spring/src/org/netbeans/modules/maven/spring/layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -43,11 +43,5 @@
 
 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
 <filesystem>
-    <folder name="Projects">
-        <folder name="org-netbeans-modules-maven">
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-maven-spring-MavenSpringLookupProvider.instance"/>
-            </folder>
-        </folder>
-    </folder>
+
 </filesystem>
diff -r f84dd9421ee5 -r 26081654191c maven/src/org/netbeans/modules/maven/layer.xml
--- a/maven/src/org/netbeans/modules/maven/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven/src/org/netbeans/modules/maven/layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -133,9 +133,6 @@
                     <attr name="position" intvalue="700"/>
                 </file>
             </folder>    
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-maven-runjar-J2seLookupProvider.instance"/>
-            </folder>    
             <folder name="Customizer">
                 <file name="org-netbeans-modules-maven-customizer-BasicPanelProvider.instance">
                     <attr name="position" intvalue="100"/>
diff -r f84dd9421ee5 -r 26081654191c maven/src/org/netbeans/modules/maven/runjar/J2seLookupProvider.java
--- a/maven/src/org/netbeans/modules/maven/runjar/J2seLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/maven/src/org/netbeans/modules/maven/runjar/J2seLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -52,7 +52,7 @@
  * extending the default maven project lookup.
  * @author  Milos Kleint
  */
-
+@LookupProvider.Register(projectType="org-netbeans-modules-maven")
 public class J2seLookupProvider implements LookupProvider {
     
     /** Creates a new instance of J2eeLookupProvider */
diff -r f84dd9421ee5 -r 26081654191c profiler.j2ee/src/org/netbeans/modules/profiler/j2ee/LookupProvider.java
--- a/profiler.j2ee/src/org/netbeans/modules/profiler/j2ee/LookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/profiler.j2ee/src/org/netbeans/modules/profiler/j2ee/LookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -41,10 +41,8 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
 import org.netbeans.api.project.Project;
 import java.util.List;
-import java.util.Set;
 import org.netbeans.modules.profiler.categories.Categorization;
 import org.netbeans.modules.profiler.categories.CategoryBuilder;
 import org.netbeans.modules.profiler.projectsupport.AbstractProjectLookupProvider;
@@ -54,6 +52,7 @@
  * @author Jiri Sedlacek
  */
 public class LookupProvider {
+    @org.netbeans.spi.project.LookupProvider.Register(projectType="org-netbeans-modules-web-project")
     public static class WebProject extends AbstractProjectLookupProvider {
         @Override
         protected List getAdditionalLookups(final Project project) {
@@ -66,6 +65,7 @@
         
     }
     
+    @org.netbeans.spi.project.LookupProvider.Register(projectType="org-netbeans-modules-j2ee-earproject")
     public static class EarProject extends AbstractProjectLookupProvider {
         @Override
         protected List getAdditionalLookups(final Project project) {
@@ -81,6 +81,7 @@
         
     }
     
+    @org.netbeans.spi.project.LookupProvider.Register(projectType="org-netbeans-modules-j2ee-ejbjarproject")
     public static class EjbJarProject extends AbstractProjectLookupProvider {
         @Override
         protected List getAdditionalLookups(final Project project) {
diff -r f84dd9421ee5 -r 26081654191c profiler.j2ee/src/org/netbeans/modules/profiler/j2ee/mf-layer.xml
--- a/profiler.j2ee/src/org/netbeans/modules/profiler/j2ee/mf-layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/profiler.j2ee/src/org/netbeans/modules/profiler/j2ee/mf-layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -219,9 +219,6 @@
     </folder>
     <folder name="Projects">
         <folder name="org-netbeans-modules-j2ee-ejbjarproject">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.profiler.j2ee.LookupProvider$EjbJarProject.instance"/>
-            </folder>
             <folder name="NBProfiler">
                 <folder name="Categories">
                     <file name="Persistence.shadow">
@@ -233,15 +230,7 @@
                 </folder>
             </folder>
         </folder>
-        <folder name="org-netbeans-modules-j2ee-earproject">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.profiler.j2ee.LookupProvider$EarProject.instance"/>
-            </folder>
-        </folder>
         <folder name="org-netbeans-modules-web-project">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.profiler.j2ee.LookupProvider$WebProject.instance"/>
-            </folder>
             <folder name="NBProfiler">
                 <folder name="Categories">
                     <file name="Persistence.shadow">
diff -r f84dd9421ee5 -r 26081654191c profiler.j2se/src/org/netbeans/modules/profiler/j2se/LookupProviderImpl.java
--- a/profiler.j2se/src/org/netbeans/modules/profiler/j2se/LookupProviderImpl.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/profiler.j2se/src/org/netbeans/modules/profiler/j2se/LookupProviderImpl.java	Wed Nov 05 15:35:28 2008 +0100
@@ -46,12 +46,14 @@
 import org.netbeans.modules.profiler.categories.Categorization;
 import org.netbeans.modules.profiler.categories.CategoryBuilder;
 import org.netbeans.modules.profiler.projectsupport.AbstractProjectLookupProvider;
+import org.netbeans.spi.project.LookupProvider;
 
 
 /**
  *
  * @author Jiri Sedlacek
  */
+@LookupProvider.Register(projectType="org-netbeans-modules-java-j2seproject")
 public class LookupProviderImpl extends AbstractProjectLookupProvider {        
     @Override
     protected List getAdditionalLookups(final Project project) {
diff -r f84dd9421ee5 -r 26081654191c profiler.j2se/src/org/netbeans/modules/profiler/j2se/mf-layer.xml
--- a/profiler.j2se/src/org/netbeans/modules/profiler/j2se/mf-layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/profiler.j2se/src/org/netbeans/modules/profiler/j2se/mf-layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -156,9 +156,6 @@
     </folder>
     <folder name="Projects">
         <folder name="org-netbeans-modules-java-j2seproject">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.profiler.j2se.LookupProviderImpl.instance"/>
-            </folder>
             <folder name="NBProfiler">
                 <folder name="Categories">
                     <file name="IO.shadow">
diff -r f84dd9421ee5 -r 26081654191c profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/LookupProviderImpl.java
--- a/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/LookupProviderImpl.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/LookupProviderImpl.java	Wed Nov 05 15:35:28 2008 +0100
@@ -46,12 +46,17 @@
 import org.netbeans.modules.profiler.categories.Categorization;
 import org.netbeans.modules.profiler.categories.CategoryBuilder;
 import org.netbeans.modules.profiler.projectsupport.AbstractProjectLookupProvider;
+import org.netbeans.spi.project.LookupProvider;
 
 
 /**
  *
  * @author Jiri Sedlacek
  */
+@LookupProvider.Register(projectType={
+        "org-netbeans-modules-apisupport-project",
+        "org-netbeans-modules-apisupport-project-suite"
+})
 public class LookupProviderImpl extends AbstractProjectLookupProvider {        
     @Override
     protected List getAdditionalLookups(final Project project) {
diff -r f84dd9421ee5 -r 26081654191c profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/mf-layer.xml
--- a/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/mf-layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/profiler.nbmodule/src/org/netbeans/modules/profiler/nbmodule/mf-layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -44,9 +44,6 @@
 <filesystem>
     <folder name="Projects">
         <folder name="org-netbeans-modules-apisupport-project">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.profiler.nbmodule.LookupProviderImpl.instance"/>
-            </folder>
             <folder name="NBProfiler">
                 <folder name="Categories">
                     <file name="IO.shadow">
@@ -59,11 +56,6 @@
                         <attr name="originalFile" stringvalue="NBProfiler/Categories/Lookup"/>
                     </file>
                 </folder>
-            </folder>
-        </folder>
-        <folder name="org-netbeans-modules-apisupport-project-suite">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.profiler.nbmodule.LookupProviderImpl.instance"/>
             </folder>
         </folder>
     </folder>
diff -r f84dd9421ee5 -r 26081654191c spring.beans/src/org/netbeans/modules/spring/beans/ProjectLookupProvider.java
--- a/spring.beans/src/org/netbeans/modules/spring/beans/ProjectLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/spring.beans/src/org/netbeans/modules/spring/beans/ProjectLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -55,15 +55,21 @@
 public class ProjectLookupProvider implements LookupProvider {
 
     private final Kind kind;
-
+    
+    @LookupProvider.Register(projectType={
+        "org-netbeans-modules-java-j2seproject",
+        "org-netbeans-modules-j2ee-ejbjarproject"
+    })
     public static ProjectLookupProvider standard() {
         return new ProjectLookupProvider(Kind.NON_WEB);
     }
 
+    @LookupProvider.Register(projectType="org-netbeans-modules-web-project")
     public static ProjectLookupProvider web() {
         return new ProjectLookupProvider(Kind.WEB);
     }
 
+    @LookupProvider.Register(projectType="org-netbeans-modules-maven")
     public static ProjectLookupProvider simple() {
         return new ProjectLookupProvider(Kind.SIMPLE);
     }
diff -r f84dd9421ee5 -r 26081654191c spring.beans/src/org/netbeans/modules/spring/beans/resources/layer.xml
--- a/spring.beans/src/org/netbeans/modules/spring/beans/resources/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/spring.beans/src/org/netbeans/modules/spring/beans/resources/layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -155,28 +155,10 @@
         </folder>
     </folder>
     <folder name="Projects">
-        <folder name="org-codehaus-mevenide-netbeans">
-         <!-- to be removed once maven modules are part of standard distro -->
-            <folder name="Customizer">
-                <file name="org.netbeans.modules.spring.beans.ui.customizer.CustomizerCategoryProvider.instance">
-                    <attr name="position" intvalue="278"/>
-                </file>
-            </folder>
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-spring-beans-ProjectLookupProvider.instance">
-                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.spring.beans.ProjectLookupProvider.standard"/>
-                </file>
-            </folder>
-        </folder>
         <folder name="org-netbeans-modules-maven">
             <folder name="Customizer">
                 <file name="org.netbeans.modules.spring.beans.ui.customizer.CustomizerCategoryProvider.instance">
                     <attr name="position" intvalue="278"/>
-                </file>
-            </folder>
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-spring-beans-ProjectLookupProvider.instance">
-                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.spring.beans.ProjectLookupProvider.simple"/>
                 </file>
             </folder>
         </folder>
@@ -186,11 +168,6 @@
                     <attr name="position" intvalue="250"/>
                 </file>
             </folder>
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-spring-beans-ProjectLookupProvider.instance">
-                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.spring.beans.ProjectLookupProvider.standard"/>
-                </file>
-            </folder>
         </folder>
         <folder name="org-netbeans-modules-java-j2seproject">
             <folder name="Customizer">
@@ -198,21 +175,11 @@
                     <attr name="position" intvalue="250"/>
                 </file>
             </folder>
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-spring-beans-ProjectLookupProvider.instance">
-                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.spring.beans.ProjectLookupProvider.standard"/>
-                </file>
-            </folder>
         </folder>
         <folder name="org-netbeans-modules-web-project">
             <folder name="Customizer">
                 <file name="org.netbeans.modules.spring.beans.ui.customizer.CustomizerCategoryProvider.instance">
                     <attr name="position" intvalue="250"/>
-                </file>
-            </folder>
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-spring-beans-ProjectLookupProvider.instance">
-                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.spring.beans.ProjectLookupProvider.web"/>
                 </file>
             </folder>
         </folder>
diff -r f84dd9421ee5 -r 26081654191c spring.webmvc/src/org/netbeans/modules/spring/webmvc/ProjectLookupProvider.java
--- a/spring.webmvc/src/org/netbeans/modules/spring/webmvc/ProjectLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/spring.webmvc/src/org/netbeans/modules/spring/webmvc/ProjectLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -50,6 +50,7 @@
  *
  * @author Andrei Badea
  */
+@LookupProvider.Register(projectType="org-netbeans-modules-web-project")
 public class ProjectLookupProvider implements LookupProvider {
 
     public Lookup createAdditionalLookup(Lookup baseContext) {
diff -r f84dd9421ee5 -r 26081654191c spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/layer.xml
--- a/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -56,19 +56,6 @@
             <file name="spring-webmvc-2.5.xml" url="spring-webmvc-2.5.xml"/>
         </folder>
     </folder>
-    <folder name="Projects">
-        <folder name="org-codehaus-mevenide-netbeans">
-         <!-- to be removed once maven modules are part of standard distro -->
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-spring-webmvc-ProjectLookupProvider.instance"/>
-            </folder>
-        </folder>
-        <folder name="org-netbeans-modules-web-project">
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-spring-webmvc-ProjectLookupProvider.instance"/>
-            </folder>
-        </folder>
-    </folder>
     <folder name="Templates">
         <folder name="SpringFramework">
             <file name="AbstractController.java" url="templates/AbstractController.template">
diff -r f84dd9421ee5 -r 26081654191c visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/ComplibLookupProvider.java
--- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/ComplibLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/ComplibLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -19,6 +19,7 @@
  * 
  * @author Edwin Goei
  */
+@LookupProvider.Register(projectType="org-netbeans-modules-web-project")
 public class ComplibLookupProvider implements LookupProvider {
 
     public static class ComplibProjectOpenedHook extends ProjectOpenedHook {
diff -r f84dd9421ee5 -r 26081654191c visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/resources/layer.xml
--- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/resources/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/resources/layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -81,9 +81,6 @@
             <folder name="BrokenLibraryRefFilterProviders">
               <file name="org-netbeans-modules-visualweb-project-jsf-libraries-ComplibBrokenLibraryRefFilterProvider.instance"/>
               <file name="org-netbeans-modules-visualweb-project-jsf-libraries-WebServicesBrokenLibraryRefFilterProvider.instance"/>
-            </folder>
-            <folder name="Lookup">
-              <file name="org-netbeans-modules-visualweb-project-jsf-libraries-ComplibLookupProvider.instance"/>
             </folder>
         </folder>
     </folder>
diff -r f84dd9421ee5 -r 26081654191c visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/OpenEditOverride.java
--- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/OpenEditOverride.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/OpenEditOverride.java	Wed Nov 05 15:35:28 2008 +0100
@@ -59,6 +59,7 @@
  * 
  * @author quynguyen
  */
+@LookupProvider.Register(projectType="org-netbeans-modules-web-project")
 public final class OpenEditOverride  implements LookupProvider {
     // Taken from org.netbeans.modules.project.ui.ProjectUtilities
     private static final String OPEN_FILES_NS = "http://www.netbeans.org/ns/projectui-open-files/1"; // NOI18N
diff -r f84dd9421ee5 -r 26081654191c visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/layer.xml
--- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -103,14 +103,6 @@
             </file>
         </folder>
     </folder>
-    
-    <folder name="Projects">
-      <folder name="org-netbeans-modules-web-project">
-        <folder name="Lookup">
-          <file name="org.netbeans.modules.visualweb.project.jsfloader.OpenEditOverride.instance"/>
-        </folder>
-      </folder>
-    </folder> 
 
 
     <folder name="CreatorJavaPalette">
diff -r f84dd9421ee5 -r 26081654191c websvc.core/src/org/netbeans/modules/websvc/core/jaxws/projects/J2SEWSSupportLookupProvider.java
--- a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/projects/J2SEWSSupportLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/projects/J2SEWSSupportLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -57,6 +57,7 @@
  *
  * @author mkuchtiak
  */
+@LookupProvider.Register(projectType="org-netbeans-modules-java-j2seproject")
 public class J2SEWSSupportLookupProvider implements LookupProvider {
     
     /** Creates a new instance of JaxWSLookupProvider */
diff -r f84dd9421ee5 -r 26081654191c websvc.core/src/org/netbeans/modules/websvc/core/jaxws/projects/JavaEEWSSupportLookupProvider.java
--- a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/projects/JavaEEWSSupportLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/projects/JavaEEWSSupportLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -71,6 +71,11 @@
  *
  * @author mkuchtiak
  */
+    @LookupProvider.Register(projectType={
+        "org-netbeans-modules-web-project",
+        "org-netbeans-modules-j2ee-ejbjarproject",
+        "org-netbeans-modules-j2ee-clientproject"
+    })
 public class JavaEEWSSupportLookupProvider implements LookupProvider {
 
     /** Creates a new instance of JavaEEWSSupportLookupProvider */
diff -r f84dd9421ee5 -r 26081654191c websvc.core/src/org/netbeans/modules/websvc/core/resources/mf-layer.xml
--- a/websvc.core/src/org/netbeans/modules/websvc/core/resources/mf-layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/websvc.core/src/org/netbeans/modules/websvc/core/resources/mf-layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -151,9 +151,6 @@
     <folder name="Projects">
         <!-- populate J2SE Project Lookup with WS Client Support -->
         <folder name="org-netbeans-modules-java-j2seproject">
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-websvc-core-jaxws-projects-J2SEWSSupportLookupProvider.instance"/>
-            </folder>
             <folder name="Nodes">
                 <file name="org-netbeans-modules-websvc-core-ProjectWebServiceNodeFactory.instance">
                     <attr name="position" intvalue="260"/>
@@ -161,9 +158,6 @@
             </folder>
         </folder>
         <folder name="org-netbeans-modules-web-project">
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-websvc-core-jaxws-projects-JavaEEWSSupportLookupProvider.instance"/>
-            </folder>  
             <folder name="Nodes">
                 <file name="org-netbeans-modules-websvc-core-ProjectWebServiceNodeFactory.instance">
                     <attr name="position" intvalue="400"/>
@@ -171,18 +165,10 @@
                 </folder>
         </folder>
         <folder name="org-netbeans-modules-j2ee-ejbjarproject">
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-websvc-core-jaxws-projects-JavaEEWSSupportLookupProvider.instance"/>
-            </folder>
             <folder name="Nodes">
                 <file name="org-netbeans-modules-websvc-core-ProjectWebServiceNodeFactory.instance">
                     <attr name="position" intvalue="155"/>
                 </file>
-            </folder>
-        </folder>
-        <folder name="org-netbeans-modules-j2ee-clientproject">
-            <folder name="Lookup">
-                <file name="org-netbeans-modules-websvc-core-jaxws-projects-JavaEEWSSupportLookupProvider.instance"/>
             </folder>
         </folder>
     </folder>
diff -r f84dd9421ee5 -r 26081654191c websvc.jaxwsmodel/manifest.mf
--- a/websvc.jaxwsmodel/manifest.mf	Wed Nov 05 15:28:15 2008 +0100
+++ b/websvc.jaxwsmodel/manifest.mf	Wed Nov 05 15:35:28 2008 +0100
@@ -1,6 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.websvc.jaxwsmodel/1
-OpenIDE-Module-Layer: org/netbeans/modules/websvc/jaxwsmodel/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/jaxwsmodel/resources/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.5
 AutoUpdate-Show-In-Client: false
diff -r f84dd9421ee5 -r 26081654191c websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/project/AppClientJaxWsLookupProvider.java
--- a/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/project/AppClientJaxWsLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/project/AppClientJaxWsLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -65,6 +65,7 @@
  *
  * @author mkuchtiak
  */
+@LookupProvider.Register(projectType="org-netbeans-modules-j2ee-clientproject")
 public class AppClientJaxWsLookupProvider implements LookupProvider {
     
     private String JAX_WS_XML_RESOURCE="/org/netbeans/modules/websvc/jaxwsmodel/resources/jax-ws.xml"; //NOI18N
diff -r f84dd9421ee5 -r 26081654191c websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/project/EjbJaxWsLookupProvider.java
--- a/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/project/EjbJaxWsLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/project/EjbJaxWsLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -71,6 +71,7 @@
  *
  * @author mkuchtiak
  */
+@LookupProvider.Register(projectType="org-netbeans-modules-j2ee-ejbjarproject")
 public class EjbJaxWsLookupProvider implements LookupProvider {
 
     private String JAX_WS_XML_RESOURCE = "/org/netbeans/modules/websvc/jaxwsmodel/resources/jax-ws.xml"; //NOI18N
diff -r f84dd9421ee5 -r 26081654191c websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/project/J2seJaxWsLookupProvider.java
--- a/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/project/J2seJaxWsLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/project/J2seJaxWsLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -67,6 +67,7 @@
  *
  * @author mkuchtiak
  */
+@LookupProvider.Register(projectType="org-netbeans-modules-java-j2seproject")
 public class J2seJaxWsLookupProvider implements LookupProvider {
     
     private String JAX_WS_XML_RESOURCE="/org/netbeans/modules/websvc/jaxwsmodel/resources/jax-ws.xml"; //NOI18N
diff -r f84dd9421ee5 -r 26081654191c websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/project/WebJaxWsLookupProvider.java
--- a/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/project/WebJaxWsLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/project/WebJaxWsLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -73,6 +73,7 @@
  *
  * @author mkuchtiak
  */
+@LookupProvider.Register(projectType="org-netbeans-modules-web-project")
 public class WebJaxWsLookupProvider implements LookupProvider {
     
     private String JAX_WS_XML_RESOURCE="/org/netbeans/modules/websvc/jaxwsmodel/resources/jax-ws.xml"; //NOI18N
diff -r f84dd9421ee5 -r 26081654191c websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/resources/layer.xml
--- a/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/resources/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxwsmodel/resources/layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -42,27 +42,4 @@
 -->
 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
 <filesystem>
-
-    <folder name="Projects">
-        <folder name="org-netbeans-modules-java-j2seproject">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.websvc.jaxwsmodel.project.J2seJaxWsLookupProvider.instance"/>
-            </folder>            
-        </folder>
-        <folder name="org-netbeans-modules-web-project">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.websvc.jaxwsmodel.project.WebJaxWsLookupProvider.instance"/>
-            </folder>            
-        </folder>
-        <folder name="org-netbeans-modules-j2ee-ejbjarproject">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.websvc.jaxwsmodel.project.EjbJaxWsLookupProvider.instance"/>
-            </folder>            
-        </folder>
-        <folder name="org-netbeans-modules-j2ee-clientproject">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.websvc.jaxwsmodel.project.AppClientJaxWsLookupProvider.instance"/>
-            </folder>            
-        </folder>   
-    </folder>
 </filesystem>
diff -r f84dd9421ee5 -r 26081654191c websvc.rest/src/org/netbeans/modules/websvc/rest/projects/WebRestSupportLookupProvider.java
--- a/websvc.rest/src/org/netbeans/modules/websvc/rest/projects/WebRestSupportLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/websvc.rest/src/org/netbeans/modules/websvc/rest/projects/WebRestSupportLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -52,6 +52,7 @@
  *
  * @author mkuchtiak
  */
+@LookupProvider.Register(projectType="org-netbeans-modules-web-project")
 public class WebRestSupportLookupProvider implements LookupProvider {
     
     /** Creates a new instance of JaxWSLookupProvider */
diff -r f84dd9421ee5 -r 26081654191c websvc.rest/src/org/netbeans/modules/websvc/rest/resources/layer.xml
--- a/websvc.rest/src/org/netbeans/modules/websvc/rest/resources/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/websvc.rest/src/org/netbeans/modules/websvc/rest/resources/layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -201,9 +201,6 @@
           <file name="org.netbeans.modules.websvc.rest.projects.ProjectTestRestServicesAction.instance"/>
         </folder>
         <folder name="org-netbeans-modules-web-project">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.websvc.rest.projects.WebRestSupportLookupProvider.instance"/>
-            </folder> 
             <folder name="Nodes">
                 <file name="org-netbeans-modules-websvc-rest-nodes-RestServicesNodeFactory.instance">
                     <attr name="position" intvalue="450"/>
diff -r f84dd9421ee5 -r 26081654191c xml.jaxb/src/org/netbeans/modules/xml/jaxb/layer.xml
--- a/xml.jaxb/src/org/netbeans/modules/xml/jaxb/layer.xml	Wed Nov 05 15:28:15 2008 +0100
+++ b/xml.jaxb/src/org/netbeans/modules/xml/jaxb/layer.xml	Wed Nov 05 15:35:28 2008 +0100
@@ -44,10 +44,6 @@
 <filesystem>
     <folder name="Projects">
         <folder name="org-netbeans-modules-java-j2seproject">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.xml.jaxb.model.JAXBWizLookupProvider.instance"/>
-            </folder>
-            
             <folder name="Nodes">                
                 <file name="org-netbeans-modules-xml-jaxb-ui-JAXBNodeFactory.instance">
                     <attr name="position" intvalue="100"/>
@@ -55,10 +51,6 @@
             </folder>
         </folder>
         <folder name="org-netbeans-modules-web-project">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.xml.jaxb.model.JAXBWizLookupProvider.instance"/>
-            </folder>
-
             <folder name="Nodes">
                 <file name="org-netbeans-modules-xml-jaxb-ui-JAXBNodeFactory.instance">
                     <attr name="position" intvalue="100"/>
@@ -66,10 +58,6 @@
             </folder>
         </folder>        
         <folder name="org-netbeans-modules-j2ee-ejbjarproject">
-            <folder name="Lookup">
-                <file name="org.netbeans.modules.xml.jaxb.model.JAXBWizLookupProvider.instance"/>
-            </folder>
-            
             <folder name="Nodes">
                 <file name="org-netbeans-modules-xml-jaxb-ui-JAXBNodeFactory.instance">
                     <attr name="position" intvalue="125"/>
diff -r f84dd9421ee5 -r 26081654191c xml.jaxb/src/org/netbeans/modules/xml/jaxb/model/JAXBWizLookupProvider.java
--- a/xml.jaxb/src/org/netbeans/modules/xml/jaxb/model/JAXBWizLookupProvider.java	Wed Nov 05 15:28:15 2008 +0100
+++ b/xml.jaxb/src/org/netbeans/modules/xml/jaxb/model/JAXBWizLookupProvider.java	Wed Nov 05 15:35:28 2008 +0100
@@ -38,6 +38,11 @@
  *
  * @author gpatil
  */
+@LookupProvider.Register(projectType={
+    "org-netbeans-modules-java-j2seproject",
+    "org-netbeans-modules-web-project",
+    "org-netbeans-modules-j2ee-ejbjarproject"
+})
 public class JAXBWizLookupProvider implements LookupProvider {
 
     public Lookup createAdditionalLookup(Lookup baseContext) {