### Eclipse Workspace Patch 1.0
#P org.jboss.tools.jst.text.ext
Index: plugin.xml
===================================================================
--- plugin.xml	(revision 29413)
+++ plugin.xml	(working copy)
@@ -23,26 +23,29 @@
          	<contentType id="jsf.facelet.composite">
          		<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitionType id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
+         		<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
          	id="org.jboss.tools.common.text.ext.hyperlink.CSSClassHyperlinkPartitioner"
          	class="org.jboss.tools.jst.text.ext.hyperlink.CSSClassHyperlinkPartitioner">
          	<contentType id="org.eclipse.jst.jsp.core.jspsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         		</partitionType>
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
          	</contentType>
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         		</partitionType>
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
          	</contentType>
          	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         		</partitionType>
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
          	</contentType>
          	<contentType id="jsf.facelet.composite">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         		</partitionType>
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
+         	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
          	</contentType>
 		</hyperlinkPartitioner>
 
@@ -80,6 +83,13 @@
          			<axis path="*/jsp:directive.taglib/prefix" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT"/>
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/jsp:directive.taglib/uri" />
+         			<axis path="*/jsp:directive.taglib/prefix" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -90,6 +100,11 @@
          			<axis path="*/jsp:attribute/name/"/>
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/jsp:attribute/name/"/>
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -101,6 +116,12 @@
          			<axis path="*/h1/" ignoreCase="true"/>
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT">
+         			<axis path="*/title/" ignoreCase="true"/>
+         			<axis path="*/h1/" ignoreCase="true"/>
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -118,6 +139,9 @@
          	<contentType id="jsf.facelet.composite">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner
@@ -135,6 +159,9 @@
          	<contentType id="jsf.facelet.composite">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT"/>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT"/>
+         	</contentType>
 		</hyperlinkPartitioner>
          
 		<hyperlinkPartitioner
@@ -152,6 +179,9 @@
          	<contentType id="jsf.facelet.composite">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" />
+         	</contentType>
 		</hyperlinkPartitioner> 
 
 		<hyperlinkPartitioner
@@ -169,6 +199,9 @@
          	<contentType id="jsf.facelet.composite">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"/>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"/>
+         	</contentType>
 		</hyperlinkPartitioner> 
 
 		<hyperlinkPartitioner
@@ -179,6 +212,11 @@
          			<axis path="*/jsp:getProperty/property/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/jsp:getProperty/property/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner> 
 
 		<hyperlinkPartitioner
@@ -189,6 +227,11 @@
          			<axis path="*/jsp:setProperty/property/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/jsp:setProperty/property/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner> 
 
 		<hyperlinkPartitioner 
@@ -200,6 +243,12 @@
          			<axis path="*/jsp:getProperty/name/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/jsp:setProperty/name/" />
+         			<axis path="*/jsp:getProperty/name/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner
@@ -212,6 +261,13 @@
          			<axis path="*/jsp:useBean/type/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/jsp:directive.page/import/" />
+         			<axis path="*/jsp:useBean/class/" />
+         			<axis path="*/jsp:useBean/type/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 		
 		<hyperlinkPartitioner
@@ -261,6 +317,17 @@
          			<!--axis path="*/style/" /-->
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/link/*" ignoreCase="true"/>
+         		</partitionType>
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT">
+         			<axis path="*/link/*" ignoreCase="true"/>
+         		</partitionType>
+         		<partitionType id="com.ibm.sse.STYLE">
+         			<!--axis path="*/style/" /-->
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner
@@ -302,6 +369,24 @@
          			<axis path="*/link/href/" ignoreCase="true"/>
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/a/href/" ignoreCase="true"/>
+         			<axis path="*/link/href/" ignoreCase="true"/>
+         			<axis path="*/jsp:directive.include/file/" />
+         			<axis path="*/[http://java.sun.com/JSP/Page]:directive.include/file/" />
+         			<axis path="*/jsp:directive.page/errorPage/" />
+         			<axis path="*/[http://java.sun.com/JSP/Page]:directive.page/errorPage/" />
+         			<axis path="*/jsp:include/page/" />
+         			<axis path="*/[http://java.sun.com/JSP/Page]:include/page/" />
+         			<axis path="*/jsp:forward/page/" />
+         			<axis path="*/[http://java.sun.com/JSP/Page]:forward/page/" />
+         			<axis path="*/jsp:plugin/iepluginurl/" />
+         			<axis path="*/[http://java.sun.com/JSP/Page]:plugin/iepluginurl/" />
+         			<axis path="*/jsp:plugin/nspluginurl/" />
+         			<axis path="*/[http://java.sun.com/JSP/Page]:plugin/nspluginurl/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 		<!-- End of Common HTML and/or JSP hyperlink partitioners -->
 
@@ -327,6 +412,9 @@
    			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.CSS_CLASS" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.CSS_CLASS" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -364,6 +452,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_STYLESHEET_REL_LINK" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_STYLESHEET_REL_LINK" />
+			</contenttypeidentifier>
 		</hyperlink>
 		
 		<hyperlink 
@@ -436,6 +527,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -444,6 +538,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_TAGLIB" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_TAGLIB" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -461,6 +558,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -469,6 +569,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FOR_BEAN_ID" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FOR_BEAN_ID" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -477,6 +580,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
             	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BEAN_GET_PROPERTY" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+            	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BEAN_GET_PROPERTY" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -485,6 +591,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BEAN_SET_PROPERTY" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BEAN_SET_PROPERTY" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 <!-- JSP -->
#P org.jboss.tools.jsf.text.ext.facelets
Index: plugin.xml
===================================================================
--- plugin.xml	(revision 29413)
+++ plugin.xml	(working copy)
@@ -22,6 +22,9 @@
          	<contentType id="jsf.facelet.composite">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -39,6 +42,9 @@
          	<contentType id="jsf.facelet.composite">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -76,6 +82,14 @@
          			<axis path="*/[http://java.sun.com/jsf/facelets]:include/src/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://java.sun.com/jsf/facelets]:composition/template/" />
