You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/08/23 13:11:08 UTC

[GitHub] geertjanw closed pull request #773: Fix cluster locations

geertjanw closed pull request #773: Fix cluster locations
URL: https://github.com/apache/incubator-netbeans/pull/773
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/java/lib.jshell.agent/build.xml b/java/lib.jshell.agent/build.xml
index 10315e7607..256f807fc4 100644
--- a/java/lib.jshell.agent/build.xml
+++ b/java/lib.jshell.agent/build.xml
@@ -33,7 +33,6 @@
         </unjar>
         <javac srcdir="agentsrc" destdir="build/agent/classes" debug="true" deprecation="true" target="1.8" source="1.8">
 	    <classpath>
-		<pathelement path="${agentsrc.asm.cp}"/>
 		<pathelement path="${module.classpath}"/>
 	    </classpath>
 	</javac>
diff --git a/java/lib.jshell.agent/nbproject/project.properties b/java/lib.jshell.agent/nbproject/project.properties
index c20922f1b5..6641c35991 100644
--- a/java/lib.jshell.agent/nbproject/project.properties
+++ b/java/lib.jshell.agent/nbproject/project.properties
@@ -21,5 +21,5 @@ javac.compilerargs=-Xlint -Xlint:-serial
 extra.module.files=modules/ext/nb-custom-jshell-probe.jar,modules/ext/nb-mod-jshell-probe.jar
 jnlp.indirect.jars=modules/ext/nb-custom-jshell-probe.jar,modules/ext/nb-mod-jshell-probe.jar
 
-agentsrc.asm.cp=${core.startup.dir}/core/asm-all-5.0.1.jar
+agentsrc.asm.cp=${libs.asm.dir}/core/asm-all-5.0.1.jar
 agentsrc.jshell.cp=${nb_all}/java/libs.jshell.compile/external/jshell-9.jar
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ResolveList.java b/nbbuild/antsrc/org/netbeans/nbbuild/ResolveList.java
index dd10201a91..2c1a0f4027 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/ResolveList.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/ResolveList.java
@@ -21,7 +21,9 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.StringTokenizer;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
@@ -41,6 +43,7 @@
     private Mapper mapper;
     private File dir;
     private String path;
