diff -r 86eabed3ea3b apisupport.project/nbproject/project.properties
--- a/apisupport.project/nbproject/project.properties	Wed Sep 17 16:38:04 2008 +0200
+++ b/apisupport.project/nbproject/project.properties	Thu Sep 18 17:08:57 2008 -0500
@@ -39,7 +39,7 @@
 
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.5
-spec.version.base=1.23.0
+spec.version.base=1.24
 
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
diff -r 86eabed3ea3b apisupport.project/nbproject/project.xml
--- a/apisupport.project/nbproject/project.xml	Wed Sep 17 16:38:04 2008 +0200
+++ b/apisupport.project/nbproject/project.xml	Thu Sep 18 17:08:57 2008 -0500
@@ -230,7 +230,7 @@ made subject to such option by the copyr
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <implementation-version/>
+                        <specification-version>1.16</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r 86eabed3ea3b xml.schema/manifest.mf
--- a/xml.schema/manifest.mf	Wed Sep 17 16:38:04 2008 +0200
+++ b/xml.schema/manifest.mf	Thu Sep 18 17:08:57 2008 -0500
@@ -3,3 +3,4 @@ OpenIDE-Module-Localizing-Bundle: org/ne
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/schema/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/xml/schema/resources/mf-layer.xml
 AutoUpdate-Show-In-Client: false
+OpenIDE-Module-Specification-Version: 1.16
diff -r 86eabed3ea3b xml.schema/nbproject/project.properties
--- a/xml.schema/nbproject/project.properties	Wed Sep 17 16:38:04 2008 +0200
+++ b/xml.schema/nbproject/project.properties	Thu Sep 18 17:08:57 2008 -0500
@@ -40,7 +40,6 @@
 
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.5
-spec.version.base=1.15.0
 javahelp.base=org/netbeans/modules/xml/schema
 javahelp.hs=xmltools-javahelp.hs
 
diff -r 86eabed3ea3b xml.schema/nbproject/project.xml
--- a/xml.schema/nbproject/project.xml	Wed Sep 17 16:38:04 2008 +0200
+++ b/xml.schema/nbproject/project.xml	Thu Sep 18 17:08:57 2008 -0500
@@ -130,7 +130,7 @@ made subject to such option by the copyr
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <implementation-version/>
+                        <specification-version>1.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r 86eabed3ea3b xml.schema/src/org/netbeans/modules/xml/schema/actions/CheckSchemaAction.java
--- a/xml.schema/src/org/netbeans/modules/xml/schema/actions/CheckSchemaAction.java	Wed Sep 17 16:38:04 2008 +0200
+++ b/xml.schema/src/org/netbeans/modules/xml/schema/actions/CheckSchemaAction.java	Thu Sep 18 17:08:57 2008 -0500
@@ -44,9 +44,9 @@ import org.openide.util.HelpCtx;
 import org.openide.util.HelpCtx;
 import org.openide.util.actions.CookieAction;
 
-import org.netbeans.modules.xml.actions.*;
 
 import org.netbeans.api.xml.cookies.*;