+         			<axis path="*/[http://java.sun.com/jsf/facelets]:decorate/template/" />
+         			<axis path="*/[http://jboss.com/products/seam/taglib]:decorate/template/" />
+         			<axis path="*/[http://java.sun.com/jsf/facelets]:include/src/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -137,6 +151,20 @@
          			<axis path="*/[http://java.sun.com/jsf/facelets]:param/value/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" />
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://java.sun.com/jsf/facelets]:component/id/" />
+         			<axis path="*/[http://java.sun.com/jsf/facelets]:component/binding/" />
+         			<axis path="*/[http://java.sun.com/jsf/facelets]:component/rendered/" />
+         			<axis path="*/[http://java.sun.com/jsf/facelets]:define/name/" />
+         			<axis path="*/[http://java.sun.com/jsf/facelets]:fragment/id/" /> 
+         			<axis path="*/[http://java.sun.com/jsf/facelets]:fragment/binding/" />
+         			<axis path="*/[http://java.sun.com/jsf/facelets]:insert/name/" />
+        			<axis path="*/[http://java.sun.com/jsf/facelets]:param/name/" /> 
+         			<axis path="*/[http://java.sun.com/jsf/facelets]:param/value/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -162,6 +190,11 @@
          			<axis path="*/[http://java.sun.com/jsf/facelets]:component/hotkey/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://java.sun.com/jsf/facelets]:component/hotkey/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 		
 		<hyperlinkPartitioner 
@@ -232,6 +265,22 @@
          			<axis path="*/[http://java.sun.com/jsf/html]:*/enabledClass/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://java.sun.com/jsf/html]:*/columnClasses/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:*/footerClass/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:*/headerClass/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:*/rowClasses/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:*/captionClass/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:*/styleClass/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:*/errorClass/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:*/fatalClass/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:*/infoClass/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:*/warnClass/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:*/disabledClass/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:*/enabledClass/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 		
 	</extension>
@@ -256,6 +305,9 @@
    			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.FACELETS_CSS_CLASS" />
 			</contenttypeidentifier>
+   			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.FACELETS_CSS_CLASS" />
+			</contenttypeidentifier>
 		</hyperlink>
 		
 	</extension>	
#P org.jboss.tools.seam.text.ext
Index: plugin.xml
===================================================================
--- plugin.xml	(revision 29413)
+++ plugin.xml	(working copy)
@@ -62,6 +62,12 @@
          			<axis path="*/[http://jboss.com/products/seam/taglib]:link/action/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jboss.com/products/seam/taglib]:button/action/" />
+         			<axis path="*/[http://jboss.com/products/seam/taglib]:link/action/" />
+         		</partitionType>
+         	</contentType>
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
          			<axis path="*/[http://jboss.com/products/seam/taglib]:button/action/" />
@@ -135,6 +141,9 @@
          	<contentType id="org.eclipse.jst.jsp.core.jspsource">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
+         	</contentType>
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
          	</contentType>
@@ -217,6 +226,12 @@
          			<axis path="*/[http://jboss.com/products/seam/taglib]:link/view/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jboss.com/products/seam/taglib]:button/view/" />
+         			<axis path="*/[http://jboss.com/products/seam/taglib]:link/view/" />
+         		</partitionType>
+         	</contentType>
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
          			<axis path="*/[http://jboss.com/products/seam/taglib]:button/view/" />
@@ -257,6 +272,11 @@
          			<axis path="*/[http://jboss.com/products/seam/taglib]:graphicImage/value/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jboss.com/products/seam/taglib]:graphicImage/value/" />
+         		</partitionType>
+         	</contentType>
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
          			<axis path="*/[http://jboss.com/products/seam/taglib]:graphicImage/value/" />
@@ -326,6 +346,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" />
+			</contenttypeidentifier>
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" />
 			</contenttypeidentifier>
@@ -367,6 +390,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" />
+			</contenttypeidentifier>
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" />
 			</contenttypeidentifier>
#P org.jboss.tools.jsf.text.ext.richfaces
Index: plugin.xml
===================================================================
--- plugin.xml	(revision 29482)
+++ plugin.xml	(working copy)
@@ -162,6 +162,44 @@
          			<axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://richfaces.org/a4j]:include/viewId/" />
+         			<axis path="*/[http://richfaces.org/a4j]:loadStyle/src/" />
+         			<axis path="*/[http://richfaces.org/a4j]:commandButton/image/" />
+         			<axis path="*/[http://richfaces.org/a4j]:loadScript/src/" />
+         			<axis path="*/[http://richfaces.org/rich]:insert/src/" />
+         			<axis path="*/[http://richfaces.org/rich]:menuGroug/icon/" />
+         			<axis path="*/[http://richfaces.org/rich]:menuGroug/iconDisabled/" />
+         			<axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolder/" />
+         			<axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolderDisabled/" />
+         			<axis path="*/[http://richfaces.org/rich]:menuItem/icon/" />
+         			<axis path="*/[http://richfaces.org/rich]:menuItem/iconDisabled/" />
+         			<axis path="*/[http://richfaces.org/rich]:tree/icon/" />
+         			<axis path="*/[http://richfaces.org/rich]:tree/iconCollapsed/" />
+         			<axis path="*/[http://richfaces.org/rich]:tree/iconExpanded/" />
+         			<axis path="*/[http://richfaces.org/rich]:tree/iconLeaf/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedGroup/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedTopGroup/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledGroup/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledItem/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedGroup/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedTopGroup/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconItem/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledGroup/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledItem/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopItem/" />
+         			<axis path="*/[http://richfaces.org/rich]:calendar/buttonIcon/" />
+         			<axis path="*/[http://richfaces.org/rich]:calendar/buttonIconDisabled/" />
+         			<axis path="*/[http://richfaces.org/rich]:comboBox/buttonIcon/" />
+         			<axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconDisabled/" />
+         			<axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconInactive/" />
+         			<axis path="*/[http://richfaces.org/rich]:inplaceInput/cancelControlIcon/" />
+         			<axis path="*/[http://richfaces.org/rich]:inplaceInput/saveControlIcon/" />
+         			<axis path="*/[http://richfaces.org/rich]:inplaceSelect/cancelControlIcon/" />
+         			<axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -319,6 +357,44 @@
          			<axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" >
