1.1 --- a/docbook/manifest.mf	Tue Jul 18 20:34:02 2006 +0000
     1.2 +++ b/docbook/manifest.mf	Wed Jul 19 06:53:53 2006 +0000
     1.3 @@ -1,6 +1,5 @@
     1.4  Manifest-Version: 1.0
     1.5  OpenIDE-Module: org.netbeans.modules.docbook
     1.6 -OpenIDE-Module-Requires: org.openide.windows.IOProvider
     1.7  OpenIDE-Module-Java-Dependencies: Java > 1.4
     1.8  OpenIDE-Module-Specification-Version: 1.4
     1.9  OpenIDE-Module-Layer: org/netbeans/modules/docbook/layer.xml

     2.1 --- a/docbook/nbproject/project.xml	Tue Jul 18 20:34:02 2006 +0000
     2.2 +++ b/docbook/nbproject/project.xml	Wed Jul 19 06:53:53 2006 +0000
     2.3 @@ -87,7 +87,7 @@
     2.4                      <build-prerequisite/>
     2.5                      <compile-dependency/>
     2.6                      <run-dependency>
     2.7 -                        <specification-version>1.0</specification-version>
     2.8 +                        <specification-version>1.11</specification-version>
     2.9                      </run-dependency>
    2.10                  </dependency>
    2.11                  <dependency>

     3.1 --- a/vcs.advanced/manifest.mf	Tue Jul 18 20:34:02 2006 +0000
     3.2 +++ b/vcs.advanced/manifest.mf	Wed Jul 19 06:53:53 2006 +0000
     3.3 @@ -1,7 +1,7 @@
     3.4  Manifest-Version: 1.0
     3.5  OpenIDE-Module: org.netbeans.modules.vcs.advanced/1
     3.6  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/vcs/advanced/config/Bundle.properties
     3.7 -OpenIDE-Module-Requires: org.openide.windows.IOProvider, org.netbeans.modules.vcscore.javacorebridge, org.netbeans.modules.refactoring.vcs
     3.8 +OpenIDE-Module-Requires: org.netbeans.modules.vcscore.javacorebridge, org.netbeans.modules.refactoring.vcs
     3.9  OpenIDE-Module-Layer: org/netbeans/modules/vcs/advanced/config/mf-layer.xml
    3.10  OpenIDE-Module-Install: org/netbeans/modules/vcs/advanced/ModuleLifecycleManager.class
    3.11  

     4.1 --- a/vcs.advanced/nbproject/project.xml	Tue Jul 18 20:34:02 2006 +0000
     4.2 +++ b/vcs.advanced/nbproject/project.xml	Wed Jul 19 06:53:53 2006 +0000
     4.3 @@ -24,6 +24,73 @@
     4.4              <code-name-base>org.netbeans.modules.vcs.advanced</code-name-base>
     4.5              <module-dependencies>
     4.6                  <dependency>
     4.7 +                    <code-name-base>org.netbeans.modules.diff</code-name-base>
     4.8 +                    <build-prerequisite/>
     4.9 +                    <compile-dependency/>
    4.10 +                    <run-dependency>
    4.11 +                        <release-version>1</release-version>
    4.12 +                        <implementation-version/>
    4.13 +                    </run-dependency>
    4.14 +                </dependency>
    4.15 +                <dependency>
    4.16 +                    <code-name-base>org.netbeans.modules.queries</code-name-base>
    4.17 +                    <build-prerequisite/>
    4.18 +                    <compile-dependency/>
    4.19 +                    <run-dependency>
    4.20 +                        <release-version>1</release-version>
    4.21 +                        <specification-version>1.3</specification-version>
    4.22 +                    </run-dependency>
    4.23 +                </dependency>
    4.24 +                <dependency>
    4.25 +                    <code-name-base>org.netbeans.modules.vcscore</code-name-base>
    4.26 +                    <build-prerequisite/>
    4.27 +                    <compile-dependency/>
    4.28 +                    <run-dependency>
    4.29 +                        <release-version>1</release-version>
    4.30 +                        <implementation-version/>
    4.31 +                    </run-dependency>
    4.32 +                </dependency>
    4.33 +                <dependency>
    4.34 +                    <code-name-base>org.openide.actions</code-name-base>
    4.35 +                    <build-prerequisite/>
    4.36 +                    <compile-dependency/>
    4.37 +                    <run-dependency>
    4.38 +                        <specification-version>6.2</specification-version>
    4.39 +                    </run-dependency>
    4.40 +                </dependency>
    4.41 +                <dependency>
    4.42 +                    <code-name-base>org.openide.awt</code-name-base>
    4.43 +                    <build-prerequisite/>
    4.44 +                    <compile-dependency/>
    4.45 +                    <run-dependency>
    4.46 +                        <specification-version>6.2</specification-version>
    4.47 +                    </run-dependency>
    4.48 +                </dependency>
    4.49 +                <dependency>
    4.50 +                    <code-name-base>org.openide.compat</code-name-base>
    4.51 +                    <build-prerequisite/>
    4.52 +                    <compile-dependency/>
    4.53 +                    <run-dependency>
    4.54 +                        <specification-version>6.2</specification-version>
    4.55 +                    </run-dependency>
    4.56 +                </dependency>
    4.57 +                <dependency>
    4.58 +                    <code-name-base>org.openide.dialogs</code-name-base>
    4.59 +                    <build-prerequisite/>
    4.60 +                    <compile-dependency/>
    4.61 +                    <run-dependency>
    4.62 +                        <specification-version>6.2</specification-version>
    4.63 +                    </run-dependency>
    4.64 +                </dependency>
    4.65 +                <dependency>
    4.66 +                    <code-name-base>org.openide.explorer</code-name-base>
    4.67 +                    <build-prerequisite/>
    4.68 +                    <compile-dependency/>
    4.69 +                    <run-dependency>
    4.70 +                        <specification-version>6.2</specification-version>
    4.71 +                    </run-dependency>
    4.72 +                </dependency>
    4.73 +                <dependency>
    4.74                      <code-name-base>org.openide.filesystems</code-name-base>
    4.75                      <build-prerequisite/>
    4.76                      <compile-dependency/>
    4.77 @@ -32,11 +99,19 @@
    4.78                      </run-dependency>
    4.79                  </dependency>
    4.80                  <dependency>
    4.81 -                    <code-name-base>org.openide.util</code-name-base>
    4.82 +                    <code-name-base>org.openide.io</code-name-base>
    4.83                      <build-prerequisite/>
    4.84                      <compile-dependency/>
    4.85                      <run-dependency>
    4.86 -                        <specification-version>6.2</specification-version>
    4.87 +                        <specification-version>1.11</specification-version>
    4.88 +                    </run-dependency>
    4.89 +                </dependency>
    4.90 +                <dependency>
    4.91 +                    <code-name-base>org.openide.loaders</code-name-base>
    4.92 +                    <build-prerequisite/>
    4.93 +                    <compile-dependency/>
    4.94 +                    <run-dependency>
    4.95 +                        <specification-version>4.11</specification-version>
    4.96                      </run-dependency>
    4.97                  </dependency>
    4.98                  <dependency>
    4.99 @@ -56,7 +131,7 @@
   4.100                      </run-dependency>
   4.101                  </dependency>
   4.102                  <dependency>
   4.103 -                    <code-name-base>org.openide.explorer</code-name-base>
   4.104 +                    <code-name-base>org.openide.options</code-name-base>
   4.105                      <build-prerequisite/>
   4.106                      <compile-dependency/>
   4.107                      <run-dependency>
   4.108 @@ -64,31 +139,7 @@
   4.109                      </run-dependency>
   4.110                  </dependency>
   4.111                  <dependency>
   4.112 -                    <code-name-base>org.openide.awt</code-name-base>
   4.113 -                    <build-prerequisite/>
   4.114 -                    <compile-dependency/>
   4.115 -                    <run-dependency>
   4.116 -                        <specification-version>6.2</specification-version>
   4.117 -                    </run-dependency>
   4.118 -                </dependency>
   4.119 -                <dependency>
   4.120 -                    <code-name-base>org.openide.dialogs</code-name-base>
   4.121 -                    <build-prerequisite/>
   4.122 -                    <compile-dependency/>
   4.123 -                    <run-dependency>
   4.124 -                        <specification-version>6.2</specification-version>
   4.125 -                    </run-dependency>
   4.126 -                </dependency>
   4.127 -                <dependency>
   4.128 -                    <code-name-base>org.openide.compat</code-name-base>
   4.129 -                    <build-prerequisite/>
   4.130 -                    <compile-dependency/>
   4.131 -                    <run-dependency>
   4.132 -                        <specification-version>6.2</specification-version>
   4.133 -                    </run-dependency>
   4.134 -                </dependency>
   4.135 -                <dependency>
   4.136 -                    <code-name-base>org.openide.options</code-name-base>
   4.137 +                    <code-name-base>org.openide.util</code-name-base>
   4.138                      <build-prerequisite/>
   4.139                      <compile-dependency/>
   4.140                      <run-dependency>
   4.141 @@ -103,57 +154,6 @@
   4.142                          <specification-version>6.2</specification-version>
   4.143                      </run-dependency>
   4.144                  </dependency>
   4.145 -                <dependency>
   4.146 -                    <code-name-base>org.openide.actions</code-name-base>
   4.147 -                    <build-prerequisite/>
   4.148 -                    <compile-dependency/>
   4.149 -                    <run-dependency>
   4.150 -                        <specification-version>6.2</specification-version>
   4.151 -                    </run-dependency>
   4.152 -                </dependency>
   4.153 -                <dependency>
   4.154 -                    <code-name-base>org.netbeans.modules.vcscore</code-name-base>
   4.155 -                    <build-prerequisite/>
   4.156 -                    <compile-dependency/>
   4.157 -                    <run-dependency>
   4.158 -                        <release-version>1</release-version>
   4.159 -                        <implementation-version/>
   4.160 -                    </run-dependency>
   4.161 -                </dependency>
   4.162 -                <dependency>
   4.163 -                    <code-name-base>org.netbeans.modules.diff</code-name-base>
   4.164 -                    <build-prerequisite/>
   4.165 -                    <compile-dependency/>
   4.166 -                    <run-dependency>
   4.167 -                        <release-version>1</release-version>
   4.168 -                        <implementation-version/>
   4.169 -                    </run-dependency>
   4.170 -                </dependency>
   4.171 -                <dependency>
   4.172 -                    <code-name-base>org.openide.io</code-name-base>
   4.173 -                    <build-prerequisite/>
   4.174 -                    <compile-dependency/>
   4.175 -                    <run-dependency>
   4.176 -                        <specification-version>1.0</specification-version>
   4.177 -                    </run-dependency>
   4.178 -                </dependency>
   4.179 -                <dependency>
   4.180 -                    <code-name-base>org.openide.loaders</code-name-base>
   4.181 -                    <build-prerequisite/>
   4.182 -                    <compile-dependency/>
   4.183 -                    <run-dependency>
   4.184 -                        <specification-version>4.11</specification-version>
   4.185 -                    </run-dependency>
   4.186 -                </dependency>
   4.187 -                <dependency>
   4.188 -                    <code-name-base>org.netbeans.modules.queries</code-name-base>
   4.189 -                    <build-prerequisite/>
   4.190 -                    <compile-dependency/>
   4.191 -                    <run-dependency>
   4.192 -                        <release-version>1</release-version>
   4.193 -                        <specification-version>1.3</specification-version>
   4.194 -                    </run-dependency>
   4.195 -                </dependency>
   4.196              </module-dependencies>
   4.197              <public-packages>
   4.198                  <package>org.netbeans.modules.vcs.profiles.commands</package>

     5.1 --- a/vcscore/manifest.mf	Tue Jul 18 20:34:02 2006 +0000
     5.2 +++ b/vcscore/manifest.mf	Wed Jul 19 06:53:53 2006 +0000
     5.3 @@ -3,6 +3,5 @@
     5.4  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/vcscore/Bundle.properties
     5.5  OpenIDE-Module-Implementation-Version: 42
     5.6  OpenIDE-Module-Layer: org/netbeans/modules/vcscore/resources/mf-layer.xml
     5.7 -OpenIDE-Module-Requires: org.openide.windows.IOProvider
     5.8  OpenIDE-Module-Install: org/netbeans/modules/vcscore/VcsModule.class
     5.9  

     6.1 --- a/vcscore/nbproject/project.xml	Tue Jul 18 20:34:02 2006 +0000
     6.2 +++ b/vcscore/nbproject/project.xml	Wed Jul 19 06:53:53 2006 +0000
     6.3 @@ -24,6 +24,72 @@
     6.4              <code-name-base>org.netbeans.modules.vcscore</code-name-base>
     6.5              <module-dependencies>
     6.6                  <dependency>
     6.7 +                    <code-name-base>org.netbeans.modules.masterfs</code-name-base>
     6.8 +                    <build-prerequisite/>
     6.9 +                    <compile-dependency/>
    6.10 +                    <run-dependency>
    6.11 +                        <release-version>1</release-version>
    6.12 +                        <specification-version>1.1</specification-version>
    6.13 +                    </run-dependency>
    6.14 +                </dependency>
    6.15 +                <dependency>
    6.16 +                    <code-name-base>org.netbeans.modules.queries</code-name-base>
    6.17 +                    <build-prerequisite/>
    6.18 +                    <compile-dependency/>
    6.19 +                    <run-dependency>
    6.20 +                        <release-version>1</release-version>
    6.21 +                        <specification-version>1.4</specification-version>
    6.22 +                    </run-dependency>
    6.23 +                </dependency>
    6.24 +                <dependency>
    6.25 +                    <code-name-base>org.openide.actions</code-name-base>
    6.26 +                    <build-prerequisite/>
    6.27 +                    <compile-dependency/>
    6.28 +                    <run-dependency>
    6.29 +                        <specification-version>6.2</specification-version>
    6.30 +                    </run-dependency>
    6.31 +                </dependency>
    6.32 +                <dependency>
    6.33 +                    <code-name-base>org.openide.awt</code-name-base>
    6.34 +                    <build-prerequisite/>
    6.35 +                    <compile-dependency/>
    6.36 +                    <run-dependency>
    6.37 +                        <specification-version>6.2</specification-version>
    6.38 +                    </run-dependency>
    6.39 +                </dependency>
    6.40 +                <dependency>
    6.41 +                    <code-name-base>org.openide.compat</code-name-base>
    6.42 +                    <build-prerequisite/>
    6.43 +                    <compile-dependency/>
    6.44 +                    <run-dependency>
    6.45 +                        <specification-version>6.2</specification-version>
    6.46 +                    </run-dependency>
    6.47 +                </dependency>
    6.48 +                <dependency>
    6.49 +                    <code-name-base>org.openide.dialogs</code-name-base>
    6.50 +                    <build-prerequisite/>
    6.51 +                    <compile-dependency/>
    6.52 +                    <run-dependency>
    6.53 +                        <specification-version>6.2</specification-version>
    6.54 +                    </run-dependency>
    6.55 +                </dependency>
    6.56 +                <dependency>
    6.57 +                    <code-name-base>org.openide.execution</code-name-base>
    6.58 +                    <build-prerequisite/>
    6.59 +                    <compile-dependency/>
    6.60 +                    <run-dependency>
    6.61 +                        <specification-version>1.2</specification-version>
    6.62 +                    </run-dependency>
    6.63 +                </dependency>
    6.64 +                <dependency>
    6.65 +                    <code-name-base>org.openide.explorer</code-name-base>
    6.66 +                    <build-prerequisite/>
    6.67 +                    <compile-dependency/>
    6.68 +                    <run-dependency>
    6.69 +                        <specification-version>6.2</specification-version>
    6.70 +                    </run-dependency>
    6.71 +                </dependency>
    6.72 +                <dependency>
    6.73                      <code-name-base>org.openide.filesystems</code-name-base>
    6.74                      <build-prerequisite/>
    6.75                      <compile-dependency/>
    6.76 @@ -32,11 +98,19 @@
    6.77                      </run-dependency>
    6.78                  </dependency>
    6.79                  <dependency>
    6.80 -                    <code-name-base>org.openide.util</code-name-base>
    6.81 +                    <code-name-base>org.openide.io</code-name-base>
    6.82                      <build-prerequisite/>
    6.83                      <compile-dependency/>
    6.84                      <run-dependency>
    6.85 -                        <specification-version>6.2</specification-version>
    6.86 +                        <specification-version>1.11</specification-version>
    6.87 +                    </run-dependency>
    6.88 +                </dependency>
    6.89 +                <dependency>
    6.90 +                    <code-name-base>org.openide.loaders</code-name-base>
    6.91 +                    <build-prerequisite/>
    6.92 +                    <compile-dependency/>
    6.93 +                    <run-dependency>
    6.94 +                        <specification-version>4.11</specification-version>
    6.95                      </run-dependency>
    6.96                  </dependency>
    6.97                  <dependency>
    6.98 @@ -56,7 +130,7 @@
    6.99                      </run-dependency>
   6.100                  </dependency>
   6.101                  <dependency>
   6.102 -                    <code-name-base>org.openide.explorer</code-name-base>
   6.103 +                    <code-name-base>org.openide.options</code-name-base>
   6.104                      <build-prerequisite/>
   6.105                      <compile-dependency/>
   6.106                      <run-dependency>
   6.107 @@ -64,7 +138,7 @@
   6.108                      </run-dependency>
   6.109                  </dependency>
   6.110                  <dependency>
   6.111 -                    <code-name-base>org.openide.awt</code-name-base>
   6.112 +                    <code-name-base>org.openide.text</code-name-base>
   6.113                      <build-prerequisite/>
   6.114                      <compile-dependency/>
   6.115                      <run-dependency>
   6.116 @@ -72,23 +146,7 @@
   6.117                      </run-dependency>
   6.118                  </dependency>
   6.119                  <dependency>
   6.120 -                    <code-name-base>org.openide.dialogs</code-name-base>
   6.121 -                    <build-prerequisite/>
   6.122 -                    <compile-dependency/>
   6.123 -                    <run-dependency>
   6.124 -                        <specification-version>6.2</specification-version>
   6.125 -                    </run-dependency>
   6.126 -                </dependency>
   6.127 -                <dependency>
   6.128 -                    <code-name-base>org.openide.compat</code-name-base>
   6.129 -                    <build-prerequisite/>
   6.130 -                    <compile-dependency/>
   6.131 -                    <run-dependency>
   6.132 -                        <specification-version>6.2</specification-version>
   6.133 -                    </run-dependency>
   6.134 -                </dependency>
   6.135 -                <dependency>
   6.136 -                    <code-name-base>org.openide.options</code-name-base>
   6.137 +                    <code-name-base>org.openide.util</code-name-base>
   6.138                      <build-prerequisite/>
   6.139                      <compile-dependency/>
   6.140                      <run-dependency>
   6.141 @@ -104,46 +162,6 @@
   6.142                      </run-dependency>
   6.143                  </dependency>
   6.144                  <dependency>
   6.145 -                    <code-name-base>org.openide.text</code-name-base>
   6.146 -                    <build-prerequisite/>
   6.147 -                    <compile-dependency/>
   6.148 -                    <run-dependency>
   6.149 -                        <specification-version>6.2</specification-version>
   6.150 -                    </run-dependency>
   6.151 -                </dependency>
   6.152 -                <dependency>
   6.153 -                    <code-name-base>org.openide.actions</code-name-base>
   6.154 -                    <build-prerequisite/>
   6.155 -                    <compile-dependency/>
   6.156 -                    <run-dependency>
   6.157 -                        <specification-version>6.2</specification-version>
   6.158 -                    </run-dependency>
   6.159 -                </dependency>
   6.160 -                <dependency>
   6.161 -                    <code-name-base>org.openide.execution</code-name-base>
   6.162 -                    <build-prerequisite/>
   6.163 -                    <compile-dependency/>
   6.164 -                    <run-dependency>
   6.165 -                        <specification-version>1.2</specification-version>
   6.166 -                    </run-dependency>
   6.167 -                </dependency>
   6.168 -                <dependency>
   6.169 -                    <code-name-base>org.openide.io</code-name-base>
   6.170 -                    <build-prerequisite/>
   6.171 -                    <compile-dependency/>
   6.172 -                    <run-dependency>
   6.173 -                        <specification-version>1.0</specification-version>
   6.174 -                    </run-dependency>
   6.175 -                </dependency>
   6.176 -                <dependency>
   6.177 -                    <code-name-base>org.openide.loaders</code-name-base>
   6.178 -                    <build-prerequisite/>
   6.179 -                    <compile-dependency/>
   6.180 -                    <run-dependency>
   6.181 -                        <specification-version>4.11</specification-version>
   6.182 -                    </run-dependency>
   6.183 -                </dependency>
   6.184 -                <dependency>
   6.185                      <code-name-base>org.openidex.util</code-name-base>
   6.186                      <build-prerequisite/>
   6.187                      <compile-dependency/>
   6.188 @@ -151,24 +169,6 @@
   6.189                          <release-version>2-3</release-version>
   6.190                      </run-dependency>
   6.191                  </dependency>
   6.192 -                <dependency>
   6.193 -                    <code-name-base>org.netbeans.modules.masterfs</code-name-base>
   6.194 -                    <build-prerequisite/>
   6.195 -                    <compile-dependency/>
   6.196 -                    <run-dependency>
   6.197 -                        <release-version>1</release-version>
   6.198 -                        <specification-version>1.1</specification-version>
   6.199 -                    </run-dependency>
   6.200 -                </dependency>
   6.201 -                <dependency>
   6.202 -                    <code-name-base>org.netbeans.modules.queries</code-name-base>
   6.203 -                    <build-prerequisite/>
   6.204 -                    <compile-dependency/>
   6.205 -                    <run-dependency>
   6.206 -                        <release-version>1</release-version>
   6.207 -                        <specification-version>1.4</specification-version>
   6.208 -                    </run-dependency>
   6.209 -                </dependency>
   6.210              </module-dependencies>
   6.211              <public-packages>
   6.212                  <package>org.netbeans.api.vcs</package>