You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2020/07/01 19:11:40 UTC
[netbeans] branch master updated: Moved Gradle modules out of
Groovy cluster
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 21e19a3 Moved Gradle modules out of Groovy cluster
21e19a3 is described below
commit 21e19a3f60e69935f7cfe5ff5b0110346bcd8aaf
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Sun Jun 7 16:25:22 2020 -0700
Moved Gradle modules out of Groovy cluster
---
.gitignore | 8 ++--
{groovy => enterprise}/gradle.javaee/build.xml | 2 +-
.../gradle.javaee/licenseinfo.xml | 0
{groovy => enterprise}/gradle.javaee/manifest.mf | 0
.../gradle.javaee/nbproject/project.properties | 1 +
.../gradle.javaee/nbproject/project.xml | 0
.../modules/gradle/javaee/BaseEEModuleImpl.java | 0
.../gradle/javaee/BaseEEModuleProvider.java | 0
.../modules/gradle/javaee/Bundle.properties | 0
.../gradle/javaee/DummyModuleChangeReporter.java | 0
.../gradle/javaee/GradleJavaEEProjectSettings.java | 0
.../gradle/javaee/JavaEEActionProvider.java | 0
.../gradle/javaee/JavaEEProjectIconProvider.java | 0
.../modules/gradle/javaee/JavaEESourcesImpl.java | 0
.../gradle/javaee/ProjectOpenedHookImpl.java | 0
.../gradle/javaee/ServiceRegistrations.java | 0
.../modules/gradle/javaee/action-mapping.xml | 0
.../gradle/javaee/api/GradleWebProject.java | 0
.../gradle/javaee/api/GradleWebProjectBuilder.java | 0
.../javaee/api/ui/support/CheckBoxUpdater.java | 0
.../javaee/api/ui/support/ComboBoxUpdater.java | 0
.../ui/support/DisplayNameListCellRenderer.java | 0
.../api/ui/support/JavaEEProfileComboBoxModel.java | 0
.../api/ui/support/JavaEEServerComboBoxModel.java | 0
.../gradle/javaee/customizer/Bundle.properties | 0
.../gradle/javaee/customizer/CustomizerRunWar.form | 0
.../gradle/javaee/customizer/CustomizerRunWar.java | 0
.../customizer/GradleCompositePanelProvider.java | 0
.../modules/gradle/javaee/execute/DeployHook.java | 0
.../javaee/nodes/RemoteFilesNodeRegistration.java | 0
.../modules/gradle/javaee/nodes/WebPagesNode.java | 0
.../gradle/javaee/nodes/WebPagesNodeFactory.java | 0
.../gradle/javaee/resources/WebPagesBadge.png | Bin
.../gradle/javaee/resources/javaeeProjectIcon.png | Bin
.../javaee/resources/javaeeProjectIcon_dark.png | Bin
.../gradle/javaee/web/AdditionalWebProvider.java | 0
.../web/CssPreprocessorsProblemProvider.java | 0
.../gradle/javaee/web/CssPreprocessorsSupport.java | 0
.../modules/gradle/javaee/web/WebEjbJarImpl.java | 0
.../modules/gradle/javaee/web/WebModuleImpl.java | 0
.../gradle/javaee/web/WebModuleProviderImpl.java | 0
.../javaee/web/WebProjectBrowserProvider.java | 0
.../javaee/web/WebProjectWebRootProvider.java | 0
.../gradle/javaee/web/WebRecoPrivTemplates.java | 0
.../gradle/javaee/web/newproject/Bundle.properties | 0
.../web/newproject/ServerSelectionPanel.java | 0
.../web/newproject/ServerSelectionPanelVisual.form | 0
.../web/newproject/ServerSelectionPanelVisual.java | 0
.../web/newproject/WebApplicationDescription.html | 0
.../newproject/WebApplicationProjectWizard.java | 0
ergonomics/ide.ergonomics/groovy.properties | 2 +-
{groovy => extide}/gradle/apichanges.xml | 0
{groovy => extide}/gradle/arch.xml | 0
{groovy => extide}/gradle/build.xml | 3 +-
{groovy => extide}/gradle/external/binaries-list | 0
.../gradle/external/gradle-4.10.2-bin-license.txt | 0
.../gradle/external/gradle-4.10.2-bin-notice.txt | 0
.../external/gradle-wrapper-4.10.2-license.txt | 0
{groovy => extide}/gradle/licenseinfo.xml | 0
{groovy => extide}/gradle/manifest.mf | 1 -
.../nbproject/org-netbeans-modules-gradle.sig | 0
.../gradle/nbproject/project.properties | 0
{groovy => extide}/gradle/nbproject/project.xml | 0
.../gradle/netbeans-gradle-tooling/build.gradle | 2 +
.../gradle/wrapper/gradle-wrapper.properties | 0
.../gradle/netbeans-gradle-tooling/settings.gradle | 0
.../org/netbeans/modules/gradle/DebugTooling.java | 0
.../netbeans/modules/gradle/api/NbProjectInfo.java | 0
.../netbeans/modules/gradle/tooling/BaseModel.java | 0
.../org/netbeans/modules/gradle/tooling/Model.java | 0
.../gradle/tooling/NbProjectInfoBuilder.groovy | 0
.../modules/gradle/tooling/NbProjectInfoModel.java | 0
.../tooling/NetBeansExplodedWarPlugin.groovy | 0
.../gradle/tooling/NetBeansRunSinglePlugin.groovy | 0
.../gradle/tooling/NetBeansToolingPlugin.java | 0
.../src/main/resources/nb-tooling.gradle | 0
.../src/test/data/multi/app/build.gradle | 0
.../src/test/data/multi/app/src/build.gradle | 0
.../src/test/data/multi/build.gradle | 0
.../src/test/data/multi/settings.gradle | 0
.../src/test/data/multi/shared/build.gradle | 0
.../src/test/data/simple-with-tests/build.gradle | 0
.../src/test/data/simple/build.gradle | 0
.../src/test/data/unresolvable/build.gradle | 0
.../modules/gradle/daemon-loader/build.gradle | 0
.../modules/gradle/daemon-loader/settings.gradle | 0
.../netbeans/modules/gradle/ActionHookMerger.java | 0
.../modules/gradle/ActionProviderImpl.java | 0
.../org/netbeans/modules/gradle/Bundle.properties | 0
.../modules/gradle/DeleteOperationImpl.java | 0
.../modules/gradle/GradleArtifactStore.java | 0
.../modules/gradle/GradleAuxiliaryConfigImpl.java | 0
.../gradle/GradleAuxiliaryPropertiesImpl.java | 0
.../org/netbeans/modules/gradle/GradleDaemon.java | 0
.../netbeans/modules/gradle/GradleDataObject.java | 3 +-
.../modules/gradle/GradleDistributionManager.java | 0
.../modules/gradle/GradleInstallPanel.form | 0
.../modules/gradle/GradleInstallPanel.java | 0
.../org/netbeans/modules/gradle/GradleProject.java | 0
.../modules/gradle/GradleProjectCache.java | 0
.../gradle/GradleProjectProblemProvider.java | 0
.../modules/gradle/GradleSharabilityQueryImpl.java | 0
.../modules/gradle/LogicalViewProviderImpl.java | 0
.../modules/gradle/NbGradleProjectFactory.java | 0
.../modules/gradle/NbGradleProjectImpl.java | 0
.../org/netbeans/modules/gradle/ProjectTrust.java | 0
.../org/netbeans/modules/gradle/ReloadAction.java | 0
.../gradle/ReloadProjectDependenciesDecorator.java | 0
.../modules/gradle/RootActionProvider.java | 0
.../modules/gradle/TemplateAttrProvider.java | 0
.../org/netbeans/modules/gradle/action-mapping.xml | 0
.../actions/ActionMappingPropertyReader.java | 0
.../gradle/actions/ActionMappingScanner.java | 0
.../modules/gradle/actions/ActionToTaskUtils.java | 0
.../actions/CustomActionRegistrationSupport.java | 0
.../gradle/actions/DefaultActionMapping.java | 0
.../gradle/actions/GradleBaseTokenProvider.java | 0
.../modules/gradle/actions/KeyValueTableModel.java | 0
.../modules/gradle/actions/MappingContainer.java | 0
.../actions/ProjectActionMappingProvider.java | 0
.../actions/ProjectActionMappingProviderImpl.java | 0
.../gradle/actions/ReplaceTokenProviderMerger.java | 0
.../modules/gradle/actions/action-mapping.dtd | 0
.../modules/gradle/api/GradleBaseProject.java | 0
.../gradle/api/GradleBaseProjectBuilder.java | 0
.../modules/gradle/api/GradleConfiguration.java | 0
.../modules/gradle/api/GradleDependency.java | 0
.../modules/gradle/api/GradleProjects.java | 0
.../netbeans/modules/gradle/api/GradleTask.java | 0
.../modules/gradle/api/ModuleSearchSupport.java | 0
.../modules/gradle/api/NbGradleProject.java | 0
.../gradle/api/doc-files/gradle-classes.dia | Bin
.../gradle/api/doc-files/gradle-classes.png | Bin
.../gradle/api/doc-files/gradle-quality.dia | Bin
.../gradle/api/doc-files/gradle-quality.png | Bin
.../modules/gradle/api/execute/ActionMapping.java | 0
.../modules/gradle/api/execute/Bundle.properties | 0
.../gradle/api/execute/GradleCommandLine.java | 0
.../modules/gradle/api/execute/RunConfig.java | 0
.../modules/gradle/api/execute/RunUtils.java | 0
.../modules/gradle/api/execute/package-info.java | 0
.../modules/gradle/api/output/OutputDisplayer.java | 0
.../modules/gradle/api/output/OutputListeners.java | 0
.../modules/gradle/api/output/OutputProcessor.java | 0
.../gradle/api/output/OutputProcessorFactory.java | 0
.../netbeans/modules/gradle/api/package-info.java | 0
.../classpath/AbstractGradleScriptClassPath.java | 0
.../gradle/classpath/ScriptClassPathProvider.java | 0
.../gradle/customizer/BuildActionsCustomizer.form | 0
.../gradle/customizer/BuildActionsCustomizer.java | 0
.../modules/gradle/customizer/Bundle.properties | 0
.../gradle/customizer/CustomActionMapping.java | 0
.../customizer/GradleCustomizerProvider.java | 0
.../gradle/customizer/GradleExecutionPanel.form | 0
.../gradle/customizer/GradleExecutionPanel.java | 0
.../gradle/customizer/LicenseHeadersPanel.form | 0
.../gradle/customizer/LicenseHeadersPanel.java | 0
.../gradle/customizer/ProjectInfoPanel.form | 0
.../gradle/customizer/ProjectInfoPanel.java | 0
.../modules/gradle/customizer/package-info.java | 0
.../gradle/execute/AbstractGradleExecutor.java | 0
.../modules/gradle/execute/Bundle.properties | 0
.../execute/EscapeProcessingOutputStream.java | 0
.../modules/gradle/execute/EscapeProcessor.java | 0
.../gradle/execute/ExecutionOptionsPanel.form | 0
.../gradle/execute/ExecutionOptionsPanel.java | 0
.../execute/GradleCliCompletionProvider.java | 0
.../modules/gradle/execute/GradleCliEditorKit.java | 0
.../gradle/execute/GradleColorEscapeProcessor.java | 0
.../gradle/execute/GradleDaemonExecutor.java | 0
.../modules/gradle/execute/GradleExecutor.java | 0
.../gradle/execute/GradleExecutorOptionsPanel.form | 0
.../gradle/execute/GradleExecutorOptionsPanel.java | 0
.../gradle/execute/GradlePlainEscapeProcessor.java | 0
.../gradle/execute/OutputTabMaintainer.java | 0
.../execute/ProxyNonSelectableInputOutput.java | 0
.../modules/gradle/execute/TrustProjectPanel.form | 0
.../modules/gradle/execute/TrustProjectPanel.java | 0
.../execute/navigator/TasksNavigationPanel.java | 0
.../execute/navigator/TasksNavigatorHint.java | 0
.../gradle/execute/navigator/TasksPanel.form | 0
.../gradle/execute/navigator/TasksPanel.java | 0
.../modules/gradle/gradle-mime-resolver.xml | 0
.../src/org/netbeans/modules/gradle/layer.xml | 36 +++++++++-------
.../modules/gradle/newproject/Bundle.properties | 0
.../newproject/GradleMultiWizardIterator.java | 0
.../gradle/newproject/MultiProjectDescription.html | 0
.../gradle/newproject/ProjectAttriburesPanel.java | 0
.../newproject/ProjectAttributesPanelVisual.form | 0
.../newproject/ProjectAttributesPanelVisual.java | 0
.../modules/gradle/newproject/SubProjectPanel.java | 0
.../gradle/newproject/SubProjectPanelVisual.form | 0
.../gradle/newproject/SubProjectPanelVisual.java | 0
.../gradle/newproject/multi-build.gradle.template | 0
.../newproject/multi-gradle.properties.template | 0
.../gradle/newproject/multi-root.gradle.template | 0
.../newproject/multi-settings.gradle.template | 0
.../gradle/newproject/single-build.gradle.template | 0
.../newproject/single-gradle.properties.template | 0
.../newproject/single-settings.gradle.template | 0
.../gradle/nodes/AnnotatedAbstractNode.java | 0
.../modules/gradle/nodes/BuildScriptsNode.java | 0
.../gradle/nodes/BuildScriptsNodeFactory.java | 0
.../modules/gradle/nodes/ConfigurationsNode.java | 0
.../gradle/nodes/ConfigurationsNodeFactory.java | 0
.../modules/gradle/nodes/GradleProjectNode.java | 0
.../modules/gradle/nodes/SubProjectsNode.java | 0
.../gradle/nodes/SubProjectsNodeFactory.java | 0
.../modules/gradle/options/Bundle.properties | 0
.../gradle/options/GradleOptionsController.java | 0
.../modules/gradle/options/SettingsPanel.form | 0
.../modules/gradle/options/SettingsPanel.java | 0
.../gradle/output/GradleProcessorFactory.java | 0
.../gradle/queries/DefaultProjectIconProvider.java | 0
.../gradle/queries/GradleSourceForBinary.java | 0
.../org/netbeans/modules/gradle/queries/Info.java | 0
.../gradle/queries/SubprojectProviderImpl.java | 0
.../gradle/resources/buildscripts-badge.png | Bin
.../modules/gradle/resources/defaultFolder.gif | Bin
.../modules/gradle/resources/defaultFolderOpen.gif | Bin
.../netbeans/modules/gradle/resources/empty.png | Bin
.../modules/gradle/resources/gradle-badge.png | Bin
.../modules/gradle/resources/gradle-badge_dark.png | Bin
.../gradle/resources/gradle-large-badge.png | Bin
.../gradle/resources/gradle-large-badge_dark.png | Bin
.../modules/gradle/resources/gradle-task.gif | Bin
.../netbeans/modules/gradle/resources/gradle.png | Bin
.../modules/gradle/resources/gradle_dark.png | Bin
.../org/netbeans/modules/gradle/resources/info.png | Bin
.../modules/gradle/resources/javadoc-badge.png | Bin
.../modules/gradle/resources/libraries-badge.png | Bin
.../modules/gradle/resources/libraries.png | Bin
.../modules/gradle/resources/module-artifact.png | Bin
.../gradle/resources/module-artifact_dark.png | Bin
.../netbeans/modules/gradle/resources/options.png | Bin
.../netbeans/modules/gradle/resources/refresh.png | Bin
.../modules/gradle/resources/refreshdebug.png | Bin
.../netbeans/modules/gradle/resources/restart.png | Bin
.../modules/gradle/resources/sources-badge.png | Bin
.../org/netbeans/modules/gradle/resources/stop.png | Bin
.../org/netbeans/modules/gradle/resources/wait.gif | Bin
.../modules/gradle/resources/warning-badge.png | Bin
.../netbeans/modules/gradle/spi/GradleFiles.java | 0
.../gradle/spi/GradleProgressListenerProvider.java | 0
.../modules/gradle/spi/GradleSettings.java | 0
.../modules/gradle/spi/ProjectIconProvider.java | 0
.../modules/gradle/spi/ProjectInfoExtractor.java | 0
.../src/org/netbeans/modules/gradle/spi/Utils.java | 0
.../gradle/spi/WatchedResourceProvider.java | 0
.../gradle/spi/actions/AfterBuildActionHook.java | 0
.../gradle/spi/actions/BeforeBuildActionHook.java | 0
.../gradle/spi/actions/BeforeReloadActionHook.java | 0
.../spi/actions/DefaultGradleActionsProvider.java | 0
.../gradle/spi/actions/GradleActionsProvider.java | 0
.../gradle/spi/actions/ReplaceTokenProvider.java | 0
.../customizer/support/FilterPanelProvider.java | 0
.../spi/newproject/BaseGradleWizardIterator.java | 0
.../spi/newproject/SimpleGradleWizardIterator.java | 0
.../gradle/spi/newproject/TemplateOperation.java | 0
.../gradle/spi/nodes/AbstractGradleNodeList.java | 0
.../modules/gradle/spi/nodes/NodeUtils.java | 0
.../gradle/AbstractGradleProjectTestCase.java | 0
.../modules/gradle/NbGradleProjectFactoryTest.java | 0
.../actions/ActionMappingPropertyReaderTest.java | 0
.../gradle/actions/ActionMappingScannerTest.java | 0
.../gradle/actions/DefaultActionMappingTest.java | 0
.../modules/gradle/actions/action-mapping.xml | 0
.../modules/gradle/api/GradleDepandencyTest.java | 0
.../modules/gradle/api/GradleTaskTest.java | 0
.../gradle/api/execute/GradleCommandLineTest.java | 0
.../modules/gradle/api/execute/RunUtilsTest.java | 0
.../gradle/api/output/OutputDisplayerMock.java | 0
.../execute/EscapeProcessingOutputStreamTest.java | 0
.../gradle/output/GradleProcessorFactoryTest.java | 0
.../modules/gradle/spi/GradleFilesTest.java | 0
{groovy => extide}/libs.gradle/build.xml | 2 +-
.../libs.gradle/external/binaries-list | 0
.../external/gradle-tooling-api-6.3-license.txt | 0
.../external/gradle-tooling-api-6.3-notice.txt | 0
{groovy => extide}/libs.gradle/manifest.mf | 0
.../libs.gradle/nbproject/project.properties | 0
.../libs.gradle/nbproject/project.xml | 0
.../netbeans/modules/libs/gradle/Bundle.properties | 0
groovy/groovy.and.gradle.kit/build.xml | 26 ------------
groovy/groovy.and.gradle.kit/manifest.mf | 5 ---
.../nbproject/project.properties | 24 -----------
groovy/groovy.and.gradle.kit/nbproject/project.xml | 46 ---------------------
.../groovy/and/gradle/kit/Bundle.properties | 22 ----------
.../modules/groovy/editor/resources/layer.xml | 19 +++++++++
{groovy => java}/gradle.htmlui/build.xml | 2 +-
{groovy => java}/gradle.htmlui/manifest.mf | 0
.../gradle.htmlui/nbproject/project.properties | 1 +
.../gradle.htmlui/nbproject/project.xml | 0
.../modules/gradle/htmlui/Bundle.properties | 0
.../netbeans/modules/gradle/htmlui/DukeHTML.png | Bin
.../modules/gradle/htmlui/GradleArchetype.java | 0
.../htmlui/HtmlJavaApplicationProjectWizard.java | 0
.../modules/gradle/htmlui/description.html | 0
.../gradle/htmlui/resources/app_build.gradle.fmk | 0
.../resources/app_src_main_AndroidManifest.xml.fmk | 0
.../htmlui/resources/desktop_build.gradle.fmk | 0
.../desktop_src_main_java_DesktopMain.fmk | 0
.../gradle/htmlui/resources/gradle.properties.fmk | 0
.../modules/gradle/htmlui/resources/layer.xml | 0
.../gradle/htmlui/resources/root_build.gradle.fmk | 0
.../gradle/htmlui/resources/settings.gradle.fmk | 0
.../gradle/htmlui/resources/src_main_java_Demo.fmk | 0
.../resources/src_main_webapp_pages_index.css.fmk | 0
.../resources/src_main_webapp_pages_index.html.fmk | 0
.../gradle/htmlui/resources/web_build.gradle.fmk | 0
.../resources/web_src_main_java_BrowserMain.fmk | 0
.../modules/gradle/htmlui/CreateArchetypeTest.java | 0
{groovy => java}/gradle.java.coverage/build.xml | 2 +-
.../gradle.java.coverage/external/binaries-list | 0
.../external/org.jacoco.core-0.8.5-license.txt | 0
.../external/org.jacoco.core-0.8.5-notice.txt | 0
{groovy => java}/gradle.java.coverage/manifest.mf | 0
.../nbproject/project.properties | 1 +
.../gradle.java.coverage/nbproject/project.xml | 0
.../modules/gradle/java/coverage/Bundle.properties | 0
.../gradle/java/coverage/CoveragePopup.java | 0
.../java/coverage/GradleCoverageProvider.java | 0
{groovy => java}/gradle.java/apichanges.xml | 0
{groovy => java}/gradle.java/arch.xml | 0
{groovy => java}/gradle.java/build.xml | 2 +-
{groovy => java}/gradle.java/licenseinfo.xml | 0
{groovy => java}/gradle.java/manifest.mf | 0
.../nbproject/org-netbeans-modules-gradle-java.sig | 0
.../gradle.java/nbproject/project.properties | 0
{groovy => java}/gradle.java/nbproject/project.xml | 0
.../netbeans/modules/gradle/java/Bundle.properties | 0
.../gradle/java/GradleJavaDebuggerImpl.java | 0
.../gradle/java/GradleJavaTokenProvider.java | 0
.../modules/gradle/java/JavaActionProvider.java | 0
.../gradle/java/JavaSEProjectIconProvider.java | 0
.../java/RecommendedPrivilegedTemplatesImpl.java | 0
.../gradle/java/SourceGroupResourceWatchList.java | 0
.../modules/gradle/java/action-mapping.xml | 0
.../modules/gradle/java/api/GradleJavaProject.java | 0
.../gradle/java/api/GradleJavaProjectBuilder.java | 0
.../gradle/java/api/GradleJavaSourceSet.java | 0
.../java/api/ProjectSourcesClassPathProvider.java | 0
.../modules/gradle/java/api/output/Location.java | 0
.../gradle/java/api/output/LocationOpener.java | 0
.../classpath/AbstractGradleClassPathImpl.java | 0
.../classpath/AbstractSourceSetClassPathImpl.java | 0
.../gradle/java/classpath/BootClassPathImpl.java | 0
.../java/classpath/ClassPathProviderImpl.java | 0
.../java/classpath/CompileClassPathImpl.java | 0
.../classpath/GlobalClassPathProviderImpl.java | 0
.../java/classpath/GradleGlobalClassPathImpl.java | 0
.../gradle/java/classpath/GradleSourcesImpl.java | 0
.../java/classpath/RuntimeClassPathImpl.java | 0
.../gradle/java/classpath/SourceClassPathImpl.java | 0
.../gradle/java/customizer/Bundle.properties | 0
.../java/customizer/CompileOptionsPanel.form | 0
.../java/customizer/CompileOptionsPanel.java | 0
.../gradle/java/customizer/SourceSetPanel.form | 0
.../gradle/java/customizer/SourceSetPanel.java | 0
.../gradle/java/customizer/SourcesPanel.form | 0
.../gradle/java/customizer/SourcesPanel.java | 0
.../modules/gradle/java/execute/DebugFixHooks.java | 0
.../gradle/java/execute/ShowJavadocHook.java | 0
.../src/org/netbeans/modules/gradle/java/layer.xml | 0
.../gradle/java/newproject/Bundle.properties | 0
.../gradle/java/newproject/MainClassPanel.java | 0
.../java/newproject/MainClassPanelVisual.form | 0
.../java/newproject/MainClassPanelVisual.java | 0
.../newproject/SimpleApplicationDescription.html | 0
.../newproject/SimpleApplicationProjectWizard.java | 0
.../java/newproject/SimpleLibraryDescription.html | 0
.../newproject/SimpleLibraryProjectWizard.java | 0
.../gradle/java/nodes/BootCPNodeFactory.java | 0
.../gradle/java/nodes/LibrariesSourceGroup.java | 0
.../modules/gradle/java/nodes/PathFinders.java | 0
.../gradle/java/nodes/SourcesNodeFactory.java | 0
.../java/output/GatlingReportProcessorFactory.java | 0
.../gradle/java/output/JDPAProcessorFactory.java | 0
.../java/output/JavaCompilerProcessorFactory.java | 0
.../gradle/java/queries/FileBuiltQueryImpl.java | 0
.../GradleAnnotationProcessorQueryImpl.java | 0
.../gradle/java/queries/GradleBinaryForSource.java | 0
.../java/queries/GradleCompilerOptionsQuery.java | 0
.../gradle/java/queries/GradleFileLocator.java | 0
.../gradle/java/queries/GradleSourceForBinary.java | 0
.../java/queries/GradleSourceForRepository.java | 0
.../gradle/java/queries/GradleSourceLevelImpl.java | 0
.../java/queries/GradleTestForSourceImpl.java | 0
.../java/queries/OpenGradleProjectForBinary.java | 0
.../gradle/java/resources/application-badge.png | Bin
.../gradle/java/resources/javaseProjectIcon.png | Bin
.../java/resources/javaseProjectIcon_dark.png | Bin
.../gradle/java/resources/libraries-badge.png | Bin
.../gradle/java/spi/debug/GradleJavaDebugger.java | 0
.../gradle/java/AbstractGradleJavaTestCase.java | 0
.../java/classpath/ClassPathProviderImplTest.java | 0
.../java/classpath/GradleSourcesImplTest.java | 0
.../output/JavaCompilerProcessorFactoryTest.java | 0
{groovy => java}/gradle.kit/build.xml | 2 +-
{groovy => java}/gradle.kit/manifest.mf | 0
.../gradle.kit/nbproject/project.properties | 0
{groovy => java}/gradle.kit/nbproject/project.xml | 0
.../modules/gradle/feature/Bundle.properties | 0
{groovy => java}/gradle.persistence/build.xml | 2 +-
{groovy => java}/gradle.persistence/manifest.mf | 0
.../nbproject/project.properties | 0
.../gradle.persistence/nbproject/project.xml | 0
.../modules/gradle/persistence/Bundle.properties | 0
.../persistence/EntityClassScopeProviderImpl.java | 0
.../persistence/GradlePersistenceProvider.java | 0
.../PersistenceLocationProviderImpl.java | 0
.../gradle/persistence/PersistenceScopeImpl.java | 0
.../persistence/PersistenceScopeProviderImpl.java | 0
.../persistence/PersistenceScopesProviderImpl.java | 0
.../persistence/RecommendedTemplatesImpl.java | 0
{groovy => java}/gradle.spring/build.xml | 2 +-
{groovy => java}/gradle.spring/manifest.mf | 0
.../gradle.spring/nbproject/project.properties | 0
.../gradle.spring/nbproject/project.xml | 0
.../modules/gradle/spring/Bundle.properties | 0
.../gradle/spring/GradleSpringConfigProvider.java | 0
.../gradle/spring/RecommendedTemplatesImpl.java | 0
.../gradle/spring/SpringActionProvider.java | 0
.../modules/gradle/spring/action-mapping.xml | 0
.../org/netbeans/modules/gradle/spring/layer.xml | 0
{groovy => java}/gradle.test/build.xml | 2 +-
{groovy => java}/gradle.test/manifest.mf | 0
.../gradle.test}/nbproject/project.properties | 0
{groovy => java}/gradle.test/nbproject/project.xml | 0
.../netbeans/modules/gradle/test/Bundle.properties | 0
.../gradle/test/GradleTestProgressListener.java | 0
.../modules/gradle/test/GradleTestSuite.java | 0
.../modules/gradle/test/GradleTestcase.java | 0
.../gradle/test/ui/GradleJUnitManagerProvider.java | 0
.../test/ui/GradleTestRunnerNodeFactory.java | 0
.../test/ui/nodes/GradleJUnitNodeOpener.java | 0
.../gradle/test/ui/nodes/GradleTestMethodNode.java | 0
.../gradle/test/ui/nodes/ReRunTestAction.java | 0
.../org/netbeans/nbbuild/extlibs/ignored-binaries | 4 +-
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 22 +++++-----
nbbuild/cluster.properties | 21 +++++-----
nbbuild/rat-exclusions.txt | 2 +-
442 files changed, 86 insertions(+), 181 deletions(-)
diff --git a/.gitignore b/.gitignore
index 35528c1..d9d0aa9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,7 +97,7 @@ derby.log
# Gradle Support Generated files #
##################################
-/groovy/gradle/netbeans-gradle-tooling/.gradle/
-/groovy/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.jar
-/groovy/gradle/release/modules/gradle/daemon-loader/.gradle/
-/nbbuild/misc/prepare-bundles/target/
\ No newline at end of file
+/extide/gradle/netbeans-gradle-tooling/.gradle/
+/extide/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.jar
+/extide/gradle/release/modules/gradle/daemon-loader/.gradle/
+/nbbuild/misc/prepare-bundles/target/
diff --git a/groovy/gradle.javaee/build.xml b/enterprise/gradle.javaee/build.xml
similarity index 93%
rename from groovy/gradle.javaee/build.xml
rename to enterprise/gradle.javaee/build.xml
index 88160de..ee6e7ed 100644
--- a/groovy/gradle.javaee/build.xml
+++ b/enterprise/gradle.javaee/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project name="groovy/gradle.javaee" default="build" basedir=".">
+<project name="enterprise/gradle.javaee" default="build" basedir=".">
<description>Builds, tests, and runs the project org.netbeans.netbeans.gradle.javaee.</description>
<import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/groovy/gradle.javaee/licenseinfo.xml b/enterprise/gradle.javaee/licenseinfo.xml
similarity index 100%
rename from groovy/gradle.javaee/licenseinfo.xml
rename to enterprise/gradle.javaee/licenseinfo.xml
diff --git a/groovy/gradle.javaee/manifest.mf b/enterprise/gradle.javaee/manifest.mf
similarity index 100%
rename from groovy/gradle.javaee/manifest.mf
rename to enterprise/gradle.javaee/manifest.mf
diff --git a/groovy/gradle.javaee/nbproject/project.properties b/enterprise/gradle.javaee/nbproject/project.properties
similarity index 98%
rename from groovy/gradle.javaee/nbproject/project.properties
rename to enterprise/gradle.javaee/nbproject/project.properties
index 2f90d20..6381e0c 100644
--- a/groovy/gradle.javaee/nbproject/project.properties
+++ b/enterprise/gradle.javaee/nbproject/project.properties
@@ -18,3 +18,4 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
nbm.module.author=Laszlo Kishalmi
+is.eager=true
\ No newline at end of file
diff --git a/groovy/gradle.javaee/nbproject/project.xml b/enterprise/gradle.javaee/nbproject/project.xml
similarity index 100%
rename from groovy/gradle.javaee/nbproject/project.xml
rename to enterprise/gradle.javaee/nbproject/project.xml
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/BaseEEModuleImpl.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/BaseEEModuleImpl.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/BaseEEModuleImpl.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/BaseEEModuleImpl.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/BaseEEModuleProvider.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/BaseEEModuleProvider.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/BaseEEModuleProvider.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/BaseEEModuleProvider.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/Bundle.properties b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/Bundle.properties
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/Bundle.properties
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/Bundle.properties
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/DummyModuleChangeReporter.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/DummyModuleChangeReporter.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/DummyModuleChangeReporter.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/DummyModuleChangeReporter.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/GradleJavaEEProjectSettings.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/GradleJavaEEProjectSettings.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/GradleJavaEEProjectSettings.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/GradleJavaEEProjectSettings.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEEActionProvider.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEEActionProvider.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEEActionProvider.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEEActionProvider.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEEProjectIconProvider.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEEProjectIconProvider.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEEProjectIconProvider.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEEProjectIconProvider.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEESourcesImpl.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEESourcesImpl.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEESourcesImpl.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEESourcesImpl.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/ProjectOpenedHookImpl.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/ProjectOpenedHookImpl.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/ProjectOpenedHookImpl.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/ProjectOpenedHookImpl.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/ServiceRegistrations.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/ServiceRegistrations.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/ServiceRegistrations.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/ServiceRegistrations.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/action-mapping.xml b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/action-mapping.xml
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/action-mapping.xml
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/action-mapping.xml
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/GradleWebProject.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/GradleWebProject.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/GradleWebProject.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/GradleWebProject.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/GradleWebProjectBuilder.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/GradleWebProjectBuilder.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/GradleWebProjectBuilder.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/GradleWebProjectBuilder.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/CheckBoxUpdater.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/CheckBoxUpdater.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/CheckBoxUpdater.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/CheckBoxUpdater.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/ComboBoxUpdater.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/ComboBoxUpdater.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/ComboBoxUpdater.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/ComboBoxUpdater.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/DisplayNameListCellRenderer.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/DisplayNameListCellRenderer.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/DisplayNameListCellRenderer.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/DisplayNameListCellRenderer.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/JavaEEProfileComboBoxModel.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/JavaEEProfileComboBoxModel.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/JavaEEProfileComboBoxModel.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/JavaEEProfileComboBoxModel.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/JavaEEServerComboBoxModel.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/JavaEEServerComboBoxModel.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/JavaEEServerComboBoxModel.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/api/ui/support/JavaEEServerComboBoxModel.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/Bundle.properties b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/Bundle.properties
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/Bundle.properties
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/Bundle.properties
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/CustomizerRunWar.form b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/CustomizerRunWar.form
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/CustomizerRunWar.form
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/CustomizerRunWar.form
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/CustomizerRunWar.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/CustomizerRunWar.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/CustomizerRunWar.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/CustomizerRunWar.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/GradleCompositePanelProvider.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/GradleCompositePanelProvider.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/GradleCompositePanelProvider.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/customizer/GradleCompositePanelProvider.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/execute/DeployHook.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/execute/DeployHook.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/execute/DeployHook.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/execute/DeployHook.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/nodes/RemoteFilesNodeRegistration.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/nodes/RemoteFilesNodeRegistration.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/nodes/RemoteFilesNodeRegistration.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/nodes/RemoteFilesNodeRegistration.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/nodes/WebPagesNode.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/nodes/WebPagesNode.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/nodes/WebPagesNode.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/nodes/WebPagesNode.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/nodes/WebPagesNodeFactory.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/nodes/WebPagesNodeFactory.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/nodes/WebPagesNodeFactory.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/nodes/WebPagesNodeFactory.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/WebPagesBadge.png b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/WebPagesBadge.png
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/WebPagesBadge.png
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/WebPagesBadge.png
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon.png b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon.png
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon.png
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon.png
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon_dark.png b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon_dark.png
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon_dark.png
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon_dark.png
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/AdditionalWebProvider.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/AdditionalWebProvider.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/AdditionalWebProvider.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/AdditionalWebProvider.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/CssPreprocessorsProblemProvider.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/CssPreprocessorsProblemProvider.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/CssPreprocessorsProblemProvider.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/CssPreprocessorsProblemProvider.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/CssPreprocessorsSupport.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/CssPreprocessorsSupport.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/CssPreprocessorsSupport.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/CssPreprocessorsSupport.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebEjbJarImpl.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebEjbJarImpl.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebEjbJarImpl.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebEjbJarImpl.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebModuleImpl.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebModuleImpl.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebModuleImpl.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebModuleImpl.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebModuleProviderImpl.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebModuleProviderImpl.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebModuleProviderImpl.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebModuleProviderImpl.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebProjectBrowserProvider.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebProjectBrowserProvider.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebProjectBrowserProvider.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebProjectBrowserProvider.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebProjectWebRootProvider.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebProjectWebRootProvider.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebProjectWebRootProvider.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebProjectWebRootProvider.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebRecoPrivTemplates.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebRecoPrivTemplates.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebRecoPrivTemplates.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebRecoPrivTemplates.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/Bundle.properties b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/Bundle.properties
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/Bundle.properties
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/Bundle.properties
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/ServerSelectionPanel.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/ServerSelectionPanel.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/ServerSelectionPanel.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/ServerSelectionPanel.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/ServerSelectionPanelVisual.form b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/ServerSelectionPanelVisual.form
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/ServerSelectionPanelVisual.form
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/ServerSelectionPanelVisual.form
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/ServerSelectionPanelVisual.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/ServerSelectionPanelVisual.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/ServerSelectionPanelVisual.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/ServerSelectionPanelVisual.java
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/WebApplicationDescription.html b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/WebApplicationDescription.html
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/WebApplicationDescription.html
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/WebApplicationDescription.html
diff --git a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/WebApplicationProjectWizard.java b/enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/WebApplicationProjectWizard.java
similarity index 100%
rename from groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/WebApplicationProjectWizard.java
rename to enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/WebApplicationProjectWizard.java
diff --git a/ergonomics/ide.ergonomics/groovy.properties b/ergonomics/ide.ergonomics/groovy.properties
index c9a6f12..b39a6a2 100644
--- a/ergonomics/ide.ergonomics/groovy.properties
+++ b/ergonomics/ide.ergonomics/groovy.properties
@@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-mainModule=org.netbeans.modules.groovy.and.gradle.kit
+mainModule=org.netbeans.modules.groovy.kit
project.xpath.nbproject/project.xml=project/configuration/buildExtensions/extension[@id='groovy']
project.file.build.gradle=org.netbeans.modules.gradle.NbGradleProjectFactory
diff --git a/groovy/gradle/apichanges.xml b/extide/gradle/apichanges.xml
similarity index 100%
rename from groovy/gradle/apichanges.xml
rename to extide/gradle/apichanges.xml
diff --git a/groovy/gradle/arch.xml b/extide/gradle/arch.xml
similarity index 100%
rename from groovy/gradle/arch.xml
rename to extide/gradle/arch.xml
diff --git a/groovy/gradle/build.xml b/extide/gradle/build.xml
similarity index 96%
rename from groovy/gradle/build.xml
rename to extide/gradle/build.xml
index a59b494..4b7f1b5 100644
--- a/groovy/gradle/build.xml
+++ b/extide/gradle/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project basedir="." default="build" name="groovy/gradle">
+<project basedir="." default="build" name="extide/gradle">
<description>Builds, tests, and runs the project org.netbeans.modules.gradle</description>
<import file="../../nbbuild/templates/projectized.xml"/>
@@ -64,6 +64,7 @@
<target name="clean" depends="projectized.clean">
<delete dir="${tooling}/build"/>
+ <delete file="${test.dist.dir}/extralibs/netbeans-gradle-tooling.jar"/>
</target>
<target name="compile" depends="build-tooling-lib, projectized-common.compile"/>
diff --git a/groovy/gradle/external/binaries-list b/extide/gradle/external/binaries-list
similarity index 100%
rename from groovy/gradle/external/binaries-list
rename to extide/gradle/external/binaries-list
diff --git a/groovy/gradle/external/gradle-4.10.2-bin-license.txt b/extide/gradle/external/gradle-4.10.2-bin-license.txt
similarity index 100%
rename from groovy/gradle/external/gradle-4.10.2-bin-license.txt
rename to extide/gradle/external/gradle-4.10.2-bin-license.txt
diff --git a/groovy/gradle/external/gradle-4.10.2-bin-notice.txt b/extide/gradle/external/gradle-4.10.2-bin-notice.txt
similarity index 100%
rename from groovy/gradle/external/gradle-4.10.2-bin-notice.txt
rename to extide/gradle/external/gradle-4.10.2-bin-notice.txt
diff --git a/groovy/gradle/external/gradle-wrapper-4.10.2-license.txt b/extide/gradle/external/gradle-wrapper-4.10.2-license.txt
similarity index 100%
rename from groovy/gradle/external/gradle-wrapper-4.10.2-license.txt
rename to extide/gradle/external/gradle-wrapper-4.10.2-license.txt
diff --git a/groovy/gradle/licenseinfo.xml b/extide/gradle/licenseinfo.xml
similarity index 100%
rename from groovy/gradle/licenseinfo.xml
rename to extide/gradle/licenseinfo.xml
diff --git a/groovy/gradle/manifest.mf b/extide/gradle/manifest.mf
similarity index 82%
rename from groovy/gradle/manifest.mf
rename to extide/gradle/manifest.mf
index 21fd5ba..83be357 100644
--- a/groovy/gradle/manifest.mf
+++ b/extide/gradle/manifest.mf
@@ -4,4 +4,3 @@ OpenIDE-Module: org.netbeans.modules.gradle/2
OpenIDE-Module-Layer: org/netbeans/modules/gradle/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/Bundle.properties
OpenIDE-Module-Specification-Version: 2.2
-OpenIDE-Module-Requires: cnb.org.netbeans.modules.groovy.kit
diff --git a/groovy/gradle/nbproject/org-netbeans-modules-gradle.sig b/extide/gradle/nbproject/org-netbeans-modules-gradle.sig
similarity index 100%
rename from groovy/gradle/nbproject/org-netbeans-modules-gradle.sig
rename to extide/gradle/nbproject/org-netbeans-modules-gradle.sig
diff --git a/groovy/gradle/nbproject/project.properties b/extide/gradle/nbproject/project.properties
similarity index 100%
rename from groovy/gradle/nbproject/project.properties
rename to extide/gradle/nbproject/project.properties
diff --git a/groovy/gradle/nbproject/project.xml b/extide/gradle/nbproject/project.xml
similarity index 100%
rename from groovy/gradle/nbproject/project.xml
rename to extide/gradle/nbproject/project.xml
diff --git a/groovy/gradle/netbeans-gradle-tooling/build.gradle b/extide/gradle/netbeans-gradle-tooling/build.gradle
similarity index 96%
rename from groovy/gradle/netbeans-gradle-tooling/build.gradle
rename to extide/gradle/netbeans-gradle-tooling/build.gradle
index 2e31708..d9514eb 100644
--- a/groovy/gradle/netbeans-gradle-tooling/build.gradle
+++ b/extide/gradle/netbeans-gradle-tooling/build.gradle
@@ -48,3 +48,5 @@ test {
run {
args = ["$projectDir/src/test/data/simple-with-tests", "-PdownloadSourcesAndJavadoc=ALL"]
}
+
+[startScripts, distTar, distZip]*.enabled = false
\ No newline at end of file
diff --git a/groovy/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.properties b/extide/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.properties
rename to extide/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.properties
diff --git a/groovy/gradle/netbeans-gradle-tooling/settings.gradle b/extide/gradle/netbeans-gradle-tooling/settings.gradle
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/settings.gradle
rename to extide/gradle/netbeans-gradle-tooling/settings.gradle
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/DebugTooling.java b/extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/DebugTooling.java
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/DebugTooling.java
rename to extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/DebugTooling.java
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/api/NbProjectInfo.java b/extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/api/NbProjectInfo.java
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/api/NbProjectInfo.java
rename to extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/api/NbProjectInfo.java
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/BaseModel.java b/extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/BaseModel.java
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/BaseModel.java
rename to extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/BaseModel.java
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/Model.java b/extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/Model.java
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/Model.java
rename to extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/Model.java
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.groovy b/extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.groovy
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.groovy
rename to extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.groovy
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NbProjectInfoModel.java b/extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NbProjectInfoModel.java
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NbProjectInfoModel.java
rename to extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NbProjectInfoModel.java
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NetBeansExplodedWarPlugin.groovy b/extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NetBeansExplodedWarPlugin.groovy
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NetBeansExplodedWarPlugin.groovy
rename to extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NetBeansExplodedWarPlugin.groovy
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.groovy b/extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.groovy
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.groovy
rename to extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.groovy
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NetBeansToolingPlugin.java b/extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NetBeansToolingPlugin.java
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NetBeansToolingPlugin.java
rename to extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NetBeansToolingPlugin.java
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/main/resources/nb-tooling.gradle b/extide/gradle/netbeans-gradle-tooling/src/main/resources/nb-tooling.gradle
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/main/resources/nb-tooling.gradle
rename to extide/gradle/netbeans-gradle-tooling/src/main/resources/nb-tooling.gradle
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/test/data/multi/app/build.gradle b/extide/gradle/netbeans-gradle-tooling/src/test/data/multi/app/build.gradle
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/test/data/multi/app/build.gradle
rename to extide/gradle/netbeans-gradle-tooling/src/test/data/multi/app/build.gradle
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/test/data/multi/app/src/build.gradle b/extide/gradle/netbeans-gradle-tooling/src/test/data/multi/app/src/build.gradle
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/test/data/multi/app/src/build.gradle
rename to extide/gradle/netbeans-gradle-tooling/src/test/data/multi/app/src/build.gradle
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/test/data/multi/build.gradle b/extide/gradle/netbeans-gradle-tooling/src/test/data/multi/build.gradle
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/test/data/multi/build.gradle
rename to extide/gradle/netbeans-gradle-tooling/src/test/data/multi/build.gradle
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/test/data/multi/settings.gradle b/extide/gradle/netbeans-gradle-tooling/src/test/data/multi/settings.gradle
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/test/data/multi/settings.gradle
rename to extide/gradle/netbeans-gradle-tooling/src/test/data/multi/settings.gradle
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/test/data/multi/shared/build.gradle b/extide/gradle/netbeans-gradle-tooling/src/test/data/multi/shared/build.gradle
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/test/data/multi/shared/build.gradle
rename to extide/gradle/netbeans-gradle-tooling/src/test/data/multi/shared/build.gradle
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/test/data/simple-with-tests/build.gradle b/extide/gradle/netbeans-gradle-tooling/src/test/data/simple-with-tests/build.gradle
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/test/data/simple-with-tests/build.gradle
rename to extide/gradle/netbeans-gradle-tooling/src/test/data/simple-with-tests/build.gradle
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/test/data/simple/build.gradle b/extide/gradle/netbeans-gradle-tooling/src/test/data/simple/build.gradle
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/test/data/simple/build.gradle
rename to extide/gradle/netbeans-gradle-tooling/src/test/data/simple/build.gradle
diff --git a/groovy/gradle/netbeans-gradle-tooling/src/test/data/unresolvable/build.gradle b/extide/gradle/netbeans-gradle-tooling/src/test/data/unresolvable/build.gradle
similarity index 100%
rename from groovy/gradle/netbeans-gradle-tooling/src/test/data/unresolvable/build.gradle
rename to extide/gradle/netbeans-gradle-tooling/src/test/data/unresolvable/build.gradle
diff --git a/groovy/gradle/release/modules/gradle/daemon-loader/build.gradle b/extide/gradle/release/modules/gradle/daemon-loader/build.gradle
similarity index 100%
rename from groovy/gradle/release/modules/gradle/daemon-loader/build.gradle
rename to extide/gradle/release/modules/gradle/daemon-loader/build.gradle
diff --git a/groovy/gradle/release/modules/gradle/daemon-loader/settings.gradle b/extide/gradle/release/modules/gradle/daemon-loader/settings.gradle
similarity index 100%
rename from groovy/gradle/release/modules/gradle/daemon-loader/settings.gradle
rename to extide/gradle/release/modules/gradle/daemon-loader/settings.gradle
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/ActionHookMerger.java b/extide/gradle/src/org/netbeans/modules/gradle/ActionHookMerger.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/ActionHookMerger.java
rename to extide/gradle/src/org/netbeans/modules/gradle/ActionHookMerger.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java b/extide/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java
rename to extide/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/Bundle.properties b/extide/gradle/src/org/netbeans/modules/gradle/Bundle.properties
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/Bundle.properties
rename to extide/gradle/src/org/netbeans/modules/gradle/Bundle.properties
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/DeleteOperationImpl.java b/extide/gradle/src/org/netbeans/modules/gradle/DeleteOperationImpl.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/DeleteOperationImpl.java
rename to extide/gradle/src/org/netbeans/modules/gradle/DeleteOperationImpl.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/GradleArtifactStore.java b/extide/gradle/src/org/netbeans/modules/gradle/GradleArtifactStore.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/GradleArtifactStore.java
rename to extide/gradle/src/org/netbeans/modules/gradle/GradleArtifactStore.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/GradleAuxiliaryConfigImpl.java b/extide/gradle/src/org/netbeans/modules/gradle/GradleAuxiliaryConfigImpl.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/GradleAuxiliaryConfigImpl.java
rename to extide/gradle/src/org/netbeans/modules/gradle/GradleAuxiliaryConfigImpl.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/GradleAuxiliaryPropertiesImpl.java b/extide/gradle/src/org/netbeans/modules/gradle/GradleAuxiliaryPropertiesImpl.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/GradleAuxiliaryPropertiesImpl.java
rename to extide/gradle/src/org/netbeans/modules/gradle/GradleAuxiliaryPropertiesImpl.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/GradleDaemon.java b/extide/gradle/src/org/netbeans/modules/gradle/GradleDaemon.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/GradleDaemon.java
rename to extide/gradle/src/org/netbeans/modules/gradle/GradleDaemon.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/GradleDataObject.java b/extide/gradle/src/org/netbeans/modules/gradle/GradleDataObject.java
similarity index 98%
rename from groovy/gradle/src/org/netbeans/modules/gradle/GradleDataObject.java
rename to extide/gradle/src/org/netbeans/modules/gradle/GradleDataObject.java
index 86f35be..88941c8 100644
--- a/groovy/gradle/src/org/netbeans/modules/gradle/GradleDataObject.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/GradleDataObject.java
@@ -212,7 +212,8 @@ public class GradleDataObject extends MultiDataObject {
@Override
protected CloneableEditorSupport.Pane createPane() {
- return (CloneableEditorSupport.Pane) MultiViews.createCloneableMultiView(MIME_TYPE, getDataObject());
+ String mime = "kts".equals(getPrimaryFile().getExt()) ? KOTLIN_MIME_TYPE : MIME_TYPE; //NOI18N
+ return (CloneableEditorSupport.Pane) MultiViews.createCloneableMultiView(mime, getDataObject());
}
@Override
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/GradleDistributionManager.java b/extide/gradle/src/org/netbeans/modules/gradle/GradleDistributionManager.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/GradleDistributionManager.java
rename to extide/gradle/src/org/netbeans/modules/gradle/GradleDistributionManager.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/GradleInstallPanel.form b/extide/gradle/src/org/netbeans/modules/gradle/GradleInstallPanel.form
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/GradleInstallPanel.form
rename to extide/gradle/src/org/netbeans/modules/gradle/GradleInstallPanel.form
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/GradleInstallPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/GradleInstallPanel.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/GradleInstallPanel.java
rename to extide/gradle/src/org/netbeans/modules/gradle/GradleInstallPanel.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/GradleProject.java b/extide/gradle/src/org/netbeans/modules/gradle/GradleProject.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/GradleProject.java
rename to extide/gradle/src/org/netbeans/modules/gradle/GradleProject.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/GradleProjectCache.java b/extide/gradle/src/org/netbeans/modules/gradle/GradleProjectCache.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/GradleProjectCache.java
rename to extide/gradle/src/org/netbeans/modules/gradle/GradleProjectCache.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/GradleProjectProblemProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/GradleProjectProblemProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/GradleProjectProblemProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/GradleProjectProblemProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/GradleSharabilityQueryImpl.java b/extide/gradle/src/org/netbeans/modules/gradle/GradleSharabilityQueryImpl.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/GradleSharabilityQueryImpl.java
rename to extide/gradle/src/org/netbeans/modules/gradle/GradleSharabilityQueryImpl.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/LogicalViewProviderImpl.java b/extide/gradle/src/org/netbeans/modules/gradle/LogicalViewProviderImpl.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/LogicalViewProviderImpl.java
rename to extide/gradle/src/org/netbeans/modules/gradle/LogicalViewProviderImpl.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/NbGradleProjectFactory.java b/extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectFactory.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/NbGradleProjectFactory.java
rename to extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectFactory.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java b/extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java
rename to extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/ProjectTrust.java b/extide/gradle/src/org/netbeans/modules/gradle/ProjectTrust.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/ProjectTrust.java
rename to extide/gradle/src/org/netbeans/modules/gradle/ProjectTrust.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/ReloadAction.java b/extide/gradle/src/org/netbeans/modules/gradle/ReloadAction.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/ReloadAction.java
rename to extide/gradle/src/org/netbeans/modules/gradle/ReloadAction.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/ReloadProjectDependenciesDecorator.java b/extide/gradle/src/org/netbeans/modules/gradle/ReloadProjectDependenciesDecorator.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/ReloadProjectDependenciesDecorator.java
rename to extide/gradle/src/org/netbeans/modules/gradle/ReloadProjectDependenciesDecorator.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/RootActionProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/RootActionProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/RootActionProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/RootActionProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/TemplateAttrProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/TemplateAttrProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/TemplateAttrProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/TemplateAttrProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/action-mapping.xml b/extide/gradle/src/org/netbeans/modules/gradle/action-mapping.xml
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/action-mapping.xml
rename to extide/gradle/src/org/netbeans/modules/gradle/action-mapping.xml
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReader.java b/extide/gradle/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReader.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReader.java
rename to extide/gradle/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReader.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/actions/ActionMappingScanner.java b/extide/gradle/src/org/netbeans/modules/gradle/actions/ActionMappingScanner.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/actions/ActionMappingScanner.java
rename to extide/gradle/src/org/netbeans/modules/gradle/actions/ActionMappingScanner.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/actions/ActionToTaskUtils.java b/extide/gradle/src/org/netbeans/modules/gradle/actions/ActionToTaskUtils.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/actions/ActionToTaskUtils.java
rename to extide/gradle/src/org/netbeans/modules/gradle/actions/ActionToTaskUtils.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/actions/CustomActionRegistrationSupport.java b/extide/gradle/src/org/netbeans/modules/gradle/actions/CustomActionRegistrationSupport.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/actions/CustomActionRegistrationSupport.java
rename to extide/gradle/src/org/netbeans/modules/gradle/actions/CustomActionRegistrationSupport.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/actions/DefaultActionMapping.java b/extide/gradle/src/org/netbeans/modules/gradle/actions/DefaultActionMapping.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/actions/DefaultActionMapping.java
rename to extide/gradle/src/org/netbeans/modules/gradle/actions/DefaultActionMapping.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/actions/GradleBaseTokenProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/actions/GradleBaseTokenProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/actions/GradleBaseTokenProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/actions/GradleBaseTokenProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/actions/KeyValueTableModel.java b/extide/gradle/src/org/netbeans/modules/gradle/actions/KeyValueTableModel.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/actions/KeyValueTableModel.java
rename to extide/gradle/src/org/netbeans/modules/gradle/actions/KeyValueTableModel.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/actions/MappingContainer.java b/extide/gradle/src/org/netbeans/modules/gradle/actions/MappingContainer.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/actions/MappingContainer.java
rename to extide/gradle/src/org/netbeans/modules/gradle/actions/MappingContainer.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/actions/ProjectActionMappingProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/actions/ProjectActionMappingProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/actions/ProjectActionMappingProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/actions/ProjectActionMappingProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/actions/ProjectActionMappingProviderImpl.java b/extide/gradle/src/org/netbeans/modules/gradle/actions/ProjectActionMappingProviderImpl.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/actions/ProjectActionMappingProviderImpl.java
rename to extide/gradle/src/org/netbeans/modules/gradle/actions/ProjectActionMappingProviderImpl.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/actions/ReplaceTokenProviderMerger.java b/extide/gradle/src/org/netbeans/modules/gradle/actions/ReplaceTokenProviderMerger.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/actions/ReplaceTokenProviderMerger.java
rename to extide/gradle/src/org/netbeans/modules/gradle/actions/ReplaceTokenProviderMerger.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/actions/action-mapping.dtd b/extide/gradle/src/org/netbeans/modules/gradle/actions/action-mapping.dtd
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/actions/action-mapping.dtd
rename to extide/gradle/src/org/netbeans/modules/gradle/actions/action-mapping.dtd
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProject.java b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProject.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProject.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProject.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleProjects.java b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleProjects.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/GradleProjects.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/GradleProjects.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleTask.java b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleTask.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/GradleTask.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/GradleTask.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/ModuleSearchSupport.java b/extide/gradle/src/org/netbeans/modules/gradle/api/ModuleSearchSupport.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/ModuleSearchSupport.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/ModuleSearchSupport.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/NbGradleProject.java b/extide/gradle/src/org/netbeans/modules/gradle/api/NbGradleProject.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/NbGradleProject.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/NbGradleProject.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-classes.dia b/extide/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-classes.dia
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-classes.dia
rename to extide/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-classes.dia
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-classes.png b/extide/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-classes.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-classes.png
rename to extide/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-classes.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-quality.dia b/extide/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-quality.dia
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-quality.dia
rename to extide/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-quality.dia
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-quality.png b/extide/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-quality.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-quality.png
rename to extide/gradle/src/org/netbeans/modules/gradle/api/doc-files/gradle-quality.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/execute/ActionMapping.java b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/ActionMapping.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/execute/ActionMapping.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/execute/ActionMapping.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/execute/Bundle.properties b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/Bundle.properties
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/execute/Bundle.properties
rename to extide/gradle/src/org/netbeans/modules/gradle/api/execute/Bundle.properties
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/execute/RunConfig.java b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/RunConfig.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/execute/RunConfig.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/execute/RunConfig.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/execute/RunUtils.java b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/RunUtils.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/execute/RunUtils.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/execute/RunUtils.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/execute/package-info.java b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/package-info.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/execute/package-info.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/execute/package-info.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/output/OutputDisplayer.java b/extide/gradle/src/org/netbeans/modules/gradle/api/output/OutputDisplayer.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/output/OutputDisplayer.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/output/OutputDisplayer.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/output/OutputListeners.java b/extide/gradle/src/org/netbeans/modules/gradle/api/output/OutputListeners.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/output/OutputListeners.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/output/OutputListeners.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/output/OutputProcessor.java b/extide/gradle/src/org/netbeans/modules/gradle/api/output/OutputProcessor.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/output/OutputProcessor.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/output/OutputProcessor.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/output/OutputProcessorFactory.java b/extide/gradle/src/org/netbeans/modules/gradle/api/output/OutputProcessorFactory.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/output/OutputProcessorFactory.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/output/OutputProcessorFactory.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/api/package-info.java b/extide/gradle/src/org/netbeans/modules/gradle/api/package-info.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/api/package-info.java
rename to extide/gradle/src/org/netbeans/modules/gradle/api/package-info.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/classpath/AbstractGradleScriptClassPath.java b/extide/gradle/src/org/netbeans/modules/gradle/classpath/AbstractGradleScriptClassPath.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/classpath/AbstractGradleScriptClassPath.java
rename to extide/gradle/src/org/netbeans/modules/gradle/classpath/AbstractGradleScriptClassPath.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/classpath/ScriptClassPathProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/classpath/ScriptClassPathProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/classpath/ScriptClassPathProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/classpath/ScriptClassPathProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/customizer/BuildActionsCustomizer.form b/extide/gradle/src/org/netbeans/modules/gradle/customizer/BuildActionsCustomizer.form
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/customizer/BuildActionsCustomizer.form
rename to extide/gradle/src/org/netbeans/modules/gradle/customizer/BuildActionsCustomizer.form
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/customizer/BuildActionsCustomizer.java b/extide/gradle/src/org/netbeans/modules/gradle/customizer/BuildActionsCustomizer.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/customizer/BuildActionsCustomizer.java
rename to extide/gradle/src/org/netbeans/modules/gradle/customizer/BuildActionsCustomizer.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/customizer/Bundle.properties b/extide/gradle/src/org/netbeans/modules/gradle/customizer/Bundle.properties
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/customizer/Bundle.properties
rename to extide/gradle/src/org/netbeans/modules/gradle/customizer/Bundle.properties
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/customizer/CustomActionMapping.java b/extide/gradle/src/org/netbeans/modules/gradle/customizer/CustomActionMapping.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/customizer/CustomActionMapping.java
rename to extide/gradle/src/org/netbeans/modules/gradle/customizer/CustomActionMapping.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/customizer/GradleCustomizerProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/customizer/GradleCustomizerProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/customizer/GradleCustomizerProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/customizer/GradleCustomizerProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/customizer/GradleExecutionPanel.form b/extide/gradle/src/org/netbeans/modules/gradle/customizer/GradleExecutionPanel.form
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/customizer/GradleExecutionPanel.form
rename to extide/gradle/src/org/netbeans/modules/gradle/customizer/GradleExecutionPanel.form
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/customizer/GradleExecutionPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/customizer/GradleExecutionPanel.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/customizer/GradleExecutionPanel.java
rename to extide/gradle/src/org/netbeans/modules/gradle/customizer/GradleExecutionPanel.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/customizer/LicenseHeadersPanel.form b/extide/gradle/src/org/netbeans/modules/gradle/customizer/LicenseHeadersPanel.form
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/customizer/LicenseHeadersPanel.form
rename to extide/gradle/src/org/netbeans/modules/gradle/customizer/LicenseHeadersPanel.form
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/customizer/LicenseHeadersPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/customizer/LicenseHeadersPanel.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/customizer/LicenseHeadersPanel.java
rename to extide/gradle/src/org/netbeans/modules/gradle/customizer/LicenseHeadersPanel.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/customizer/ProjectInfoPanel.form b/extide/gradle/src/org/netbeans/modules/gradle/customizer/ProjectInfoPanel.form
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/customizer/ProjectInfoPanel.form
rename to extide/gradle/src/org/netbeans/modules/gradle/customizer/ProjectInfoPanel.form
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/customizer/ProjectInfoPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/customizer/ProjectInfoPanel.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/customizer/ProjectInfoPanel.java
rename to extide/gradle/src/org/netbeans/modules/gradle/customizer/ProjectInfoPanel.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/customizer/package-info.java b/extide/gradle/src/org/netbeans/modules/gradle/customizer/package-info.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/customizer/package-info.java
rename to extide/gradle/src/org/netbeans/modules/gradle/customizer/package-info.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/AbstractGradleExecutor.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/AbstractGradleExecutor.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/AbstractGradleExecutor.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/AbstractGradleExecutor.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/Bundle.properties b/extide/gradle/src/org/netbeans/modules/gradle/execute/Bundle.properties
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/Bundle.properties
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/Bundle.properties
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStream.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStream.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStream.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStream.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessor.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessor.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessor.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessor.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/ExecutionOptionsPanel.form b/extide/gradle/src/org/netbeans/modules/gradle/execute/ExecutionOptionsPanel.form
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/ExecutionOptionsPanel.form
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/ExecutionOptionsPanel.form
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/ExecutionOptionsPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/ExecutionOptionsPanel.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/ExecutionOptionsPanel.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/ExecutionOptionsPanel.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/GradleCliCompletionProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleCliCompletionProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/GradleCliCompletionProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/GradleCliCompletionProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/GradleCliEditorKit.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleCliEditorKit.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/GradleCliEditorKit.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/GradleCliEditorKit.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/GradleColorEscapeProcessor.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleColorEscapeProcessor.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/GradleColorEscapeProcessor.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/GradleColorEscapeProcessor.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/GradleDaemonExecutor.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleDaemonExecutor.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/GradleDaemonExecutor.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/GradleDaemonExecutor.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/GradleExecutor.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleExecutor.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/GradleExecutor.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/GradleExecutor.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/GradleExecutorOptionsPanel.form b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleExecutorOptionsPanel.form
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/GradleExecutorOptionsPanel.form
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/GradleExecutorOptionsPanel.form
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/GradleExecutorOptionsPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleExecutorOptionsPanel.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/GradleExecutorOptionsPanel.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/GradleExecutorOptionsPanel.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/GradlePlainEscapeProcessor.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradlePlainEscapeProcessor.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/GradlePlainEscapeProcessor.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/GradlePlainEscapeProcessor.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/OutputTabMaintainer.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/OutputTabMaintainer.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/OutputTabMaintainer.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/OutputTabMaintainer.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/ProxyNonSelectableInputOutput.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/ProxyNonSelectableInputOutput.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/ProxyNonSelectableInputOutput.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/ProxyNonSelectableInputOutput.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/TrustProjectPanel.form b/extide/gradle/src/org/netbeans/modules/gradle/execute/TrustProjectPanel.form
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/TrustProjectPanel.form
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/TrustProjectPanel.form
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/TrustProjectPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/TrustProjectPanel.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/TrustProjectPanel.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/TrustProjectPanel.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksNavigationPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksNavigationPanel.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksNavigationPanel.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksNavigationPanel.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksNavigatorHint.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksNavigatorHint.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksNavigatorHint.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksNavigatorHint.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksPanel.form b/extide/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksPanel.form
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksPanel.form
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksPanel.form
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksPanel.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksPanel.java
rename to extide/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksPanel.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/gradle-mime-resolver.xml b/extide/gradle/src/org/netbeans/modules/gradle/gradle-mime-resolver.xml
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/gradle-mime-resolver.xml
rename to extide/gradle/src/org/netbeans/modules/gradle/gradle-mime-resolver.xml
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/layer.xml b/extide/gradle/src/org/netbeans/modules/gradle/layer.xml
similarity index 87%
rename from groovy/gradle/src/org/netbeans/modules/gradle/layer.xml
rename to extide/gradle/src/org/netbeans/modules/gradle/layer.xml
index d4c080a..99b332a 100644
--- a/groovy/gradle/src/org/netbeans/modules/gradle/layer.xml
+++ b/extide/gradle/src/org/netbeans/modules/gradle/layer.xml
@@ -134,12 +134,27 @@
</folder>
<folder name="Editors">
<folder name="text">
- <!--folder name="x-gradle+x-groovy">
- <file name="org-netbeans-modules-csl-core-GsfParserFactory-create.instance">
- <attr methodvalue="org.netbeans.modules.csl.core.GsfParserFactory.create" name="instanceCreate"/>
- <attr name="instanceOf" stringvalue="org.netbeans.modules.parsing.spi.ParserFactory"/>
+ <folder name="x-gradle+x-groovy">
+ <file name="EditorKit.instance">
+ <attr name="position" intvalue="200"/>
+ <attr name="instanceClass" stringvalue="org.netbeans.modules.editor.plain.PlainKit"/>
+ <attr name="instanceOf" stringvalue="javax.swing.text.EditorKit,org.netbeans.modules.editor.plain.PlainKit"/>
+ <attr name="beaninfo" boolvalue="false"/>
</file>
- </folder-->
+ <folder name="MultiView">
+ <file name="default-text-editor.instance">
+ <attr methodvalue="org.netbeans.core.spi.multiview.MultiViewFactory.createMultiViewDescription" name="instanceCreate"/>
+ <attr name="instanceClass" stringvalue="org.netbeans.core.multiview.ContextAwareDescription"/>
+ <attr name="class" stringvalue="org.netbeans.core.spi.multiview.text.MultiViewEditorElement"/>
+ <attr name="displayName" bundlevalue="org.openide.loaders.Bundle#CTL_Source"/>
+ <attr name="iconBase" stringvalue="none"/>
+ <attr name="preferredID" stringvalue="editor"/>
+ <attr intvalue="1" name="persistenceType"/>
+ <attr boolvalue="true" name="sourceview"/>
+ <attr name="position" intvalue="1000"/>
+ </file>
+ </folder>
+ </folder>
<folder name="x-gradle-cli">
<file name="EditorKit.instance">
<attr name="instanceClass" stringvalue="org.netbeans.modules.gradle.execute.GradleCliEditorKit"/>
@@ -156,15 +171,4 @@
</folder>
</folder>
</folder>
- <folder name="CslPlugins">
- <folder name="text">
- <folder name="x-gradle+x-groovy">
- <file name="language.instance">
- <attr name="instanceClass" stringvalue="org.netbeans.modules.groovy.editor.api.parser.GroovyLanguage"/>
- </file>
- <attr intvalue="2" name="genver"/>
- <attr boolvalue="true" name="useMultiview"/>
- </folder>
- </folder>
- </folder>
</filesystem>
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/Bundle.properties b/extide/gradle/src/org/netbeans/modules/gradle/newproject/Bundle.properties
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/Bundle.properties
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/Bundle.properties
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/GradleMultiWizardIterator.java b/extide/gradle/src/org/netbeans/modules/gradle/newproject/GradleMultiWizardIterator.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/GradleMultiWizardIterator.java
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/GradleMultiWizardIterator.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/MultiProjectDescription.html b/extide/gradle/src/org/netbeans/modules/gradle/newproject/MultiProjectDescription.html
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/MultiProjectDescription.html
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/MultiProjectDescription.html
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttriburesPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttriburesPanel.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttriburesPanel.java
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttriburesPanel.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttributesPanelVisual.form b/extide/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttributesPanelVisual.form
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttributesPanelVisual.form
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttributesPanelVisual.form
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttributesPanelVisual.java b/extide/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttributesPanelVisual.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttributesPanelVisual.java
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttributesPanelVisual.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/SubProjectPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/newproject/SubProjectPanel.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/SubProjectPanel.java
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/SubProjectPanel.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/SubProjectPanelVisual.form b/extide/gradle/src/org/netbeans/modules/gradle/newproject/SubProjectPanelVisual.form
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/SubProjectPanelVisual.form
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/SubProjectPanelVisual.form
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/SubProjectPanelVisual.java b/extide/gradle/src/org/netbeans/modules/gradle/newproject/SubProjectPanelVisual.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/SubProjectPanelVisual.java
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/SubProjectPanelVisual.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/multi-build.gradle.template b/extide/gradle/src/org/netbeans/modules/gradle/newproject/multi-build.gradle.template
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/multi-build.gradle.template
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/multi-build.gradle.template
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/multi-gradle.properties.template b/extide/gradle/src/org/netbeans/modules/gradle/newproject/multi-gradle.properties.template
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/multi-gradle.properties.template
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/multi-gradle.properties.template
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/multi-root.gradle.template b/extide/gradle/src/org/netbeans/modules/gradle/newproject/multi-root.gradle.template
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/multi-root.gradle.template
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/multi-root.gradle.template
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/multi-settings.gradle.template b/extide/gradle/src/org/netbeans/modules/gradle/newproject/multi-settings.gradle.template
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/multi-settings.gradle.template
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/multi-settings.gradle.template
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/single-build.gradle.template b/extide/gradle/src/org/netbeans/modules/gradle/newproject/single-build.gradle.template
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/single-build.gradle.template
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/single-build.gradle.template
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/single-gradle.properties.template b/extide/gradle/src/org/netbeans/modules/gradle/newproject/single-gradle.properties.template
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/single-gradle.properties.template
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/single-gradle.properties.template
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/newproject/single-settings.gradle.template b/extide/gradle/src/org/netbeans/modules/gradle/newproject/single-settings.gradle.template
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/newproject/single-settings.gradle.template
rename to extide/gradle/src/org/netbeans/modules/gradle/newproject/single-settings.gradle.template
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/nodes/AnnotatedAbstractNode.java b/extide/gradle/src/org/netbeans/modules/gradle/nodes/AnnotatedAbstractNode.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/nodes/AnnotatedAbstractNode.java
rename to extide/gradle/src/org/netbeans/modules/gradle/nodes/AnnotatedAbstractNode.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNode.java b/extide/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNode.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNode.java
rename to extide/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNode.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNodeFactory.java b/extide/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNodeFactory.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNodeFactory.java
rename to extide/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNodeFactory.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNode.java b/extide/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNode.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNode.java
rename to extide/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNode.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNodeFactory.java b/extide/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNodeFactory.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNodeFactory.java
rename to extide/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNodeFactory.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/nodes/GradleProjectNode.java b/extide/gradle/src/org/netbeans/modules/gradle/nodes/GradleProjectNode.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/nodes/GradleProjectNode.java
rename to extide/gradle/src/org/netbeans/modules/gradle/nodes/GradleProjectNode.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/nodes/SubProjectsNode.java b/extide/gradle/src/org/netbeans/modules/gradle/nodes/SubProjectsNode.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/nodes/SubProjectsNode.java
rename to extide/gradle/src/org/netbeans/modules/gradle/nodes/SubProjectsNode.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/nodes/SubProjectsNodeFactory.java b/extide/gradle/src/org/netbeans/modules/gradle/nodes/SubProjectsNodeFactory.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/nodes/SubProjectsNodeFactory.java
rename to extide/gradle/src/org/netbeans/modules/gradle/nodes/SubProjectsNodeFactory.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/options/Bundle.properties b/extide/gradle/src/org/netbeans/modules/gradle/options/Bundle.properties
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/options/Bundle.properties
rename to extide/gradle/src/org/netbeans/modules/gradle/options/Bundle.properties
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/options/GradleOptionsController.java b/extide/gradle/src/org/netbeans/modules/gradle/options/GradleOptionsController.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/options/GradleOptionsController.java
rename to extide/gradle/src/org/netbeans/modules/gradle/options/GradleOptionsController.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.form b/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.form
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.form
rename to extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.form
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java
rename to extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/output/GradleProcessorFactory.java b/extide/gradle/src/org/netbeans/modules/gradle/output/GradleProcessorFactory.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/output/GradleProcessorFactory.java
rename to extide/gradle/src/org/netbeans/modules/gradle/output/GradleProcessorFactory.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/queries/DefaultProjectIconProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/queries/DefaultProjectIconProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/queries/DefaultProjectIconProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/queries/DefaultProjectIconProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/queries/GradleSourceForBinary.java b/extide/gradle/src/org/netbeans/modules/gradle/queries/GradleSourceForBinary.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/queries/GradleSourceForBinary.java
rename to extide/gradle/src/org/netbeans/modules/gradle/queries/GradleSourceForBinary.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/queries/Info.java b/extide/gradle/src/org/netbeans/modules/gradle/queries/Info.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/queries/Info.java
rename to extide/gradle/src/org/netbeans/modules/gradle/queries/Info.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/queries/SubprojectProviderImpl.java b/extide/gradle/src/org/netbeans/modules/gradle/queries/SubprojectProviderImpl.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/queries/SubprojectProviderImpl.java
rename to extide/gradle/src/org/netbeans/modules/gradle/queries/SubprojectProviderImpl.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/buildscripts-badge.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/buildscripts-badge.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/buildscripts-badge.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/buildscripts-badge.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/defaultFolder.gif b/extide/gradle/src/org/netbeans/modules/gradle/resources/defaultFolder.gif
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/defaultFolder.gif
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/defaultFolder.gif
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/defaultFolderOpen.gif b/extide/gradle/src/org/netbeans/modules/gradle/resources/defaultFolderOpen.gif
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/defaultFolderOpen.gif
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/defaultFolderOpen.gif
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/empty.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/empty.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/empty.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/empty.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge_dark.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge_dark.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge_dark.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge_dark.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge_dark.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge_dark.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge_dark.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge_dark.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-task.gif b/extide/gradle/src/org/netbeans/modules/gradle/resources/gradle-task.gif
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-task.gif
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/gradle-task.gif
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/gradle.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/gradle.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle_dark.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/gradle_dark.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle_dark.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/gradle_dark.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/info.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/info.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/info.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/info.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/javadoc-badge.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/javadoc-badge.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/javadoc-badge.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/javadoc-badge.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/libraries-badge.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/libraries-badge.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/libraries-badge.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/libraries-badge.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/libraries.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/libraries.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/libraries.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/libraries.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/module-artifact.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/module-artifact.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/module-artifact.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/module-artifact.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/module-artifact_dark.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/module-artifact_dark.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/module-artifact_dark.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/module-artifact_dark.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/options.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/options.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/options.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/options.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/refresh.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/refresh.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/refresh.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/refresh.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/refreshdebug.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/refreshdebug.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/refreshdebug.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/refreshdebug.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/restart.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/restart.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/restart.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/restart.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/sources-badge.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/sources-badge.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/sources-badge.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/sources-badge.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/stop.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/stop.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/stop.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/stop.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/wait.gif b/extide/gradle/src/org/netbeans/modules/gradle/resources/wait.gif
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/wait.gif
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/wait.gif
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/warning-badge.png b/extide/gradle/src/org/netbeans/modules/gradle/resources/warning-badge.png
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/resources/warning-badge.png
rename to extide/gradle/src/org/netbeans/modules/gradle/resources/warning-badge.png
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/GradleFiles.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/GradleFiles.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/GradleFiles.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/GradleFiles.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/GradleProgressListenerProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/GradleProgressListenerProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/GradleProgressListenerProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/GradleProgressListenerProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/GradleSettings.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/GradleSettings.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/GradleSettings.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/GradleSettings.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/ProjectIconProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/ProjectIconProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/ProjectIconProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/ProjectIconProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/ProjectInfoExtractor.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/ProjectInfoExtractor.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/ProjectInfoExtractor.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/ProjectInfoExtractor.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/Utils.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/Utils.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/Utils.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/Utils.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/WatchedResourceProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/WatchedResourceProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/WatchedResourceProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/WatchedResourceProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/actions/AfterBuildActionHook.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/actions/AfterBuildActionHook.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/actions/AfterBuildActionHook.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/actions/AfterBuildActionHook.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/actions/BeforeBuildActionHook.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/actions/BeforeBuildActionHook.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/actions/BeforeBuildActionHook.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/actions/BeforeBuildActionHook.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/actions/BeforeReloadActionHook.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/actions/BeforeReloadActionHook.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/actions/BeforeReloadActionHook.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/actions/BeforeReloadActionHook.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/actions/DefaultGradleActionsProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/actions/DefaultGradleActionsProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/actions/DefaultGradleActionsProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/actions/DefaultGradleActionsProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/actions/GradleActionsProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/actions/GradleActionsProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/actions/GradleActionsProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/actions/GradleActionsProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/actions/ReplaceTokenProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/actions/ReplaceTokenProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/actions/ReplaceTokenProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/actions/ReplaceTokenProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/customizer/support/FilterPanelProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/customizer/support/FilterPanelProvider.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/customizer/support/FilterPanelProvider.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/customizer/support/FilterPanelProvider.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/newproject/BaseGradleWizardIterator.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/BaseGradleWizardIterator.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/newproject/BaseGradleWizardIterator.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/BaseGradleWizardIterator.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/newproject/SimpleGradleWizardIterator.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/SimpleGradleWizardIterator.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/newproject/SimpleGradleWizardIterator.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/SimpleGradleWizardIterator.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/newproject/TemplateOperation.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/TemplateOperation.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/newproject/TemplateOperation.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/TemplateOperation.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/nodes/AbstractGradleNodeList.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/nodes/AbstractGradleNodeList.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/nodes/AbstractGradleNodeList.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/nodes/AbstractGradleNodeList.java
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/spi/nodes/NodeUtils.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/nodes/NodeUtils.java
similarity index 100%
rename from groovy/gradle/src/org/netbeans/modules/gradle/spi/nodes/NodeUtils.java
rename to extide/gradle/src/org/netbeans/modules/gradle/spi/nodes/NodeUtils.java
diff --git a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/AbstractGradleProjectTestCase.java b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/AbstractGradleProjectTestCase.java
similarity index 100%
rename from groovy/gradle/test/unit/src/org/netbeans/modules/gradle/AbstractGradleProjectTestCase.java
rename to extide/gradle/test/unit/src/org/netbeans/modules/gradle/AbstractGradleProjectTestCase.java
diff --git a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/NbGradleProjectFactoryTest.java b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/NbGradleProjectFactoryTest.java
similarity index 100%
rename from groovy/gradle/test/unit/src/org/netbeans/modules/gradle/NbGradleProjectFactoryTest.java
rename to extide/gradle/test/unit/src/org/netbeans/modules/gradle/NbGradleProjectFactoryTest.java
diff --git a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReaderTest.java b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReaderTest.java
similarity index 100%
rename from groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReaderTest.java
rename to extide/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReaderTest.java
diff --git a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingScannerTest.java b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingScannerTest.java
similarity index 100%
rename from groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingScannerTest.java
rename to extide/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingScannerTest.java
diff --git a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/DefaultActionMappingTest.java b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/actions/DefaultActionMappingTest.java
similarity index 100%
rename from groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/DefaultActionMappingTest.java
rename to extide/gradle/test/unit/src/org/netbeans/modules/gradle/actions/DefaultActionMappingTest.java
diff --git a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/action-mapping.xml b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/actions/action-mapping.xml
similarity index 100%
rename from groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/action-mapping.xml
rename to extide/gradle/test/unit/src/org/netbeans/modules/gradle/actions/action-mapping.xml
diff --git a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleDepandencyTest.java b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleDepandencyTest.java
similarity index 100%
rename from groovy/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleDepandencyTest.java
rename to extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleDepandencyTest.java
diff --git a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleTaskTest.java b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleTaskTest.java
similarity index 100%
rename from groovy/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleTaskTest.java
rename to extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleTaskTest.java
diff --git a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/api/execute/GradleCommandLineTest.java b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/execute/GradleCommandLineTest.java
similarity index 100%
rename from groovy/gradle/test/unit/src/org/netbeans/modules/gradle/api/execute/GradleCommandLineTest.java
rename to extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/execute/GradleCommandLineTest.java
diff --git a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/api/execute/RunUtilsTest.java b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/execute/RunUtilsTest.java
similarity index 100%
rename from groovy/gradle/test/unit/src/org/netbeans/modules/gradle/api/execute/RunUtilsTest.java
rename to extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/execute/RunUtilsTest.java
diff --git a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/api/output/OutputDisplayerMock.java b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/output/OutputDisplayerMock.java
similarity index 100%
rename from groovy/gradle/test/unit/src/org/netbeans/modules/gradle/api/output/OutputDisplayerMock.java
rename to extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/output/OutputDisplayerMock.java
diff --git a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStreamTest.java b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStreamTest.java
similarity index 100%
rename from groovy/gradle/test/unit/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStreamTest.java
rename to extide/gradle/test/unit/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStreamTest.java
diff --git a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/output/GradleProcessorFactoryTest.java b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/output/GradleProcessorFactoryTest.java
similarity index 100%
rename from groovy/gradle/test/unit/src/org/netbeans/modules/gradle/output/GradleProcessorFactoryTest.java
rename to extide/gradle/test/unit/src/org/netbeans/modules/gradle/output/GradleProcessorFactoryTest.java
diff --git a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/spi/GradleFilesTest.java b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/spi/GradleFilesTest.java
similarity index 100%
rename from groovy/gradle/test/unit/src/org/netbeans/modules/gradle/spi/GradleFilesTest.java
rename to extide/gradle/test/unit/src/org/netbeans/modules/gradle/spi/GradleFilesTest.java
diff --git a/groovy/libs.gradle/build.xml b/extide/libs.gradle/build.xml
similarity index 94%
rename from groovy/libs.gradle/build.xml
rename to extide/libs.gradle/build.xml
index 0ee2bfc..9ab7b9f 100644
--- a/groovy/libs.gradle/build.xml
+++ b/extide/libs.gradle/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project basedir="." default="build" name="groovy/libs.gradle">
+<project basedir="." default="build" name="extide/libs.gradle">
<description>Builds, tests, and runs the project org.netbeans.modules.libs.gradle</description>
<import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/groovy/libs.gradle/external/binaries-list b/extide/libs.gradle/external/binaries-list
similarity index 100%
rename from groovy/libs.gradle/external/binaries-list
rename to extide/libs.gradle/external/binaries-list
diff --git a/groovy/libs.gradle/external/gradle-tooling-api-6.3-license.txt b/extide/libs.gradle/external/gradle-tooling-api-6.3-license.txt
similarity index 100%
rename from groovy/libs.gradle/external/gradle-tooling-api-6.3-license.txt
rename to extide/libs.gradle/external/gradle-tooling-api-6.3-license.txt
diff --git a/groovy/libs.gradle/external/gradle-tooling-api-6.3-notice.txt b/extide/libs.gradle/external/gradle-tooling-api-6.3-notice.txt
similarity index 100%
rename from groovy/libs.gradle/external/gradle-tooling-api-6.3-notice.txt
rename to extide/libs.gradle/external/gradle-tooling-api-6.3-notice.txt
diff --git a/groovy/libs.gradle/manifest.mf b/extide/libs.gradle/manifest.mf
similarity index 100%
rename from groovy/libs.gradle/manifest.mf
rename to extide/libs.gradle/manifest.mf
diff --git a/groovy/libs.gradle/nbproject/project.properties b/extide/libs.gradle/nbproject/project.properties
similarity index 100%
rename from groovy/libs.gradle/nbproject/project.properties
rename to extide/libs.gradle/nbproject/project.properties
diff --git a/groovy/libs.gradle/nbproject/project.xml b/extide/libs.gradle/nbproject/project.xml
similarity index 100%
rename from groovy/libs.gradle/nbproject/project.xml
rename to extide/libs.gradle/nbproject/project.xml
diff --git a/groovy/libs.gradle/src/org/netbeans/modules/libs/gradle/Bundle.properties b/extide/libs.gradle/src/org/netbeans/modules/libs/gradle/Bundle.properties
similarity index 100%
rename from groovy/libs.gradle/src/org/netbeans/modules/libs/gradle/Bundle.properties
rename to extide/libs.gradle/src/org/netbeans/modules/libs/gradle/Bundle.properties
diff --git a/groovy/groovy.and.gradle.kit/build.xml b/groovy/groovy.and.gradle.kit/build.xml
deleted file mode 100644
index 362180e..0000000
--- a/groovy/groovy.and.gradle.kit/build.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project basedir="." default="build" name="groovy/groovy.and.gradle.kit">
- <description>Builds, tests, and runs the project org.netbeans.modules.groovy.kit</description>
- <import file="../../nbbuild/templates/projectized.xml"/>
-
-</project>
diff --git a/groovy/groovy.and.gradle.kit/manifest.mf b/groovy/groovy.and.gradle.kit/manifest.mf
deleted file mode 100644
index d3c1a3a..0000000
--- a/groovy/groovy.and.gradle.kit/manifest.mf
+++ /dev/null
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.netbeans.modules.groovy.and.gradle.kit
-OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/and/gradle/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.5
-
diff --git a/groovy/groovy.and.gradle.kit/nbproject/project.properties b/groovy/groovy.and.gradle.kit/nbproject/project.properties
deleted file mode 100644
index 741e205..0000000
--- a/groovy/groovy.and.gradle.kit/nbproject/project.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.8
-
-nbm.homepage=http://wiki.netbeans.org/groovy
-nbm.module.author=Martin Adamek, Petr Hejl, Martin Janicek, Matthias Schmidt
-
-test.config.stable.includes=\
- **/*Test.class
diff --git a/groovy/groovy.and.gradle.kit/nbproject/project.xml b/groovy/groovy.and.gradle.kit/nbproject/project.xml
deleted file mode 100644
index db482e4..0000000
--- a/groovy/groovy.and.gradle.kit/nbproject/project.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.apisupport.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
- <code-name-base>org.netbeans.modules.groovy.and.gradle.kit</code-name-base>
- <module-dependencies>
- <dependency>
- <code-name-base>org.netbeans.modules.groovy.kit</code-name-base>
- <run-dependency>
- <specification-version>1.36</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.gradle.kit</code-name-base>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- </module-dependencies>
- <test-dependencies>
- </test-dependencies>
- <public-packages/>
- </data>
- </configuration>
-</project>
diff --git a/groovy/groovy.and.gradle.kit/src/org/netbeans/modules/groovy/and/gradle/kit/Bundle.properties b/groovy/groovy.and.gradle.kit/src/org/netbeans/modules/groovy/and/gradle/kit/Bundle.properties
deleted file mode 100644
index d5dc5f5..0000000
--- a/groovy/groovy.and.gradle.kit/src/org/netbeans/modules/groovy/and/gradle/kit/Bundle.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-OpenIDE-Module-Display-Category=Groovy
-OpenIDE-Module-Long-Description=\
- This module provides all Groovy and Gradle functionality available in NetBeans. \
- This module is wrapper for Groovy and Gradle features.
-OpenIDE-Module-Name=Groovy and Gradle
-OpenIDE-Module-Short-Description=Wrapper module for all Groovy and Gradle functionality
diff --git a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/layer.xml b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/layer.xml
index 613f0d5..395b1c7 100644
--- a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/layer.xml
+++ b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/layer.xml
@@ -30,6 +30,18 @@
</folder>
</folder>
+ <folder name="CslPlugins">
+ <folder name="text">
+ <folder name="x-gradle+x-groovy">
+ <file name="language.instance">
+ <attr name="instanceClass" stringvalue="org.netbeans.modules.groovy.editor.api.parser.GroovyLanguage"/>
+ </file>
+ <attr intvalue="2" name="genver"/>
+ <attr boolvalue="true" name="useMultiview"/>
+ </folder>
+ </folder>
+ </folder>
+
<folder name="csl-hints">
<folder name="text">
<folder name="x-groovy">
@@ -112,6 +124,13 @@
</file>
</folder>
+ <folder name="x-gradle+x-groovy">
+ <file name="org-netbeans-modules-csl-core-GsfParserFactory-create.instance">
+ <attr name="position" intvalue="100"/>
+ <attr methodvalue="org.netbeans.modules.csl.core.GsfParserFactory.create" name="instanceCreate"/>
+ <attr name="instanceOf" stringvalue="org.netbeans.modules.parsing.spi.ParserFactory"/>
+ </file>
+ </folder>
</folder>
</folder>
diff --git a/groovy/gradle.htmlui/build.xml b/java/gradle.htmlui/build.xml
similarity index 93%
rename from groovy/gradle.htmlui/build.xml
rename to java/gradle.htmlui/build.xml
index 13efd8f..30a3b3f 100644
--- a/groovy/gradle.htmlui/build.xml
+++ b/java/gradle.htmlui/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project basedir="." default="netbeans" name="groovy/gradle.htmlui">
+<project basedir="." default="netbeans" name="java/gradle.htmlui">
<description>Builds, tests, and runs the project org.netbeans.modules.gradle.htmlui</description>
<import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/groovy/gradle.htmlui/manifest.mf b/java/gradle.htmlui/manifest.mf
similarity index 100%
rename from groovy/gradle.htmlui/manifest.mf
rename to java/gradle.htmlui/manifest.mf
diff --git a/groovy/gradle.htmlui/nbproject/project.properties b/java/gradle.htmlui/nbproject/project.properties
similarity index 98%
rename from groovy/gradle.htmlui/nbproject/project.properties
rename to java/gradle.htmlui/nbproject/project.properties
index 5137752..f32081d 100644
--- a/groovy/gradle.htmlui/nbproject/project.properties
+++ b/java/gradle.htmlui/nbproject/project.properties
@@ -17,3 +17,4 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
+is.eager=true
diff --git a/groovy/gradle.htmlui/nbproject/project.xml b/java/gradle.htmlui/nbproject/project.xml
similarity index 100%
rename from groovy/gradle.htmlui/nbproject/project.xml
rename to java/gradle.htmlui/nbproject/project.xml
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/Bundle.properties b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/Bundle.properties
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/Bundle.properties
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/Bundle.properties
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/DukeHTML.png b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/DukeHTML.png
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/DukeHTML.png
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/DukeHTML.png
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/GradleArchetype.java b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/GradleArchetype.java
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/GradleArchetype.java
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/GradleArchetype.java
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/HtmlJavaApplicationProjectWizard.java b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/HtmlJavaApplicationProjectWizard.java
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/HtmlJavaApplicationProjectWizard.java
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/HtmlJavaApplicationProjectWizard.java
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/description.html b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/description.html
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/description.html
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/description.html
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/app_build.gradle.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/app_build.gradle.fmk
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/app_build.gradle.fmk
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/app_build.gradle.fmk
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/app_src_main_AndroidManifest.xml.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/app_src_main_AndroidManifest.xml.fmk
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/app_src_main_AndroidManifest.xml.fmk
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/app_src_main_AndroidManifest.xml.fmk
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_src_main_java_DesktopMain.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_src_main_java_DesktopMain.fmk
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_src_main_java_DesktopMain.fmk
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_src_main_java_DesktopMain.fmk
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/gradle.properties.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/gradle.properties.fmk
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/gradle.properties.fmk
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/gradle.properties.fmk
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/root_build.gradle.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/root_build.gradle.fmk
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/root_build.gradle.fmk
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/root_build.gradle.fmk
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/settings.gradle.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/settings.gradle.fmk
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/settings.gradle.fmk
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/settings.gradle.fmk
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_java_Demo.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_java_Demo.fmk
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_java_Demo.fmk
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_java_Demo.fmk
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_webapp_pages_index.css.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_webapp_pages_index.css.fmk
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_webapp_pages_index.css.fmk
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_webapp_pages_index.css.fmk
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_webapp_pages_index.html.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_webapp_pages_index.html.fmk
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_webapp_pages_index.html.fmk
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_webapp_pages_index.html.fmk
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
diff --git a/groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_src_main_java_BrowserMain.fmk b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_src_main_java_BrowserMain.fmk
similarity index 100%
rename from groovy/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_src_main_java_BrowserMain.fmk
rename to java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_src_main_java_BrowserMain.fmk
diff --git a/groovy/gradle.htmlui/test/unit/src/org/netbeans/modules/gradle/htmlui/CreateArchetypeTest.java b/java/gradle.htmlui/test/unit/src/org/netbeans/modules/gradle/htmlui/CreateArchetypeTest.java
similarity index 100%
rename from groovy/gradle.htmlui/test/unit/src/org/netbeans/modules/gradle/htmlui/CreateArchetypeTest.java
rename to java/gradle.htmlui/test/unit/src/org/netbeans/modules/gradle/htmlui/CreateArchetypeTest.java
diff --git a/groovy/gradle.java.coverage/build.xml b/java/gradle.java.coverage/build.xml
similarity index 93%
rename from groovy/gradle.java.coverage/build.xml
rename to java/gradle.java.coverage/build.xml
index 29bd60a..d36cd6d 100644
--- a/groovy/gradle.java.coverage/build.xml
+++ b/java/gradle.java.coverage/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project name="groovy/gradle.java.coverage" default="build" basedir=".">
+<project name="java/gradle.java.coverage" default="build" basedir=".">
<description>Builds, tests, and runs the project org.netbeans.modules.gradle.java.coverage</description>
<import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/groovy/gradle.java.coverage/external/binaries-list b/java/gradle.java.coverage/external/binaries-list
similarity index 100%
rename from groovy/gradle.java.coverage/external/binaries-list
rename to java/gradle.java.coverage/external/binaries-list
diff --git a/groovy/gradle.java.coverage/external/org.jacoco.core-0.8.5-license.txt b/java/gradle.java.coverage/external/org.jacoco.core-0.8.5-license.txt
similarity index 100%
rename from groovy/gradle.java.coverage/external/org.jacoco.core-0.8.5-license.txt
rename to java/gradle.java.coverage/external/org.jacoco.core-0.8.5-license.txt
diff --git a/groovy/gradle.java.coverage/external/org.jacoco.core-0.8.5-notice.txt b/java/gradle.java.coverage/external/org.jacoco.core-0.8.5-notice.txt
similarity index 100%
rename from groovy/gradle.java.coverage/external/org.jacoco.core-0.8.5-notice.txt
rename to java/gradle.java.coverage/external/org.jacoco.core-0.8.5-notice.txt
diff --git a/groovy/gradle.java.coverage/manifest.mf b/java/gradle.java.coverage/manifest.mf
similarity index 100%
rename from groovy/gradle.java.coverage/manifest.mf
rename to java/gradle.java.coverage/manifest.mf
diff --git a/groovy/gradle.java.coverage/nbproject/project.properties b/java/gradle.java.coverage/nbproject/project.properties
similarity index 98%
rename from groovy/gradle.java.coverage/nbproject/project.properties
rename to java/gradle.java.coverage/nbproject/project.properties
index d1a647d..a94a5bd 100644
--- a/groovy/gradle.java.coverage/nbproject/project.properties
+++ b/java/gradle.java.coverage/nbproject/project.properties
@@ -18,6 +18,7 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
nbm.module.author=Laszlo Kishalmi
+is.eager=true
test-unit-sys-prop.test.netbeans.dest.dir=${netbeans.dest.dir}
test-unit-sys-prop.java.awt.headless=true
diff --git a/groovy/gradle.java.coverage/nbproject/project.xml b/java/gradle.java.coverage/nbproject/project.xml
similarity index 100%
rename from groovy/gradle.java.coverage/nbproject/project.xml
rename to java/gradle.java.coverage/nbproject/project.xml
diff --git a/groovy/gradle.java.coverage/src/org/netbeans/modules/gradle/java/coverage/Bundle.properties b/java/gradle.java.coverage/src/org/netbeans/modules/gradle/java/coverage/Bundle.properties
similarity index 100%
rename from groovy/gradle.java.coverage/src/org/netbeans/modules/gradle/java/coverage/Bundle.properties
rename to java/gradle.java.coverage/src/org/netbeans/modules/gradle/java/coverage/Bundle.properties
diff --git a/groovy/gradle.java.coverage/src/org/netbeans/modules/gradle/java/coverage/CoveragePopup.java b/java/gradle.java.coverage/src/org/netbeans/modules/gradle/java/coverage/CoveragePopup.java
similarity index 100%
rename from groovy/gradle.java.coverage/src/org/netbeans/modules/gradle/java/coverage/CoveragePopup.java
rename to java/gradle.java.coverage/src/org/netbeans/modules/gradle/java/coverage/CoveragePopup.java
diff --git a/groovy/gradle.java.coverage/src/org/netbeans/modules/gradle/java/coverage/GradleCoverageProvider.java b/java/gradle.java.coverage/src/org/netbeans/modules/gradle/java/coverage/GradleCoverageProvider.java
similarity index 100%
rename from groovy/gradle.java.coverage/src/org/netbeans/modules/gradle/java/coverage/GradleCoverageProvider.java
rename to java/gradle.java.coverage/src/org/netbeans/modules/gradle/java/coverage/GradleCoverageProvider.java
diff --git a/groovy/gradle.java/apichanges.xml b/java/gradle.java/apichanges.xml
similarity index 100%
rename from groovy/gradle.java/apichanges.xml
rename to java/gradle.java/apichanges.xml
diff --git a/groovy/gradle.java/arch.xml b/java/gradle.java/arch.xml
similarity index 100%
rename from groovy/gradle.java/arch.xml
rename to java/gradle.java/arch.xml
diff --git a/groovy/gradle.java/build.xml b/java/gradle.java/build.xml
similarity index 94%
rename from groovy/gradle.java/build.xml
rename to java/gradle.java/build.xml
index 6fc1838..d382909 100644
--- a/groovy/gradle.java/build.xml
+++ b/java/gradle.java/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project name="groovy/gradle.java" default="build" basedir=".">
+<project name="java/gradle.java" default="build" basedir=".">
<description>Builds, tests, and runs the project org.netbeans.modules.gradle.java.</description>
<import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/groovy/gradle.java/licenseinfo.xml b/java/gradle.java/licenseinfo.xml
similarity index 100%
rename from groovy/gradle.java/licenseinfo.xml
rename to java/gradle.java/licenseinfo.xml
diff --git a/groovy/gradle.java/manifest.mf b/java/gradle.java/manifest.mf
similarity index 100%
rename from groovy/gradle.java/manifest.mf
rename to java/gradle.java/manifest.mf
diff --git a/groovy/gradle.java/nbproject/org-netbeans-modules-gradle-java.sig b/java/gradle.java/nbproject/org-netbeans-modules-gradle-java.sig
similarity index 100%
rename from groovy/gradle.java/nbproject/org-netbeans-modules-gradle-java.sig
rename to java/gradle.java/nbproject/org-netbeans-modules-gradle-java.sig
diff --git a/groovy/gradle.java/nbproject/project.properties b/java/gradle.java/nbproject/project.properties
similarity index 100%
rename from groovy/gradle.java/nbproject/project.properties
rename to java/gradle.java/nbproject/project.properties
diff --git a/groovy/gradle.java/nbproject/project.xml b/java/gradle.java/nbproject/project.xml
similarity index 100%
rename from groovy/gradle.java/nbproject/project.xml
rename to java/gradle.java/nbproject/project.xml
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/Bundle.properties b/java/gradle.java/src/org/netbeans/modules/gradle/java/Bundle.properties
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/Bundle.properties
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/Bundle.properties
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaDebuggerImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaDebuggerImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaDebuggerImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaDebuggerImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaSEProjectIconProvider.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/JavaSEProjectIconProvider.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaSEProjectIconProvider.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/JavaSEProjectIconProvider.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/RecommendedPrivilegedTemplatesImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/RecommendedPrivilegedTemplatesImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/RecommendedPrivilegedTemplatesImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/RecommendedPrivilegedTemplatesImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/SourceGroupResourceWatchList.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/SourceGroupResourceWatchList.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/SourceGroupResourceWatchList.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/SourceGroupResourceWatchList.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/action-mapping.xml b/java/gradle.java/src/org/netbeans/modules/gradle/java/action-mapping.xml
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/action-mapping.xml
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/action-mapping.xml
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/api/GradleJavaProject.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/api/GradleJavaProject.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/api/GradleJavaProject.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/api/GradleJavaProject.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/api/GradleJavaProjectBuilder.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/api/GradleJavaProjectBuilder.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/api/GradleJavaProjectBuilder.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/api/GradleJavaProjectBuilder.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/api/GradleJavaSourceSet.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/api/GradleJavaSourceSet.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/api/GradleJavaSourceSet.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/api/GradleJavaSourceSet.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/api/ProjectSourcesClassPathProvider.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/api/ProjectSourcesClassPathProvider.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/api/ProjectSourcesClassPathProvider.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/api/ProjectSourcesClassPathProvider.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/api/output/Location.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/api/output/Location.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/api/output/Location.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/api/output/Location.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/api/output/LocationOpener.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/api/output/LocationOpener.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/api/output/LocationOpener.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/api/output/LocationOpener.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractGradleClassPathImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractGradleClassPathImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractGradleClassPathImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractGradleClassPathImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractSourceSetClassPathImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractSourceSetClassPathImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractSourceSetClassPathImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractSourceSetClassPathImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/BootClassPathImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/BootClassPathImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/BootClassPathImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/BootClassPathImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/ClassPathProviderImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/ClassPathProviderImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/ClassPathProviderImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/ClassPathProviderImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/CompileClassPathImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/CompileClassPathImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/CompileClassPathImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/CompileClassPathImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GlobalClassPathProviderImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GlobalClassPathProviderImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GlobalClassPathProviderImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GlobalClassPathProviderImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GradleGlobalClassPathImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GradleGlobalClassPathImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GradleGlobalClassPathImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GradleGlobalClassPathImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GradleSourcesImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GradleSourcesImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GradleSourcesImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GradleSourcesImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/RuntimeClassPathImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/RuntimeClassPathImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/RuntimeClassPathImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/RuntimeClassPathImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/SourceClassPathImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/SourceClassPathImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/SourceClassPathImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/SourceClassPathImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/customizer/Bundle.properties b/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/Bundle.properties
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/customizer/Bundle.properties
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/Bundle.properties
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.form b/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.form
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.form
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.form
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourceSetPanel.form b/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourceSetPanel.form
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourceSetPanel.form
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourceSetPanel.form
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourceSetPanel.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourceSetPanel.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourceSetPanel.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourceSetPanel.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourcesPanel.form b/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourcesPanel.form
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourcesPanel.form
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourcesPanel.form
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourcesPanel.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourcesPanel.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourcesPanel.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/SourcesPanel.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/execute/DebugFixHooks.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/execute/DebugFixHooks.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/execute/DebugFixHooks.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/execute/DebugFixHooks.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/execute/ShowJavadocHook.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/execute/ShowJavadocHook.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/execute/ShowJavadocHook.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/execute/ShowJavadocHook.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/layer.xml b/java/gradle.java/src/org/netbeans/modules/gradle/java/layer.xml
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/layer.xml
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/layer.xml
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/Bundle.properties b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/Bundle.properties
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/Bundle.properties
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/Bundle.properties
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/MainClassPanel.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/MainClassPanel.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/MainClassPanel.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/MainClassPanel.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/MainClassPanelVisual.form b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/MainClassPanelVisual.form
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/MainClassPanelVisual.form
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/MainClassPanelVisual.form
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/MainClassPanelVisual.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/MainClassPanelVisual.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/MainClassPanelVisual.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/MainClassPanelVisual.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationDescription.html b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationDescription.html
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationDescription.html
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationDescription.html
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleLibraryDescription.html b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleLibraryDescription.html
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleLibraryDescription.html
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleLibraryDescription.html
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleLibraryProjectWizard.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleLibraryProjectWizard.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleLibraryProjectWizard.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleLibraryProjectWizard.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/nodes/BootCPNodeFactory.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/nodes/BootCPNodeFactory.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/nodes/BootCPNodeFactory.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/nodes/BootCPNodeFactory.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/nodes/LibrariesSourceGroup.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/nodes/LibrariesSourceGroup.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/nodes/LibrariesSourceGroup.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/nodes/LibrariesSourceGroup.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/nodes/PathFinders.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/nodes/PathFinders.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/nodes/PathFinders.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/nodes/PathFinders.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/nodes/SourcesNodeFactory.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/nodes/SourcesNodeFactory.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/nodes/SourcesNodeFactory.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/nodes/SourcesNodeFactory.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/output/GatlingReportProcessorFactory.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/output/GatlingReportProcessorFactory.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/output/GatlingReportProcessorFactory.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/output/GatlingReportProcessorFactory.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/output/JDPAProcessorFactory.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/output/JDPAProcessorFactory.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/output/JDPAProcessorFactory.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/output/JDPAProcessorFactory.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactory.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactory.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactory.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactory.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/FileBuiltQueryImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/FileBuiltQueryImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/FileBuiltQueryImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/queries/FileBuiltQueryImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleAnnotationProcessorQueryImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleAnnotationProcessorQueryImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleAnnotationProcessorQueryImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleAnnotationProcessorQueryImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleBinaryForSource.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleBinaryForSource.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleBinaryForSource.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleBinaryForSource.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleCompilerOptionsQuery.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleCompilerOptionsQuery.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleCompilerOptionsQuery.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleCompilerOptionsQuery.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleFileLocator.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleFileLocator.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleFileLocator.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleFileLocator.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleSourceForBinary.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleSourceForBinary.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleSourceForBinary.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleSourceForBinary.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleSourceForRepository.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleSourceForRepository.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleSourceForRepository.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleSourceForRepository.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleSourceLevelImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleSourceLevelImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleSourceLevelImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleSourceLevelImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleTestForSourceImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleTestForSourceImpl.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleTestForSourceImpl.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleTestForSourceImpl.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/OpenGradleProjectForBinary.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/OpenGradleProjectForBinary.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/OpenGradleProjectForBinary.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/queries/OpenGradleProjectForBinary.java
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/application-badge.png b/java/gradle.java/src/org/netbeans/modules/gradle/java/resources/application-badge.png
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/application-badge.png
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/resources/application-badge.png
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon.png b/java/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon.png
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon.png
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon.png
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon_dark.png b/java/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon_dark.png
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon_dark.png
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon_dark.png
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/libraries-badge.png b/java/gradle.java/src/org/netbeans/modules/gradle/java/resources/libraries-badge.png
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/libraries-badge.png
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/resources/libraries-badge.png
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/spi/debug/GradleJavaDebugger.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/spi/debug/GradleJavaDebugger.java
similarity index 100%
rename from groovy/gradle.java/src/org/netbeans/modules/gradle/java/spi/debug/GradleJavaDebugger.java
rename to java/gradle.java/src/org/netbeans/modules/gradle/java/spi/debug/GradleJavaDebugger.java
diff --git a/groovy/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/AbstractGradleJavaTestCase.java b/java/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/AbstractGradleJavaTestCase.java
similarity index 100%
rename from groovy/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/AbstractGradleJavaTestCase.java
rename to java/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/AbstractGradleJavaTestCase.java
diff --git a/groovy/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/classpath/ClassPathProviderImplTest.java b/java/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/classpath/ClassPathProviderImplTest.java
similarity index 100%
rename from groovy/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/classpath/ClassPathProviderImplTest.java
rename to java/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/classpath/ClassPathProviderImplTest.java
diff --git a/groovy/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/classpath/GradleSourcesImplTest.java b/java/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/classpath/GradleSourcesImplTest.java
similarity index 100%
rename from groovy/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/classpath/GradleSourcesImplTest.java
rename to java/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/classpath/GradleSourcesImplTest.java
diff --git a/groovy/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactoryTest.java b/java/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactoryTest.java
similarity index 100%
rename from groovy/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactoryTest.java
rename to java/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactoryTest.java
diff --git a/groovy/gradle.kit/build.xml b/java/gradle.kit/build.xml
similarity index 94%
rename from groovy/gradle.kit/build.xml
rename to java/gradle.kit/build.xml
index 1bbbf81..d20bed6 100644
--- a/groovy/gradle.kit/build.xml
+++ b/java/gradle.kit/build.xml
@@ -20,7 +20,7 @@
-->
-<project basedir="." default="build" name="groovy/gradle.kit">
+<project basedir="." default="build" name="java/gradle.kit">
<description>Builds, tests, and runs the project org.netbeans.modules.gradle.kit</description>
<import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/groovy/gradle.kit/manifest.mf b/java/gradle.kit/manifest.mf
similarity index 100%
rename from groovy/gradle.kit/manifest.mf
rename to java/gradle.kit/manifest.mf
diff --git a/groovy/gradle.kit/nbproject/project.properties b/java/gradle.kit/nbproject/project.properties
similarity index 100%
rename from groovy/gradle.kit/nbproject/project.properties
rename to java/gradle.kit/nbproject/project.properties
diff --git a/groovy/gradle.kit/nbproject/project.xml b/java/gradle.kit/nbproject/project.xml
similarity index 100%
rename from groovy/gradle.kit/nbproject/project.xml
rename to java/gradle.kit/nbproject/project.xml
diff --git a/groovy/gradle.kit/src/org/netbeans/modules/gradle/feature/Bundle.properties b/java/gradle.kit/src/org/netbeans/modules/gradle/feature/Bundle.properties
similarity index 100%
rename from groovy/gradle.kit/src/org/netbeans/modules/gradle/feature/Bundle.properties
rename to java/gradle.kit/src/org/netbeans/modules/gradle/feature/Bundle.properties
diff --git a/groovy/gradle.persistence/build.xml b/java/gradle.persistence/build.xml
similarity index 93%
rename from groovy/gradle.persistence/build.xml
rename to java/gradle.persistence/build.xml
index 2102381..9d9cf2c 100644
--- a/groovy/gradle.persistence/build.xml
+++ b/java/gradle.persistence/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project name="groovy/gradle.persistence" default="build" basedir=".">
+<project name="java/gradle.persistence" default="build" basedir=".">
<description>Builds, tests, and runs the project org.netbeans.modules.gradle.persistence.</description>
<import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/groovy/gradle.persistence/manifest.mf b/java/gradle.persistence/manifest.mf
similarity index 100%
rename from groovy/gradle.persistence/manifest.mf
rename to java/gradle.persistence/manifest.mf
diff --git a/groovy/gradle.test/nbproject/project.properties b/java/gradle.persistence/nbproject/project.properties
similarity index 100%
rename from groovy/gradle.test/nbproject/project.properties
rename to java/gradle.persistence/nbproject/project.properties
diff --git a/groovy/gradle.persistence/nbproject/project.xml b/java/gradle.persistence/nbproject/project.xml
similarity index 100%
rename from groovy/gradle.persistence/nbproject/project.xml
rename to java/gradle.persistence/nbproject/project.xml
diff --git a/groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/Bundle.properties b/java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/Bundle.properties
similarity index 100%
rename from groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/Bundle.properties
rename to java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/Bundle.properties
diff --git a/groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/EntityClassScopeProviderImpl.java b/java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/EntityClassScopeProviderImpl.java
similarity index 100%
rename from groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/EntityClassScopeProviderImpl.java
rename to java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/EntityClassScopeProviderImpl.java
diff --git a/groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/GradlePersistenceProvider.java b/java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/GradlePersistenceProvider.java
similarity index 100%
rename from groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/GradlePersistenceProvider.java
rename to java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/GradlePersistenceProvider.java
diff --git a/groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceLocationProviderImpl.java b/java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceLocationProviderImpl.java
similarity index 100%
rename from groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceLocationProviderImpl.java
rename to java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceLocationProviderImpl.java
diff --git a/groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceScopeImpl.java b/java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceScopeImpl.java
similarity index 100%
rename from groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceScopeImpl.java
rename to java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceScopeImpl.java
diff --git a/groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceScopeProviderImpl.java b/java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceScopeProviderImpl.java
similarity index 100%
rename from groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceScopeProviderImpl.java
rename to java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceScopeProviderImpl.java
diff --git a/groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceScopesProviderImpl.java b/java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceScopesProviderImpl.java
similarity index 100%
rename from groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceScopesProviderImpl.java
rename to java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/PersistenceScopesProviderImpl.java
diff --git a/groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/RecommendedTemplatesImpl.java b/java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/RecommendedTemplatesImpl.java
similarity index 100%
rename from groovy/gradle.persistence/src/org/netbeans/modules/gradle/persistence/RecommendedTemplatesImpl.java
rename to java/gradle.persistence/src/org/netbeans/modules/gradle/persistence/RecommendedTemplatesImpl.java
diff --git a/groovy/gradle.spring/build.xml b/java/gradle.spring/build.xml
similarity index 94%
rename from groovy/gradle.spring/build.xml
rename to java/gradle.spring/build.xml
index 53bc1dd..cfd8cd3 100644
--- a/groovy/gradle.spring/build.xml
+++ b/java/gradle.spring/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project name="groovy/gradle.spring" default="build" basedir=".">
+<project name="java/gradle.spring" default="build" basedir=".">
<description>Builds, tests, and runs the project org.netbeans.modules.gradle.spring.</description>
<import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/groovy/gradle.spring/manifest.mf b/java/gradle.spring/manifest.mf
similarity index 100%
rename from groovy/gradle.spring/manifest.mf
rename to java/gradle.spring/manifest.mf
diff --git a/groovy/gradle.spring/nbproject/project.properties b/java/gradle.spring/nbproject/project.properties
similarity index 100%
rename from groovy/gradle.spring/nbproject/project.properties
rename to java/gradle.spring/nbproject/project.properties
diff --git a/groovy/gradle.spring/nbproject/project.xml b/java/gradle.spring/nbproject/project.xml
similarity index 100%
rename from groovy/gradle.spring/nbproject/project.xml
rename to java/gradle.spring/nbproject/project.xml
diff --git a/groovy/gradle.spring/src/org/netbeans/modules/gradle/spring/Bundle.properties b/java/gradle.spring/src/org/netbeans/modules/gradle/spring/Bundle.properties
similarity index 100%
rename from groovy/gradle.spring/src/org/netbeans/modules/gradle/spring/Bundle.properties
rename to java/gradle.spring/src/org/netbeans/modules/gradle/spring/Bundle.properties
diff --git a/groovy/gradle.spring/src/org/netbeans/modules/gradle/spring/GradleSpringConfigProvider.java b/java/gradle.spring/src/org/netbeans/modules/gradle/spring/GradleSpringConfigProvider.java
similarity index 100%
rename from groovy/gradle.spring/src/org/netbeans/modules/gradle/spring/GradleSpringConfigProvider.java
rename to java/gradle.spring/src/org/netbeans/modules/gradle/spring/GradleSpringConfigProvider.java
diff --git a/groovy/gradle.spring/src/org/netbeans/modules/gradle/spring/RecommendedTemplatesImpl.java b/java/gradle.spring/src/org/netbeans/modules/gradle/spring/RecommendedTemplatesImpl.java
similarity index 100%
rename from groovy/gradle.spring/src/org/netbeans/modules/gradle/spring/RecommendedTemplatesImpl.java
rename to java/gradle.spring/src/org/netbeans/modules/gradle/spring/RecommendedTemplatesImpl.java
diff --git a/groovy/gradle.spring/src/org/netbeans/modules/gradle/spring/SpringActionProvider.java b/java/gradle.spring/src/org/netbeans/modules/gradle/spring/SpringActionProvider.java
similarity index 100%
rename from groovy/gradle.spring/src/org/netbeans/modules/gradle/spring/SpringActionProvider.java
rename to java/gradle.spring/src/org/netbeans/modules/gradle/spring/SpringActionProvider.java
diff --git a/groovy/gradle.spring/src/org/netbeans/modules/gradle/spring/action-mapping.xml b/java/gradle.spring/src/org/netbeans/modules/gradle/spring/action-mapping.xml
similarity index 100%
rename from groovy/gradle.spring/src/org/netbeans/modules/gradle/spring/action-mapping.xml
rename to java/gradle.spring/src/org/netbeans/modules/gradle/spring/action-mapping.xml
diff --git a/groovy/gradle.spring/src/org/netbeans/modules/gradle/spring/layer.xml b/java/gradle.spring/src/org/netbeans/modules/gradle/spring/layer.xml
similarity index 100%
rename from groovy/gradle.spring/src/org/netbeans/modules/gradle/spring/layer.xml
rename to java/gradle.spring/src/org/netbeans/modules/gradle/spring/layer.xml
diff --git a/groovy/gradle.test/build.xml b/java/gradle.test/build.xml
similarity index 94%
rename from groovy/gradle.test/build.xml
rename to java/gradle.test/build.xml
index 7eea6be..bf59ba4 100644
--- a/groovy/gradle.test/build.xml
+++ b/java/gradle.test/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project name="groovy/gradle.test" default="build" basedir=".">
+<project name="java/gradle.test" default="build" basedir=".">
<description>Builds, tests, and runs the project org.netbeans.modules.gradle.test.</description>
<import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/groovy/gradle.test/manifest.mf b/java/gradle.test/manifest.mf
similarity index 100%
rename from groovy/gradle.test/manifest.mf
rename to java/gradle.test/manifest.mf
diff --git a/groovy/gradle.persistence/nbproject/project.properties b/java/gradle.test/nbproject/project.properties
similarity index 100%
rename from groovy/gradle.persistence/nbproject/project.properties
rename to java/gradle.test/nbproject/project.properties
diff --git a/groovy/gradle.test/nbproject/project.xml b/java/gradle.test/nbproject/project.xml
similarity index 100%
rename from groovy/gradle.test/nbproject/project.xml
rename to java/gradle.test/nbproject/project.xml
diff --git a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/Bundle.properties b/java/gradle.test/src/org/netbeans/modules/gradle/test/Bundle.properties
similarity index 100%
rename from groovy/gradle.test/src/org/netbeans/modules/gradle/test/Bundle.properties
rename to java/gradle.test/src/org/netbeans/modules/gradle/test/Bundle.properties
diff --git a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java b/java/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java
similarity index 100%
rename from groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java
rename to java/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java
diff --git a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestSuite.java b/java/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestSuite.java
similarity index 100%
rename from groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestSuite.java
rename to java/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestSuite.java
diff --git a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestcase.java b/java/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestcase.java
similarity index 100%
rename from groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestcase.java
rename to java/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestcase.java
diff --git a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/ui/GradleJUnitManagerProvider.java b/java/gradle.test/src/org/netbeans/modules/gradle/test/ui/GradleJUnitManagerProvider.java
similarity index 100%
rename from groovy/gradle.test/src/org/netbeans/modules/gradle/test/ui/GradleJUnitManagerProvider.java
rename to java/gradle.test/src/org/netbeans/modules/gradle/test/ui/GradleJUnitManagerProvider.java
diff --git a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/ui/GradleTestRunnerNodeFactory.java b/java/gradle.test/src/org/netbeans/modules/gradle/test/ui/GradleTestRunnerNodeFactory.java
similarity index 100%
rename from groovy/gradle.test/src/org/netbeans/modules/gradle/test/ui/GradleTestRunnerNodeFactory.java
rename to java/gradle.test/src/org/netbeans/modules/gradle/test/ui/GradleTestRunnerNodeFactory.java
diff --git a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/ui/nodes/GradleJUnitNodeOpener.java b/java/gradle.test/src/org/netbeans/modules/gradle/test/ui/nodes/GradleJUnitNodeOpener.java
similarity index 100%
rename from groovy/gradle.test/src/org/netbeans/modules/gradle/test/ui/nodes/GradleJUnitNodeOpener.java
rename to java/gradle.test/src/org/netbeans/modules/gradle/test/ui/nodes/GradleJUnitNodeOpener.java
diff --git a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/ui/nodes/GradleTestMethodNode.java b/java/gradle.test/src/org/netbeans/modules/gradle/test/ui/nodes/GradleTestMethodNode.java
similarity index 100%
rename from groovy/gradle.test/src/org/netbeans/modules/gradle/test/ui/nodes/GradleTestMethodNode.java
rename to java/gradle.test/src/org/netbeans/modules/gradle/test/ui/nodes/GradleTestMethodNode.java
diff --git a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/ui/nodes/ReRunTestAction.java b/java/gradle.test/src/org/netbeans/modules/gradle/test/ui/nodes/ReRunTestAction.java
similarity index 100%
rename from groovy/gradle.test/src/org/netbeans/modules/gradle/test/ui/nodes/ReRunTestAction.java
rename to java/gradle.test/src/org/netbeans/modules/gradle/test/ui/nodes/ReRunTestAction.java
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
index 6b14b53..df54e66 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
@@ -57,10 +57,10 @@ mobility.databindingme/lib/*
lib.terminalemulator/examples/lib.richexecution/process_start-*.zip
# Gradle Wrapper, used by the Gradle tooling build, but not distributed
-groovy/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.jar
+extide/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.jar
# Gradle NetBeans Tooling, built by Gradle, so it is not recognized
-groovy/gradle/release/modules/gradle/netbeans-gradle-tooling.jar
+extide/gradle/release/modules/gradle/netbeans-gradle-tooling.jar
# ide.launcher is a special semi-module, does not have nbproject/project.xml, so is not recognized:
nb/ide.launcher/external/launchers-10.0.zip
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
index 515c851..672771f 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -56,14 +56,14 @@ enterprise/web.core.syntax/external/struts-taglib-1.3.10.jar enterprise/web.stru
enterprise/web.core.syntax/external/struts-tiles-1.3.10.jar enterprise/web.struts/external/struts-tiles-1.3.10.jar
# gradle is used at build-time, so we can ignore the duplicates
-groovy/gradle/external/gradle-4.10.2-bin.zip ide/c.google.gson/external/gson-2.7.jar
-groovy/gradle/external/gradle-4.10.2-bin.zip ide/c.jcraft.jsch/external/jsch-0.1.54.jar
-groovy/gradle/external/gradle-4.10.2-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar
-groovy/gradle/external/gradle-4.10.2-bin.zip java/maven.embedder/external/apache-maven-3.6.3-bin.zip
-groovy/gradle/external/gradle-4.10.2-bin.zip platform/api.annotations.common/external/jsr305-3.0.2.jar
-groovy/gradle/external/gradle-4.10.2-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar
-groovy/gradle/external/gradle-4.10.2-bin.zip platform/libs.junit4/external/junit-4.12.jar
-groovy/gradle/external/gradle-4.10.2-bin.zip java/maven/external/aether-api-1.13.1.jar
+extide/gradle/external/gradle-4.10.2-bin.zip ide/c.google.gson/external/gson-2.7.jar
+extide/gradle/external/gradle-4.10.2-bin.zip ide/c.jcraft.jsch/external/jsch-0.1.54.jar
+extide/gradle/external/gradle-4.10.2-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar
+extide/gradle/external/gradle-4.10.2-bin.zip java/maven.embedder/external/apache-maven-3.6.3-bin.zip
+extide/gradle/external/gradle-4.10.2-bin.zip platform/api.annotations.common/external/jsr305-3.0.2.jar
+extide/gradle/external/gradle-4.10.2-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar
+extide/gradle/external/gradle-4.10.2-bin.zip platform/libs.junit4/external/junit-4.12.jar
+extide/gradle/external/gradle-4.10.2-bin.zip java/maven/external/aether-api-1.13.1.jar
# These are the endorsed version of the javaee apis and create libraries, so they are better kept separate
enterprise/javaee.api/external/javax.annotation-api-1.2.jar enterprise/javaee7.api/external/javax.annotation-api-1.2.jar
@@ -87,9 +87,9 @@ ide/derby/external/derby-10.14.2.0.jar ide/db.metadata.model/external/derby-10.1
ide/libs.antlr4.runtime/external/antlr4-runtime-4.7.2.jar java/debugger.jpda.truffle/external/antlr4-runtime-4.7.2.jar
# Amazon Beanstalk SDK has frequently changing dependencies, so they are better kept separate
-enterprise/libs.amazon/external/httpclient-4.5.5.jar groovy/gradle/external/gradle-4.10.2-bin.zip
-enterprise/libs.amazon/external/ion-java-1.0.2.jar groovy/gradle/external/gradle-4.10.2-bin.zip
-enterprise/libs.amazon/external/httpcore-4.4.9.jar groovy/gradle/external/gradle-4.10.2-bin.zip
+enterprise/libs.amazon/external/httpclient-4.5.5.jar extide/gradle/external/gradle-4.10.2-bin.zip
+enterprise/libs.amazon/external/ion-java-1.0.2.jar extide/gradle/external/gradle-4.10.2-bin.zip
+enterprise/libs.amazon/external/httpcore-4.4.9.jar extide/gradle/external/gradle-4.10.2-bin.zip
# Only used as testdata (not redistributed) and modules should be testable independed of each other
webcommon/javascript2.doc/external/testfiles-jsdoc-1.zip webcommon/javascript2.editor/external/testfiles-jsdoc-1.zip are identical
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index cc06269..fe8f87d 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -601,6 +601,13 @@ nb.cluster.java=\
form.kit,\
form.nb,\
form.refactoring,\
+ gradle.htmlui,\
+ gradle.java,\
+ gradle.java.coverage,\
+ gradle.kit,\
+ gradle.persistence,\
+ gradle.spring,\
+ gradle.test,\
hudson.ant,\
hudson.maven,\
i18n,\
@@ -762,6 +769,7 @@ nb.cluster.enterprise=\
glassfish.eecommon,\
glassfish.javaee,\
glassfish.tooling,\
+ gradle.javaee,\
j2ee.ant,\
j2ee.api.ejbmodule,\
j2ee.clientproject,\
@@ -996,16 +1004,6 @@ nb.cluster.groovy.depends=\
nb.cluster.java,\
nb.cluster.enterprise
nb.cluster.groovy=\
- gradle,\
- gradle.htmlui,\
- gradle.java,\
- gradle.java.coverage,\
- gradle.javaee,\
- gradle.kit,\
- gradle.persistence,\
- gradle.spring,\
- gradle.test,\
- groovy.and.gradle.kit,\
groovy.antproject,\
groovy.editor,\
groovy.gsp,\
@@ -1013,7 +1011,6 @@ nb.cluster.groovy=\
groovy.refactoring,\
groovy.samples,\
groovy.support,\
- libs.gradle,\
libs.groovy,\
maven.groovy
@@ -1462,6 +1459,8 @@ nb.cluster.extide.depends=\
nb.cluster.ide,\
nb.cluster.platform
nb.cluster.extide=\
+ gradle,\
+ libs.gradle,\
o.apache.tools.ant.module,\
options.java
diff --git a/nbbuild/rat-exclusions.txt b/nbbuild/rat-exclusions.txt
index eff5267..17e5130 100644
--- a/nbbuild/rat-exclusions.txt
+++ b/nbbuild/rat-exclusions.txt
@@ -118,7 +118,7 @@ java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/resources/modul
java/java.platform.ui/src/org/netbeans/modules/java/platform/resources/templates/javaplatform.xml
java/java.project.ui/src/org/netbeans/modules/java/project/ui/resources/*.template
java/java.source/src/org/netbeans/modules/**/*.template
-groovy/gradle/src/org/netbeans/modules/gradle/newproject/*.template
+extide/gradle/src/org/netbeans/modules/gradle/newproject/*.template
### user templates for mercurial commits, etc.
ide/mercurial/src/org/netbeans/modules/mercurial/util/log*
ide/properties/src/org/netbeans/modules/properties/sample.properties.template
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists