Moving the platform modules into their own subdirectory to lower the …

…clutter in the root
jirkabs · May 6, 2018 · 3dfe012 · 3dfe012
1 parent acefa19
commit 3dfe012
Show file tree

Hide file tree

Showing 6,702 changed files with 1,233 additions and 1,213 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,12 @@
 /*/external/*.exe
 /*/external/*.js
 /*/external/*/**
+/*/*/external/*.zip
+/*/*/external/*.jar
+/*/*/external/*.dll
+/*/*/external/*.exe
+/*/*/external/*.js
+/*/*/external/*/**
 /nbbuild/netbeans/
 /nbbuild/nbms/
 /nbbuild/testuserdir/

diff --git a/core.startup/build.xml b/core.startup/build.xml
diff --git a/core.ui/build.xml b/core.ui/build.xml
diff --git a/core.windows/build.xml b/core.windows/build.xml
diff --git a/editor.mimelookup/build.xml b/editor.mimelookup/build.xml
diff --git a/favorites/build.xml b/favorites/build.xml
diff --git a/apisupport.harness/arch.xml → harness/apisupport.harness/arch.xml b/apisupport.harness/arch.xml → harness/apisupport.harness/arch.xml
diff --git a/apisupport.harness/build.xml → harness/apisupport.harness/build.xml b/apisupport.harness/build.xml → harness/apisupport.harness/build.xml
@@ -21,7 +21,7 @@
 -->
 <project name="apisupport.harness" default="build" basedir=".">
 
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
     <target name="nbantext" depends="build-init">
         <jar jarfile="${cluster}/tasks.jar" compress="${build.package.compress}" index="${build.package.index}">

diff --git a/apisupport.harness/external/binaries-list → ...apisupport.harness/external/binaries-list b/apisupport.harness/external/binaries-list → ...apisupport.harness/external/binaries-list
diff --git a/...t.harness/external/bindex-2.2-license.txt → ...t.harness/external/bindex-2.2-license.txt b/...t.harness/external/bindex-2.2-license.txt → ...t.harness/external/bindex-2.2-license.txt
diff --git a/...xternal/harness-launchers-8.2-license.txt → ...xternal/harness-launchers-8.2-license.txt b/...xternal/harness-launchers-8.2-license.txt → ...xternal/harness-launchers-8.2-license.txt
diff --git a/apisupport.harness/jnlp-manifest.mf → harness/apisupport.harness/jnlp-manifest.mf b/apisupport.harness/jnlp-manifest.mf → harness/apisupport.harness/jnlp-manifest.mf
diff --git a/...nlplauncher/InstalledFileLocatorImpl.java → ...nlplauncher/InstalledFileLocatorImpl.java b/...nlplauncher/InstalledFileLocatorImpl.java → ...nlplauncher/InstalledFileLocatorImpl.java
diff --git a/...modules/apisupport/jnlplauncher/Main.java → ...modules/apisupport/jnlplauncher/Main.java b/...modules/apisupport/jnlplauncher/Main.java → ...modules/apisupport/jnlplauncher/Main.java
diff --git a/...pisupport/jnlplauncher/RuntimePolicy.java → ...pisupport/jnlplauncher/RuntimePolicy.java b/...pisupport/jnlplauncher/RuntimePolicy.java → ...pisupport/jnlplauncher/RuntimePolicy.java
diff --git a/apisupport.harness/licenseinfo.xml → harness/apisupport.harness/licenseinfo.xml b/apisupport.harness/licenseinfo.xml → harness/apisupport.harness/licenseinfo.xml
diff --git a/apisupport.harness/manifest.mf → harness/apisupport.harness/manifest.mf b/apisupport.harness/manifest.mf → harness/apisupport.harness/manifest.mf
diff --git a/...port.harness/nbproject/project.properties → ...port.harness/nbproject/project.properties b/...port.harness/nbproject/project.properties → ...port.harness/nbproject/project.properties
diff --git a/apisupport.harness/nbproject/project.xml → .../apisupport.harness/nbproject/project.xml b/apisupport.harness/nbproject/project.xml → .../apisupport.harness/nbproject/project.xml
diff --git a/apisupport.harness/release/README → harness/apisupport.harness/release/README b/apisupport.harness/release/README → harness/apisupport.harness/release/README
diff --git a/apisupport.harness/release/build.xml → harness/apisupport.harness/release/build.xml b/apisupport.harness/release/build.xml → harness/apisupport.harness/release/build.xml
diff --git a/apisupport.harness/release/etc/Info.plist → ...apisupport.harness/release/etc/Info.plist b/apisupport.harness/release/etc/Info.plist → ...apisupport.harness/release/etc/Info.plist
diff --git a/apisupport.harness/release/etc/app.conf → ...s/apisupport.harness/release/etc/app.conf b/apisupport.harness/release/etc/app.conf → ...s/apisupport.harness/release/etc/app.conf
diff --git a/....harness/release/etc/applicationIcon.icns → ....harness/release/etc/applicationIcon.icns b/....harness/release/etc/applicationIcon.icns → ....harness/release/etc/applicationIcon.icns
diff --git a/apisupport.harness/release/jnlp.xml → harness/apisupport.harness/release/jnlp.xml b/apisupport.harness/release/jnlp.xml → harness/apisupport.harness/release/jnlp.xml
diff --git a/apisupport.harness/release/launchers/app.sh → ...isupport.harness/release/launchers/app.sh b/apisupport.harness/release/launchers/app.sh → ...isupport.harness/release/launchers/app.sh
diff --git a/apisupport.harness/release/osgi.xml → harness/apisupport.harness/release/osgi.xml b/apisupport.harness/release/osgi.xml → harness/apisupport.harness/release/osgi.xml
diff --git a/apisupport.harness/release/run.xml → harness/apisupport.harness/release/run.xml b/apisupport.harness/release/run.xml → harness/apisupport.harness/release/run.xml
diff --git a/apisupport.harness/release/suite.xml → harness/apisupport.harness/release/suite.xml b/apisupport.harness/release/suite.xml → harness/apisupport.harness/release/suite.xml
diff --git a/...ules/apisupport/harness/Bundle.properties → ...ules/apisupport/harness/Bundle.properties b/...ules/apisupport/harness/Bundle.properties → ...ules/apisupport/harness/Bundle.properties
diff --git a/apisupport.harness/taskdefs.properties → ...ss/apisupport.harness/taskdefs.properties b/apisupport.harness/taskdefs.properties → ...ss/apisupport.harness/taskdefs.properties
diff --git a/...pisupport/jnlplauncher/FixPolicyTest.java → ...pisupport/jnlplauncher/FixPolicyTest.java b/...pisupport/jnlplauncher/FixPolicyTest.java → ...pisupport/jnlplauncher/FixPolicyTest.java
diff --git a/...port/jnlplauncher/ReplaceUserDirTest.java → ...port/jnlplauncher/ReplaceUserDirTest.java b/...port/jnlplauncher/ReplaceUserDirTest.java → ...port/jnlplauncher/ReplaceUserDirTest.java
diff --git a/...ort.harness/windows-launcher-src/Makefile → ...ort.harness/windows-launcher-src/Makefile b/...ort.harness/windows-launcher-src/Makefile → ...ort.harness/windows-launcher-src/Makefile
diff --git a/...port.harness/windows-launcher-src/app.cpp → ...port.harness/windows-launcher-src/app.cpp b/...port.harness/windows-launcher-src/app.cpp → ...port.harness/windows-launcher-src/app.cpp
diff --git a/...port.harness/windows-launcher-src/app.ico → ...port.harness/windows-launcher-src/app.ico b/...port.harness/windows-launcher-src/app.ico → ...port.harness/windows-launcher-src/app.ico
diff --git a/...pport.harness/windows-launcher-src/app.rc → ...pport.harness/windows-launcher-src/app.rc b/...pport.harness/windows-launcher-src/app.rc → ...pport.harness/windows-launcher-src/app.rc
diff --git a/...ness/windows-launcher-src/applauncher.cpp → ...ness/windows-launcher-src/applauncher.cpp b/...ness/windows-launcher-src/applauncher.cpp → ...ness/windows-launcher-src/applauncher.cpp
diff --git a/...arness/windows-launcher-src/applauncher.h → ...arness/windows-launcher-src/applauncher.h b/...arness/windows-launcher-src/applauncher.h → ...arness/windows-launcher-src/applauncher.h
diff --git a/...launcher-src/nbproject/configurations.xml → ...launcher-src/nbproject/configurations.xml b/...launcher-src/nbproject/configurations.xml → ...launcher-src/nbproject/configurations.xml
diff --git a/...launcher-src/nbproject/project.properties → ...launcher-src/nbproject/project.properties b/...launcher-src/nbproject/project.properties → ...launcher-src/nbproject/project.properties
diff --git a/...indows-launcher-src/nbproject/project.xml → ...indows-launcher-src/nbproject/project.xml b/...indows-launcher-src/nbproject/project.xml → ...indows-launcher-src/nbproject/project.xml
diff --git a/jellytools.platform/build.xml → harness/jellytools.platform/build.xml b/jellytools.platform/build.xml → harness/jellytools.platform/build.xml
@@ -21,5 +21,5 @@
 -->
 <project basedir="." default="build" name="jellytools.platform">
     <description>Builds, tests, and runs the project org.netbeans.modules.jellytools.platform</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/jellytools.platform/licenseinfo.xml → harness/jellytools.platform/licenseinfo.xml b/jellytools.platform/licenseinfo.xml → harness/jellytools.platform/licenseinfo.xml
diff --git a/jellytools.platform/manifest.mf → harness/jellytools.platform/manifest.mf b/jellytools.platform/manifest.mf → harness/jellytools.platform/manifest.mf
diff --git a/...-netbeans-modules-jellytools-platform.sig → ...-netbeans-modules-jellytools-platform.sig b/...-netbeans-modules-jellytools-platform.sig → ...-netbeans-modules-jellytools-platform.sig
diff --git a/...ols.platform/nbproject/project.properties → ...ols.platform/nbproject/project.properties b/...ols.platform/nbproject/project.properties → ...ols.platform/nbproject/project.properties
diff --git a/jellytools.platform/nbproject/project.xml → ...jellytools.platform/nbproject/project.xml b/jellytools.platform/nbproject/project.xml → ...jellytools.platform/nbproject/project.xml
diff --git a/...m/src/org/netbeans/jellytools/Bundle.java → ...m/src/org/netbeans/jellytools/Bundle.java b/...m/src/org/netbeans/jellytools/Bundle.java → ...m/src/org/netbeans/jellytools/Bundle.java
diff --git a/...etbeans/jellytools/FavoritesOperator.java → ...etbeans/jellytools/FavoritesOperator.java b/...etbeans/jellytools/FavoritesOperator.java → ...etbeans/jellytools/FavoritesOperator.java
diff --git a/...org/netbeans/jellytools/HelpOperator.java → ...org/netbeans/jellytools/HelpOperator.java b/...org/netbeans/jellytools/HelpOperator.java → ...org/netbeans/jellytools/HelpOperator.java
diff --git a/...rg/netbeans/jellytools/JellyTestCase.java → ...rg/netbeans/jellytools/JellyTestCase.java b/...rg/netbeans/jellytools/JellyTestCase.java → ...rg/netbeans/jellytools/JellyTestCase.java
diff --git a/...org/netbeans/jellytools/JellyVersion.java → ...org/netbeans/jellytools/JellyVersion.java b/...org/netbeans/jellytools/JellyVersion.java → ...org/netbeans/jellytools/JellyVersion.java
diff --git a/...tbeans/jellytools/MainWindowOperator.java → ...tbeans/jellytools/MainWindowOperator.java b/...tbeans/jellytools/MainWindowOperator.java → ...tbeans/jellytools/MainWindowOperator.java
diff --git a/...netbeans/jellytools/NbDialogOperator.java → ...netbeans/jellytools/NbDialogOperator.java b/...netbeans/jellytools/NbDialogOperator.java → ...netbeans/jellytools/NbDialogOperator.java
diff --git a/.../netbeans/jellytools/OptionsOperator.java → .../netbeans/jellytools/OptionsOperator.java b/.../netbeans/jellytools/OptionsOperator.java → .../netbeans/jellytools/OptionsOperator.java
diff --git a/.../netbeans/jellytools/OutlineOperator.java → .../netbeans/jellytools/OutlineOperator.java b/.../netbeans/jellytools/OutlineOperator.java → .../netbeans/jellytools/OutlineOperator.java
diff --git a/...g/netbeans/jellytools/OutputOperator.java → ...g/netbeans/jellytools/OutputOperator.java b/...g/netbeans/jellytools/OutputOperator.java → ...g/netbeans/jellytools/OutputOperator.java
diff --git a/...etbeans/jellytools/OutputTabOperator.java → ...etbeans/jellytools/OutputTabOperator.java b/...etbeans/jellytools/OutputTabOperator.java → ...etbeans/jellytools/OutputTabOperator.java
diff --git a/.../netbeans/jellytools/PluginsOperator.java → .../netbeans/jellytools/PluginsOperator.java b/.../netbeans/jellytools/PluginsOperator.java → .../netbeans/jellytools/PluginsOperator.java
diff --git a/...ns/jellytools/QuestionDialogOperator.java → ...ns/jellytools/QuestionDialogOperator.java b/...ns/jellytools/QuestionDialogOperator.java → ...ns/jellytools/QuestionDialogOperator.java
diff --git a/...ns/jellytools/SaveAsTemplateOperator.java → ...ns/jellytools/SaveAsTemplateOperator.java b/...ns/jellytools/SaveAsTemplateOperator.java → ...ns/jellytools/SaveAsTemplateOperator.java
diff --git a/...g/netbeans/jellytools/TestBundleKeys.java → ...g/netbeans/jellytools/TestBundleKeys.java b/...g/netbeans/jellytools/TestBundleKeys.java → ...g/netbeans/jellytools/TestBundleKeys.java
diff --git a/...eans/jellytools/TopComponentOperator.java → ...eans/jellytools/TopComponentOperator.java b/...eans/jellytools/TopComponentOperator.java → ...eans/jellytools/TopComponentOperator.java
diff --git a/...etbeans/jellytools/TreeTableOperator.java → ...etbeans/jellytools/TreeTableOperator.java b/...etbeans/jellytools/TreeTableOperator.java → ...etbeans/jellytools/TreeTableOperator.java
diff --git a/...g/netbeans/jellytools/WizardOperator.java → ...g/netbeans/jellytools/WizardOperator.java b/...g/netbeans/jellytools/WizardOperator.java → ...g/netbeans/jellytools/WizardOperator.java
diff --git a/...g/netbeans/jellytools/actions/Action.java → ...g/netbeans/jellytools/actions/Action.java b/...g/netbeans/jellytools/actions/Action.java → ...g/netbeans/jellytools/actions/Action.java
diff --git a/...ans/jellytools/actions/ActionNoBlock.java → ...ans/jellytools/actions/ActionNoBlock.java b/...ans/jellytools/actions/ActionNoBlock.java → ...ans/jellytools/actions/ActionNoBlock.java
diff --git a/...s/jellytools/actions/AddLocaleAction.java → ...s/jellytools/actions/AddLocaleAction.java b/...s/jellytools/actions/AddLocaleAction.java → ...s/jellytools/actions/AddLocaleAction.java
diff --git a/...ellytools/actions/AttachWindowAction.java → ...ellytools/actions/AttachWindowAction.java b/...ellytools/actions/AttachWindowAction.java → ...ellytools/actions/AttachWindowAction.java
diff --git a/...s/jellytools/actions/CloneViewAction.java → ...s/jellytools/actions/CloneViewAction.java b/...s/jellytools/actions/CloneViewAction.java → ...s/jellytools/actions/CloneViewAction.java
diff --git a/...beans/jellytools/actions/CloseAction.java → ...beans/jellytools/actions/CloseAction.java b/...beans/jellytools/actions/CloseAction.java → ...beans/jellytools/actions/CloseAction.java
diff --git a/...ools/actions/CloseAllDocumentsAction.java → ...ools/actions/CloseAllDocumentsAction.java b/...ools/actions/CloseAllDocumentsAction.java → ...ools/actions/CloseAllDocumentsAction.java
diff --git a/...s/jellytools/actions/CloseViewAction.java → ...s/jellytools/actions/CloseViewAction.java b/...s/jellytools/actions/CloseViewAction.java → ...s/jellytools/actions/CloseViewAction.java
diff --git a/...tbeans/jellytools/actions/CopyAction.java → ...tbeans/jellytools/actions/CopyAction.java b/...tbeans/jellytools/actions/CopyAction.java → ...tbeans/jellytools/actions/CopyAction.java
diff --git a/...s/jellytools/actions/CustomizeAction.java → ...s/jellytools/actions/CustomizeAction.java b/...s/jellytools/actions/CustomizeAction.java → ...s/jellytools/actions/CustomizeAction.java
diff --git a/...etbeans/jellytools/actions/CutAction.java → ...etbeans/jellytools/actions/CutAction.java b/...etbeans/jellytools/actions/CutAction.java → ...etbeans/jellytools/actions/CutAction.java
diff --git a/...eans/jellytools/actions/DeleteAction.java → ...eans/jellytools/actions/DeleteAction.java b/...eans/jellytools/actions/DeleteAction.java → ...eans/jellytools/actions/DeleteAction.java
diff --git a/.../jellytools/actions/DockWindowAction.java → .../jellytools/actions/DockWindowAction.java b/.../jellytools/actions/DockWindowAction.java → .../jellytools/actions/DockWindowAction.java
diff --git a/...s/jellytools/actions/DocumentsAction.java → ...s/jellytools/actions/DocumentsAction.java b/...s/jellytools/actions/DocumentsAction.java → ...s/jellytools/actions/DocumentsAction.java
diff --git a/...tbeans/jellytools/actions/EditAction.java → ...tbeans/jellytools/actions/EditAction.java b/...tbeans/jellytools/actions/EditAction.java → ...tbeans/jellytools/actions/EditAction.java
diff --git a/...ytools/actions/ExploreFromHereAction.java → ...ytools/actions/ExploreFromHereAction.java b/...ytools/actions/ExploreFromHereAction.java → ...ytools/actions/ExploreFromHereAction.java
diff --git a/...s/jellytools/actions/FavoritesAction.java → ...s/jellytools/actions/FavoritesAction.java b/...s/jellytools/actions/FavoritesAction.java → ...s/jellytools/actions/FavoritesAction.java
diff --git a/...tbeans/jellytools/actions/FindAction.java → ...tbeans/jellytools/actions/FindAction.java b/...tbeans/jellytools/actions/FindAction.java → ...tbeans/jellytools/actions/FindAction.java
diff --git a/...tbeans/jellytools/actions/HelpAction.java → ...tbeans/jellytools/actions/HelpAction.java b/...tbeans/jellytools/actions/HelpAction.java → ...tbeans/jellytools/actions/HelpAction.java
diff --git a/...lytools/actions/MaximizeWindowAction.java → ...lytools/actions/MaximizeWindowAction.java b/...lytools/actions/MaximizeWindowAction.java → ...lytools/actions/MaximizeWindowAction.java
diff --git a/...tbeans/jellytools/actions/OpenAction.java → ...tbeans/jellytools/actions/OpenAction.java b/...tbeans/jellytools/actions/OpenAction.java → ...tbeans/jellytools/actions/OpenAction.java
diff --git a/...jellytools/actions/OptionsViewAction.java → ...jellytools/actions/OptionsViewAction.java b/...jellytools/actions/OptionsViewAction.java → ...jellytools/actions/OptionsViewAction.java
diff --git a/...tools/actions/OutputWindowViewAction.java → ...tools/actions/OutputWindowViewAction.java b/...tools/actions/OutputWindowViewAction.java → ...tools/actions/OutputWindowViewAction.java
diff --git a/...beans/jellytools/actions/PasteAction.java → ...beans/jellytools/actions/PasteAction.java b/...beans/jellytools/actions/PasteAction.java → ...beans/jellytools/actions/PasteAction.java
diff --git a/...ellytools/actions/PasteActionNoBlock.java → ...ellytools/actions/PasteActionNoBlock.java b/...ellytools/actions/PasteActionNoBlock.java → ...ellytools/actions/PasteActionNoBlock.java
diff --git a/.../jellytools/actions/PropertiesAction.java → .../jellytools/actions/PropertiesAction.java b/.../jellytools/actions/PropertiesAction.java → .../jellytools/actions/PropertiesAction.java
diff --git a/...eans/jellytools/actions/RenameAction.java → ...eans/jellytools/actions/RenameAction.java b/...eans/jellytools/actions/RenameAction.java → ...eans/jellytools/actions/RenameAction.java
diff --git a/...ans/jellytools/actions/ReplaceAction.java → ...ans/jellytools/actions/ReplaceAction.java b/...ans/jellytools/actions/ReplaceAction.java → ...ans/jellytools/actions/ReplaceAction.java
diff --git a/...llytools/actions/RestoreWindowAction.java → ...llytools/actions/RestoreWindowAction.java b/...llytools/actions/RestoreWindowAction.java → ...llytools/actions/RestoreWindowAction.java
diff --git a/...tbeans/jellytools/actions/SaveAction.java → ...tbeans/jellytools/actions/SaveAction.java b/...tbeans/jellytools/actions/SaveAction.java → ...tbeans/jellytools/actions/SaveAction.java
diff --git a/...ans/jellytools/actions/SaveAllAction.java → ...ans/jellytools/actions/SaveAllAction.java b/...ans/jellytools/actions/SaveAllAction.java → ...ans/jellytools/actions/SaveAllAction.java
diff --git a/...lytools/actions/SaveAsTemplateAction.java → ...lytools/actions/SaveAsTemplateAction.java b/...lytools/actions/SaveAsTemplateAction.java → ...lytools/actions/SaveAsTemplateAction.java
diff --git a/...ls/actions/ShowDescriptionAreaAction.java → ...ls/actions/ShowDescriptionAreaAction.java b/...ls/actions/ShowDescriptionAreaAction.java → ...ls/actions/ShowDescriptionAreaAction.java
diff --git a/...lytools/actions/SortByCategoryAction.java → ...lytools/actions/SortByCategoryAction.java b/...lytools/actions/SortByCategoryAction.java → ...lytools/actions/SortByCategoryAction.java
diff --git a/.../jellytools/actions/SortByNameAction.java → .../jellytools/actions/SortByNameAction.java b/.../jellytools/actions/SortByNameAction.java → .../jellytools/actions/SortByNameAction.java
diff --git a/...ellytools/actions/UndockWindowAction.java → ...ellytools/actions/UndockWindowAction.java b/...ellytools/actions/UndockWindowAction.java → ...ellytools/actions/UndockWindowAction.java
diff --git a/...tbeans/jellytools/actions/ViewAction.java → ...tbeans/jellytools/actions/ViewAction.java b/...tbeans/jellytools/actions/ViewAction.java → ...tbeans/jellytools/actions/ViewAction.java
diff --git a/...g/netbeans/jellytools/nodes/HTMLNode.java → ...g/netbeans/jellytools/nodes/HTMLNode.java b/...g/netbeans/jellytools/nodes/HTMLNode.java → ...g/netbeans/jellytools/nodes/HTMLNode.java
diff --git a/...c/org/netbeans/jellytools/nodes/Node.java → ...c/org/netbeans/jellytools/nodes/Node.java b/...c/org/netbeans/jellytools/nodes/Node.java → ...c/org/netbeans/jellytools/nodes/Node.java
diff --git a/...etbeans/jellytools/nodes/OutlineNode.java → ...etbeans/jellytools/nodes/OutlineNode.java b/...etbeans/jellytools/nodes/OutlineNode.java → ...etbeans/jellytools/nodes/OutlineNode.java
diff --git a/...ns/jellytools/nodes/UnrecognizedNode.java → ...ns/jellytools/nodes/UnrecognizedNode.java b/...ns/jellytools/nodes/UnrecognizedNode.java → ...ns/jellytools/nodes/UnrecognizedNode.java
diff --git a/...lytools/properties/ClasspathProperty.java → ...lytools/properties/ClasspathProperty.java b/...lytools/properties/ClasspathProperty.java → ...lytools/properties/ClasspathProperty.java
diff --git a/.../jellytools/properties/ColorProperty.java → .../jellytools/properties/ColorProperty.java b/.../jellytools/properties/ColorProperty.java → .../jellytools/properties/ColorProperty.java
diff --git a/...lytools/properties/DimensionProperty.java → ...lytools/properties/DimensionProperty.java b/...lytools/properties/DimensionProperty.java → ...lytools/properties/DimensionProperty.java
diff --git a/...s/jellytools/properties/FileProperty.java → ...s/jellytools/properties/FileProperty.java b/...s/jellytools/properties/FileProperty.java → ...s/jellytools/properties/FileProperty.java
diff --git a/...s/jellytools/properties/FontProperty.java → ...s/jellytools/properties/FontProperty.java b/...s/jellytools/properties/FontProperty.java → ...s/jellytools/properties/FontProperty.java
diff --git a/.../jellytools/properties/PointProperty.java → .../jellytools/properties/PointProperty.java b/.../jellytools/properties/PointProperty.java → .../jellytools/properties/PointProperty.java
diff --git a/...properties/ProcessDescriptorProperty.java → ...properties/ProcessDescriptorProperty.java b/...properties/ProcessDescriptorProperty.java → ...properties/ProcessDescriptorProperty.java
diff --git a/...beans/jellytools/properties/Property.java → ...beans/jellytools/properties/Property.java b/...beans/jellytools/properties/Property.java → ...beans/jellytools/properties/Property.java
diff --git a/...ols/properties/PropertySheetOperator.java → ...ols/properties/PropertySheetOperator.java b/...ols/properties/PropertySheetOperator.java → ...ols/properties/PropertySheetOperator.java
diff --git a/...lytools/properties/RectangleProperty.java → ...lytools/properties/RectangleProperty.java b/...lytools/properties/RectangleProperty.java → ...lytools/properties/RectangleProperty.java
diff --git a/...tools/properties/StringArrayProperty.java → ...tools/properties/StringArrayProperty.java b/...tools/properties/StringArrayProperty.java → ...tools/properties/StringArrayProperty.java
diff --git a/...jellytools/properties/StringProperty.java → ...jellytools/properties/StringProperty.java b/...jellytools/properties/StringProperty.java → ...jellytools/properties/StringProperty.java
diff --git a/...ditors/ClasspathCustomEditorOperator.java → ...ditors/ClasspathCustomEditorOperator.java b/...ditors/ClasspathCustomEditorOperator.java → ...ditors/ClasspathCustomEditorOperator.java
diff --git a/...es/editors/ColorCustomEditorOperator.java → ...es/editors/ColorCustomEditorOperator.java b/...es/editors/ColorCustomEditorOperator.java → ...es/editors/ColorCustomEditorOperator.java
diff --git a/...ditors/DimensionCustomEditorOperator.java → ...ditors/DimensionCustomEditorOperator.java b/...ditors/DimensionCustomEditorOperator.java → ...ditors/DimensionCustomEditorOperator.java
diff --git a/...ies/editors/FileCustomEditorOperator.java → ...ies/editors/FileCustomEditorOperator.java b/...ies/editors/FileCustomEditorOperator.java → ...ies/editors/FileCustomEditorOperator.java
diff --git a/...ies/editors/FontCustomEditorOperator.java → ...ies/editors/FontCustomEditorOperator.java b/...ies/editors/FontCustomEditorOperator.java → ...ies/editors/FontCustomEditorOperator.java
diff --git a/...ies/editors/IconCustomEditorOperator.java → ...ies/editors/IconCustomEditorOperator.java b/...ies/editors/IconCustomEditorOperator.java → ...ies/editors/IconCustomEditorOperator.java
diff --git a/...es/editors/PointCustomEditorOperator.java → ...es/editors/PointCustomEditorOperator.java b/...es/editors/PointCustomEditorOperator.java → ...es/editors/PointCustomEditorOperator.java
diff --git a/...rocessDescriptorCustomEditorOperator.java → ...rocessDescriptorCustomEditorOperator.java b/...rocessDescriptorCustomEditorOperator.java → ...rocessDescriptorCustomEditorOperator.java
diff --git a/...ditors/RectangleCustomEditorOperator.java → ...ditors/RectangleCustomEditorOperator.java b/...ditors/RectangleCustomEditorOperator.java → ...ditors/RectangleCustomEditorOperator.java
diff --git a/...tors/StringArrayCustomEditorOperator.java → ...tors/StringArrayCustomEditorOperator.java b/...tors/StringArrayCustomEditorOperator.java → ...tors/StringArrayCustomEditorOperator.java
diff --git a/...s/editors/StringCustomEditorOperator.java → ...s/editors/StringCustomEditorOperator.java b/...s/editors/StringCustomEditorOperator.java → ...s/editors/StringCustomEditorOperator.java
diff --git a/...editors/TreeViewCustomEditorOperator.java → ...editors/TreeViewCustomEditorOperator.java b/...editors/TreeViewCustomEditorOperator.java → ...editors/TreeViewCustomEditorOperator.java
diff --git a/...ellytools/properties/editors/package.html → ...ellytools/properties/editors/package.html b/...ellytools/properties/editors/package.html → ...ellytools/properties/editors/package.html
diff --git a/...tbeans/jellytools/properties/package.html → ...tbeans/jellytools/properties/package.html b/...tbeans/jellytools/properties/package.html → ...tbeans/jellytools/properties/package.html
diff --git a/...form/src/org/netbeans/jellytools/timeouts → ...form/src/org/netbeans/jellytools/timeouts b/...form/src/org/netbeans/jellytools/timeouts → ...form/src/org/netbeans/jellytools/timeouts
diff --git a/...tbeans/jellytools/util/FolderContext.java → ...tbeans/jellytools/util/FolderContext.java b/...tbeans/jellytools/util/FolderContext.java → ...tbeans/jellytools/util/FolderContext.java
diff --git a/...etbeans/jellytools/util/StringFilter.java → ...etbeans/jellytools/util/StringFilter.java b/...etbeans/jellytools/util/StringFilter.java → ...etbeans/jellytools/util/StringFilter.java
diff --git a/...org/netbeans/jellytools/util/package.html → ...org/netbeans/jellytools/util/package.html b/...org/netbeans/jellytools/util/package.html → ...org/netbeans/jellytools/util/package.html
diff --git a/.../src/org/netbeans/jellytools/version_info → .../src/org/netbeans/jellytools/version_info b/.../src/org/netbeans/jellytools/version_info → .../src/org/netbeans/jellytools/version_info
diff --git a/...ols/widgets/ConnectionWidgetOperator.java → ...ols/widgets/ConnectionWidgetOperator.java b/...ols/widgets/ConnectionWidgetOperator.java → ...ols/widgets/ConnectionWidgetOperator.java
diff --git a/...llytools/widgets/LabelWidgetOperator.java → ...llytools/widgets/LabelWidgetOperator.java b/...llytools/widgets/LabelWidgetOperator.java → ...llytools/widgets/LabelWidgetOperator.java
diff --git a/...ns/jellytools/widgets/WidgetOperator.java → ...ns/jellytools/widgets/WidgetOperator.java b/...ns/jellytools/widgets/WidgetOperator.java → ...ns/jellytools/widgets/WidgetOperator.java
diff --git a/...les/jellytools/platform/Bundle.properties → ...les/jellytools/platform/Bundle.properties b/...les/jellytools/platform/Bundle.properties → ...les/jellytools/platform/Bundle.properties
diff --git a/...ampleProject/nbproject/project.properties → ...ampleProject/nbproject/project.properties b/...ampleProject/nbproject/project.properties → ...ampleProject/nbproject/project.properties
diff --git a/.../data/SampleProject/nbproject/project.xml → .../data/SampleProject/nbproject/project.xml b/.../data/SampleProject/nbproject/project.xml → .../data/SampleProject/nbproject/project.xml
diff --git a/...mpleProject/src/sample1/JFrameSample.form → ...mpleProject/src/sample1/JFrameSample.form b/...mpleProject/src/sample1/JFrameSample.form → ...mpleProject/src/sample1/JFrameSample.form
diff --git a/...mpleProject/src/sample1/JFrameSample.java → ...mpleProject/src/sample1/JFrameSample.java b/...mpleProject/src/sample1/JFrameSample.java → ...mpleProject/src/sample1/JFrameSample.java
diff --git a/...mpleProject/src/sample1/SampleClass1.java → ...mpleProject/src/sample1/SampleClass1.java b/...mpleProject/src/sample1/SampleClass1.java → ...mpleProject/src/sample1/SampleClass1.java
diff --git a/.../data/SampleProject/src/sample1/html.html → .../data/SampleProject/src/sample1/html.html b/.../data/SampleProject/src/sample1/html.html → .../data/SampleProject/src/sample1/html.html
diff --git a/.../data/SampleProject/src/sample1/image.gif → .../data/SampleProject/src/sample1/image.gif b/.../data/SampleProject/src/sample1/image.gif → .../data/SampleProject/src/sample1/image.gif
diff --git a/...Project/src/sample1/properties.properties → ...Project/src/sample1/properties.properties b/...Project/src/sample1/properties.properties → ...Project/src/sample1/properties.properties
diff --git a/...ect/src/sample1/sample2/SampleClass2.java → ...ect/src/sample1/sample2/SampleClass2.java b/...ect/src/sample1/sample2/SampleClass2.java → ...ect/src/sample1/sample2/SampleClass2.java
diff --git a/...ta/SampleProject/src/sample1/unrecognized → ...ta/SampleProject/src/sample1/unrecognized b/...ta/SampleProject/src/sample1/unrecognized → ...ta/SampleProject/src/sample1/unrecognized
diff --git a/...al/data/SampleProject/src/sample1/url.url → ...al/data/SampleProject/src/sample1/url.url b/...al/data/SampleProject/src/sample1/url.url → ...al/data/SampleProject/src/sample1/url.url
diff --git a/...tional/data/SampleProject/test/Dummy.java → ...tional/data/SampleProject/test/Dummy.java b/...tional/data/SampleProject/test/Dummy.java → ...tional/data/SampleProject/test/Dummy.java
diff --git a/...c/org/netbeans/jellytools/BundleTest.java → ...c/org/netbeans/jellytools/BundleTest.java b/...c/org/netbeans/jellytools/BundleTest.java → ...c/org/netbeans/jellytools/BundleTest.java
diff --git a/...ans/jellytools/FavoritesOperatorTest.java → ...ans/jellytools/FavoritesOperatorTest.java b/...ans/jellytools/FavoritesOperatorTest.java → ...ans/jellytools/FavoritesOperatorTest.java
diff --git a/...netbeans/jellytools/HelpOperatorTest.java → ...netbeans/jellytools/HelpOperatorTest.java b/...netbeans/jellytools/HelpOperatorTest.java → ...netbeans/jellytools/HelpOperatorTest.java
diff --git a/...s/jellytools/JellytoolsPlatformSuite.java → ...s/jellytools/JellytoolsPlatformSuite.java b/...s/jellytools/JellytoolsPlatformSuite.java → ...s/jellytools/JellytoolsPlatformSuite.java
diff --git a/...ns/jellytools/MainWindowOperatorTest.java → ...ns/jellytools/MainWindowOperatorTest.java b/...ns/jellytools/MainWindowOperatorTest.java → ...ns/jellytools/MainWindowOperatorTest.java
diff --git a/...eans/jellytools/NbDialogOperatorTest.java → ...eans/jellytools/NbDialogOperatorTest.java b/...eans/jellytools/NbDialogOperatorTest.java → ...eans/jellytools/NbDialogOperatorTest.java
diff --git a/...beans/jellytools/OptionsOperatorTest.java → ...beans/jellytools/OptionsOperatorTest.java b/...beans/jellytools/OptionsOperatorTest.java → ...beans/jellytools/OptionsOperatorTest.java
diff --git a/...tbeans/jellytools/OutputOperatorTest.java → ...tbeans/jellytools/OutputOperatorTest.java b/...tbeans/jellytools/OutputOperatorTest.java → ...tbeans/jellytools/OutputOperatorTest.java
diff --git a/...ans/jellytools/OutputTabOperatorTest.java → ...ans/jellytools/OutputTabOperatorTest.java b/...ans/jellytools/OutputTabOperatorTest.java → ...ans/jellytools/OutputTabOperatorTest.java
diff --git a/...ns/jellytools/PlatformBundleKeysTest.java → ...ns/jellytools/PlatformBundleKeysTest.java b/...ns/jellytools/PlatformBundleKeysTest.java → ...ns/jellytools/PlatformBundleKeysTest.java
diff --git a/...lytools/PlatformBundleKeysTest.properties → ...lytools/PlatformBundleKeysTest.properties b/...lytools/PlatformBundleKeysTest.properties → ...lytools/PlatformBundleKeysTest.properties
diff --git a/...beans/jellytools/PluginsOperatorTest.java → ...beans/jellytools/PluginsOperatorTest.java b/...beans/jellytools/PluginsOperatorTest.java → ...beans/jellytools/PluginsOperatorTest.java
diff --git a/...ellytools/QuestionDialogOperatorTest.java → ...ellytools/QuestionDialogOperatorTest.java b/...ellytools/QuestionDialogOperatorTest.java → ...ellytools/QuestionDialogOperatorTest.java
diff --git a/...ellytools/SaveAsTemplateOperatorTest.java → ...ellytools/SaveAsTemplateOperatorTest.java b/...ellytools/SaveAsTemplateOperatorTest.java → ...ellytools/SaveAsTemplateOperatorTest.java
diff --git a/...al/src/org/netbeans/jellytools/Utils.java → ...al/src/org/netbeans/jellytools/Utils.java b/...al/src/org/netbeans/jellytools/Utils.java → ...al/src/org/netbeans/jellytools/Utils.java
diff --git a/...tbeans/jellytools/WizardOperatorTest.java → ...tbeans/jellytools/WizardOperatorTest.java b/...tbeans/jellytools/WizardOperatorTest.java → ...tbeans/jellytools/WizardOperatorTest.java
diff --git a/...rg/netbeans/jellytools/widgets/Utils.java → ...rg/netbeans/jellytools/widgets/Utils.java b/...rg/netbeans/jellytools/widgets/Utils.java → ...rg/netbeans/jellytools/widgets/Utils.java
diff --git a/...ellytools/widgets/WidgetOperatorTest.java → ...ellytools/widgets/WidgetOperatorTest.java b/...ellytools/widgets/WidgetOperatorTest.java → ...ellytools/widgets/WidgetOperatorTest.java
diff --git a/jemmy/CHANGES → harness/jemmy/CHANGES b/jemmy/CHANGES → harness/jemmy/CHANGES
diff --git a/jemmy/build.xml → harness/jemmy/build.xml b/jemmy/build.xml → harness/jemmy/build.xml
@@ -20,5 +20,5 @@
 
 -->
 <project name="jemmy" default="build" basedir=".">
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/jemmy/external/binaries-list → harness/jemmy/external/binaries-list b/jemmy/external/binaries-list → harness/jemmy/external/binaries-list
diff --git a/jemmy/external/jemmy-2.3.1.1-license.txt → .../jemmy/external/jemmy-2.3.1.1-license.txt b/jemmy/external/jemmy-2.3.1.1-license.txt → .../jemmy/external/jemmy-2.3.1.1-license.txt
diff --git a/jemmy/manifest.mf → harness/jemmy/manifest.mf b/jemmy/manifest.mf → harness/jemmy/manifest.mf
diff --git a/jemmy/nbproject/project.properties → harness/jemmy/nbproject/project.properties b/jemmy/nbproject/project.properties → harness/jemmy/nbproject/project.properties
diff --git a/jemmy/nbproject/project.xml → harness/jemmy/nbproject/project.xml b/jemmy/nbproject/project.xml → harness/jemmy/nbproject/project.xml
diff --git a/...modules/jemmy/idemodule/Bundle.properties → ...modules/jemmy/idemodule/Bundle.properties b/...modules/jemmy/idemodule/Bundle.properties → ...modules/jemmy/idemodule/Bundle.properties
diff --git a/jemmy/test/unit/gui_resource → harness/jemmy/test/unit/gui_resource b/jemmy/test/unit/gui_resource → harness/jemmy/test/unit/gui_resource
diff --git a/jemmy/test/unit/jemmy.timeouts → harness/jemmy/test/unit/jemmy.timeouts b/jemmy/test/unit/jemmy.timeouts → harness/jemmy/test/unit/jemmy.timeouts
diff --git a/jemmy/test/unit/testlist → harness/jemmy/test/unit/testlist b/jemmy/test/unit/testlist → harness/jemmy/test/unit/testlist
diff --git a/libs.nbi.ant/build.xml → harness/libs.nbi.ant/build.xml b/libs.nbi.ant/build.xml → harness/libs.nbi.ant/build.xml
@@ -24,7 +24,7 @@
 <!-- If you delete this file and reopen the project it will be recreated. -->
 <project basedir="." name="libs.nbi.ant" default="build">
     <description>Builds, tests, and runs the project org.netbeans.libs.nbi.ant</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
     <property name="nbi.engine.dir" value="../nbi/engine/"/>
 

diff --git a/libs.nbi.ant/licenseinfo.xml → harness/libs.nbi.ant/licenseinfo.xml b/libs.nbi.ant/licenseinfo.xml → harness/libs.nbi.ant/licenseinfo.xml
diff --git a/libs.nbi.ant/manifest.mf → harness/libs.nbi.ant/manifest.mf b/libs.nbi.ant/manifest.mf → harness/libs.nbi.ant/manifest.mf
diff --git a/libs.nbi.ant/nbproject/project.properties → ...libs.nbi.ant/nbproject/project.properties b/libs.nbi.ant/nbproject/project.properties → ...libs.nbi.ant/nbproject/project.properties
diff --git a/libs.nbi.ant/nbproject/project.xml → harness/libs.nbi.ant/nbproject/project.xml b/libs.nbi.ant/nbproject/project.xml → harness/libs.nbi.ant/nbproject/project.xml
diff --git a/...g/netbeans/libs/nbi/ant/Bundle.properties → ...g/netbeans/libs/nbi/ant/Bundle.properties b/...g/netbeans/libs/nbi/ant/Bundle.properties → ...g/netbeans/libs/nbi/ant/Bundle.properties
diff --git a/libs.nbi.ant/stub/build.properties → harness/libs.nbi.ant/stub/build.properties b/libs.nbi.ant/stub/build.properties → harness/libs.nbi.ant/stub/build.properties
diff --git a/libs.nbi.ant/stub/build.xml → harness/libs.nbi.ant/stub/build.xml b/libs.nbi.ant/stub/build.xml → harness/libs.nbi.ant/stub/build.xml
diff --git a/.../components/products/helloworld/build.xml → .../components/products/helloworld/build.xml b/.../components/products/helloworld/build.xml → .../components/products/helloworld/build.xml
diff --git a/...roducts/helloworld/data/Bundle.properties → ...roducts/helloworld/data/Bundle.properties b/...roducts/helloworld/data/Bundle.properties → ...roducts/helloworld/data/Bundle.properties
diff --git a/...ponents/products/helloworld/data/icon.png → ...ponents/products/helloworld/data/icon.png b/...ponents/products/helloworld/data/icon.png → ...ponents/products/helloworld/data/icon.png
diff --git a/...nents/products/helloworld/data/icon48.png → ...nents/products/helloworld/data/icon48.png b/...nents/products/helloworld/data/icon48.png → ...nents/products/helloworld/data/icon48.png
diff --git a/...omponents/products/helloworld/manifest.mf → ...omponents/products/helloworld/manifest.mf b/...omponents/products/helloworld/manifest.mf → ...omponents/products/helloworld/manifest.mf
diff --git a/...ducts/helloworld/nbproject/build-impl.xml → ...ducts/helloworld/nbproject/build-impl.xml b/...ducts/helloworld/nbproject/build-impl.xml → ...ducts/helloworld/nbproject/build-impl.xml
diff --git a/.../helloworld/nbproject/genfiles.properties → .../helloworld/nbproject/genfiles.properties b/.../helloworld/nbproject/genfiles.properties → .../helloworld/nbproject/genfiles.properties
diff --git a/...s/helloworld/nbproject/project.properties → ...s/helloworld/nbproject/project.properties b/...s/helloworld/nbproject/project.properties → ...s/helloworld/nbproject/project.properties
diff --git a/...products/helloworld/nbproject/project.xml → ...products/helloworld/nbproject/project.xml b/...products/helloworld/nbproject/project.xml → ...products/helloworld/nbproject/project.xml
diff --git a/...world/src/org/mycompany/Bundle.properties → ...world/src/org/mycompany/Bundle.properties b/...world/src/org/mycompany/Bundle.properties → ...world/src/org/mycompany/Bundle.properties
diff --git a/...src/org/mycompany/ConfigurationLogic.java → ...src/org/mycompany/ConfigurationLogic.java b/...src/org/mycompany/ConfigurationLogic.java → ...src/org/mycompany/ConfigurationLogic.java
diff --git a/...s/helloworld/src/org/mycompany/wizard.xml → ...s/helloworld/src/org/mycompany/wizard.xml b/...s/helloworld/src/org/mycompany/wizard.xml → ...s/helloworld/src/org/mycompany/wizard.xml
diff --git a/...mycompany/wizard/panels/Bundle.properties → ...mycompany/wizard/panels/Bundle.properties b/...mycompany/wizard/panels/Bundle.properties → ...mycompany/wizard/panels/Bundle.properties
diff --git a/...ompany/wizard/panels/HelloWorldPanel.java → ...ompany/wizard/panels/HelloWorldPanel.java b/...ompany/wizard/panels/HelloWorldPanel.java → ...ompany/wizard/panels/HelloWorldPanel.java
diff --git a/....nbi.ant/stub/ext/engine/build.properties → ....nbi.ant/stub/ext/engine/build.properties b/....nbi.ant/stub/ext/engine/build.properties → ....nbi.ant/stub/ext/engine/build.properties
diff --git a/libs.nbi.ant/stub/ext/engine/build.xml → ...ss/libs.nbi.ant/stub/ext/engine/build.xml b/libs.nbi.ant/stub/ext/engine/build.xml → ...ss/libs.nbi.ant/stub/ext/engine/build.xml
diff --git a/libs.nbi.ant/stub/ext/engine/manifest.mf → .../libs.nbi.ant/stub/ext/engine/manifest.mf b/libs.nbi.ant/stub/ext/engine/manifest.mf → .../libs.nbi.ant/stub/ext/engine/manifest.mf
diff --git a/.../stub/ext/engine/nbproject/build-impl.xml → .../stub/ext/engine/nbproject/build-impl.xml b/.../stub/ext/engine/nbproject/build-impl.xml → .../stub/ext/engine/nbproject/build-impl.xml
diff --git a/.../ext/engine/nbproject/genfiles.properties → .../ext/engine/nbproject/genfiles.properties b/.../ext/engine/nbproject/genfiles.properties → .../ext/engine/nbproject/genfiles.properties
diff --git a/...b/ext/engine/nbproject/project.properties → ...b/ext/engine/nbproject/project.properties b/...b/ext/engine/nbproject/project.properties → ...b/ext/engine/nbproject/project.properties
diff --git a/...ant/stub/ext/engine/nbproject/project.xml → ...ant/stub/ext/engine/nbproject/project.xml b/...ant/stub/ext/engine/nbproject/project.xml → ...ant/stub/ext/engine/nbproject/project.xml
diff --git a/...tub/ext/engine/src/data/engine.properties → ...tub/ext/engine/src/data/engine.properties b/...tub/ext/engine/src/data/engine.properties → ...tub/ext/engine/src/data/engine.properties
diff --git a/...ve/launcher/unix/i18n/launcher.properties → ...ve/launcher/unix/i18n/launcher.properties b/...ve/launcher/unix/i18n/launcher.properties → ...ve/launcher/unix/i18n/launcher.properties
diff --git a/...launcher/windows/i18n/launcher.properties → ...launcher/windows/i18n/launcher.properties b/...launcher/windows/i18n/launcher.properties → ...launcher/windows/i18n/launcher.properties
diff --git a/...ller/utils/applications/Bundle.properties → ...ller/utils/applications/Bundle.properties b/...ller/utils/applications/Bundle.properties → ...ller/utils/applications/Bundle.properties
diff --git a/.../utils/applications/NetBeansRCPUtils.java → .../utils/applications/NetBeansRCPUtils.java b/.../utils/applications/NetBeansRCPUtils.java → .../utils/applications/NetBeansRCPUtils.java
diff --git a/...zard/components/actions/Bundle.properties → ...zard/components/actions/Bundle.properties b/...zard/components/actions/Bundle.properties → ...zard/components/actions/Bundle.properties
diff --git a/.../components/actions/InitializeAction.java → .../components/actions/InitializeAction.java b/.../components/actions/InitializeAction.java → .../components/actions/InitializeAction.java
diff --git a/...izard/components/panels/Bundle.properties → ...izard/components/panels/Bundle.properties b/...izard/components/panels/Bundle.properties → ...izard/components/panels/Bundle.properties
diff --git a/...nents/panels/PostInstallSummaryPanel.java → ...nents/panels/PostInstallSummaryPanel.java b/...nents/panels/PostInstallSummaryPanel.java → ...nents/panels/PostInstallSummaryPanel.java
diff --git a/...onents/panels/PreInstallSummaryPanel.java → ...onents/panels/PreInstallSummaryPanel.java b/...onents/panels/PreInstallSummaryPanel.java → ...onents/panels/PreInstallSummaryPanel.java
diff --git a/...izard/components/panels/WelcomePanel.java → ...izard/components/panels/WelcomePanel.java b/...izard/components/panels/WelcomePanel.java → ...izard/components/panels/WelcomePanel.java
diff --git a/.../panels/resources/welcome-left-bottom.png → .../panels/resources/welcome-left-bottom.png b/.../panels/resources/welcome-left-bottom.png → .../panels/resources/welcome-left-bottom.png
diff --git a/...nts/panels/resources/welcome-left-top.png → ...nts/panels/resources/welcome-left-top.png b/...nts/panels/resources/welcome-left-top.png → ...nts/panels/resources/welcome-left-top.png
diff --git a/...rd/components/sequences/Bundle.properties → ...rd/components/sequences/Bundle.properties b/...rd/components/sequences/Bundle.properties → ...rd/components/sequences/Bundle.properties
diff --git a/...rd/components/sequences/MainSequence.java → ...rd/components/sequences/MainSequence.java b/...rd/components/sequences/MainSequence.java → ...rd/components/sequences/MainSequence.java
diff --git a/...ny/installer/wizard/wizard-components.xml → ...ny/installer/wizard/wizard-components.xml b/...ny/installer/wizard/wizard-components.xml → ...ny/installer/wizard/wizard-components.xml
diff --git a/...rd/wizard-description-background-left.png → ...rd/wizard-description-background-left.png b/...rd/wizard-description-background-left.png → ...rd/wizard-description-background-left.png
diff --git a/...d/wizard-description-background-right.png → ...d/wizard-description-background-right.png b/...d/wizard-description-background-right.png → ...d/wizard-description-background-right.png
diff --git a/...ycompany/installer/wizard/wizard-icon.png → ...ycompany/installer/wizard/wizard-icon.png b/...ycompany/installer/wizard/wizard-icon.png → ...ycompany/installer/wizard/wizard-icon.png
diff --git a/...b/ext/infra/build/engine/build.properties → ...b/ext/infra/build/engine/build.properties b/...b/ext/infra/build/engine/build.properties → ...b/ext/infra/build/engine/build.properties
diff --git a/...ant/stub/ext/infra/build/engine/build.xml → ...ant/stub/ext/infra/build/engine/build.xml b/...ant/stub/ext/infra/build/engine/build.xml → ...ant/stub/ext/infra/build/engine/build.xml
diff --git a/...uild/products/helloworld/build.properties → ...uild/products/helloworld/build.properties b/...uild/products/helloworld/build.properties → ...uild/products/helloworld/build.properties
diff --git a/...infra/build/products/helloworld/build.xml → ...infra/build/products/helloworld/build.xml b/...infra/build/products/helloworld/build.xml → ...infra/build/products/helloworld/build.xml
diff --git a/libs.nbi.ant/stub/template.xml → harness/libs.nbi.ant/stub/template.xml b/libs.nbi.ant/stub/template.xml → harness/libs.nbi.ant/stub/template.xml
diff --git a/libs.nbi.ant/stub/tmpl.properties → harness/libs.nbi.ant/stub/tmpl.properties b/libs.nbi.ant/stub/tmpl.properties → harness/libs.nbi.ant/stub/tmpl.properties
diff --git a/libs.nbi.engine/build.xml → harness/libs.nbi.engine/build.xml b/libs.nbi.engine/build.xml → harness/libs.nbi.engine/build.xml
@@ -24,7 +24,7 @@
 <!-- If you delete this file and reopen the project it will be recreated. -->
 <project basedir="." name="libs.nbi.engine" default="build">
     <description>Builds, tests, and runs the project org.netbeans.libs.nbi.engine</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
    <property name="nbi.engine.dir" value="../nbi/engine/"/>
 

diff --git a/libs.nbi.engine/external/binaries-list → ...ss/libs.nbi.engine/external/binaries-list b/libs.nbi.engine/external/binaries-list → ...ss/libs.nbi.engine/external/binaries-list
diff --git a/....engine-external-binaries-8.2-license.txt → ....engine-external-binaries-8.2-license.txt b/....engine-external-binaries-8.2-license.txt → ....engine-external-binaries-8.2-license.txt
diff --git a/libs.nbi.engine/manifest.mf → harness/libs.nbi.engine/manifest.mf b/libs.nbi.engine/manifest.mf → harness/libs.nbi.engine/manifest.mf
diff --git a/libs.nbi.engine/nbproject/project.properties → ...s.nbi.engine/nbproject/project.properties b/libs.nbi.engine/nbproject/project.properties → ...s.nbi.engine/nbproject/project.properties
diff --git a/libs.nbi.engine/nbproject/project.xml → ...ess/libs.nbi.engine/nbproject/project.xml b/libs.nbi.engine/nbproject/project.xml → ...ess/libs.nbi.engine/nbproject/project.xml
diff --git a/...etbeans/libs/nbi/engine/Bundle.properties → ...etbeans/libs/nbi/engine/Bundle.properties b/...etbeans/libs/nbi/engine/Bundle.properties → ...etbeans/libs/nbi/engine/Bundle.properties
diff --git a/nbjunit/apichanges.xml → harness/nbjunit/apichanges.xml b/nbjunit/apichanges.xml → harness/nbjunit/apichanges.xml
diff --git a/nbjunit/arch.xml → harness/nbjunit/arch.xml b/nbjunit/arch.xml → harness/nbjunit/arch.xml
diff --git a/nbjunit/build.xml → harness/nbjunit/build.xml b/nbjunit/build.xml → harness/nbjunit/build.xml
@@ -20,5 +20,5 @@
 
 -->
 <project name="nbjunit" basedir="." default="build">
-    <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/nbjunit/manifest.mf → harness/nbjunit/manifest.mf b/nbjunit/manifest.mf → harness/nbjunit/manifest.mf
diff --git a/...bproject/org-netbeans-modules-nbjunit.sig → ...bproject/org-netbeans-modules-nbjunit.sig b/...bproject/org-netbeans-modules-nbjunit.sig → ...bproject/org-netbeans-modules-nbjunit.sig
diff --git a/nbjunit/nbproject/project.properties → harness/nbjunit/nbproject/project.properties b/nbjunit/nbproject/project.properties → harness/nbjunit/nbproject/project.properties
diff --git a/nbjunit/nbproject/project.xml → harness/nbjunit/nbproject/project.xml b/nbjunit/nbproject/project.xml → harness/nbjunit/nbproject/project.xml
diff --git a/...t/src/META-INF/upgrade/NbModuleSuite.hint → ...t/src/META-INF/upgrade/NbModuleSuite.hint b/...t/src/META-INF/upgrade/NbModuleSuite.hint → ...t/src/META-INF/upgrade/NbModuleSuite.hint
diff --git a/.../junit/AssertionFailedErrorException.java → .../junit/AssertionFailedErrorException.java b/.../junit/AssertionFailedErrorException.java → .../junit/AssertionFailedErrorException.java
diff --git a/...beans/junit/AssertionFileFailedError.java → ...beans/junit/AssertionFileFailedError.java b/...beans/junit/AssertionFileFailedError.java → ...beans/junit/AssertionFileFailedError.java
diff --git a/...etbeans/junit/AssertionKnownBugError.java → ...etbeans/junit/AssertionKnownBugError.java b/...etbeans/junit/AssertionKnownBugError.java → ...etbeans/junit/AssertionKnownBugError.java
diff --git a/.../src/org/netbeans/junit/Bundle.properties → .../src/org/netbeans/junit/Bundle.properties b/.../src/org/netbeans/junit/Bundle.properties → .../src/org/netbeans/junit/Bundle.properties
diff --git a/...t/src/org/netbeans/junit/ControlFlow.java → ...t/src/org/netbeans/junit/ControlFlow.java b/...t/src/org/netbeans/junit/ControlFlow.java → ...t/src/org/netbeans/junit/ControlFlow.java
diff --git a/nbjunit/src/org/netbeans/junit/Filter.java → ...bjunit/src/org/netbeans/junit/Filter.java b/nbjunit/src/org/netbeans/junit/Filter.java → ...bjunit/src/org/netbeans/junit/Filter.java
diff --git a/nbjunit/src/org/netbeans/junit/Log.java → ...s/nbjunit/src/org/netbeans/junit/Log.java b/nbjunit/src/org/netbeans/junit/Log.java → ...s/nbjunit/src/org/netbeans/junit/Log.java
diff --git a/nbjunit/src/org/netbeans/junit/Manager.java → ...junit/src/org/netbeans/junit/Manager.java b/nbjunit/src/org/netbeans/junit/Manager.java → ...junit/src/org/netbeans/junit/Manager.java
diff --git a/.../src/org/netbeans/junit/MemoryFilter.java → .../src/org/netbeans/junit/MemoryFilter.java b/.../src/org/netbeans/junit/MemoryFilter.java → .../src/org/netbeans/junit/MemoryFilter.java
diff --git a/...org/netbeans/junit/MemoryMeasurement.java → ...org/netbeans/junit/MemoryMeasurement.java b/...org/netbeans/junit/MemoryMeasurement.java → ...org/netbeans/junit/MemoryMeasurement.java
diff --git a/...nit/MemoryMeasurementFailedException.java → ...nit/MemoryMeasurementFailedException.java b/...nit/MemoryMeasurementFailedException.java → ...nit/MemoryMeasurementFailedException.java
diff --git a/...t/src/org/netbeans/junit/MethodOrder.java → ...t/src/org/netbeans/junit/MethodOrder.java b/...t/src/org/netbeans/junit/MethodOrder.java → ...t/src/org/netbeans/junit/MethodOrder.java
diff --git a/.../src/org/netbeans/junit/MockServices.java → .../src/org/netbeans/junit/MockServices.java b/.../src/org/netbeans/junit/MockServices.java → .../src/org/netbeans/junit/MockServices.java
diff --git a/...src/org/netbeans/junit/MultiTestCase.java → ...src/org/netbeans/junit/MultiTestCase.java b/...src/org/netbeans/junit/MultiTestCase.java → ...src/org/netbeans/junit/MultiTestCase.java
diff --git a/...rc/org/netbeans/junit/MultiTestSuite.java → ...rc/org/netbeans/junit/MultiTestSuite.java b/...rc/org/netbeans/junit/MultiTestSuite.java → ...rc/org/netbeans/junit/MultiTestSuite.java
diff --git a/...src/org/netbeans/junit/NbModuleSuite.java → ...src/org/netbeans/junit/NbModuleSuite.java b/...src/org/netbeans/junit/NbModuleSuite.java → ...src/org/netbeans/junit/NbModuleSuite.java
diff --git a/...org/netbeans/junit/NbPerformanceTest.java → ...org/netbeans/junit/NbPerformanceTest.java b/...org/netbeans/junit/NbPerformanceTest.java → ...org/netbeans/junit/NbPerformanceTest.java
diff --git a/...netbeans/junit/NbPerformanceTestCase.java → ...netbeans/junit/NbPerformanceTestCase.java b/...netbeans/junit/NbPerformanceTestCase.java → ...netbeans/junit/NbPerformanceTestCase.java
diff --git a/nbjunit/src/org/netbeans/junit/NbTest.java → ...bjunit/src/org/netbeans/junit/NbTest.java b/nbjunit/src/org/netbeans/junit/NbTest.java → ...bjunit/src/org/netbeans/junit/NbTest.java
diff --git a/...it/src/org/netbeans/junit/NbTestCase.java → ...it/src/org/netbeans/junit/NbTestCase.java b/...it/src/org/netbeans/junit/NbTestCase.java → ...it/src/org/netbeans/junit/NbTestCase.java
diff --git a/...c/org/netbeans/junit/NbTestDecorator.java → ...c/org/netbeans/junit/NbTestDecorator.java b/...c/org/netbeans/junit/NbTestDecorator.java → ...c/org/netbeans/junit/NbTestDecorator.java
diff --git a/...t/src/org/netbeans/junit/NbTestSetup.java → ...t/src/org/netbeans/junit/NbTestSetup.java b/...t/src/org/netbeans/junit/NbTestSetup.java → ...t/src/org/netbeans/junit/NbTestSetup.java
diff --git a/...t/src/org/netbeans/junit/NbTestSuite.java → ...t/src/org/netbeans/junit/NbTestSuite.java b/...t/src/org/netbeans/junit/NbTestSuite.java → ...t/src/org/netbeans/junit/NbTestSuite.java
diff --git a/...rg/netbeans/junit/ParametricTestCase.java → ...rg/netbeans/junit/ParametricTestCase.java b/...rg/netbeans/junit/ParametricTestCase.java → ...rg/netbeans/junit/ParametricTestCase.java
diff --git a/...g/netbeans/junit/ParametricTestSuite.java → ...g/netbeans/junit/ParametricTestSuite.java b/...g/netbeans/junit/ParametricTestSuite.java → ...g/netbeans/junit/ParametricTestSuite.java
diff --git a/...src/org/netbeans/junit/RandomlyFails.java → ...src/org/netbeans/junit/RandomlyFails.java b/...src/org/netbeans/junit/RandomlyFails.java → ...src/org/netbeans/junit/RandomlyFails.java
diff --git a/...nit/src/org/netbeans/junit/diff/Diff.java → ...nit/src/org/netbeans/junit/diff/Diff.java b/...nit/src/org/netbeans/junit/diff/Diff.java → ...nit/src/org/netbeans/junit/diff/Diff.java
diff --git a/...rg/netbeans/junit/diff/DiffException.java → ...rg/netbeans/junit/diff/DiffException.java b/...rg/netbeans/junit/diff/DiffException.java → ...rg/netbeans/junit/diff/DiffException.java
diff --git a/...src/org/netbeans/junit/diff/LineDiff.java → ...src/org/netbeans/junit/diff/LineDiff.java b/...src/org/netbeans/junit/diff/LineDiff.java → ...src/org/netbeans/junit/diff/LineDiff.java
diff --git a/...c/org/netbeans/junit/diff/NativeDiff.java → ...c/org/netbeans/junit/diff/NativeDiff.java b/...c/org/netbeans/junit/diff/NativeDiff.java → ...c/org/netbeans/junit/diff/NativeDiff.java
diff --git a/...c/org/netbeans/junit/diff/SimpleDiff.java → ...c/org/netbeans/junit/diff/SimpleDiff.java b/...c/org/netbeans/junit/diff/SimpleDiff.java → ...c/org/netbeans/junit/diff/SimpleDiff.java
diff --git a/...g/netbeans/junit/internal/FakeMetaInf.txt → ...g/netbeans/junit/internal/FakeMetaInf.txt b/...g/netbeans/junit/internal/FakeMetaInf.txt → ...g/netbeans/junit/internal/FakeMetaInf.txt
diff --git a/...it/internal/MemoryPreferencesFactory.java → ...it/internal/MemoryPreferencesFactory.java b/...it/internal/MemoryPreferencesFactory.java → ...it/internal/MemoryPreferencesFactory.java
diff --git a/...ns/junit/internal/NbModuleLogHandler.java → ...ns/junit/internal/NbModuleLogHandler.java b/...ns/junit/internal/NbModuleLogHandler.java → ...ns/junit/internal/NbModuleLogHandler.java
diff --git a/...unit/internal/RandomlyFailsProcessor.java → ...unit/internal/RandomlyFailsProcessor.java b/...unit/internal/RandomlyFailsProcessor.java → ...unit/internal/RandomlyFailsProcessor.java
diff --git a/...t/src/META-INF/upgrade/NbModuleSuite.test → ...t/src/META-INF/upgrade/NbModuleSuite.test b/...t/src/META-INF/upgrade/NbModuleSuite.test → ...t/src/META-INF/upgrade/NbModuleSuite.test
diff --git a/...g/netbeans/junit/AssertInstancesTest.java → ...g/netbeans/junit/AssertInstancesTest.java b/...g/netbeans/junit/AssertInstancesTest.java → ...g/netbeans/junit/AssertInstancesTest.java
diff --git a/.../src/org/netbeans/junit/DummyService.java → .../src/org/netbeans/junit/DummyService.java b/.../src/org/netbeans/junit/DummyService.java → .../src/org/netbeans/junit/DummyService.java
diff --git a/.../org/netbeans/junit/DummyServiceImpl.java → .../org/netbeans/junit/DummyServiceImpl.java b/.../org/netbeans/junit/DummyServiceImpl.java → .../org/netbeans/junit/DummyServiceImpl.java
diff --git a/...c/org/netbeans/junit/FlowControlTest.java → ...c/org/netbeans/junit/FlowControlTest.java b/...c/org/netbeans/junit/FlowControlTest.java → ...c/org/netbeans/junit/FlowControlTest.java
diff --git a/.../org/netbeans/junit/FlowCountingTest.java → .../org/netbeans/junit/FlowCountingTest.java b/.../org/netbeans/junit/FlowCountingTest.java → .../org/netbeans/junit/FlowCountingTest.java
diff --git a/...c/org/netbeans/junit/LinearSpeedTest.java → ...c/org/netbeans/junit/LinearSpeedTest.java b/...c/org/netbeans/junit/LinearSpeedTest.java → ...c/org/netbeans/junit/LinearSpeedTest.java
diff --git a/...org/netbeans/junit/LogAndTimeOutTest.java → ...org/netbeans/junit/LogAndTimeOutTest.java b/...org/netbeans/junit/LogAndTimeOutTest.java → ...org/netbeans/junit/LogAndTimeOutTest.java
diff --git a/.../unit/src/org/netbeans/junit/LogTest.java → .../unit/src/org/netbeans/junit/LogTest.java b/.../unit/src/org/netbeans/junit/LogTest.java → .../unit/src/org/netbeans/junit/LogTest.java
diff --git a/.../netbeans/junit/LoggingExceptionTest.java → .../netbeans/junit/LoggingExceptionTest.java b/.../netbeans/junit/LoggingExceptionTest.java → .../netbeans/junit/LoggingExceptionTest.java
diff --git a/...t/src/org/netbeans/junit/LoggingTest.java → ...t/src/org/netbeans/junit/LoggingTest.java b/...t/src/org/netbeans/junit/LoggingTest.java → ...t/src/org/netbeans/junit/LoggingTest.java
diff --git a/.../org/netbeans/junit/MockServicesTest.java → .../org/netbeans/junit/MockServicesTest.java b/.../org/netbeans/junit/MockServicesTest.java → .../org/netbeans/junit/MockServicesTest.java
diff --git a/...rg/netbeans/junit/NbModuleSuite2Test.java → ...rg/netbeans/junit/NbModuleSuite2Test.java b/...rg/netbeans/junit/NbModuleSuite2Test.java → ...rg/netbeans/junit/NbModuleSuite2Test.java