# HG changeset patch
# User Milos Kleint <mkleint@netbeans.org>
# Date 1226484901 -3600
# Node ID c0fb8b51937041453c12609cbc632660b5c9dbcb
# Parent  690fffa4fb6ee823c5549d0d0d252f6ab96dc5cd
#153015 rewrite modules to use the new NodeFactory.Registration annotation instead of the layer registration

diff -r 690fffa4fb6e -r c0fb8b519370 ant.freeform/src/org/netbeans/modules/ant/freeform/resources/layer.xml
--- a/ant.freeform/src/org/netbeans/modules/ant/freeform/resources/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ b/ant.freeform/src/org/netbeans/modules/ant/freeform/resources/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -54,9 +54,6 @@
                     <attr name="position" intvalue="700"/>
                 </file>
                 </folder>    
-            <folder name="Nodes">
-                <file name="org-netbeans-modules-ant-freeform-ui-FolderNodeFactory.instance"/>
-            </folder>    
          </folder>
     </folder>
     <folder name="ProjectXMLCatalog">
diff -r 690fffa4fb6e -r c0fb8b519370 ant.freeform/src/org/netbeans/modules/ant/freeform/ui/FolderNodeFactory.java
--- a/ant.freeform/src/org/netbeans/modules/ant/freeform/ui/FolderNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/ant.freeform/src/org/netbeans/modules/ant/freeform/ui/FolderNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -89,7 +89,6 @@
 import org.openide.util.ImageUtilities;
 import org.openide.util.Lookup;
 import org.openide.util.RequestProcessor;
-import org.openide.util.Utilities;
 import org.openide.util.actions.SystemAction;
 import org.openide.util.lookup.Lookups;
 import org.w3c.dom.Element;