+         			<axis path="*/[http://richfaces.org/a4j]:include/viewId/" />
+         			<axis path="*/[http://richfaces.org/a4j]:loadStyle/src/" />
+         			<axis path="*/[http://richfaces.org/a4j]:commandButton/image/" />
+         			<axis path="*/[http://richfaces.org/a4j]:loadScript/src/" />
+         			<axis path="*/[http://richfaces.org/rich]:insert/src/" />
+         			<axis path="*/[http://richfaces.org/rich]:menuGroug/icon/" />
+         			<axis path="*/[http://richfaces.org/rich]:menuGroug/iconDisabled/" />
+         			<axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolder/" />
+         			<axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolderDisabled/" />
+         			<axis path="*/[http://richfaces.org/rich]:menuItem/icon/" />
+         			<axis path="*/[http://richfaces.org/rich]:menuItem/iconDisabled/" />
+         			<axis path="*/[http://richfaces.org/rich]:tree/icon/" />
+         			<axis path="*/[http://richfaces.org/rich]:tree/iconCollapsed/" />
+         			<axis path="*/[http://richfaces.org/rich]:tree/iconExpanded/" />
+         			<axis path="*/[http://richfaces.org/rich]:tree/iconLeaf/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedGroup/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedTopGroup/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledGroup/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledItem/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedGroup/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedTopGroup/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconItem/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledGroup/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledItem/" />
+         			<axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopItem/" />
+         			<axis path="*/[http://richfaces.org/rich]:calendar/buttonIcon/" />
+         			<axis path="*/[http://richfaces.org/rich]:calendar/buttonIconDisabled/" />
+         			<axis path="*/[http://richfaces.org/rich]:comboBox/buttonIcon/" />
+         			<axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconDisabled/" />
+         			<axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconInactive/" />
+         			<axis path="*/[http://richfaces.org/rich]:inplaceInput/cancelControlIcon/" />
+         			<axis path="*/[http://richfaces.org/rich]:inplaceInput/saveControlIcon/" />
+         			<axis path="*/[http://richfaces.org/rich]:inplaceSelect/cancelControlIcon/" />
+         			<axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -340,6 +416,10 @@
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 
@@ -539,6 +619,49 @@
 					<axis path="*/[http://richfaces.ajax4jsf.org/rich]:contextMenu/attachTo/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://richfaces.org/a4j]:*/focus/" />
+         			<axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/focus/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/focus/" />
+         			<axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/focus/" />
+
+         			<axis path="*/[http://richfaces.org/a4j]:*/reRender/" />
+         			<axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/reRender/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/reRender/" />
+         			<axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/reRender/" />
+
+         			<axis path="*/[http://richfaces.org/a4j]:*/status/" />
+         			<axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/status/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/status/" />
+         			<axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/status/" />
+
+         			<axis path="*/[http://richfaces.org/a4j]:*/for/" />
+         			<axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/for/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/for/" />
+         			<axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/for/" />
+         			
+         			<axis path="*/[http://richfaces.org/rich]:effect/targetId/" />
+         			<axis path="*/[http://richfaces.ajax4jsf.org/rich]:effect/targetId/" />
+         			
+         			<axis path="*/[http://richfaces.org/rich]:toggleControl/panelId/" />
+         			<axis path="*/[http://richfaces.ajax4jsf.org/rich]:toggleControl/panelId/" />
+         			
+         			<axis path="*/[http://richfaces.org/rich]:*/dragIndicator/" />
+         			<axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/dragIndicator/" />
+         			
+         			<axis path="*/[http://richfaces.org/rich]:*/process/" />
+         			<axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/process/" />
+         			
+         			<axis path="*/[http://richfaces.org/rich]:*/similarityGroupingId/" />
+         			<axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/similarityGroupingId/" />
+
+					<axis path="*/[http://richfaces.org/rich]:progressBar/reRenderAfterComplete/" />
+
+					<axis path="*/[http://richfaces.ajax4jsf.org/rich]:componentControl/attachTo/" />
+					<axis path="*/[http://richfaces.ajax4jsf.org/rich]:contextMenu/attachTo/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -588,6 +711,17 @@
          			<axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/rowKeyConverter/" />
           		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         		    <axis path="*/[http://richfaces.org/a4j]:*/converter/" />
+         			<axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/converter/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/converter/" />
+         			<axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/converter/" />
+         			
+         			<axis path="*/[http://richfaces.org/rich]:*/rowKeyConverter/" />
+         			<axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/rowKeyConverter/" />
+          		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -981,6 +1115,103 @@
          			<axis path="*/[http://richfaces.org/rich]:*/nodeClass/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://richfaces.org/rich]:*/addButtonClass/" />
