234368 Source not generated for trinidad.tagsupport.feature
diff --git a/assembly/features/org.eclipse.jst.sdk/build.properties b/assembly/features/org.eclipse.jst.sdk/build.properties
index b8d3af1..08ed19d 100644
--- a/assembly/features/org.eclipse.jst.sdk/build.properties
+++ b/assembly/features/org.eclipse.jst.sdk/build.properties
@@ -3,5 +3,3 @@
                feature.properties,\
                eclipse_update_120.jpg,\
                epl-v10.html
-
-generate.feature@org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.source=org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature
diff --git a/assembly/features/org.eclipse.jst.sdk/feature.xml b/assembly/features/org.eclipse.jst.sdk/feature.xml
index 52a2963..8bdd981 100644
--- a/assembly/features/org.eclipse.jst.sdk/feature.xml
+++ b/assembly/features/org.eclipse.jst.sdk/feature.xml
@@ -1,76 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-    id="org.eclipse.jst.sdk"
-    label="%featureName"
-    version="3.0.0.qualifier"
-    provider-name="%providerName"
-    plugin="org.eclipse.jst"
-    image="eclipse_update_120.jpg">
+      id="org.eclipse.jst.sdk"
+      label="%featureName"
+      version="3.0.0.qualifier"
+      provider-name="%providerName"
+      plugin="org.eclipse.jst"
+      image="eclipse_update_120.jpg">
 
-    <description>%description</description>
+   <description>
+      %description
+   </description>
 
-    <copyright>%copyright</copyright>
+   <copyright>
+      %copyright
+   </copyright>
 
-    <license url="license.html">%license</license>
+   <license url="license.html">
+      %license
+   </license>
 
-    <url>
-        <update
-            label="%updateSiteName"
-            url="http://download.eclipse.org/webtools/updates" />
-        <discovery
-            label="Web Tools Platform (WTP) Updates"
-            url="http://download.eclipse.org/webtools/updates" />
-    </url>
+   <url>
+      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
+      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+   </url>
 
-
-    <includes
-        id="org.eclipse.jst.common_sdk.feature"
-        version="0.0.0" />
-
-    <includes
-        id="org.eclipse.jst.server_sdk.feature"
-        version="0.0.0" />
-
-    <includes
-        id="org.eclipse.jst.server_adapters.sdk.feature"
-        version="0.0.0" />
-
-    <includes
-        id="org.eclipse.jst.web_sdk.feature"
-        version="0.0.0" />
-
-    <includes
-        id="org.eclipse.jst.enterprise_sdk.feature"
-        version="0.0.0" />
-         
    <includes
-         optional="true"
-         id="org.eclipse.jst.webpageeditor_sdk.feature"
-         version="0.0.0" />
-         
-   <includes
-         optional="true"
-         id="org.eclipse.jst.ws.axis2tools_sdk.feature"
-         version="0.0.0" />
-
-	<!-- technically, this last org.eclipse.jst feature include is not needed for the build or packaging, 
-		but, it helps update manager behave more as expected (that is, it can filter out org.eclipse.wst 
-		if user selects to -->
-   <includes
-         id="org.eclipse.jst"
+         id="org.eclipse.jst.common_sdk.feature"
          version="0.0.0"/>
-         
+
    <includes
-         optional="true"
-         id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.source"
-         version="0.0.0" />
+         id="org.eclipse.jst.server_sdk.feature"
+         version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.jst.server_adapters.sdk.feature"
+         version="0.0.0"/>
 
-    <plugin
-        id="org.eclipse.jst"
-        download-size="0"
-        install-size="0"
-        version="0.0.0"
-        unpack="false" />
+   <includes
+         id="org.eclipse.jst.web_sdk.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.jst.enterprise_sdk.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.jst.webpageeditor_sdk.feature"
+         version="0.0.0"
+         optional="true"/>
+
+   <includes
+         id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
+         version="0.0.0"
+         optional="true"/>
+
+   <includes
+         id="org.eclipse.jst.ws.axis2tools_sdk.feature"
+         version="0.0.0"
+         optional="true"/>
+
+   <plugin
+         id="org.eclipse.jst"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>