@@ -98,6 +97,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-ant-freeform")
 public class FolderNodeFactory implements NodeFactory {
     
     /** Creates a new instance of FolderNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 apisupport.project/src/org/netbeans/modules/apisupport/project/ui/ImportantFilesNodeFactory.java
--- a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/ImportantFilesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/ImportantFilesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -78,6 +78,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType={"org-netbeans-modules-apisupport-project-suite","org-netbeans-modules-apisupport-project"}, position=200)
 public class ImportantFilesNodeFactory implements NodeFactory {
 
     /** Package private for unit tests. */
diff -r 690fffa4fb6e -r c0fb8b519370 apisupport.project/src/org/netbeans/modules/apisupport/project/ui/LibrariesNodeFactory.java
--- a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/LibrariesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/LibrariesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -55,6 +55,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-apisupport-project", position=300)
 public class LibrariesNodeFactory implements NodeFactory {
     
     /** Creates a new instance of LibrariesNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 apisupport.project/src/org/netbeans/modules/apisupport/project/ui/ModulesNodeFactory.java
--- a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/ModulesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/ModulesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -82,7 +82,6 @@
 import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
 import org.openide.util.RequestProcessor;
-import org.openide.util.Utilities;
 import org.openide.util.actions.CookieAction;
 import org.openide.util.actions.NodeAction;
 import org.openide.util.lookup.Lookups;
@@ -91,6 +90,7 @@
 /**
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-apisupport-project-suite", position=100)
 public class ModulesNodeFactory implements NodeFactory {
 
     public ModulesNodeFactory() {}
diff -r 690fffa4fb6e -r c0fb8b519370 apisupport.project/src/org/netbeans/modules/apisupport/project/ui/SourcesNodeFactory.java
--- a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/SourcesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/SourcesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -65,6 +65,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-apisupport-project", position=100)
 public class SourcesNodeFactory implements NodeFactory {
     
     /** Creates a new instance of SourcesNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 apisupport.project/src/org/netbeans/modules/apisupport/project/ui/TestDataDirsNodeFactory.java
--- a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/TestDataDirsNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/TestDataDirsNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -58,6 +58,7 @@
 /**
  * Displays data directories.
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-apisupport-project", position=150)
 public class TestDataDirsNodeFactory implements NodeFactory {
 
     /** public for layer */
diff -r 690fffa4fb6e -r c0fb8b519370 apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer.xml
--- a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -298,20 +298,6 @@
     <folder name="Projects">
         <folder name="org-netbeans-modules-apisupport-project">
             <folder name="Lookup"/>
-            <folder name="Nodes">
-                <file name="org-netbeans-modules-apisupport-project-ui-SourcesNodeFactory.instance">
-                    <attr name="position" intvalue="100"/>
-                </file>
-                <file name="org-netbeans-modules-apisupport-project-ui-TestDataDirsNodeFactory.instance">
-                    <attr name="position" intvalue="150"/>
-                </file>
-                <file name="org-netbeans-modules-apisupport-project-ui-ImportantFilesNodeFactory.instance">
-                    <attr name="position" intvalue="200"/>
-                </file>
-                <file name="org-netbeans-modules-apisupport-project-ui-LibrariesNodeFactory.instance">
-                    <attr name="position" intvalue="300"/>
-                </file>
-            </folder>
             <folder name="Customizer">
                 <file name="org-netbeans-modules-apisupport-project-ui-customizer-CustomizerSourcesFactory.instance">
                     <attr name="position" intvalue="100"/>
@@ -345,14 +331,6 @@
         </folder>
         <folder name="org-netbeans-modules-apisupport-project-suite">
             <folder name="Lookup"/>
-            <folder name="Nodes">
-                <file name="org-netbeans-modules-apisupport-project-ui-ModulesNodeFactory.instance">
-                    <attr name="position" intvalue="100"/>
-                </file>
-                <file name="org-netbeans-modules-apisupport-project-ui-ImportantFilesNodeFactory.instance">
-                    <attr name="position" intvalue="200"/>
-                </file>
-            </folder>
             <folder name="Customizer">
                 <file name="org-netbeans-modules-apisupport-project-ui-customizer-SuiteCustomizerSourcesFactory.instance">
                     <attr name="position" intvalue="100"/>
diff -r 690fffa4fb6e -r c0fb8b519370 groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/layer.xml
--- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -150,10 +150,6 @@
                 </file>
             </folder>
 
-            <folder name="Nodes">
-                <file name="org-netbeans-modules-groovy-grailsproject-ui-SourceNodeFactory.instance"/>
-            </folder>
-            
             <folder name="Lookup"/>
             
         </folder>
diff -r 690fffa4fb6e -r c0fb8b519370 groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/SourceNodeFactory.java
--- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/SourceNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/SourceNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -64,6 +64,7 @@
  *
  * @author Martin Adamek
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-groovy-grailsproject")
 public class SourceNodeFactory implements NodeFactory {
 
     public SourceNodeFactory() {
diff -r 690fffa4fb6e -r c0fb8b519370 j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ConfFilesNodeFactory.java
--- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ConfFilesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ConfFilesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -54,7 +54,9 @@
 /**
  *
  * @author Lukas Jungmann
- */ public class ConfFilesNodeFactory implements NodeFactory {
+ */
+@NodeFactory.Registration(projectType="org-netbeans-modules-j2ee-earproject", position=100)
+public class ConfFilesNodeFactory implements NodeFactory {
 
     public ConfFilesNodeFactory() {
     }
diff -r 690fffa4fb6e -r c0fb8b519370 j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeFactory.java
--- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -53,6 +53,7 @@
  *
  * @author Lukas Jungmann
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-j2ee-earproject", position=300)
 public class ModuleNodeFactory implements NodeFactory {
 
     public ModuleNodeFactory() {
diff -r 690fffa4fb6e -r c0fb8b519370 j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/SetupDirNodeFactory.java
--- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/SetupDirNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/SetupDirNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -56,6 +56,7 @@
  * 
  * @author gpatil
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-j2ee-earproject", position=200)
 public final class SetupDirNodeFactory implements NodeFactory {
     
     public SetupDirNodeFactory() {
diff -r 690fffa4fb6e -r c0fb8b519370 j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/layer.xml
--- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -113,18 +113,6 @@
                 </file>
             </folder>
             
-            <folder name="Nodes">
-                <file name="org-netbeans-modules-j2ee-earproject-ui-ConfFilesNodeFactory.instance">
-                        <attr name="position" intvalue="100"/>
-                    </file>
-                <file name="org-netbeans-modules-j2ee-earproject-ui-SetupDirNodeFactory.instance">
-                        <attr name="position" intvalue="200"/>
-                    </file>
-                <file name="org-netbeans-modules-j2ee-earproject-ui-ModuleNodeFactory.instance">
-                        <attr name="position" intvalue="300"/>
-                    </file>
-            </folder>
-
             <folder name="Lookup"/>
             
         </folder>
diff -r 690fffa4fb6e -r c0fb8b519370 j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/ConfFilesNodeFactory.java
--- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/ConfFilesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/ConfFilesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -56,6 +56,7 @@
  *
  * @author gpatil
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-j2ee-ejbjarproject", position=200)
 public class ConfFilesNodeFactory implements NodeFactory {
 
     public ConfFilesNodeFactory() {
diff -r 690fffa4fb6e -r c0fb8b519370 j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbsNodeFactory.java
--- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbsNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbsNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -57,6 +57,7 @@
  * 
  * @author gpatil
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-j2ee-ejbjarproject", position=100)
 public class EjbsNodeFactory implements NodeFactory {
 
     public EjbsNodeFactory() {
diff -r 690fffa4fb6e -r c0fb8b519370 j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/LibrariesNodeFactory.java
--- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/LibrariesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/LibrariesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -76,6 +76,7 @@
  * 
  * @author gpatil
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-j2ee-ejbjarproject", position=500)
 public final class LibrariesNodeFactory implements NodeFactory {
     
     /** Creates a new instance of LibrariesNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/SetupDirNodeFactory.java
--- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/SetupDirNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/SetupDirNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -56,6 +56,7 @@
  * 
  * @author gpatil
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-j2ee-ejbjarproject", position=300)
 public final class SetupDirNodeFactory implements NodeFactory {
     
     public SetupDirNodeFactory() {
diff -r 690fffa4fb6e -r c0fb8b519370 j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/layer.xml
--- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -120,20 +120,8 @@
             <folder name="Lookup"/>
 
             <folder name="Nodes">
-                <file name="org-netbeans-modules-j2ee-ejbjarproject-ui-EjbsNodeFactory.instance">
-                    <attr name="position" intvalue="100"/>
-                </file>
-                <file name="org-netbeans-modules-j2ee-ejbjarproject-ui-ConfFilesNodeFactory.instance">
-                    <attr name="position" intvalue="200"/>
-                </file>
-                <file name="org-netbeans-modules-j2ee-ejbjarproject-ui-SetupDirNodeFactory.instance">
-                    <attr name="position" intvalue="300"/>
-                </file>
                 <file name="org-netbeans-modules-java-api-common-project-ui-JavaSourceNodeFactory.instance">
                     <attr name="position" intvalue="400"/>
-                </file>
-                <file name="org-netbeans-modules-j2ee-ejbjarproject-ui-LibrariesNodeFactory.instance">
-                    <attr name="position" intvalue="500"/>
                 </file>
             </folder>
 
diff -r 690fffa4fb6e -r c0fb8b519370 java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/LibrariesNodeFactory.java
--- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/LibrariesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/LibrariesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -72,6 +72,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-java-j2seproject", position=300)
 public final class LibrariesNodeFactory implements NodeFactory {
     
     /** Creates a new instance of LibrariesNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml
--- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -135,9 +135,6 @@
                 <file name="org-netbeans-modules-java-api-common-project-ui-JavaSourceNodeFactory.instance">
                     <attr name="position" intvalue="200"/>
                 </file>
-                <file name="org-netbeans-modules-java-j2seproject-ui-LibrariesNodeFactory.instance">
-                    <attr name="position" intvalue="300"/>
-                </file>
             </folder>
             
             <folder name="Lookup"/>
diff -r 690fffa4fb6e -r c0fb8b519370 maven.apisupport/src/org/netbeans/modules/maven/apisupport/ImportantFilesNodeFactory.java
--- a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ImportantFilesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ImportantFilesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -77,6 +77,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-maven",position=650)
 public class ImportantFilesNodeFactory implements NodeFactory {
     /** Package private for unit tests. */
     static final String IMPORTANT_FILES_NAME = "important.files"; // NOI18N
diff -r 690fffa4fb6e -r c0fb8b519370 maven.apisupport/src/org/netbeans/modules/maven/apisupport/layer.xml
--- a/maven.apisupport/src/org/netbeans/modules/maven/apisupport/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ b/maven.apisupport/src/org/netbeans/modules/maven/apisupport/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -55,11 +55,6 @@
                     <attr name="repoIndexUrl" stringvalue="http://deadlock.netbeans.org/maven2/.index/netbeans/"/>
                 </file>
             </folder>
-            <folder name="Nodes">
-                <file name="org-netbeans-modules-maven-apisupport-ImportantFilesNodeFactory.instance">
-                    <attr name="position" intvalue="650"/>
-                </file>
-            </folder>
             <folder name="ProjectActions">
                 <file name="NBMReload.instance">
                     <attr name="instanceOf" stringvalue="javax.swing.Action" />
diff -r 690fffa4fb6e -r c0fb8b519370 maven.gsf/manifest.mf
--- a/maven.gsf/manifest.mf	Wed Nov 12 11:12:08 2008 +0100
+++ b/maven.gsf/manifest.mf	Wed Nov 12 11:15:01 2008 +0100
@@ -1,5 +1,4 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.maven.gsf/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/gsf/Bundle.properties
-OpenIDE-Module-Layer: org/netbeans/modules/maven/gsf/layer.xml
 OpenIDE-Module-Public-Packages: -
diff -r 690fffa4fb6e -r c0fb8b519370 maven.gsf/src/org/netbeans/modules/maven/gsf/SourcesNodeFactory.java
--- a/maven.gsf/src/org/netbeans/modules/maven/gsf/SourcesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/maven.gsf/src/org/netbeans/modules/maven/gsf/SourcesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -58,6 +58,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-maven",position=139)
 public class SourcesNodeFactory implements NodeFactory {
     
     /** Creates a new instance of SourcesNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 maven.gsf/src/org/netbeans/modules/maven/gsf/layer.xml
--- a/maven.gsf/src/org/netbeans/modules/maven/gsf/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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="Nodes">
-                <file name="org-netbeans-modules-maven-gsf-SourcesNodeFactory.instance">
-                    <attr name="position" intvalue="139"/>
-                </file>
-            </folder>
-        </folder>
-    </folder>
-
-</filesystem>
diff -r 690fffa4fb6e -r c0fb8b519370 maven.j2ee/src/org/netbeans/modules/maven/j2ee/layer.xml
--- a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -60,12 +60,6 @@
                     <attr name="position" intvalue="303"/>
                 </file>
             </folder>
-            <folder name="Nodes">
-                <file name="org-netbeans-modules-maven-j2ee-web-WebAppNodeFactory.instance">
-                    <attr name="position" intvalue="50"/>
-                </file>
-            </folder>    
-            
         </folder>
     </folder>
 </filesystem>
diff -r 690fffa4fb6e -r c0fb8b519370 maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/WebAppNodeFactory.java
--- a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/WebAppNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/WebAppNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -61,6 +61,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-maven",position=50)
 public class WebAppNodeFactory implements NodeFactory {
     private static final String KEY_WEBAPP = "webapp"; //NOI18N
     
diff -r 690fffa4fb6e -r c0fb8b519370 maven/src/org/netbeans/modules/maven/layer.xml
--- a/maven/src/org/netbeans/modules/maven/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ b/maven/src/org/netbeans/modules/maven/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -110,29 +110,7 @@
     
     <folder name="Projects">
         <folder name="org-netbeans-modules-maven">
-            <folder name="Nodes">
-                <file name="org-netbeans-modules-maven-nodes-SourcesNodeFactory.instance">
-                    <attr name="position" intvalue="100"/>
-                </file>
-                <file name="org-netbeans-modules-maven-nodes-OtherRootNodeFactory.instance">
-                    <attr name="position" intvalue="200"/>
-                </file>
-                <file name="org-netbeans-modules-maven-nodes-GenSourcesNodeFactory.instance">
-                    <attr name="position" intvalue="300"/>
-                </file>
-                <file name="org-netbeans-modules-maven-nodes-ModulesNodeFactory.instance">
-                    <attr name="position" intvalue="400"/>
-                </file>
-                <file name="org-netbeans-modules-maven-nodes-DependenciesNodeFactory.instance">
-                    <attr name="position" intvalue="500"/>
-                </file>
-                <file name="org-netbeans-modules-maven-nodes-SiteDocsNodeFactory.instance">
-                    <attr name="position" intvalue="600"/>
-                </file>
-                <file name="org-netbeans-modules-maven-nodes-ProjectFilesNodeFactory.instance">
-                    <attr name="position" intvalue="700"/>
-                </file>
-            </folder>    
+            <folder name="Nodes"/>
             <folder name="Customizer">
                 <file name="org-netbeans-modules-maven-customizer-BasicPanelProvider.instance">
                     <attr name="position" intvalue="100"/>
diff -r 690fffa4fb6e -r c0fb8b519370 maven/src/org/netbeans/modules/maven/nodes/DependenciesNodeFactory.java
--- a/maven/src/org/netbeans/modules/maven/nodes/DependenciesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/maven/src/org/netbeans/modules/maven/nodes/DependenciesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -42,9 +42,7 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import org.apache.maven.project.MavenProject;
 import org.netbeans.modules.maven.NbMavenProjectImpl;
 import org.netbeans.modules.maven.api.NbMavenProject;
 import org.netbeans.api.project.Project;
@@ -56,6 +54,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-maven",position=500)
 public class DependenciesNodeFactory implements NodeFactory {
     
     private static final String KEY_DEPENDENCIES = "dependencies"; //NOI18N
diff -r 690fffa4fb6e -r c0fb8b519370 maven/src/org/netbeans/modules/maven/nodes/GenSourcesNodeFactory.java
--- a/maven/src/org/netbeans/modules/maven/nodes/GenSourcesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/maven/src/org/netbeans/modules/maven/nodes/GenSourcesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -58,6 +58,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-maven",position=300)
 public class GenSourcesNodeFactory implements NodeFactory {
     
     /** Creates a new instance of GenSourcesNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 maven/src/org/netbeans/modules/maven/nodes/ModulesNodeFactory.java
--- a/maven/src/org/netbeans/modules/maven/nodes/ModulesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/maven/src/org/netbeans/modules/maven/nodes/ModulesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -54,6 +54,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-maven",position=400)
 public class ModulesNodeFactory implements NodeFactory {
     
     private static final String KEY_MODULES = "modules"; //NOI18N
diff -r 690fffa4fb6e -r c0fb8b519370 maven/src/org/netbeans/modules/maven/nodes/OtherRootNodeFactory.java
--- a/maven/src/org/netbeans/modules/maven/nodes/OtherRootNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/maven/src/org/netbeans/modules/maven/nodes/OtherRootNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -61,6 +61,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-maven",position=200)
 public class OtherRootNodeFactory implements NodeFactory {
     
     private static final String KEY_OTHER = "otherRoots"; //NOI18N
diff -r 690fffa4fb6e -r c0fb8b519370 maven/src/org/netbeans/modules/maven/nodes/ProjectFilesNodeFactory.java
--- a/maven/src/org/netbeans/modules/maven/nodes/ProjectFilesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/maven/src/org/netbeans/modules/maven/nodes/ProjectFilesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -49,6 +49,7 @@
  * shows maven project files.
  * @author  Milos Kleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-maven",position=700)
 public class ProjectFilesNodeFactory implements NodeFactory {
     
     /** Creates a new instance of ProjectFilesNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 maven/src/org/netbeans/modules/maven/nodes/SiteDocsNodeFactory.java
--- a/maven/src/org/netbeans/modules/maven/nodes/SiteDocsNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/maven/src/org/netbeans/modules/maven/nodes/SiteDocsNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -56,6 +56,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-maven",position=600)
 public class SiteDocsNodeFactory implements NodeFactory {
     private static final String KEY_SITE = "SITE"; //NOI18N
     private static final String SITE = "src/site"; //NOI18N
diff -r 690fffa4fb6e -r c0fb8b519370 maven/src/org/netbeans/modules/maven/nodes/SourcesNodeFactory.java
--- a/maven/src/org/netbeans/modules/maven/nodes/SourcesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/maven/src/org/netbeans/modules/maven/nodes/SourcesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -65,6 +65,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-maven",position=100)
 public class SourcesNodeFactory implements NodeFactory {
     
     /** Creates a new instance of SourcesNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 php.project/src/org/netbeans/modules/php/project/resources/layer.xml
--- a/php.project/src/org/netbeans/modules/php/project/resources/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ b/php.project/src/org/netbeans/modules/php/project/resources/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -156,14 +156,6 @@
                     <attr name="position" intvalue="1000"/>
                 </file>
             </folder>
-            <folder name="Nodes">
-                <file name="org-netbeans-modules-php-project-ui-logicalview-SourcesNodeFactory.instance">
-                    <attr name="position" intvalue="100"/>
-                </file>
-                <file name="org-netbeans-modules-php-project-ui-logicalview-IncludePathNodeFactory.instance">
-                    <attr name="position" intvalue="200"/>
-                </file>
-            </folder>
         </folder>
     </folder>
     <folder name="PHP">
diff -r 690fffa4fb6e -r c0fb8b519370 php.project/src/org/netbeans/modules/php/project/ui/logicalview/IncludePathNodeFactory.java
--- a/php.project/src/org/netbeans/modules/php/project/ui/logicalview/IncludePathNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/php.project/src/org/netbeans/modules/php/project/ui/logicalview/IncludePathNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -74,6 +74,7 @@
  *
  * @author Radek Matous
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-php-project", position=200)
 public class IncludePathNodeFactory implements NodeFactory {
 
     /** Creates a new instance of SourcesNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 php.project/src/org/netbeans/modules/php/project/ui/logicalview/SourcesNodeFactory.java
--- a/php.project/src/org/netbeans/modules/php/project/ui/logicalview/SourcesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/php.project/src/org/netbeans/modules/php/project/ui/logicalview/SourcesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -65,6 +65,7 @@
  *
  * @author Radek Matous
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-php-project", position=100)
 public class SourcesNodeFactory implements NodeFactory {
     private static final Logger LOGGER = Logger.getLogger(SourcesNodeFactory.class.getName());
 
diff -r 690fffa4fb6e -r c0fb8b519370 ruby.project/src/org/netbeans/modules/ruby/rubyproject/ui/ProjectRootNodeFactory.java
--- a/ruby.project/src/org/netbeans/modules/ruby/rubyproject/ui/ProjectRootNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/ruby.project/src/org/netbeans/modules/ruby/rubyproject/ui/ProjectRootNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -85,6 +85,7 @@
 /**
  * Factory for the nodes in the Rails Project logical view.
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-ruby-rubyproject")
 public final class ProjectRootNodeFactory implements NodeFactory {
     
     public NodeList createNodes(Project p) {
diff -r 690fffa4fb6e -r c0fb8b519370 ruby.project/src/org/netbeans/modules/ruby/rubyproject/ui/resources/layer.xml
--- a/ruby.project/src/org/netbeans/modules/ruby/rubyproject/ui/resources/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ b/ruby.project/src/org/netbeans/modules/ruby/rubyproject/ui/resources/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -203,10 +203,6 @@
                 </file>
             </folder>
             
-            <folder name="Nodes">
-                <file name="org-netbeans-modules-ruby-rubyproject-ui-ProjectRootNodeFactory.instance"/>
-            </folder>
-            
             <folder name="Lookup"/>
             
         </folder>
diff -r 690fffa4fb6e -r c0fb8b519370 ruby.railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/ProjectRootNodeFactory.java
--- a/ruby.railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/ProjectRootNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/ruby.railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/ProjectRootNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -76,6 +76,7 @@
 /**
  * Factory for the nodes in the Rails Project logical view.
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-ruby-railsprojects")
 public final class ProjectRootNodeFactory implements NodeFactory {
 
     public NodeList createNodes(Project p) {
diff -r 690fffa4fb6e -r c0fb8b519370 ruby.railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/resources/layer.xml
--- a/ruby.railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/resources/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ b/ruby.railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/resources/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -120,10 +120,6 @@
                 <attr name="allowedMimeTypes" stringvalue="text/x-ruby,application/x-httpd-eruby,text/x-java"/>
                 <attr name="position" intvalue="1000"/>
             </file>
-        </folder>
-        
-        <folder name="Nodes">
-            <file name="org-netbeans-modules-ruby-railsprojects-ui-ProjectRootNodeFactory.instance"/>
         </folder>
         
         <folder name="Lookup"/>
diff -r 690fffa4fb6e -r c0fb8b519370 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 12 11:12:08 2008 +0100
+++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/resources/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -73,11 +73,6 @@
     
     <folder name="Projects">
         <folder name="org-netbeans-modules-web-project">
-            <folder name="Nodes">
-                <file name="org-netbeans-modules-visualweb-project-jsf-ui-JSFNodeFactory.instance">
-                    <attr name="position" intvalue="900"/>
-                </file>
-            </folder>
             <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"/>
diff -r 690fffa4fb6e -r c0fb8b519370 visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/JSFNodeFactory.java
--- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/JSFNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/JSFNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -49,7 +49,6 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
@@ -60,12 +59,12 @@
 import org.netbeans.spi.project.ui.support.NodeList;
 import org.openide.nodes.Node;
 import org.openide.util.Lookup;
-import org.openide.util.NbBundle;
 
 /** Visual Web framework extra nodes factory.
  *
  * @author Po-Ting Wu
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-web-project",position=900)
 public class JSFNodeFactory implements NodeFactory {
     /** Creates a new instance of JSFNodeFactory */
     public JSFNodeFactory() {
diff -r 690fffa4fb6e -r c0fb8b519370 web.project/src/org/netbeans/modules/web/project/ui/ConfFilesNodeFactory.java
--- a/web.project/src/org/netbeans/modules/web/project/ui/ConfFilesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/web.project/src/org/netbeans/modules/web/project/ui/ConfFilesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -95,7 +95,6 @@
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
 import org.openide.util.RequestProcessor;
-import org.openide.util.Utilities;
 import org.openide.util.WeakListeners;
 import org.openide.util.actions.SystemAction;
 import org.openide.util.lookup.Lookups;
@@ -104,6 +103,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-web-project",position=500)
 public final class ConfFilesNodeFactory implements NodeFactory {
 
     /** Creates a new instance of ConfFilesNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 web.project/src/org/netbeans/modules/web/project/ui/DocBaseNodeFactory.java
--- a/web.project/src/org/netbeans/modules/web/project/ui/DocBaseNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/web.project/src/org/netbeans/modules/web/project/ui/DocBaseNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -91,6 +91,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-web-project",position=200)
 public final class DocBaseNodeFactory implements NodeFactory {
     
     /** Creates a new instance of LibrariesNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 web.project/src/org/netbeans/modules/web/project/ui/LibrariesNodeFactory.java
--- a/web.project/src/org/netbeans/modules/web/project/ui/LibrariesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/web.project/src/org/netbeans/modules/web/project/ui/LibrariesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -76,6 +76,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-web-project",position=800)
 public final class LibrariesNodeFactory implements NodeFactory {
     
     /** Creates a new instance of LibrariesNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 web.project/src/org/netbeans/modules/web/project/ui/SetupDirNodeFactory.java
--- a/web.project/src/org/netbeans/modules/web/project/ui/SetupDirNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/web.project/src/org/netbeans/modules/web/project/ui/SetupDirNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -59,6 +59,7 @@
  *
  * @author mkleint
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-web-project",position=600)
 public final class SetupDirNodeFactory implements NodeFactory {
     
     /** Creates a new instance of LibrariesNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 web.project/src/org/netbeans/modules/web/project/ui/resources/layer.xml
--- a/web.project/src/org/netbeans/modules/web/project/ui/resources/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ b/web.project/src/org/netbeans/modules/web/project/ui/resources/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -175,20 +175,8 @@
             </folder>
 
             <folder name="Nodes">
-                <file name="org-netbeans-modules-web-project-ui-DocBaseNodeFactory.instance">
-                    <attr name="position" intvalue="200"/>
-                </file>
-                <file name="org-netbeans-modules-web-project-ui-ConfFilesNodeFactory.instance">
-                    <attr name="position" intvalue="500"/>
-                </file>
-                <file name="org-netbeans-modules-web-project-ui-SetupDirNodeFactory.instance">
-                    <attr name="position" intvalue="600"/>
-                </file>
                 <file name="org-netbeans-modules-java-api-common-project-ui-JavaSourceNodeFactory.instance">
                     <attr name="position" intvalue="700"/>
-                </file>
-                <file name="org-netbeans-modules-web-project-ui-LibrariesNodeFactory.instance">
-                    <attr name="position" intvalue="800"/>
                 </file>
             </folder>
             
diff -r 690fffa4fb6e -r c0fb8b519370 websvc.rest/src/org/netbeans/modules/websvc/rest/nodes/RestServicesNodeFactory.java
--- a/websvc.rest/src/org/netbeans/modules/websvc/rest/nodes/RestServicesNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/websvc.rest/src/org/netbeans/modules/websvc/rest/nodes/RestServicesNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -66,6 +66,7 @@
  *
  * @author Milan Kuchtiak
  */
+@NodeFactory.Registration(projectType="org-netbeans-modules-web-project",position=450)
 public class RestServicesNodeFactory implements NodeFactory {
 
     /** Creates a new instance of WebServicesNodeFactory */
diff -r 690fffa4fb6e -r c0fb8b519370 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 12 11:12:08 2008 +0100
+++ b/websvc.rest/src/org/netbeans/modules/websvc/rest/resources/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -201,11 +201,6 @@
           <file name="org.netbeans.modules.websvc.rest.projects.ProjectTestRestServicesAction.instance"/>
         </folder>
         <folder name="org-netbeans-modules-web-project">
-            <folder name="Nodes">
-                <file name="org-netbeans-modules-websvc-rest-nodes-RestServicesNodeFactory.instance">
-                    <attr name="position" intvalue="450"/>
-                </file>
-            </folder>
             <!-- folder name="Customizer">
                 <file name="org.netbeans.modules.websvc.rest.projects.WebCustomizerCategoryProvider.instance">
                     <attr name="position" intvalue="770"/>
diff -r 690fffa4fb6e -r c0fb8b519370 xml.jaxb/src/org/netbeans/modules/xml/jaxb/layer.xml
--- a/xml.jaxb/src/org/netbeans/modules/xml/jaxb/layer.xml	Wed Nov 12 11:12:08 2008 +0100
+++ b/xml.jaxb/src/org/netbeans/modules/xml/jaxb/layer.xml	Wed Nov 12 11:15:01 2008 +0100
@@ -42,30 +42,6 @@
 made subject to such option by the copyright holder.
 -->
 <filesystem>
-    <folder name="Projects">
-        <folder name="org-netbeans-modules-java-j2seproject">
-            <folder name="Nodes">                
-                <file name="org-netbeans-modules-xml-jaxb-ui-JAXBNodeFactory.instance">
-                    <attr name="position" intvalue="100"/>
-                </file>
-            </folder>
-        </folder>
-        <folder name="org-netbeans-modules-web-project">
-            <folder name="Nodes">
-                <file name="org-netbeans-modules-xml-jaxb-ui-JAXBNodeFactory.instance">
-                    <attr name="position" intvalue="100"/>
-                </file>
-            </folder>
-        </folder>        
-        <folder name="org-netbeans-modules-j2ee-ejbjarproject">
-            <folder name="Nodes">
-                <file name="org-netbeans-modules-xml-jaxb-ui-JAXBNodeFactory.instance">
-                    <attr name="position" intvalue="125"/>
-                </file>
-            </folder>
-        </folder>                
-    </folder>
-    
     <folder name="Templates">
         <folder name="XML">
              <file name="JavaXMLBinding">
diff -r 690fffa4fb6e -r c0fb8b519370 xml.jaxb/src/org/netbeans/modules/xml/jaxb/ui/JAXBNodeFactory.java
--- a/xml.jaxb/src/org/netbeans/modules/xml/jaxb/ui/JAXBNodeFactory.java	Wed Nov 12 11:12:08 2008 +0100
+++ b/xml.jaxb/src/org/netbeans/modules/xml/jaxb/ui/JAXBNodeFactory.java	Wed Nov 12 11:15:01 2008 +0100
@@ -60,9 +60,15 @@
  *
  * @author gpatil
  */
+@NodeFactory.Registration(projectType={"org-netbeans-modules-java-j2seproject","org-netbeans-modules-web-project"} ,position=100)
 public class JAXBNodeFactory implements NodeFactory {
     public static final String JAXB_NODE_NAME = "JAXB Bindings" ; // NOI18N
-    
+
+    @NodeFactory.Registration(projectType="org-netbeans-modules-j2ee-ejbjarproject",position=125)
+    public static JAXBNodeFactory ejbproject() {
+        return new JAXBNodeFactory();
+    }
+
     public JAXBNodeFactory() {
     }