+					<axis path="*/[http://richfaces.org/rich]:*/activeClass/" />
+					<axis path="*/[http://richfaces.org/rich]:*/activeTabClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/buttonClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/buttonDisabledClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/buttonInactiveClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/barClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/bottomControlClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/bodyClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/columnClasses/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/controlClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/controlsClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/controlHoverClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/controlPressedClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/controlPressClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/cleanButtonClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/changedClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/changedHoverClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/copyAllControlClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/copyControlClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/contentClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/completeClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/dayStyleClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/decreaseClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/decreaseSelectedClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/disabledItemClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/disabledControlClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/downControlClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/disabledGroupClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/disabledClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/errorClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/errorLabelClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/errorMarkerClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/entryClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/footerClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/fileEntryClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/fileEntryControlClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/fatalClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/fatalLabelClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/fatalMarkerClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/finishClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/headerClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/handleClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/handleSelectedClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/hoveredGroupClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/hoveredItemClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/highlightedClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/inputClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/inputDisabledClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/inputInactiveClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/itemClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/itemSelectedClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/increaseClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/increaseSelectedClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/iconClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/infoClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/infoLabelClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/infoMarkerClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/initialClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/listClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/labelClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/popupClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/rowClasses/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/removeAllControlClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/removeControlClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/remainClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/styleClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/selectItemClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/stopButtonClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/selectClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/sidebarClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/selectedClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/selectValueClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/separatorClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/uploadButtonClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/uploadListClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/upControlClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/editClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/viewClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/viewHoverClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/tipClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/topControlClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/topGroupClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/topItemClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/tabClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/markerClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/warnClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/warnLabelClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/warnMarkerClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/groupClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/disabledTabClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/inactiveTabClass/" />
+         			<axis path="*/[http://richfaces.org/rich]:*/nodeClass/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 	</extension>	
@@ -1005,6 +1236,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_LOADBUNDLE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_LOADBUNDLE" />
+			</contenttypeidentifier>
 		</hyperlink>
 	
 		<!-- hyperlink 
#P org.jboss.tools.jst.web.kb
Index: plugin.xml
===================================================================
--- plugin.xml	(revision 29413)
+++ plugin.xml	(working copy)
@@ -94,6 +94,7 @@
 
 	<contexttype id="JSP_PAGE_CONTEXT_TYPE">
 		<contenttype id="org.eclipse.jst.jsp.core.jspsource" />
+		<contenttype id="org.jboss.tools.jst.jsp.jspincludesource" />
         <contenttype id="org.eclipse.jst.jsp.core.jspfragmentsource"/>
         <contenttype id="org.eclipse.jst.jsp.core.tagsource"/>
 	</contexttype>
@@ -185,6 +186,7 @@
 				nameFilter="*.jtpl">
 			</filter>
          	<contentTypeBinding contentTypeId="org.eclipse.jst.jsp.core.jspsource"/>
+         	<contentTypeBinding contentTypeId="org.jboss.tools.jst.jsp.jspincludesource"/>
          	<contentTypeBinding contentTypeId="org.eclipse.jst.jsp.core.jspfragmentsource"/>
          	<contentTypeBinding contentTypeId="org.eclipse.jst.jsp.core.tagsource"/>
 			<markerId
#P org.jboss.tools.jsf.text.ext
Index: plugin.xml
===================================================================
--- plugin.xml	(revision 29482)
+++ plugin.xml	(working copy)
@@ -417,6 +417,9 @@
             <contentType id="jsf.facelet.composite">
                     <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" />
             </contentType>
+            <contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+                    <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" />
+            </contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -450,6 +453,13 @@
          			<axis path="*/[http://java.sun.com/jsf/html]:graphicImage/name/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://java.sun.com/jsf/html]:outputStylesheet/name/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:outputScript/name/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:graphicImage/name/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -467,6 +477,9 @@
          	<contentType id="jsf.facelet.composite">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -508,6 +521,15 @@
          			<axis path="*/[http://myfaces.apache.org/tomahawk]:commandLink/action/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://java.sun.com/jsf/html]:commandButton/action/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:commandLink/action/" />
+
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:commandButton/action/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:commandLink/action/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -657,6 +679,43 @@
          			<axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneRadio/converter/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://java.sun.com/jsf/core]:converter/converterId/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:inputHidden/converter/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:inputSecret/converter/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:inputText/converter/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:inputTextarea/converter/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:outputFormat/converter/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:outputLabel/converter/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:outputLink/converter/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:outputText/converter/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:selectBooleanCheckbox/converter/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:selectManyCheckbox/converter/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:selectManyListbox/converter/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:selectManyMenu/converter/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:selectOneListbox/converter/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:selectOneMenu/converter/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:selectOneRadio/converter/" />
+
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:inputHidden/converter/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:inputSecret/converter/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:inputText/converter/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:inputTextarea/converter/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:outputFormat/converter/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:outputLabel/converter/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:outputLink/converter/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:outputText/converter/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:selectBooleanCheckbox/converter/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:selectManyCheckbox/converter/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:selectManyListbox/converter/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:selectManyMenu/converter/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneListbox/converter/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneMenu/converter/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneRadio/converter/" />
+         		</partitionType>
+         	</contentType>
+         	
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -682,6 +741,11 @@
          			<axis path="*/[http://java.sun.com/jsf/core]:validator/validatorId/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://java.sun.com/jsf/core]:validator/validatorId/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -723,6 +787,15 @@
          			<axis path="*/[http://myfaces.apache.org/tomahawk]:message/for/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://java.sun.com/jsf/html]:outputLabel/for/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:message/for/" />
+
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:outputLabel/for/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:message/for/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 		<hyperlinkPartitioner 
          	id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPExprHyperlinkPartitioner"
@@ -759,6 +832,14 @@
          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" />
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_CONVERTER" />
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_NAVIGATION_CASE" />
+         		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+         		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -784,6 +865,11 @@
          			<!--axis path="*/[http://java.sun.com/jsf/core]:loadBundle/basename/" /-->
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<!--axis path="*/[http://java.sun.com/jsf/core]:loadBundle/basename/" /-->
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -802,6 +888,9 @@
          	<contentType id="jsf.facelet.composite">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
+         	</contentType>
 		</hyperlinkPartitioner>
 		<!-- hyperlinkPartitioner 
          	id="org.jboss.tools.common.text.ext.jsf.hyperlink.JsfJSPBundleHyperlinkPartitioner"
@@ -852,6 +941,14 @@
          			<axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />
+         			<axis path="*/[http://java.sun.com/jsf/core]:valueChangeListener/type/" />
+         			<axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />
+         			<axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -901,6 +998,17 @@
          			<axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/url/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://java.sun.com/jsf/html]:commandButton/image/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:graphicImage/value/" />
+		   			<axis path="*/img/src/" />
+         			<axis path="*/[http://java.sun.com/jsf/html]:graphicImage/url/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:commandButton/image/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/value/" />
+         			<axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/url/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
          
 		<hyperlinkPartitioner 
@@ -918,6 +1026,9 @@
          	<contentType id="jsf.facelet.composite">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAGLIB" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAGLIB" />
+         	</contentType>
 		</hyperlinkPartitioner>
          
 		<hyperlinkPartitioner 
@@ -935,6 +1046,9 @@
          	<contentType id="jsf.facelet.composite">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAG_ATTRIBUTE" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAG_ATTRIBUTE" />
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -952,6 +1066,9 @@
          	<contentType id="jsf.facelet.composite">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" />
+         	</contentType>
 		</hyperlinkPartitioner>
 
 	</extension>	
@@ -1068,6 +1185,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_LOADBUNDLE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_LOADBUNDLE" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1085,6 +1205,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
             	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+            	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" />
+			</contenttypeidentifier>
 		</hyperlink>
 		
 		<!-- hyperlink 
@@ -1139,6 +1262,10 @@
 			<contenttypeidentifier id="jsf.facelet.composite"> 
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FORWARD" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource"> 
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FORWARD" />
+			</contenttypeidentifier>
+			
 		</hyperlink>
 
 		<hyperlink 
@@ -1156,6 +1283,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
             	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_NAVIGATION_CASE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+            	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_NAVIGATION_CASE" />
+			</contenttypeidentifier>
 		</hyperlink>
       
 		<hyperlink 
@@ -1173,6 +1303,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
             	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CONVERTER" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+            	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CONVERTER" />
+			</contenttypeidentifier>
 			<contenttypeidentifier id="org.eclipse.jst.jsf.facesconfig.facesConfigFile">
 				<partitiontype id="org.jboss.tools.common.text.ext.xml.XML_CONVERTER" />
 			</contenttypeidentifier>
@@ -1208,6 +1341,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_VALIDATOR" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_VALIDATOR" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1225,6 +1361,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FOR_ID" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FOR_ID" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<!-- Faces Config File -->
@@ -1261,6 +1400,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_LINK" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_LINK" />
+			</contenttypeidentifier>
 		</hyperlink>
 		
 		<hyperlink 
@@ -1278,6 +1420,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF2_JSP_LINK" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF2_JSP_LINK" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1295,6 +1440,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_XMLNS" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_XMLNS" />
+			</contenttypeidentifier>
 		</hyperlink>
 	
 		<hyperlink 
@@ -1312,6 +1460,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAGLIB_DIRECTIVE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAGLIB_DIRECTIVE" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1329,6 +1480,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_ATTRIBUTE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_ATTRIBUTE" />
+			</contenttypeidentifier>
 		</hyperlink>
 	
 		<hyperlink 
@@ -1346,6 +1500,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_NAME" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_NAME" />
+			</contenttypeidentifier>
 		</hyperlink>
 		
 		<hyperlink 
@@ -1363,6 +1520,9 @@
 			<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
+			</contenttypeidentifier>
 			<contenttypeidentifier id="org.eclipse.core.runtime.xml">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
 			</contenttypeidentifier>
#P org.jboss.tools.struts.text.ext
Index: plugin.xml
===================================================================
--- plugin.xml	(revision 29413)
+++ plugin.xml	(working copy)
@@ -408,11 +408,13 @@
          	<contentType id="org.eclipse.jst.jsp.core.jspsource">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" />
+         	</contentType>
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" />
          	</contentType>
 		</hyperlinkPartitioner>
-
          
 		<hyperlinkPartitioner 
          	id="org.jboss.tools.common.text.ext.struts.hyperlink.JSPCSSClassHyperlinkPartitioner"
@@ -513,6 +515,102 @@
 					<axis path="*/[http://struts.apache.org/tags-html]:textarea/errorStyleClass/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:button/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:cancel/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:checkbox/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:checkbox/errorStyleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:file/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:file/errorStyleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:form/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:frame/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:hidden/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:image/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:img/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:link/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:multibox/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:multibox/errorStyleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:option/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:options/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:optionsCollection/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:password/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:password/errorStyleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:radio/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:radio/errorStyleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:reset/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:rewrite/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:select/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:select/errorStyleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:submit/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:text/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:text/errorStyleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:textarea/styleClass/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:textarea/errorStyleClass/" />