+    private Set<String> modules;
 
     /** Comma-separated list of properties to expand */
     public void setList (String s) {
@@ -50,6 +53,13 @@ public void setList (String s) {
             properties.add(tok.nextToken ());
     }
 
+    public void setModules (String s) {
+        StringTokenizer tok = new StringTokenizer (s, ", ");
+        modules = new HashSet<>();
+        while (tok.hasMoreTokens ())
+            modules.add(tok.nextToken ());
+    }
+
     /** New property name */
     public void setName(String s) {
         name = s;
@@ -117,12 +127,18 @@ private void seekHarderExecute() {
             final FileUtils fileUtils = FileUtils.getFileUtils();
 
             String clusterDir = getProject().getProperty(property + ".dir");
+            if (clusterDir == null) {
+                throw new BuildException(property + ".dir is not defined");
+            }
             File cluster = fileUtils.resolveFile(dir, clusterDir);
 
             for (String p : props) {
                 String[] pValues = getProject().getProperty(p).split(",");
 
                 for (String oneValue : pValues) {
+                    if (modules != null && !modules.contains(oneValue)) {
+                        continue;
+                    }
                     File oneFile = fileUtils.resolveFile(dir, oneValue);
                     if (!nbProjectExists(oneFile)) {
                         File sndFile = fileUtils.resolveFile(cluster, oneValue);
diff --git a/nbbuild/javadoctools/build.xml b/nbbuild/javadoctools/build.xml
index 2ac9649b38..24f959225e 100644
--- a/nbbuild/javadoctools/build.xml
+++ b/nbbuild/javadoctools/build.xml
@@ -31,13 +31,7 @@
     <import file="../default.xml"/>
 
     <target name="build-javadoc" depends="-jdk-init,-load-build-properties,init-tasks,set-buildnumber" description="Builds Javadoc documentation for modules; on branches pass e.g. -Djavadoc.web.root=http://bits.netbeans.org/6.7/javadoc">
-        <pathconvert property="modules.fullpath">
-            <path>
-                <dirset dir="${nb_all}" includes="${config.javadoc.all}"/>
-            </path>
-            <mapper type="identity"/>
-        </pathconvert>
-        
+        <resolvelist name="allmodules" path="modules.fullpath" dir="${nb_all}" list="${nb.clusters.list}" modules="${config.javadoc.all}"/>
         <sortsuitemodules unsortedmodules="${modules.fullpath}" sortedmodulesproperty="modules.sorted"/>
         
         <property name="export.interfaces" location="${netbeans.javadoc.dir}/../ModulesExportedInterfaces"/>
diff --git a/nbbuild/rat-exclusions.txt b/nbbuild/rat-exclusions.txt
index 0300aaaeaa..4f015ffacc 100644
--- a/nbbuild/rat-exclusions.txt
+++ b/nbbuild/rat-exclusions.txt
@@ -75,7 +75,7 @@ java/java.j2seproject/copylibstask/test/org/netbeans/modules/java/j2seproject/mo
 lexer/demo/src/org/netbeans/modules/lexer/demo/**/*.txt
 platform/lib.uihandler/test/unit/src/**
 platform/o.n.core/test/unit/src/org/netbeans/core/projects/cache/data/**
-openide.nodes/test/unit/src/org/openide/nodes/data/**
+platform/openide.nodes/test/unit/src/org/openide/nodes/data/**
 projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/data/*.txt
 platform/queries/test/unit/src/org/netbeans/api/queries/data/*
 utilities/test/unit/src/org/netbeans/modules/openfile/resources/recent_files/*
diff --git a/platform/api.annotations.common/arch.xml b/platform/api.annotations.common/arch.xml
index b708d7156a..150c99f624 100644
--- a/platform/api.annotations.common/arch.xml
+++ b/platform/api.annotations.common/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/api.htmlui/arch.xml b/platform/api.htmlui/arch.xml
index b6c9bd2451..344e06a45b 100644
--- a/platform/api.htmlui/arch.xml
+++ b/platform/api.htmlui/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/api.intent/arch.xml b/platform/api.intent/arch.xml
index 929cecc971..6cc1a6af93 100644
--- a/platform/api.intent/arch.xml
+++ b/platform/api.intent/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/api.io/apichanges.xml b/platform/api.io/apichanges.xml
index ab7c5b72de..4b1008e5c5 100644
--- a/platform/api.io/apichanges.xml
+++ b/platform/api.io/apichanges.xml
@@ -21,7 +21,7 @@
 -->
 
 
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <!--
diff --git a/platform/api.io/arch.xml b/platform/api.io/arch.xml
index f71d31fb10..3ad8981358 100644
--- a/platform/api.io/arch.xml
+++ b/platform/api.io/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/api.progress.nb/arch.xml b/platform/api.progress.nb/arch.xml
index 86ebea1e99..f6216508ca 100644
--- a/platform/api.progress.nb/arch.xml
+++ b/platform/api.progress.nb/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/api.progress/arch.xml b/platform/api.progress/arch.xml
index 85fe8e6ad4..c074292fe3 100644
--- a/platform/api.progress/arch.xml
+++ b/platform/api.progress/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/api.search/apichanges.xml b/platform/api.search/apichanges.xml
index 5f4c595b9f..0899107771 100644
--- a/platform/api.search/apichanges.xml
+++ b/platform/api.search/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <!--
diff --git a/platform/api.search/arch.xml b/platform/api.search/arch.xml
index f1389fef0c..5c34218faa 100644
--- a/platform/api.search/arch.xml
+++ b/platform/api.search/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/api.templates/apichanges.xml b/platform/api.templates/apichanges.xml
index 6588e04a89..448b78e75e 100644
--- a/platform/api.templates/apichanges.xml
+++ b/platform/api.templates/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <apichanges>
diff --git a/platform/api.templates/arch.xml b/platform/api.templates/arch.xml
index bbf2e66ab6..25d0e3a321 100644
--- a/platform/api.templates/arch.xml
+++ b/platform/api.templates/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/api.visual/apichanges.xml b/platform/api.visual/apichanges.xml
index 45fa4956aa..5b6fbd3b06 100644
--- a/platform/api.visual/apichanges.xml
+++ b/platform/api.visual/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <apichanges>
diff --git a/platform/api.visual/arch.xml b/platform/api.visual/arch.xml
index 9ea8dc9fee..371c4535be 100644
--- a/platform/api.visual/arch.xml
+++ b/platform/api.visual/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/autoupdate.cli/nbproject/project.properties b/platform/autoupdate.cli/nbproject/project.properties
index 43b241fad7..59614e1fe7 100644
--- a/platform/autoupdate.cli/nbproject/project.properties
+++ b/platform/autoupdate.cli/nbproject/project.properties
@@ -19,6 +19,6 @@ javac.compilerargs=-Xlint:unchecked
 javac.source=1.7
 
 
-test.unit.cp.extra=${core.startup.dir}/core/core.jar:\
+test.unit.cp.extra=${libs.asm.dir}/core/core.jar:\
     ${o.n.bootstrap.dir}/lib/boot.jar
 
diff --git a/platform/autoupdate.services/apichanges.xml b/platform/autoupdate.services/apichanges.xml
index 6cc9d39b71..3caf646527 100644
--- a/platform/autoupdate.services/apichanges.xml
+++ b/platform/autoupdate.services/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <apichanges>
diff --git a/platform/autoupdate.services/arch.xml b/platform/autoupdate.services/arch.xml
index fc7f237cbc..3f2e3ef595 100644
--- a/platform/autoupdate.services/arch.xml
+++ b/platform/autoupdate.services/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+<!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/autoupdate.ui/apichanges.xml b/platform/autoupdate.ui/apichanges.xml
index beb67722f6..1de8cbbc9b 100644
--- a/platform/autoupdate.ui/apichanges.xml
+++ b/platform/autoupdate.ui/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <apichanges>
diff --git a/platform/autoupdate.ui/arch.xml b/platform/autoupdate.ui/arch.xml
index 58f01de8bc..206f1c23c9 100644
--- a/platform/autoupdate.ui/arch.xml
+++ b/platform/autoupdate.ui/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/core.io.ui/arch.xml b/platform/core.io.ui/arch.xml
index 3d9bf0bead..911e12fbee 100644
--- a/platform/core.io.ui/arch.xml
+++ b/platform/core.io.ui/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/core.multitabs/arch.xml b/platform/core.multitabs/arch.xml
index 8df9d81d9b..6645c24007 100644
--- a/platform/core.multitabs/arch.xml
+++ b/platform/core.multitabs/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/core.multiview/arch.xml b/platform/core.multiview/arch.xml
index 2ee495b8d4..a02dc0998b 100644
--- a/platform/core.multiview/arch.xml
+++ b/platform/core.multiview/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/core.netigso/arch.xml b/platform/core.netigso/arch.xml
index 8528956e7c..1566e626fd 100644
--- a/platform/core.netigso/arch.xml
+++ b/platform/core.netigso/arch.xml
@@ -20,8 +20,8 @@
 
 -->
 
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/core.network/apichanges.xml b/platform/core.network/apichanges.xml
index cef92a91ad..dcb4c0937e 100644
--- a/platform/core.network/apichanges.xml
+++ b/platform/core.network/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <apichanges>
diff --git a/platform/core.network/arch.xml b/platform/core.network/arch.xml
index a1d257fd65..59da8650ad 100644
--- a/platform/core.network/arch.xml
+++ b/platform/core.network/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/core.output2/arch.xml b/platform/core.output2/arch.xml
index 99a905e903..211ab98c42 100644
--- a/platform/core.output2/arch.xml
+++ b/platform/core.output2/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/core.startup.base/arch.xml b/platform/core.startup.base/arch.xml
index 2d9dd192a8..9eead1b6ab 100644
--- a/platform/core.startup.base/arch.xml
+++ b/platform/core.startup.base/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/core.startup/apichanges.xml b/platform/core.startup/apichanges.xml
index 6dc67fe043..376dde473f 100644
--- a/platform/core.startup/apichanges.xml
+++ b/platform/core.startup/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <apichanges>
diff --git a/platform/core.startup/arch.xml b/platform/core.startup/arch.xml
index fec0e428ed..7a18ab718c 100644
--- a/platform/core.startup/arch.xml
+++ b/platform/core.startup/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/core.ui/arch.xml b/platform/core.ui/arch.xml
index a5f75e4957..903ff9d632 100644
--- a/platform/core.ui/arch.xml
+++ b/platform/core.ui/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/core.windows/apichanges.xml b/platform/core.windows/apichanges.xml
index b2b364e6fd..92f40cf389 100644
--- a/platform/core.windows/apichanges.xml
+++ b/platform/core.windows/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <!--
diff --git a/platform/core.windows/arch.xml b/platform/core.windows/arch.xml
index 8e79ca3c65..9aa702b0e0 100644
--- a/platform/core.windows/arch.xml
+++ b/platform/core.windows/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/editor.mimelookup.impl/arch.xml b/platform/editor.mimelookup.impl/arch.xml
index 626e084222..01f87ebbc8 100644
--- a/platform/editor.mimelookup.impl/arch.xml
+++ b/platform/editor.mimelookup.impl/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/editor.mimelookup/apichanges.xml b/platform/editor.mimelookup/apichanges.xml
index 8f7031365f..0a8d5d6083 100644
--- a/platform/editor.mimelookup/apichanges.xml
+++ b/platform/editor.mimelookup/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <!--
diff --git a/platform/editor.mimelookup/arch.xml b/platform/editor.mimelookup/arch.xml
index 9f6521f63f..0627c9131e 100644
--- a/platform/editor.mimelookup/arch.xml
+++ b/platform/editor.mimelookup/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/javahelp/apichanges.xml b/platform/javahelp/apichanges.xml
index 89c3e7e7ae..0f39038af0 100644
--- a/platform/javahelp/apichanges.xml
+++ b/platform/javahelp/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet href="../nbbuild/javadoctools/apichanges.xsl" type="text/xsl" ?>
+<?xml-stylesheet href="../../nbbuild/javadoctools/apichanges.xsl" type="text/xsl" ?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN"
                      "../../nbbuild/javadoctools/apichanges.dtd">
 
diff --git a/platform/javahelp/arch.xml b/platform/javahelp/arch.xml
index dea8b11f32..4f17f7eec6 100644
--- a/platform/javahelp/arch.xml
+++ b/platform/javahelp/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/junitlib/build.xml b/platform/junitlib/build.xml
index 1f603390d8..5a843876e7 100644
--- a/platform/junitlib/build.xml
+++ b/platform/junitlib/build.xml
@@ -20,7 +20,7 @@
 
 -->
 <project basedir="." default="build" name="platform/junitlib">
-    <property name="license.file" location="../nbbuild/licenses/CPL-1.0"/>
+    <property name="license.file" location="../../nbbuild/licenses/CPL-1.0"/>
     <target name="-create-license.file"/>
     <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/platform/keyring/apichanges.xml b/platform/keyring/apichanges.xml
index deb18f0710..b26655aea1 100644
--- a/platform/keyring/apichanges.xml
+++ b/platform/keyring/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 <apichanges>
     <apidefs>
diff --git a/platform/keyring/arch.xml b/platform/keyring/arch.xml
index 6eb7de0888..59a02e39a2 100644
--- a/platform/keyring/arch.xml
+++ b/platform/keyring/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/keyring/build.xml b/platform/keyring/build.xml
index 0ea05a7382..b125b533d6 100644
--- a/platform/keyring/build.xml
+++ b/platform/keyring/build.xml
@@ -24,7 +24,7 @@
     <target name="debug" depends="netbeans">
         <ant dir="../keyring.impl" inheritall="false"/>
         <input addproperty="nonative" defaultvalue="false" validargs="true,false" message="Suppress native keyrings?"/>
-        <ant dir="../nbbuild" target="tryme-debug">
+        <ant dir="../../nbbuild" target="tryme-debug">
             <property name="tryme.arg.keyring" value="-J-Dorg.netbeans.modules.keyring.level=0 -J-Dnetbeans.keyring.no.native=${nonative}"/>
         </ant>
     </target>
diff --git a/platform/lib.uihandler/arch.xml b/platform/lib.uihandler/arch.xml
index 3308ed35b9..3701d1c75e 100644
--- a/platform/lib.uihandler/arch.xml
+++ b/platform/lib.uihandler/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/libs.junit4/build.xml b/platform/libs.junit4/build.xml
index 59fe7e4d4c..5e6c0afbd3 100644
--- a/platform/libs.junit4/build.xml
+++ b/platform/libs.junit4/build.xml
@@ -20,7 +20,7 @@
 
 -->
 <project name="platform/libs.junit4" default="build" basedir=".">
-    <property name="license.file" location="../nbbuild/licenses/CPL-1.0"/>
+    <property name="license.file" location="../../nbbuild/licenses/CPL-1.0"/>
     <target name="-create-license.file"/>
     <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/platform/masterfs/arch.xml b/platform/masterfs/arch.xml
index 85820323bd..73fc88cadb 100644
--- a/platform/masterfs/arch.xml
+++ b/platform/masterfs/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/o.n.bootstrap/apichanges.xml b/platform/o.n.bootstrap/apichanges.xml
index e08b6c51d7..713c35a547 100644
--- a/platform/o.n.bootstrap/apichanges.xml
+++ b/platform/o.n.bootstrap/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <apichanges>
diff --git a/platform/o.n.bootstrap/arch.xml b/platform/o.n.bootstrap/arch.xml
index c440329bdc..4ca45f70c0 100644
--- a/platform/o.n.bootstrap/arch.xml
+++ b/platform/o.n.bootstrap/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/o.n.core/apichanges.xml b/platform/o.n.core/apichanges.xml
index 4ad714ab87..6d46d9ed3c 100644
--- a/platform/o.n.core/apichanges.xml
+++ b/platform/o.n.core/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <apichanges>
diff --git a/platform/o.n.core/arch.xml b/platform/o.n.core/arch.xml
index 2a88df39a8..a3e4b750e0 100644
--- a/platform/o.n.core/arch.xml
+++ b/platform/o.n.core/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/o.n.swing.outline/apichanges.xml b/platform/o.n.swing.outline/apichanges.xml
index fa48235411..cec86cb617 100644
--- a/platform/o.n.swing.outline/apichanges.xml
+++ b/platform/o.n.swing.outline/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <!--
diff --git a/platform/o.n.swing.outline/arch.xml b/platform/o.n.swing.outline/arch.xml
index fa8eac24eb..bf020242d9 100644
--- a/platform/o.n.swing.outline/arch.xml
+++ b/platform/o.n.swing.outline/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/o.n.swing.plaf/arch.xml b/platform/o.n.swing.plaf/arch.xml
index 68c3453bbb..b2d6b941f4 100644
--- a/platform/o.n.swing.plaf/arch.xml
+++ b/platform/o.n.swing.plaf/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/o.n.swing.tabcontrol/apichanges.xml b/platform/o.n.swing.tabcontrol/apichanges.xml
index 0797b480e2..3e45572bd4 100644
--- a/platform/o.n.swing.tabcontrol/apichanges.xml
+++ b/platform/o.n.swing.tabcontrol/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <!--
diff --git a/platform/o.n.swing.tabcontrol/arch.xml b/platform/o.n.swing.tabcontrol/arch.xml
index e8b1b08d65..4cca6af60d 100644
--- a/platform/o.n.swing.tabcontrol/arch.xml
+++ b/platform/o.n.swing.tabcontrol/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.actions/arch.xml b/platform/openide.actions/arch.xml
index bf81d7dff8..e1459b1ae0 100644
--- a/platform/openide.actions/arch.xml
+++ b/platform/openide.actions/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.awt/arch.xml b/platform/openide.awt/arch.xml
index 8596b2ab74..393f547211 100644
--- a/platform/openide.awt/arch.xml
+++ b/platform/openide.awt/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.compat/arch.xml b/platform/openide.compat/arch.xml
index a1ee87991f..ed4e96f8a1 100644
--- a/platform/openide.compat/arch.xml
+++ b/platform/openide.compat/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.dialogs/arch.xml b/platform/openide.dialogs/arch.xml
index 3fe193d7c2..f5cc356d5c 100644
--- a/platform/openide.dialogs/arch.xml
+++ b/platform/openide.dialogs/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.execution/apichanges.xml b/platform/openide.execution/apichanges.xml
index 991a1c7b54..b3c24e8924 100644
--- a/platform/openide.execution/apichanges.xml
+++ b/platform/openide.execution/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <apichanges>
diff --git a/platform/openide.execution/arch.xml b/platform/openide.execution/arch.xml
index c57b7c2742..7aa9f2838c 100644
--- a/platform/openide.execution/arch.xml
+++ b/platform/openide.execution/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <!-- XXX need to remove obsolete info from Execution API split -->
diff --git a/platform/openide.explorer/arch.xml b/platform/openide.explorer/arch.xml
index 8920ea465a..c3baad423d 100644
--- a/platform/openide.explorer/arch.xml
+++ b/platform/openide.explorer/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.filesystems.compat8/arch.xml b/platform/openide.filesystems.compat8/arch.xml
index e61739c999..46c9deca74 100644
--- a/platform/openide.filesystems.compat8/arch.xml
+++ b/platform/openide.filesystems.compat8/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.filesystems/arch.xml b/platform/openide.filesystems/arch.xml
index b5442042e6..2907d75b4f 100644
--- a/platform/openide.filesystems/arch.xml
+++ b/platform/openide.filesystems/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.io/apichanges.xml b/platform/openide.io/apichanges.xml
index 29e13c36f5..2d56c9751f 100644
--- a/platform/openide.io/apichanges.xml
+++ b/platform/openide.io/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <!--
diff --git a/platform/openide.io/arch.xml b/platform/openide.io/arch.xml
index 756b7946ea..3e06298d03 100644
--- a/platform/openide.io/arch.xml
+++ b/platform/openide.io/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.loaders/apichanges.xml b/platform/openide.loaders/apichanges.xml
index 84131c2083..63c260cf59 100644
--- a/platform/openide.loaders/apichanges.xml
+++ b/platform/openide.loaders/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <!--
diff --git a/platform/openide.loaders/arch.xml b/platform/openide.loaders/arch.xml
index 7b9a4d4f5e..c9b32d75c0 100644
--- a/platform/openide.loaders/arch.xml
+++ b/platform/openide.loaders/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.modules/arch.xml b/platform/openide.modules/arch.xml
index db027ff1df..e7d7991d63 100644
--- a/platform/openide.modules/arch.xml
+++ b/platform/openide.modules/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.nodes/arch.xml b/platform/openide.nodes/arch.xml
index b010a415b2..74201c5758 100644
--- a/platform/openide.nodes/arch.xml
+++ b/platform/openide.nodes/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.options/arch.xml b/platform/openide.options/arch.xml
index 4f636ffccc..196e0990df 100644
--- a/platform/openide.options/arch.xml
+++ b/platform/openide.options/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.text/arch.xml b/platform/openide.text/arch.xml
index 3158a024ea..e5eb6ef3d0 100644
--- a/platform/openide.text/arch.xml
+++ b/platform/openide.text/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.util.enumerations/arch.xml b/platform/openide.util.enumerations/arch.xml
index c651ba54ed..b7cb50a52e 100644
--- a/platform/openide.util.enumerations/arch.xml
+++ b/platform/openide.util.enumerations/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.util.lookup/arch.xml b/platform/openide.util.lookup/arch.xml
index 00e17976f1..6e50e72dd2 100644
--- a/platform/openide.util.lookup/arch.xml
+++ b/platform/openide.util.lookup/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.util.ui/arch.xml b/platform/openide.util.ui/arch.xml
index d19da9c6b8..7203ae063e 100644
--- a/platform/openide.util.ui/arch.xml
+++ b/platform/openide.util.ui/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.util/arch.xml b/platform/openide.util/arch.xml
index e084a83d4e..c1d295664e 100644
--- a/platform/openide.util/arch.xml
+++ b/platform/openide.util/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/openide.windows/arch.xml b/platform/openide.windows/arch.xml
index c9775d255f..a9e30456b0 100644
--- a/platform/openide.windows/arch.xml
+++ b/platform/openide.windows/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/options.api/apichanges.xml b/platform/options.api/apichanges.xml
index 9bf226e887..f63bca4eef 100644
--- a/platform/options.api/apichanges.xml
+++ b/platform/options.api/apichanges.xml
@@ -20,7 +20,7 @@
 
 -->
 
-<?xml-stylesheet href="../nbbuild/javadoctools/apichanges.xsl" type="text/xsl"?>
+<?xml-stylesheet href="../../nbbuild/javadoctools/apichanges.xsl" type="text/xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <!-- INFO FOR PEOPLE ADDING CHANGES:
diff --git a/platform/options.api/arch.xml b/platform/options.api/arch.xml
index 0bdd5ad6f7..5c3cad2563 100644
--- a/platform/options.api/arch.xml
+++ b/platform/options.api/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/options.keymap/apichanges.xml b/platform/options.keymap/apichanges.xml
index 3f45e700f2..055f44ac1c 100644
--- a/platform/options.keymap/apichanges.xml
+++ b/platform/options.keymap/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 <apichanges>
     <apidefs>
diff --git a/platform/options.keymap/arch.xml b/platform/options.keymap/arch.xml
index c2733ffc67..75db55b6a2 100644
--- a/platform/options.keymap/arch.xml
+++ b/platform/options.keymap/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/print/apichanges.xml b/platform/print/apichanges.xml
index 595374e913..18ce7450c2 100644
--- a/platform/print/apichanges.xml
+++ b/platform/print/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?><!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?><!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 <!--
 INFO FOR PEOPLE ADDING CHANGES:
 
diff --git a/platform/print/arch.xml b/platform/print/arch.xml
index 307d777df8..ce65c108f1 100644
--- a/platform/print/arch.xml
+++ b/platform/print/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">]>
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+<!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">]>
 
 <api-answers question-version="1.29" author="yaroslavskiy@netbeans.org">
   &api-questions;
diff --git a/platform/queries/apichanges.xml b/platform/queries/apichanges.xml
index e2932d559d..9d17669f42 100644
--- a/platform/queries/apichanges.xml
+++ b/platform/queries/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <!--
diff --git a/platform/queries/arch.xml b/platform/queries/arch.xml
index c50c7425ae..8fbf5aeaf0 100644
--- a/platform/queries/arch.xml
+++ b/platform/queries/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/sampler/arch.xml b/platform/sampler/arch.xml
index ad24a69a4a..40ca7e3fca 100644
--- a/platform/sampler/arch.xml
+++ b/platform/sampler/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/sendopts/arch.xml b/platform/sendopts/arch.xml
index 794a113b33..09dfa6048f 100644
--- a/platform/sendopts/arch.xml
+++ b/platform/sendopts/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/settings/apichanges.xml b/platform/settings/apichanges.xml
index e1d60812c8..58b7a886d9 100644
--- a/platform/settings/apichanges.xml
+++ b/platform/settings/apichanges.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
 <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
 
 <!--
diff --git a/platform/settings/arch.xml b/platform/settings/arch.xml
index 5d0824da65..1b5d46d84f 100644
--- a/platform/settings/arch.xml
+++ b/platform/settings/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/spi.actions/arch.xml b/platform/spi.actions/arch.xml
index 53f9df3d9b..d005afffcb 100644
--- a/platform/spi.actions/arch.xml
+++ b/platform/spi.actions/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/spi.quicksearch/arch.xml b/platform/spi.quicksearch/arch.xml
index e10a6a345b..09beaceb26 100644
--- a/platform/spi.quicksearch/arch.xml
+++ b/platform/spi.quicksearch/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-  <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+  <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers
diff --git a/platform/uihandler/arch.xml b/platform/uihandler/arch.xml
index 2e5cbd706d..21535e1c32 100644
--- a/platform/uihandler/arch.xml
+++ b/platform/uihandler/arch.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
-<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+<!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>
 
 <api-answers


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists