1.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/layer.xml	Sat Jun 13 21:30:19 2009 +0200
     1.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/layer.xml	Sun Jun 14 23:16:23 2009 +0200
     1.3 @@ -42,11 +42,13 @@
     1.4  -->
     1.5  <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
     1.6  <filesystem>
     1.7 +    <folder name="Actions">
     1.8 +        <folder name="Tools">
     1.9 +            <file name="org-netbeans-modules-visualweb-complib-ui-ComponentLibraryManagerAction.instance"/>
    1.10 +        </folder>
    1.11 +    </folder>
    1.12      <folder name="Menu">
    1.13          <folder name="Tools">
    1.14 -            <file name="org-netbeans-modules-visualweb-complib-ui-ComponentLibraryManagerAction.instance">
    1.15 -                <attr name="position" intvalue="700"/>
    1.16 -            </file>
    1.17              <!-- Temporary UI -->
    1.18              <!--
    1.19              <file name="org-netbeans-modules-visualweb-complib-ui-SharedComplibAction.instance"/>
    1.20 @@ -54,6 +56,10 @@
    1.21        <!-- For debug only
    1.22              <file name="com-sun-rave-complib-ui-ComplibDebugAction.instance"/>
    1.23        -->
    1.24 +            <file name="org-netbeans-modules-visualweb-complib-ui-ComponentLibraryManagerAction.shadow">
    1.25 +                <attr name="originalFile" stringvalue="Actions/Tools/org-netbeans-modules-visualweb-complib-ui-ComponentLibraryManagerAction.instance"/>
    1.26 +                <attr name="position" intvalue="700"/>
    1.27 +            </file>
    1.28          </folder>
    1.29      </folder>
    1.30      <!--
    1.31 @@ -77,10 +83,8 @@
    1.32  
    1.33         <folder name="Services">
    1.34          <folder name="MIMEResolver">
    1.35 -            <file name="org-netbeans-modules-visualweb-complib-mime-resolver.xml"
    1.36 -                  url="complib-mime-resolver.xml">
    1.37 -                <attr name="SystemFileSystem.localizingBundle"
    1.38 -                      stringvalue="org.netbeans.modules.visualweb.complib.Bundle"/>
    1.39 +            <file name="org-netbeans-modules-visualweb-complib-mime-resolver.xml" url="complib-mime-resolver.xml">
    1.40 +                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.visualweb.complib.Bundle"/>
    1.41                  <!--<attr name="SystemFileSystem.icon"
    1.42                        urlvalue="nbresloc:/org/netbeans/modules/visualweb/palette/resolver-icon.gif"/> -->
    1.43                  <attr name="position" intvalue="70002"/>

     2.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/resources/layer.xml	Sat Jun 13 21:30:19 2009 +0200
     2.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/resources/layer.xml	Sun Jun 14 23:16:23 2009 +0200
     2.3 @@ -56,6 +56,10 @@
     2.4              <file name="org-netbeans-modules-visualweb-designer-jsf-action-BringToFrontAction.instance"/>
     2.5              <file name="org-netbeans-modules-visualweb-designer-jsf-action-SendToBackAction.instance"/>
     2.6          </folder>
     2.7 +        <folder name="Tools">
     2.8 +            <file name="org-netbeans-modules-visualweb-designer-jsf-palette-JSF1_1PaletteCustomizerAction.instance"/>
     2.9 +            <file name="org-netbeans-modules-visualweb-designer-jsf-palette-JSF1_2PaletteCustomizerAction.instance"/>
    2.10 +        </folder>
    2.11      </folder>
    2.12      
    2.13      <!-- XXX Actions for DesignBeanNodes, TODO revise the policy of naming of folders. -->
    2.14 @@ -221,10 +225,12 @@
    2.15      <folder name="Menu">
    2.16          <folder name="Tools">
    2.17              <folder name="PaletteManager">
    2.18 -                <file name="org-netbeans-modules-visualweb-designer-jsf-palette-JSF1_1PaletteCustomizerAction.instance">
    2.19 +                <file name="org-netbeans-modules-visualweb-designer-jsf-palette-JSF1_1PaletteCustomizerAction.shadow">
    2.20 +                    <attr name="originalFile" stringvalue="Actions/Tools/org-netbeans-modules-visualweb-designer-jsf-palette-JSF1_1PaletteCustomizerAction.instance"/>
    2.21                      <attr name="position" intvalue="500"/>
    2.22                  </file>
    2.23 -                <file name="org-netbeans-modules-visualweb-designer-jsf-palette-JSF1_2PaletteCustomizerAction.instance">
    2.24 +                <file name="org-netbeans-modules-visualweb-designer-jsf-palette-JSF1_2PaletteCustomizerAction.shadow">
    2.25 +                    <attr name="originalFile" stringvalue="Actions/Tools/org-netbeans-modules-visualweb-designer-jsf-palette-JSF1_2PaletteCustomizerAction.instance"/>
    2.26                      <attr name="position" intvalue="600"/>
    2.27                  </file>
    2.28              </folder>

     3.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/mf-layer.xml	Sat Jun 13 21:30:19 2009 +0200
     3.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/mf-layer.xml	Sun Jun 14 23:16:23 2009 +0200
     3.3 @@ -59,6 +59,9 @@
     3.4              <file name="org-netbeans-modules-visualweb-insync-action-ViewPageNavigationAction.instance"/>
     3.5              <file name="org-netbeans-modules-visualweb-insync-action-VirtualFormsAction.instance"/>
     3.6          </folder>
     3.7 +        <folder name="Tools">
     3.8 +            <file name="org-netbeans-modules-visualweb-insync-live-CustomizeAction.instance"/>
     3.9 +        </folder>
    3.10      </folder>
    3.11  
    3.12      <folder name="Editors">
    3.13 @@ -72,9 +75,6 @@
    3.14          <folder name="application">
    3.15              <folder name="x-designtime">
    3.16                  <folder name="Actions">
    3.17 -                    <file name="org-netbeans-modules-visualweb-insync-live-CustomizeAction.instance">
    3.18 -                        <attr name="position" intvalue="100"/>
    3.19 -                    </file>
    3.20                      <file name="SeparatorCustomizer.instance">
    3.21                          <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
    3.22                          <attr name="position" intvalue="200"/>
    3.23 @@ -139,6 +139,10 @@
    3.24                          <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
    3.25                          <attr name="position" intvalue="2400"/>
    3.26                      </file>
    3.27 +                    <file name="org-netbeans-modules-visualweb-insync-live-CustomizeAction.shadow">
    3.28 +                        <attr name="originalFile" stringvalue="Actions/Tools/org-netbeans-modules-visualweb-insync-live-CustomizeAction.instance"/>
    3.29 +                        <attr name="position" intvalue="100"/>
    3.30 +                    </file>
    3.31                      <file name="org-openide-actions-CopyAction.shadow">
    3.32                          <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-CopyAction.instance"/>
    3.33                          <attr name="position" intvalue="2600"/>

     4.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/layer.xml	Sat Jun 13 21:30:19 2009 +0200
     4.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/layer.xml	Sun Jun 14 23:16:23 2009 +0200
     4.3 @@ -42,6 +42,13 @@
     4.4  -->
     4.5  <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
     4.6  <filesystem>
     4.7 +    <folder name="Actions">
     4.8 +        <folder name="Tools">
     4.9 +            <file name="SetStartPageAction.instance">
    4.10 +                <attr name="instanceClass" stringvalue="org.netbeans.modules.visualweb.project.jsf.actions.SetStartPageAction"/>
    4.11 +            </file>
    4.12 +        </folder>
    4.13 +    </folder>
    4.14      <folder name="CreatorJspPalette">
    4.15          <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.visualweb.webui.designtime.resources.Bundle"/>
    4.16          
    4.17 @@ -327,11 +334,11 @@
    4.18                              <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-SaveAsTemplateAction.instance"/>
    4.19                              <attr name="position" intvalue="1500"/>
    4.20                          </file>
    4.21 -                        <file name="SetStartPageAction.instance">
    4.22 -                    <attr name="instanceClass" stringvalue="org.netbeans.modules.visualweb.project.jsf.actions.SetStartPageAction"/>
    4.23 -                      <attr name="position" intvalue="100"/>
    4.24 +                        <file name="SetStartPageAction.shadow">
    4.25 +                            <attr name="originalFile" stringvalue="Actions/Tools/SetStartPageAction.instance"/>
    4.26 +                            <attr name="position" intvalue="100"/>
    4.27                          </file>
    4.28 -                  <file name="ToolsAction.shadow">
    4.29 +                        <file name="ToolsAction.shadow">
    4.30                              <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-ToolsAction.instance"/>
    4.31                              <attr name="position" intvalue="1900"/>
    4.32                          </file>