+					
+					<axis path="*/[http://struts.apache.org/tags-html-el]:button/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:cancel/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:checkbox/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:checkbox/errorStyleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:file/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:file/errorStyleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:form/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:frame/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:hidden/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:image/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:img/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:link/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:multibox/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:multibox/errorStyleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:option/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:options/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:optionsCollection/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:password/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:password/errorStyleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:radio/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:radio/errorStyleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:reset/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:rewrite/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:select/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:select/errorStyleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:submit/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:text/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:text/errorStyleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:textarea/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:textarea/errorStyleClass/" />
+					
+					<axis path="*/[http://struts.apache.org/tags-html]:button/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:cancel/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:checkbox/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:checkbox/errorStyleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:file/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:file/errorStyleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:form/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:frame/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:hidden/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:image/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:img/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:link/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:multibox/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:multibox/errorStyleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:option/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:options/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:optionsCollection/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:password/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:password/errorStyleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:radio/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:radio/errorStyleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:reset/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:rewrite/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:select/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:select/errorStyleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:submit/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:text/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:text/errorStyleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:textarea/styleClass/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:textarea/errorStyleClass/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
          
 		<hyperlinkPartitioner 
@@ -531,6 +629,19 @@
 					<axis path="*/[http://struts.apache.org/tags-logic]:iterate/type/" />
            		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:define/type/" />
+					<axis path="*/[http://struts.apache.org/tags-bean-el]:define/type/" />
+					<axis path="*/[http://struts.apache.org/tags-bean]:define/type/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-html]:form/type/" />
+					<axis path="*/[http://struts.apache.org/tags-html-el]:form/type/" />
+					<axis path="*/[http://struts.apache.org/tags-html]:form/type/" />
+					<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:iterate/type/" />
+					<axis path="*/[http://struts.apache.org/tags-logic-el]:iterate/type/" />
+					<axis path="*/[http://struts.apache.org/tags-logic]:iterate/type/" />
+           		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
          
 		<hyperlinkPartitioner 
@@ -564,6 +675,34 @@
          			
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:frame/href/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:image/src/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:img/src/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:link/src/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:rewrite/href/" />
+         			
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:frame/href/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:image/src/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:img/src/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:link/src/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:rewrite/href/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-html]:frame/href/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:image/src/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:img/src/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:link/src/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:rewrite/href/" />
+         			
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:include/href/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:include/href/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-bean]:include/href/" />
+         			
+         		</partitionType>
+         	</contentType>
         </hyperlinkPartitioner>
 
         <!--hyperlinkPartitioner 
@@ -625,6 +764,51 @@
          			<axis path="*/[http://struts.apache.org/tags-logic]:redirect/page/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:frame/page/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:link/page/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:link/href/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:rewrite/page/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:image/page/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:img/page/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:frame/page/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:link/page/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:link/href/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:rewrite/page/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:image/page/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:img/page/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-html]:frame/page/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:link/page/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:link/href/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:rewrite/page/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:image/page/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:img/page/" />
+
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:include/page/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:include/name/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:resource/name/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:include/page/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:include/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:resource/name/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-bean]:include/page/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean]:include/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean]:resource/name/" />
+         			
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:redirect/href/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:redirect/page/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:redirect/href/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:redirect/page/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-logic]:redirect/href/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:redirect/page/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
         
 		<hyperlinkPartitioner 
@@ -702,6 +886,78 @@
          			<axis path="*/[http://struts.apache.org/tags-bean]:write/bundle/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:button/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:cancel/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:checkbox/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:errors/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:file/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:frame/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:hidden/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:img/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:link/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:messages/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:multibox/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:option/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:password/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:radio/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:reset/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:select/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:submit/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:text/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:textarea/bundle/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:button/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:cancel/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:checkbox/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:errors/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:file/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:frame/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:hidden/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:img/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:link/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:messages/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:multibox/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:option/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:password/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:radio/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:reset/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:select/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:submit/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:text/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:textarea/bundle/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-html]:button/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:cancel/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:checkbox/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:errors/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:file/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:frame/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:hidden/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:img/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:link/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:messages/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:multibox/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:option/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:password/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:radio/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:reset/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:select/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:submit/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:text/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:textarea/bundle/" />
+
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:message/bundle/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:write/bundle/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:message/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:write/bundle/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-bean]:message/bundle/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean]:write/bundle/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
         
 		<hyperlinkPartitioner 
@@ -841,19 +1097,200 @@
          			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:message/key/" />
          			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:write/formatKey/" />
 
