Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--site/category.xml26
-rw-r--r--web/features/org.eclipse.wst.web_js_support.feature/build.properties3
-rw-r--r--web/features/org.eclipse.wst.web_js_support.feature/feature.properties51
-rw-r--r--web/features/org.eclipse.wst.web_js_support.feature/feature.xml52
-rw-r--r--web/features/org.eclipse.wst.web_js_support.feature/pom.xml66
-rw-r--r--web/features/org.eclipse.wst.web_js_support.feature/sourceTemplateFeature/.gitkeep0
-rw-r--r--web/features/org.eclipse.wst.web_js_support_sdk.feature/build.properties6
-rw-r--r--web/features/org.eclipse.wst.web_js_support_sdk.feature/eclipse_update_120.jpgbin0 -> 21695 bytes
-rw-r--r--web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.properties51
-rw-r--r--web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.xml38
-rw-r--r--web/features/org.eclipse.wst.web_js_support_sdk.feature/pom.xml26
-rw-r--r--web/features/org.eclipse.wst.web_js_support_sdk.feature/sourceTemplateFeature/.gitkeep0
-rw-r--r--web/features/org.eclipse.wst.web_js_support_tests.feature/build.properties3
-rw-r--r--web/features/org.eclipse.wst.web_js_support_tests.feature/eclipse_update_120.jpgbin0 -> 21695 bytes
-rw-r--r--web/features/org.eclipse.wst.web_js_support_tests.feature/feature.properties52
-rw-r--r--web/features/org.eclipse.wst.web_js_support_tests.feature/feature.xml46
-rw-r--r--web/features/org.eclipse.wst.web_js_support_tests.feature/pom.xml26
-rw-r--r--web/features/org.eclipse.wst.web_js_support_tests.feature/sourceTemplateFeature/.gitkeep0
-rw-r--r--web/features/org.eclipse.wst.web_sdk.feature/feature.xml6
-rw-r--r--web/features/org.eclipse.wst.web_tests.feature/feature.xml15
-rw-r--r--web/features/org.eclipse.wst.web_ui.feature/feature.properties2
-rw-r--r--web/features/org.eclipse.wst.web_ui.feature/feature.xml15
-rw-r--r--web/features/pom.xml4
23 files changed, 460 insertions, 28 deletions
diff --git a/site/category.xml b/site/category.xml
index b9c5521111..923b40e9c7 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -43,15 +43,19 @@
<bundle id="org.eclipse.jst.jsp.tests.encoding"><category name="wtp.bundles"/></bundle>
<bundle id="org.eclipse.jst.standard.schemas"><category name="wtp.bundles"/></bundle>
- <bundle id="org.eclipse.wst.jsdt.web.support.jsp"><category name="wtp.bundles"/></bundle>
<bundle id="org.eclipse.jst.jsp.ui.infopop"><category name="wtp.bundles"/></bundle>
<bundle id="org.eclipse.jst.jsp.core.tests"><category name="wtp.bundles"/></bundle>
<bundle id="org.eclipse.jst.jsp.ui.tests"><category name="wtp.bundles"/></bundle>
- <bundle id="org.eclipse.wtp.javascript.capabilities"><category name="wtp.bundles"/></bundle>
<bundle id="org.eclipse.wtp.web.capabilities"><category name="wtp.bundles"/></bundle>
<bundle id="org.eclipse.wtp.xml.capabilities"><category name="wtp.bundles"/></bundle>
+ <feature id="org.eclipse.wst.web_js_support.feature"><category name="wtp.js_sopport"/></feature>
+ <feature id="org.eclipse.wst.web_js_support_sdk.feature"><category name="wtp.js_sopport.sdk"/></feature>
+
+ <bundle id="org.eclipse.wst.jsdt.web.support.jsp"><category name="wtp.js_sopport"/></bundle>
+ <bundle id="org.eclipse.wtp.javascript.capabilities"><category name="wtp.js_sopport"/></bundle>
+
<!-- sources -->
<feature id="org.eclipse.wst.json_core.feature.source"><category name="wtp.sources"/></feature>
@@ -72,17 +76,28 @@
<feature id="org.eclipse.wst.xml.xpath2.processor.sdk.feature.source"><category name="wtp.sdk.sources"/></feature>
<bundle id="org.eclipse.wst.xml.xpath2.processor.sdk.doc.source"><category name="wtp.bundles.sdk.sources"/></bundle>
+ <feature id="org.eclipse.wst.web_js_support.feature.source"><category name="wtp.js_sopport.sources"/></feature>
+ <feature id="org.eclipse.wst.web_js_support_sdk.feature.source"><category name="wtp.js_sopport.sdk.sources"/></feature>
+
+ <bundle id="org.eclipse.wst.jsdt.web.support.jsp.source"><category name="wtp.js_sopport.sources"/></bundle>
+ <bundle id="org.eclipse.wtp.javascript.capabilities.source"><category name="wtp.js_sopport.sources"/></bundle>
+
+ <!-- tests -->
+
<feature id="org.eclipse.wst.json_tests.feature.source"><category name="wtp.tests"/></feature>
<feature id="org.eclipse.wst.web_tests.feature.source"><category name="wtp.tests"/></feature>
<feature id="org.eclipse.wst.xml_tests.feature.source"><category name="wtp.tests"/></feature>
<feature id="org.eclipse.wst.xsl_tests.feature.source"><category name="wtp.tests"/></feature>
<bundle id="org.eclipse.wst.xml.xpath2.wtptypes.tests.source"><category name="wtp.tests"/></bundle>
+ <feature id="org.eclipse.wst.web_js_support_tests.feature.source"><category name="wtp.js_sopport.tests"/></feature>
+
+ <!-- bundles -->
+
<bundle id="org.eclipse.jst.jsp.core.source"><category name="wtp.bundles"/></bundle>
<bundle id="org.eclipse.jst.jsp.ui.source"><category name="wtp.bundles"/></bundle>
<bundle id="org.eclipse.jst.jsp.tests.encoding.source"><category name="wtp.bundles"/></bundle>
- <bundle id="org.eclipse.wtp.javascript.capabilities.source"><category name="wtp.bundles.sources"/></bundle>
<bundle id="org.eclipse.wtp.web.capabilities.source"><category name="wtp.bundles.sources"/></bundle>
<bundle id="org.eclipse.wtp.xml.capabilities.source"><category name="wtp.bundles.sources"/></bundle>
@@ -98,4 +113,9 @@
<category-def name="wtp.bundles.sources" label="Web Tools Platform (WTP) Bundle Sources"><description>These bundles provide sources.</description></category-def>
<category-def name="wtp.bundles.sdk.sources" label="Web Tools Platform SDK (WTP SDK) Bundle Sources"><description>These bundles provide sources.</description></category-def>
+ <category-def name="wtp.js_sopport" label="Web Tools Platform (WTP) JavaScript Support"><description>These bundles are most likely include in features, but are provided here for completeness.</description></category-def>
+ <category-def name="wtp.js_support.sdk" label="Web Tools Platform SDK (WTP SDK) JavaScript Support"><description>These bundles are most likely include in features, but are provided here for completeness.</description></category-def>
+
+ <category-def name="wtp.js_sopport.sources" label="Web Tools Platform (WTP) JavaScript Support Sources"><description>These bundles provide sources.</description></category-def>
+ <category-def name="wtp.js_sopport.sdk.sources" label="Web Tools Platform SDK (WTP SDK) JavaScript Support Sources"><description>These bundles provide sources.</description></category-def>
</site>
diff --git a/web/features/org.eclipse.wst.web_js_support.feature/build.properties b/web/features/org.eclipse.wst.web_js_support.feature/build.properties
new file mode 100644
index 0000000000..7c626e2106
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support.feature/build.properties
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+ eclipse_update_120.jpg,\
+ feature.properties
diff --git a/web/features/org.eclipse.wst.web_js_support.feature/feature.properties b/web/features/org.eclipse.wst.web_js_support.feature/feature.properties
new file mode 100644
index 0000000000..8cb77451fb
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support.feature/feature.properties
@@ -0,0 +1,51 @@
+###############################################################################
+# Copyright (c) 2006, 2017 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Web JavaScript Developer Tools
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse Web Tools Platform
+
+# "description" property - description of the feature
+description=Editors and tools for working with JavaScript in combination with HTML, XHTML.
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2006, 2009 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+# license and licenseURL properties were removed as a result to migrating to new PDE license support.
+# Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism.
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+# license and licenseURL properties were removed as a result to migrating to new PDE license support.
+# Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism.
+########### end of license property ##########################################
diff --git a/web/features/org.eclipse.wst.web_js_support.feature/feature.xml b/web/features/org.eclipse.wst.web_js_support.feature/feature.xml
new file mode 100644
index 0000000000..53ebcfa03a
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support.feature/feature.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2005, 2018 IBM Corporation and others.
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License 2.0
+ which accompanies this distribution, and is available at
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
+
+ Contributors:
+ IBM Corporation - initial API and implementation
+ -->
+<feature
+ id="org.eclipse.wst.web_js_support.feature"
+ label="%featureName"
+ version="3.18.0.qualifier"
+ provider-name="%providerName"
+ license-feature="org.eclipse.license"
+ license-feature-version="0.0.0">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.eclipse.wst.jsdt.feature"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.wst.jsdt.web.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.wst.jsdt.web.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/web/features/org.eclipse.wst.web_js_support.feature/pom.xml b/web/features/org.eclipse.wst.web_js_support.feature/pom.xml
new file mode 100644
index 0000000000..39c297aef9
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support.feature/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2012, 2018 Eclipse Foundation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>sourceediting.web.features</artifactId>
+ <version>3.10.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.web_js_support.feature</artifactId>
+ <version>3.18.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tycho-extras.version}</version>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <feature id="org.eclipse.wst.web_userdoc.feature"/>
+ <plugin id="org.eclipse.wst.html.ui.infopop"/>
+ <plugin id="org.eclipse.wst.web.ui.infopop"/>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <executions>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/web/features/org.eclipse.wst.web_js_support.feature/sourceTemplateFeature/.gitkeep b/web/features/org.eclipse.wst.web_js_support.feature/sourceTemplateFeature/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support.feature/sourceTemplateFeature/.gitkeep
diff --git a/web/features/org.eclipse.wst.web_js_support_sdk.feature/build.properties b/web/features/org.eclipse.wst.web_js_support_sdk.feature/build.properties
new file mode 100644
index 0000000000..860b5b7333
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support_sdk.feature/build.properties
@@ -0,0 +1,6 @@
+bin.includes = feature.xml,\
+ eclipse_update_120.jpg,\
+ feature.properties
+
+generate.feature@org.eclipse.wst.web_ui.feature.source=org.eclipse.wst.web_ui.feature, feature@org.eclipse.wst.web_core.feature.source
+
diff --git a/web/features/org.eclipse.wst.web_js_support_sdk.feature/eclipse_update_120.jpg b/web/features/org.eclipse.wst.web_js_support_sdk.feature/eclipse_update_120.jpg
new file mode 100644
index 0000000000..bfdf708ad6
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support_sdk.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.properties b/web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.properties
new file mode 100644
index 0000000000..27367b0c03
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.properties
@@ -0,0 +1,51 @@
+###############################################################################
+# Copyright (c) 2006, 2017 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Web JavaScript Developer Tools SDK
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse Web Tools Platform
+
+# "description" property - description of the feature
+description=Source code and API documentation for the Eclipse Web Developer Tools
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2006 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+# license and licenseURL properties were removed as a result to migrating to new PDE license support.
+# Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism.
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+# license and licenseURL properties were removed as a result to migrating to new PDE license support.
+# Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism.
+########### end of license property ##########################################
diff --git a/web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.xml b/web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.xml
new file mode 100644
index 0000000000..964ee07165
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2005, 2018 IBM Corporation and others.
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License 2.0
+ which accompanies this distribution, and is available at
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
+
+ Contributors:
+ IBM Corporation - initial API and implementation
+ -->
+<feature
+ id="org.eclipse.wst.web_js_support_sdk.feature"
+ label="%featureName"
+ version="3.18.0.qualifier"
+ provider-name="%providerName"
+ license-feature="org.eclipse.license"
+ license-feature-version="0.0.0">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="license.html">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.eclipse.wst.jsdt_sdk.feature"/>
+ </requires>
+
+</feature>
diff --git a/web/features/org.eclipse.wst.web_js_support_sdk.feature/pom.xml b/web/features/org.eclipse.wst.web_js_support_sdk.feature/pom.xml
new file mode 100644
index 0000000000..596a4f9e6d
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support_sdk.feature/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2012, 2018 Eclipse Foundation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>sourceediting.web.features</artifactId>
+ <version>3.10.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.web_js_support_sdk.feature</artifactId>
+ <version>3.18.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/web/features/org.eclipse.wst.web_js_support_sdk.feature/sourceTemplateFeature/.gitkeep b/web/features/org.eclipse.wst.web_js_support_sdk.feature/sourceTemplateFeature/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support_sdk.feature/sourceTemplateFeature/.gitkeep
diff --git a/web/features/org.eclipse.wst.web_js_support_tests.feature/build.properties b/web/features/org.eclipse.wst.web_js_support_tests.feature/build.properties
new file mode 100644
index 0000000000..7c626e2106
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support_tests.feature/build.properties
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+ eclipse_update_120.jpg,\
+ feature.properties
diff --git a/web/features/org.eclipse.wst.web_js_support_tests.feature/eclipse_update_120.jpg b/web/features/org.eclipse.wst.web_js_support_tests.feature/eclipse_update_120.jpg
new file mode 100644
index 0000000000..bfdf708ad6
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support_tests.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/web/features/org.eclipse.wst.web_js_support_tests.feature/feature.properties b/web/features/org.eclipse.wst.web_js_support_tests.feature/feature.properties
new file mode 100644
index 0000000000..3b6948b0df
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support_tests.feature/feature.properties
@@ -0,0 +1,52 @@
+###############################################################################
+# Copyright (c) 2006, 2017 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=WST Web JavaScript Tests
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse Web Tools Platform
+
+
+# "description" property - description of the feature
+description=Tests for the Eclipse Web Developer Tools
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2006 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+# license and licenseURL properties were removed as a result to migrating to new PDE license support.
+# Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism.
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+# license and licenseURL properties were removed as a result to migrating to new PDE license support.
+# Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism.
+########### end of license property ##########################################
diff --git a/web/features/org.eclipse.wst.web_js_support_tests.feature/feature.xml b/web/features/org.eclipse.wst.web_js_support_tests.feature/feature.xml
new file mode 100644
index 0000000000..b2b0498506
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support_tests.feature/feature.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2005, 2018 IBM Corporation and others.
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License 2.0
+ which accompanies this distribution, and is available at
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
+
+ Contributors:
+ IBM Corporation - initial API and implementation
+ -->
+<feature
+ id="org.eclipse.wst.web_js_support_tests.feature"
+ label="%featureName"
+ version="3.18.0.qualifier"
+ provider-name="%providerName"
+ license-feature="org.eclipse.license"
+ license-feature-version="0.0.0">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.wst.jsdt.web.core.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.wst.jsdt.web.ui.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+</feature>
diff --git a/web/features/org.eclipse.wst.web_js_support_tests.feature/pom.xml b/web/features/org.eclipse.wst.web_js_support_tests.feature/pom.xml
new file mode 100644
index 0000000000..6c55f4f81e
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support_tests.feature/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2012, 2018 Eclipse Foundation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>sourceediting.web.features</artifactId>
+ <version>3.10.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.eclipse.webtools.sourceediting</groupId>
+ <artifactId>org.eclipse.wst.web_js_support_tests.feature</artifactId>
+ <version>3.18.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/web/features/org.eclipse.wst.web_js_support_tests.feature/sourceTemplateFeature/.gitkeep b/web/features/org.eclipse.wst.web_js_support_tests.feature/sourceTemplateFeature/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_js_support_tests.feature/sourceTemplateFeature/.gitkeep
diff --git a/web/features/org.eclipse.wst.web_sdk.feature/feature.xml b/web/features/org.eclipse.wst.web_sdk.feature/feature.xml
index baa75af70c..8e9cebaa73 100644
--- a/web/features/org.eclipse.wst.web_sdk.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_sdk.feature/feature.xml
@@ -32,7 +32,6 @@
</license>
<requires>
- <import feature="org.eclipse.wst.jsdt_sdk.feature"/>
<import feature="org.eclipse.wst.server_sdk.feature"/>
<import feature="org.eclipse.wst.common_sdk.feature"/>
<import feature="org.eclipse.wst.web_ui.feature"/>
@@ -40,4 +39,9 @@
<import feature="org.eclipse.wst.json_sdk.feature"/>
</requires>
+ <includes
+ id="org.eclipse.wst.web_js_support_sdk.feature"
+ version="0.0.0"
+ optional="true"/>
+
</feature>
diff --git a/web/features/org.eclipse.wst.web_tests.feature/feature.xml b/web/features/org.eclipse.wst.web_tests.feature/feature.xml
index fffae14e29..2345e0c57c 100644
--- a/web/features/org.eclipse.wst.web_tests.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_tests.feature/feature.xml
@@ -31,17 +31,10 @@
%license
</license>
- <plugin
- id="org.eclipse.wst.jsdt.web.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.jsdt.web.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
+ <includes
+ id="org.eclipse.wst.web_js_support_tests.feature"
+ version="0.0.0"
+ optional="true"/>
<plugin
id="org.eclipse.wst.css.core.tests"
diff --git a/web/features/org.eclipse.wst.web_ui.feature/feature.properties b/web/features/org.eclipse.wst.web_ui.feature/feature.properties
index 6d133d88cf..87fc162176 100644
--- a/web/features/org.eclipse.wst.web_ui.feature/feature.properties
+++ b/web/features/org.eclipse.wst.web_ui.feature/feature.properties
@@ -23,7 +23,7 @@ featureName=Eclipse Web Developer Tools
providerName=Eclipse Web Tools Platform
# "description" property - description of the feature
-description=Editors and tools for working with HTML, JavaScript, CSS, XHTML, in combination, and more.
+description=Editors and tools for working with HTML, CSS, XHTML, in combination, and more.
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
diff --git a/web/features/org.eclipse.wst.web_ui.feature/feature.xml b/web/features/org.eclipse.wst.web_ui.feature/feature.xml
index c29969bbd3..d0e8f62bc8 100644
--- a/web/features/org.eclipse.wst.web_ui.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_ui.feature/feature.xml
@@ -53,19 +53,10 @@
<import feature="org.eclipse.wst.server_ui.feature"/>
</requires>
- <plugin
- id="org.eclipse.wst.jsdt.web.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.jsdt.web.ui"
- download-size="0"
- install-size="0"
+ <includes
+ id="org.eclipse.wst.web_js_support.feature"
version="0.0.0"
- unpack="false"/>
+ optional="true"/>
<plugin
id="org.eclipse.wst.html.ui.infopop"
diff --git a/web/features/pom.xml b/web/features/pom.xml
index 9700e52298..92b04c505f 100644
--- a/web/features/pom.xml
+++ b/web/features/pom.xml
@@ -62,5 +62,9 @@
<module>org.eclipse.wst.web_tests.feature</module>
<module>org.eclipse.wst.web_ui.feature</module>
<module>org.eclipse.wst.web_userdoc.feature</module>
+
+ <module>org.eclipse.wst.web_js_support.feature</module>
+ <module>org.eclipse.wst.web_js_support_sdk.feature</module>
+ <module>org.eclipse.wst.web_js_support_tests.feature</module>
</modules>
</project>

Back to the top