+import org.netbeans.modules.xml.actions.InputOutputReporter;
 import org.openide.util.NbBundle;
 
 /**
diff -r 86eabed3ea3b xml.tax/manifest.mf
--- a/xml.tax/manifest.mf	Wed Sep 17 16:38:04 2008 +0200
+++ b/xml.tax/manifest.mf	Thu Sep 18 17:08:57 2008 -0500
@@ -2,7 +2,7 @@ OpenIDE-Module: org.netbeans.modules.xml
 OpenIDE-Module: org.netbeans.modules.xml.tax/2
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/tax/resources/Bundle.properties
 OpenIDE-Module-Install: org/netbeans/modules/xml/tax/TAXModuleInstall.class
-OpenIDE-Module-Implementation-Version: 4
 OpenIDE-Module-Layer: org/netbeans/modules/xml/tax/resources/mf-layer.xml
 OpenIDE-Module-Requires: org.openide.modules.InstalledFileLocator
+OpenIDE-Module-Specification-Version: 1.16
 
diff -r 86eabed3ea3b xml.tax/nbproject/project.properties
--- a/xml.tax/nbproject/project.properties	Wed Sep 17 16:38:04 2008 +0200
+++ b/xml.tax/nbproject/project.properties	Thu Sep 18 17:08:57 2008 -0500
@@ -37,7 +37,6 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
-spec.version.base=1.15.0
 extra.module.files=modules/ext/org-netbeans-tax.jar
 is.autoload=true
 # Apache's XNI API - parser implementation used internally by module
diff -r 86eabed3ea3b xml.tax/nbproject/project.xml
--- a/xml.tax/nbproject/project.xml	Wed Sep 17 16:38:04 2008 +0200
+++ b/xml.tax/nbproject/project.xml	Thu Sep 18 17:08:57 2008 -0500
@@ -69,7 +69,7 @@ made subject to such option by the copyr
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <implementation-version/>
+                        <specification-version>1.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -145,7 +145,17 @@ made subject to such option by the copyr
                     </run-dependency>
                 </dependency>
             </module-dependencies>
-            <public-packages/>
+            <friend-packages>
+                <friend>org.netbeans.modules.apisupport.project</friend>
+                <friend>org.netbeans.modules.xml.tools</friend>
+                <friend>org.netbeans.modules.xml.tools.java</friend>
+                <package>org.netbeans.tax</package>
+                <package>org.netbeans.tax.io</package>
+                <package>org.netbeans.tax.decl</package>
+                <package>org.netbeans.tax.event</package>
+                <package>org.netbeans.modules.xml.tax.cookies</package>
+                <package>org.netbeans.modules.xml.tax.parser</package>
+            </friend-packages>
             <class-path-extension>
                 <runtime-relative-path>ext/org-netbeans-tax.jar</runtime-relative-path>
             </class-path-extension>
diff -r 86eabed3ea3b xml.tools.java/manifest.mf
--- a/xml.tools.java/manifest.mf	Wed Sep 17 16:38:04 2008 +0200
+++ b/xml.tools.java/manifest.mf	Thu Sep 18 17:08:57 2008 -0500
@@ -2,7 +2,7 @@ OpenIDE-Module: org.netbeans.modules.xml
 OpenIDE-Module: org.netbeans.modules.xml.tools.java
 OpenIDE-Module-Layer: org/netbeans/modules/xml/tools/java/resources/mf-layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/tools/java/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
 
 
 
diff -r 86eabed3ea3b xml.tools.java/nbproject/project.xml
--- a/xml.tools.java/nbproject/project.xml	Wed Sep 17 16:38:04 2008 +0200
+++ b/xml.tools.java/nbproject/project.xml	Thu Sep 18 17:08:57 2008 -0500
@@ -71,7 +71,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <implementation-version/>
+                        <specification-version>1.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -80,7 +80,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <implementation-version/>
+                        <specification-version>1.16</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -89,7 +89,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <implementation-version/>
+                        <specification-version>1.16</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r 86eabed3ea3b xml.tools/manifest.mf
--- a/xml.tools/manifest.mf	Wed Sep 17 16:38:04 2008 +0200
+++ b/xml.tools/manifest.mf	Thu Sep 18 17:08:57 2008 -0500
@@ -1,7 +1,7 @@ Manifest-Version: 1.0
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.xml.tools/2
-OpenIDE-Module-Implementation-Version: 4
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/tools/resources/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/xml/tools/resources/mf-layer.xml
 AutoUpdate-Show-In-Client: false
+OpenIDE-Module-Specification-Version: 1.16
 
diff -r 86eabed3ea3b xml.tools/nbproject/project.properties
--- a/xml.tools/nbproject/project.properties	Wed Sep 17 16:38:04 2008 +0200
+++ b/xml.tools/nbproject/project.properties	Thu Sep 18 17:08:57 2008 -0500
@@ -37,5 +37,5 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
-spec.version.base=1.15.0
 disable.qa-functional.tests=true
+is.autoload=true
diff -r 86eabed3ea3b xml.tools/nbproject/project.xml
--- a/xml.tools/nbproject/project.xml	Wed Sep 17 16:38:04 2008 +0200
+++ b/xml.tools/nbproject/project.xml	Thu Sep 18 17:08:57 2008 -0500
@@ -60,7 +60,7 @@ made subject to such option by the copyr
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <implementation-version/>
+                        <specification-version>1.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -78,7 +78,7 @@ made subject to such option by the copyr
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <implementation-version/>
+                        <specification-version>1.16</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -136,7 +136,11 @@ made subject to such option by the copyr
                     </run-dependency>
                 </dependency>
             </module-dependencies>
-            <public-packages/>
+            <friend-packages>
+                <friend>org.netbeans.modules.xml.tools.java</friend>
+                <package>org.netbeans.modules.xml.tools.actions</package>
+                <package>org.netbeans.modules.xml.tools.generator</package>
+            </friend-packages>
         </data>
     </configuration>
 </project>
diff -r 86eabed3ea3b xml/manifest.mf
--- a/xml/manifest.mf	Wed Sep 17 16:38:04 2008 +0200
+++ b/xml/manifest.mf	Thu Sep 18 17:08:57 2008 -0500
@@ -1,8 +1,6 @@ Manifest-Version: 1.0
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.xml
-OpenIDE-Module-Implementation-Version: 1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/resources/Bundle.properties
 OpenIDE-Module-Install: org/netbeans/modules/xml/CoreModuleInstall.class
 OpenIDE-Module-Layer: org/netbeans/modules/xml/resources/mf-layer.xml
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
diff -r 86eabed3ea3b xml/nbproject/project.xml
--- a/xml/nbproject/project.xml	Wed Sep 17 16:38:04 2008 +0200
+++ b/xml/nbproject/project.xml	Thu Sep 18 17:08:57 2008 -0500
@@ -299,7 +299,22 @@ made subject to such option by the copyr
                     </test-dependency>
                 </test-type>
             </test-dependencies>
-            <public-packages/>
+            <friend-packages>
+                <friend>org.netbeans.modules.xml.schema</friend>
+                <friend>org.netbeans.modules.xml.tax</friend>
+                <friend>org.netbeans.modules.xml.tools</friend>
+                <friend>org.netbeans.modules.xml.tools.java</friend>
+                <friend>org.netbeans.modules.xsl</friend>
+                <friend>org.netbeans.modules.xslt.core</friend>
+                <package>org.netbeans.modules.xml</package>
+                <package>org.netbeans.modules.xml.actions</package>
+                <package>org.netbeans.modules.xml.cookies</package>
+                <package>org.netbeans.modules.xml.lib</package>
+                <package>org.netbeans.modules.xml.sync</package>
+                <package>org.netbeans.modules.xml.text</package>
+                <package>org.netbeans.modules.xml.tree</package>
+                <package>org.netbeans.modules.xml.wizard</package>
+            </friend-packages>
         </data>
     </configuration>
 </project>
diff -r 86eabed3ea3b xsl/manifest.mf
--- a/xsl/manifest.mf	Wed Sep 17 16:38:04 2008 +0200
+++ b/xsl/manifest.mf	Thu Sep 18 17:08:57 2008 -0500
@@ -4,3 +4,4 @@ OpenIDE-Module-Layer: org/netbeans/modul
 OpenIDE-Module-Layer: org/netbeans/modules/xsl/resources/mf-layer.xml
 OpenIDE-Module-Requires: org.openide.util.HttpServer$Impl
 AutoUpdate-Show-In-Client: false
+OpenIDE-Module-Specification-Version: 1.16
diff -r 86eabed3ea3b xsl/nbproject/project.properties
--- a/xsl/nbproject/project.properties	Wed Sep 17 16:38:04 2008 +0200
+++ b/xsl/nbproject/project.properties	Thu Sep 18 17:08:57 2008 -0500
@@ -39,4 +39,3 @@
 
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.5
-spec.version.base=1.15.0
diff -r 86eabed3ea3b xsl/nbproject/project.xml
--- a/xsl/nbproject/project.xml	Wed Sep 17 16:38:04 2008 +0200
+++ b/xsl/nbproject/project.xml	Thu Sep 18 17:08:57 2008 -0500
@@ -93,7 +93,7 @@ made subject to such option by the copyr
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <implementation-version/>
+                        <specification-version>1.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r 86eabed3ea3b xslt.core/manifest.mf
--- a/xslt.core/manifest.mf	Wed Sep 17 16:38:04 2008 +0200
+++ b/xslt.core/manifest.mf	Thu Sep 18 17:08:57 2008 -0500
@@ -1,6 +1,6 @@ Manifest-Version: 1.0
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
 OpenIDE-Module: org.netbeans.modules.xslt.core/1
 OpenIDE-Module-Layer: org/netbeans/modules/xslt/core/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xslt/core/resources/Bundle.properties
diff -r 86eabed3ea3b xslt.core/nbproject/project.xml
--- a/xslt.core/nbproject/project.xml	Wed Sep 17 16:38:04 2008 +0200
+++ b/xslt.core/nbproject/project.xml	Thu Sep 18 17:08:57 2008 -0500
@@ -146,7 +146,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <implementation-version/>
+                        <specification-version>1.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>