-         			<axis path="*/[http://struts.apache.org/tags-bean-el]:message/key/" />
-         			<axis path="*/[http://struts.apache.org/tags-bean-el]:write/formatKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:message/key/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:write/formatKey/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-bean]:message/key/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean]:write/formatKey/" />
+         		</partitionType>
+         	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:button/altKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:button/titleKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:cancel/altKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:cancel/titleKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:checkbox/altKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:checkbox/titleKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:errors/header/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:file/altKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:file/titleKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:frame/titleKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:hidden/altKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:hidden/titleKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:img/altKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:img/titleKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:link/titleKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:messages/header/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:messages/footer/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:multibox/altKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:multibox/titleKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:option/key/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:password/altKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:password/titleKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:radio/altKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:radio/titleKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:reset/altKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:reset/titleKey/" />
+          			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:submit/altKey/" />
+          			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:submit/titleKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:text/altKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:text/titleKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:textarea/altKey/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:textarea/titleKey/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:button/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:button/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:cancel/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:cancel/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:checkbox/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:checkbox/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:errors/header/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:file/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:file/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:frame/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:hidden/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:hidden/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:img/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:img/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:link/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:messages/header/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:messages/footer/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:multibox/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:multibox/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:option/key/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:password/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:password/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:radio/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:radio/errorKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:radio/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:reset/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:reset/titleKey/" />
+          			<axis path="*/[http://struts.apache.org/tags-html-el]:submit/altKey/" />
+          			<axis path="*/[http://struts.apache.org/tags-html-el]:submit/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:text/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:text/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:textarea/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:textarea/titleKey/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-html]:button/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:button/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:cancel/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:cancel/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:checkbox/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:checkbox/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:errors/header/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:errors/footer/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:file/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:file/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:frame/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:hidden/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:hidden/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:img/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:img/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:image/altKey/" />
+        			<axis path="*/[http://struts.apache.org/tags-html]:image/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:link/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:messages/header/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:messages/footer/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:multibox/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:multibox/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:option/key/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:password/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:password/errorKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:password/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:radio/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:radio/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:reset/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:reset/titleKey/" />
+          			<axis path="*/[http://struts.apache.org/tags-html]:submit/altKey/" />
+          			<axis path="*/[http://struts.apache.org/tags-html]:submit/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:text/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:text/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:text/errorKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:textarea/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:textarea/titleKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:textarea/errorKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:select/altKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:select/errorKey/" />
+        			<axis path="*/[http://struts.apache.org/tags-html]:select/titleKey/" />
+
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:message/key/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:write/formatKey/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:message/key/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:write/formatKey/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-bean]:message/key/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean]:write/formatKey/" />
+         		</partitionType>
+         	</contentType>
+		</hyperlinkPartitioner>
+
+		<hyperlinkPartitioner 
+         	id="org.jboss.tools.common.text.ext.struts.hyperlink.StrutsPropertyHyperlinkPartitioner"
+         	class="org.jboss.tools.struts.text.ext.hyperlink.StrutsPropertyHyperlinkPartitioner">
+         	<contentType id="org.eclipse.jst.jsp.core.jspsource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:button/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:cancel/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:checkbox/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:errors/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:file/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:hidden/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:messages/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:multibox/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:optionsCollection/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:optionsCollection/label/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:optionsCollection/value/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:password/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:radio/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:reset/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:select/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:submit/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:text/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:textarea/property/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:button/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:cancel/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:checkbox/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:errors/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:file/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:hidden/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:messages/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:multibox/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:optionsCollection/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:optionsCollection/label/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:optionsCollection/value/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:password/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:radio/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:reset/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:select/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:submit/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:text/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:textarea/property/" />
 
-         			<axis path="*/[http://struts.apache.org/tags-bean]:message/key/" />
-         			<axis path="*/[http://struts.apache.org/tags-bean]:write/formatKey/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:button/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:cancel/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:checkbox/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:errors/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:file/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:hidden/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:messages/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:multibox/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:optionsCollection/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:optionsCollection/label/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:optionsCollection/value/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:password/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:radio/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:reset/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:select/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:submit/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:text/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:textarea/property/" />
          		</partitionType>
          	</contentType>
-		</hyperlinkPartitioner>
-
-		<hyperlinkPartitioner 
-         	id="org.jboss.tools.common.text.ext.struts.hyperlink.StrutsPropertyHyperlinkPartitioner"
-         	class="org.jboss.tools.struts.text.ext.hyperlink.StrutsPropertyHyperlinkPartitioner">
-         	<contentType id="org.eclipse.jst.jsp.core.jspsource">
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
          			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:button/property/" />
          			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:cancel/property/" />
@@ -913,6 +1350,7 @@
          			<axis path="*/[http://struts.apache.org/tags-html]:textarea/property/" />
          		</partitionType>
          	</contentType>
+         	
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -951,6 +1389,39 @@
          			
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:frame/forward/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:link/forward/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:rewrite/forward/" />
+         			
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:frame/forward/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:link/forward/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:rewrite/forward/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-html]:frame/forward/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:link/forward/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:rewrite/forward/" />
+         			
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:include/forward/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:struts/forward/" />
+         			
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:include/forward/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:struts/forward/" />
+         			
+         			<axis path="*/[http://struts.apache.org/tags-bean]:include/forward/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean]:struts/forward/" />
+         			
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:redirect/forward/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:redirect/forward/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:redirect/forward/" />
+         			
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:forward/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:forward/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:forward/name/" />
+         			
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -977,6 +1448,27 @@
          			<axis path="*/[http://struts.apache.org/tags-logic]:redirect/action/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:frame/action/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:link/action/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:rewrite/action/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:frame/action/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:link/action/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:rewrite/action/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-html]:frame/action/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:link/action/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:rewrite/action/" />
+
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:redirect/action/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:redirect/action/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-logic]:redirect/action/" />
+         		</partitionType>
+         	</contentType>
         </hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -989,6 +1481,13 @@
          			<axis path="*/[http://struts.apache.org/tags-html]:form/action/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:form/action/" />
+         			<axis path="*/[http://struts.apache.org/tags-html-el]:form/action/" />
+         			<axis path="*/[http://struts.apache.org/tags-html]:form/action/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -1001,6 +1500,13 @@
          			<axis path="*/[http://struts.apache.org/tags-bean]:struts/formBean/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:struts/formBean/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:struts/formBean/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean]:struts/formBean/" />
+         		</partitionType>
+         	</contentType>
          	<contentType id="org.eclipse.wst.xml.core.xmlsource">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
          			<axis path="/form-validation/formset/form/name/" />
@@ -1028,6 +1534,13 @@
          			<axis path="*/[http://struts.apache.org/tags-bean]:struts/mapping/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:struts/mapping/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:struts/mapping/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean]:struts/mapping/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -1082,6 +1595,55 @@
          			<axis path="*/[http://struts.apache.org/tags-logic]:present/name/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:write/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean-el]:write/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-bean]:write/name/" />
+
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:empty/name/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:equal/name/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:greaterEqual/name/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:greaterThan/name/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:iterate/name/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:lessEqual/name/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:lessThan/name/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:match/name/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:notEmpty/name/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:notEqual/name/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:notMatch/name/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:notPresent/name/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:present/name/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:empty/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:equal/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:greaterEqual/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:greaterThan/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:iterate/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:lessEqual/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:lessThan/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:match/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:notEmpty/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:notEqual/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:notMatch/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:notPresent/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:present/name/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-logic]:empty/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:equal/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:greaterEqual/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:greaterThan/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:iterate/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:lessEqual/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:lessThan/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:match/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:notEmpty/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:notEqual/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:notMatch/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:notPresent/name/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:present/name/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -1132,6 +1694,51 @@
          			<axis path="*/[http://struts.apache.org/tags-logic]:present/property/" />
          		</partitionType>
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:empty/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:equal/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:greaterEqual/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:greaterThan/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:iterate/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:lessEqual/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:lessThan/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:match/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:notEmpty/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:notEqual/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:notMatch/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:notPresent/property/" />
+         			<axis path="*/[http://jakarta.apache.org/struts/tags-logic]:present/property/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:empty/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:equal/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:greaterEqual/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:greaterThan/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:iterate/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:lessEqual/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:lessThan/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:match/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:notEmpty/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:notEqual/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:notMatch/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:notPresent/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic-el]:present/property/" />
+
+         			<axis path="*/[http://struts.apache.org/tags-logic]:empty/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:equal/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:greaterEqual/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:greaterThan/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:iterate/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:lessEqual/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:lessThan/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:match/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:notEmpty/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:notEqual/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:notMatch/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:notPresent/property/" />
+         			<axis path="*/[http://struts.apache.org/tags-logic]:present/property/" />
+         		</partitionType>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -1317,6 +1924,9 @@
          	<contentType id="org.eclipse.jst.jsp.core.jspsource">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAGLIB" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAGLIB" />
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -1325,6 +1935,9 @@
          	<contentType id="org.eclipse.jst.jsp.core.jspsource">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAG_ATTRIBUTE" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAG_ATTRIBUTE" />
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -1333,6 +1946,9 @@
          	<contentType id="org.eclipse.jst.jsp.core.jspsource">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" />
          	</contentType>
+         	<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" />
+         	</contentType>
 		</hyperlinkPartitioner>
 
 	</extension>
@@ -1530,6 +2146,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_BUNDLE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_BUNDLE" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1552,6 +2171,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_BUNDLE_KEY" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_BUNDLE_KEY" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1560,6 +2182,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_PROPERTY" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_PROPERTY" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1568,6 +2193,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_FORWARD" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_FORWARD" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1576,6 +2204,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_PAGE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_PAGE" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1585,6 +2216,10 @@
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_ACTION" />
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_FORM_ACTION" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_ACTION" />
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_FORM_ACTION" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1593,6 +2228,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RELATIVE_LINK" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RELATIVE_LINK" />
+			</contenttypeidentifier>
 		</hyperlink>
       
 		<hyperlink 
@@ -1601,6 +2239,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_LINK" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_LINK" />
+			</contenttypeidentifier>
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_LINK" />
 			</contenttypeidentifier>
@@ -1612,6 +2253,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_FORM_BEAN" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_FORM_BEAN" />
+			</contenttypeidentifier>
 			<contenttypeidentifier id="org.eclipse.wst.xml.core.xmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_FORM_BEAN" />
 			</contenttypeidentifier>
@@ -1629,6 +2273,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_ACTION_MAPPING" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_ACTION_MAPPING" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1637,6 +2284,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_BEAN_NAME" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_BEAN_NAME" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1645,6 +2295,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_LOGIC_PROPERTY" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_LOGIC_PROPERTY" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1723,6 +2376,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_TAGLIB_DIRECTIVE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_TAGLIB_DIRECTIVE" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1731,6 +2387,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_TAG_ATTRIBUTE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_TAG_ATTRIBUTE" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1739,6 +2398,9 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_TAG_NAME" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.STRUTS_JSP_TAG_NAME" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 	</extension>
#P org.jboss.tools.common.text.ext
Index: plugin.xml
===================================================================
--- plugin.xml	(revision 29413)
+++ plugin.xml	(working copy)
@@ -239,6 +239,14 @@
          			<axis path="*/[http://java.sun.com/jsp/jstl/core]:redirect/url" />
         		</partitionType>
 			</contentType>
+			<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+         			<axis path="*/[http://java.sun.com/jstl/core]:import/url" />
+         			<axis path="*/[http://java.sun.com/jstl/core]:redirect/url" />
+         			<axis path="*/[http://java.sun.com/jsp/jstl/core]:import/url" />
+         			<axis path="*/[http://java.sun.com/jsp/jstl/core]:redirect/url" />
+        		</partitionType>
+			</contentType>
 		</hyperlinkPartitioner>
 		
 		
@@ -581,6 +589,15 @@
 			<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
             	<partitiontype id="org.jboss.tools.common.text.ext.xml.XML_CLASS" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+            	<partitiontype id="org.jboss.tools.common.text.ext.xml.XML_CLASS" />
+			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet.composite">
+            	<partitiontype id="org.jboss.tools.common.text.ext.xml.XML_CLASS" />
+			</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+            	<partitiontype id="org.jboss.tools.common.text.ext.xml.XML_CLASS" />
+			</contenttypeidentifier>
         	<contenttypeidentifier id="org.eclipse.jst.j2ee.webDD">
 				<partitiontype id="org.jboss.tools.common.text.ext.xml.XML_CLASS" />
         	</contenttypeidentifier>
@@ -642,6 +659,10 @@
          	<contenttypeidentifier id="jsf.facelet.composite">
 				<partitiontype id="org.jboss.tools.common.text.ext.hyperlink.xml.INCLUDE_FILE" />
          	</contenttypeidentifier>
+			<contenttypeidentifier id="org.jboss.tools.jst.jsp.jspincludesource">
+				<partitiontype id="org.jboss.tools.common.text.ext.hyperlink.xml.INCLUDE_FILE" />
+         	</contenttypeidentifier>
+         	
 		</hyperlink>
    </extension>
 	
