diff --git a/gradle/ide.gradle b/gradle/ide.gradle index 1dddd7d63c..d5215f2875 100644 --- a/gradle/ide.gradle +++ b/gradle/ide.gradle @@ -69,38 +69,20 @@ eclipse.classpath.file.whenMerged { } } -// Allow projects to be used as WTP modules -eclipse.project.natures 'org.eclipse.wst.common.project.facet.core.nature' - // Include project specific settings task eclipseSettings(type: Copy) { from rootProject.files( - 'src/eclipse/org.eclipse.jdt.ui.prefs', - 'src/eclipse/org.eclipse.wst.common.project.facet.core.xml') + 'src/eclipse/org.eclipse.jdt.core.prefs', + 'src/eclipse/org.eclipse.jdt.ui.prefs') into project.file('.settings/') outputs.upToDateWhen { false } } -task eclipseJdtSettings(type: Copy) { - from rootProject.file('src/eclipse/org.eclipse.jdt.core.prefs') - into project.file('.settings/') - outputs.upToDateWhen { false } -} - -task eclipseWstComponentSettings(type: Copy) { - from rootProject.files('src/eclipse/org.eclipse.wst.common.component') - into project.file('.settings/') - expand(deployname: project.name) - outputs.upToDateWhen { false } -} - task cleanEclipseSettings(type: Delete) { delete project.file('.settings/org.eclipse.jdt.core.prefs') delete project.file('.settings/org.eclipse.jdt.ui.prefs') - delete project.file('.settings/org.eclipse.wst.common.component') - delete project.file('.settings/org.eclipse.wst.common.project.facet.core.xml') } -tasks['eclipse'].dependsOn(eclipseSettings, eclipseJdtSettings, eclipseWstComponentSettings) -tasks['eclipseJdt'].dependsOn(eclipseJdtSettings) +tasks['eclipse'].dependsOn(eclipseSettings) +tasks['eclipseJdt'].dependsOn(eclipseSettings) tasks['cleanEclipse'].dependsOn(cleanEclipseSettings) diff --git a/src/eclipse/org.eclipse.wst.common.component b/src/eclipse/org.eclipse.wst.common.component deleted file mode 100644 index ce05d97c85..0000000000 --- a/src/eclipse/org.eclipse.wst.common.component +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/eclipse/org.eclipse.wst.common.project.facet.core.xml b/src/eclipse/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 78e8ebb782..0000000000 --- a/src/eclipse/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - -