[jbosstools-commits] JBoss Tools SVN: r35960 - in trunk: common/plugins/org.jboss.tools.common.text.ext/schema and 10 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Mon Oct 24 19:24:34 EDT 2011 

Author: vrubezhny
Date: 2011-10-24 19:24:33 -0400 (Mon, 24 Oct 2011)
New Revision: 35960

Modified:
   trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml
   trunk/common/plugins/org.jboss.tools.common.text.ext/schema/hyperlinkPartitioner.exsd
   trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkPartitionerBuilder.java
   trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml
   trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml
   trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
   trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF
   trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
   trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
   trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml
   trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
   trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml
   trunk/struts/plugins/org.jboss.tools.struts.text.ext/plugin.xml
Log:
JBIDE-9872 Html editor should be able to show html files even though they don't end in .html

PHP files are forced to be opened by JBoss Tools HTML Editor. Content Assist and Hyperlinks are made to work for PHP files content type.

Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml	2011-10-24 20:23:00 UTC (rev 35959)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml	2011-10-24 23:24:33 UTC (rev 35960)
@@ -10,6 +10,17 @@
 		id="org.jboss.tools.common.text.ext.hyperlinkPartitioner"
 		name="org.jboss.tools.common.text.ext.hyperlinkPartitioner">
 		
+		<!-- Synonyms to org.eclipse.wst.html.core.htmlsource Content Type -->
+		<contentTypeSynonym type="org.jboss.tools.jst.jsp.phpsource" base="org.eclipse.wst.html.core.htmlsource"/>
+		<contentTypeSynonym type="jsf.facelet" base="org.eclipse.wst.html.core.htmlsource"/>
+		<contentTypeSynonym type="jsf.facelet.composite" base="org.eclipse.wst.html.core.htmlsource"/>
+
+		<!-- Synonyms to org.eclipse.jst.jsp.core.jspsource Content Type -->
+		<contentTypeSynonym type="org.jboss.tools.jst.jsp.jspincludesource" base="org.eclipse.jst.jsp.core.jspsource"/>
+
+		<!-- Synonyms to org.eclipse.core.runtime.xml Content Type -->
+		<contentTypeSynonym type="org.eclipse.wst.xml.core.xmlsource" base="org.eclipse.core.runtime.xml"/>
+		
 		<!-- Root XML, HTML and JSP hyperlink partitioners -->
 		<hyperlinkPartitioner
         	class="org.jboss.tools.common.text.ext.hyperlink.xml.XMLRootHyperlinkPartitioner" 
@@ -249,33 +260,8 @@
          			<axis path="*/[http://java.sun.com/jsp/jstl/core]:redirect/url" />
         		</partitionType>
 			</contentType>
-			<contentType id="jsf.facelet">
-				<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>
-			<contentType id="jsf.facelet.composite">
-				<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>
-			<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>
 		
-		
 		<!-- End of Common XML hyperlink partitioners -->
 		
 		<!-- Web.xml and/or TLD files hyperlink partitioners -->

Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/schema/hyperlinkPartitioner.exsd
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/schema/hyperlinkPartitioner.exsd	2011-10-24 20:23:00 UTC (rev 35959)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/schema/hyperlinkPartitioner.exsd	2011-10-24 23:24:33 UTC (rev 35960)
@@ -1,214 +1,242 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.jboss.tools.common.text.ext">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.jboss.tools.common.text.ext" id="hyperlinkPartitioner" name="Hyperlink Partitioner Extension Point Extension"/>
-      </appInfo>
-      <documentation>
-         Hyperlink partitioners to be used to divide the editor document content into special typed regions depending on the editor&apos;s partition type. Here after different hyperlinks can be assigned for these typed regions. 
-The hyperlinks are typically used to fast switch amount the project files (such as XML, JSP, HTML, etc.).
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <documentation>
-            Defines an extension point for the Hyperlink partitioner definitions.
-
-This extension point is used to add new hiperlynk partitioners to the editors depending on the editor&apos;s content type. 
-
-The hyperlink partitioner is used to divide the editor&apos;s content into special typed regions depending on the editor&apos;s partition type. Here after different hyperlinks can be assigned for these typed regions. 
-
-The hyperlinks are typically used to fast switch amount the project files (such as XML, JSP, HTML, etc.).
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="hyperlinkPartitioner" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A unique ID for this extension point.  It is recommended that the plugin ID be used to prefix any extensions.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  A unique ID for this extension.  It is recommended that the plugin ID be used to prefix any extensions.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  A brief name to show to the user.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="hyperlinkPartitioner">
-      <annotation>
-         <documentation>
-            Defines a hyperlink partitioner item. Contains information on a class to be used to divide the editor&apos;s content into spetial typed regions depending on the editor&apos;s content type.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="contentType" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A unique ID for this hyperlink partitioner.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  An implementor of org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitioner, it controls the detecting the partition types depending on the editor&apos;s content.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="contentType">
-      <annotation>
-         <documentation>
-            Defined the editor&apos;s content type to be assotiated with the hyperlink partitioner.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="partitionType" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A unique ID for this contentType. The value is one of the WTP structured model content types.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="partitionType">
-      <annotation>
-         <documentation>
-            Defined the editor&apos;s partition type to be assotiated with the hyperlink partitioner.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="axis" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A unique ID for this partitionType. The value is either one of the WTP structured model partition type ID or the hyperlinkPartitioner ID.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="axis">
-      <annotation>
-         <documentation>
-            Defined the &quot;path&quot; constraint for the partition type within the editor&apos;s xml-like document.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="path" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Describes the path constraint for the specified partition type.
-
-The &quot;*&quot;-wildcards are used to define any elements within the path. The forward slash symbols are used to split element names within the path.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="ignoreCase" type="boolean">
-            <annotation>
-               <documentation>
-                  Spesifies case sensitivity to the element names within the path constraint.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         V3.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         &lt;pre&gt;
-   &lt;extension-point id=&quot;hyperlinkPartitioner&quot; name=&quot;Hyperlink Partitioner Extension Point Extension&quot;/&gt;
-   
- &lt;extension 
-  point=&quot;org.jboss.tools.common.text.ext.hyperlinkPartitioner&quot;
-  id=&quot;org.jboss.tools.common.text.ext.hyperlinkPartitioner&quot;
-  name=&quot;org.jboss.tools.common.text.ext.hyperlinkPartitioner&quot;&gt;
-
-  &lt;hyperlinkPartitioner
-         class=&quot;org.jboss.tools.common.text.xml.hyperlink.XMLRootHyperlinkPartitioner&quot; 
-         id=&quot;org.jboss.tools.common.text.org.jboss.tools.common.text.xml.hyperlink.XMLRootHyperlinkPartitioner&quot;&gt;
-          &lt;contentType id=&quot;org.eclipse.wst.xml.core.xmlsource&quot;&gt;
-           &lt;partitionType id=&quot;org.eclipse.wst.xml.XML_DEFAULT&quot;/&gt;
-          &lt;/contentType&gt;
-          &lt;contentType id=&quot;org.eclipse.core.runtime.xml&quot;&gt;
-           &lt;partitionType id=&quot;org.eclipse.wst.xml.XML_DEFAULT&quot;/&gt;
-          &lt;/contentType&gt;
-         &lt;/hyperlinkPartitioner&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The baseline for API and extension point stability is RedHat Developer Studio .
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         The supplied implementation of the hyperlink partitionning functionality requires the WTP components.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         RedHat
-      </documentation>
-   </annotation>
-
-</schema>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.jboss.tools.common.text.ext" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.jboss.tools.common.text.ext" id="hyperlinkPartitioner" name="Hyperlink Partitioner Extension Point Extension"/>
+      </appInfo>
+      <documentation>
+         Hyperlink partitioners to be used to divide the editor document content into special typed regions depending on the editor&apos;s partition type. Here after different hyperlinks can be assigned for these typed regions. 
+The hyperlinks are typically used to fast switch amount the project files (such as XML, JSP, HTML, etc.).
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+         <documentation>
+            Defines an extension point for the Hyperlink partitioner definitions.
+
+This extension point is used to add new hiperlynk partitioners to the editors depending on the editor&apos;s content type. 
+
+The hyperlink partitioner is used to divide the editor&apos;s content into special typed regions depending on the editor&apos;s partition type. Here after different hyperlinks can be assigned for these typed regions. 
+
+The hyperlinks are typically used to fast switch amount the project files (such as XML, JSP, HTML, etc.).
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="hyperlinkPartitioner" minOccurs="1" maxOccurs="unbounded"/>
+            <element ref="contentTypeSynonym" minOccurs="0" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A unique ID for this extension point.  It is recommended that the plugin ID be used to prefix any extensions.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  A unique ID for this extension.  It is recommended that the plugin ID be used to prefix any extensions.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  A brief name to show to the user.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="hyperlinkPartitioner">
+      <annotation>
+         <documentation>
+            Defines a hyperlink partitioner item. Contains information on a class to be used to divide the editor&apos;s content into spetial typed regions depending on the editor&apos;s content type.
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="contentType" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A unique ID for this hyperlink partitioner.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  An implementor of org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitioner, it controls the detecting the partition types depending on the editor&apos;s content.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="contentType">
+      <annotation>
+         <documentation>
+            Defined the editor&apos;s content type to be assotiated with the hyperlink partitioner.
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="partitionType" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A unique ID for this contentType. The value is one of the WTP structured model content types.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="partitionType">
+      <annotation>
+         <documentation>
+            Defined the editor&apos;s partition type to be assotiated with the hyperlink partitioner.
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="axis" minOccurs="0" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A unique ID for this partitionType. The value is either one of the WTP structured model partition type ID or the hyperlinkPartitioner ID.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="axis">
+      <annotation>
+         <documentation>
+            Defined the &quot;path&quot; constraint for the partition type within the editor&apos;s xml-like document.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="path" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Describes the path constraint for the specified partition type.
+
+The &quot;*&quot;-wildcards are used to define any elements within the path. The forward slash symbols are used to split element names within the path.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="ignoreCase" type="boolean">
+            <annotation>
+               <documentation>
+                  Spesifies case sensitivity to the element names within the path constraint.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="contentTypeSynonym">
+      <annotation>
+         <documentation>
+            The assiciacion for
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="base" type="string">
+            <annotation>
+               <documentation>
+                  Base Content Type
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="type" type="string">
+            <annotation>
+               <documentation>
+                  Content Type is to be binded to the base one
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         V3.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         &lt;pre&gt;
+   &lt;extension-point id=&quot;hyperlinkPartitioner&quot; name=&quot;Hyperlink Partitioner Extension Point Extension&quot;/&gt;
+   
+ &lt;extension 
+  point=&quot;org.jboss.tools.common.text.ext.hyperlinkPartitioner&quot;
+  id=&quot;org.jboss.tools.common.text.ext.hyperlinkPartitioner&quot;
+  name=&quot;org.jboss.tools.common.text.ext.hyperlinkPartitioner&quot;&gt;
+
+  &lt;hyperlinkPartitioner
+         class=&quot;org.jboss.tools.common.text.xml.hyperlink.XMLRootHyperlinkPartitioner&quot; 
+         id=&quot;org.jboss.tools.common.text.org.jboss.tools.common.text.xml.hyperlink.XMLRootHyperlinkPartitioner&quot;&gt;
+          &lt;contentType id=&quot;org.eclipse.wst.xml.core.xmlsource&quot;&gt;
+           &lt;partitionType id=&quot;org.eclipse.wst.xml.XML_DEFAULT&quot;/&gt;
+          &lt;/contentType&gt;
+          &lt;contentType id=&quot;org.eclipse.core.runtime.xml&quot;&gt;
+           &lt;partitionType id=&quot;org.eclipse.wst.xml.XML_DEFAULT&quot;/&gt;
+          &lt;/contentType&gt;
+         &lt;/hyperlinkPartitioner&gt;
+ &lt;/extension&gt;
+&lt;/pre&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         The baseline for API and extension point stability is RedHat Developer Studio .
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         The supplied implementation of the hyperlink partitionning functionality requires the WTP components.
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         RedHat
+      </documentation>
+   </annotation>
+
+</schema>

Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkPartitionerBuilder.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkPartitionerBuilder.java	2011-10-24 20:23:00 UTC (rev 35959)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkPartitionerBuilder.java	2011-10-24 23:24:33 UTC (rev 35960)
@@ -1,22 +1,23 @@
 /*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-2011 Red Hat, Inc.
  * Distributed under license by Red Hat, Inc. All rights reserved.
  * This program is made available under the terms of the
  * Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ *     Red Hat, Inc. - initial API and implementation
  ******************************************************************************/ 
 package org.jboss.tools.common.text.ext.hyperlink;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
-
 import org.jboss.tools.common.text.ext.ExtensionsPlugin;
 import org.jboss.tools.common.text.ext.util.xpl.RegistryReader;
 
@@ -30,14 +31,19 @@
 	public static final String PLUGIN_ID = ExtensionsPlugin.PLUGIN_ID;
 
 	public static final String TAG_HYPERLINK_PARTITIONER = "hyperlinkPartitioner"; //$NON-NLS-1$
+	public static final String TAG_CONTENT_TYPE_SYNONYM = "contentTypeSynonym"; //$NON-NLS-1$
 	public static final String TAG_CONTENT_TYPE = "contentType"; //$NON-NLS-1$
 	public static final String TAG_PARTITION_TYPE = "partitionType"; //$NON-NLS-1$
 	public static final String TAG_AXIS = "axis"; //$NON-NLS-1$
 
 	public static final String ATT_ID = "id"; //$NON-NLS-1$
+	public static final String ATT_TYPE = "type"; //$NON-NLS-1$
+	public static final String ATT_BASE = "base"; //$NON-NLS-1$
 	public static final String ATT_CLASS = "class"; //$NON-NLS-1$
 	public static final String ATT_PATH = "path"; //$NON-NLS-1$
 	public static final String ATT_IGNORE_CASE = "ignoreCase"; //$NON-NLS-1$
+	
+	
 
 	private static HyperlinkPartitionerBuilder fInstance;
 	private ArrayList fPartitionerDefs;
@@ -46,6 +52,9 @@
 	private String fCurrentPartitionType;
 
 	protected String targetContributionTag;
+	
+	private Map<String, String> fContentTypeSynonyms = 
+			new HashMap<String, String>();
 
 	/**
 	 * returns singleton instance of HyperlinkPartitionerBuilder
@@ -77,6 +86,9 @@
 				readElementChildren(element);
 			}
 			return true;
+		} else if(tag.equals(TAG_CONTENT_TYPE_SYNONYM)) {
+			processContentTypeSynonymTag(element);
+			return true;
 		} else if(tag.equals(TAG_CONTENT_TYPE)) {
 			processContentTypeTag(element);
 			// make sure processing of current content type resulted in a valid content type
@@ -127,6 +139,23 @@
 	}
 
 	/**
+	 * Processes element which should be a configuration element specifying an
+	 * open on object.  Creates a new content type synonym object and
+	 * adds it to the list of content type synonym objects
+	 * 
+	 * @param element hyperlink partitioner configuration element
+	 */
+	private void processContentTypeSynonymTag(IConfigurationElement element) {
+		String theType = getType(element);
+		String theBase = getBase(element);
+
+		if(theType != null && theBase != null) {
+			// add new Content Type Synonym to the map
+			fContentTypeSynonyms.put(theType.trim(), theBase.trim());
+		}
+	}
+
+	/**
 	 * Processes element which should be a configuration element specifying a content
 	 * type for the current open on partitioner tag. Assumes that there is a valid current open
 	 * on partitioner definition object.
@@ -205,6 +234,31 @@
 		return value;
 	}
 
+	/**
+	 * Returns the name of the part TYPE attribute that is expected
+	 * in the target extension.
+	 * 
+	 * @param element
+	 * @return String
+	 */
+	protected String getType(IConfigurationElement element) {
+		String value = element.getAttribute(ATT_TYPE);
+		return value;
+	}
+
+	/**
+	 * Returns the name of the part BASE attribute that is expected
+	 * in the target extension.
+	 * 
+	 * @param element
+	 * @return String
+	 */
+	protected String getBase(IConfigurationElement element) {
+		String value = element.getAttribute(ATT_BASE);
+		return value;
+	}
+
+	
 	protected boolean isIgnoreCase(IConfigurationElement element) {
 		String value = element.getAttribute(ATT_IGNORE_CASE);
 		if("true".equals(value)) { //$NON-NLS-1$
@@ -247,7 +301,18 @@
 	    }
 		return (HyperlinkPartitionerDefinition[])fPartitionerDefs.toArray(new HyperlinkPartitionerDefinition[fPartitionerDefs.size()]);
 	}
+	
+	private String getBaseContentType(String contentType) {
+		if (contentType == null)
+			return null;
 
+		String baseContentType = contentType.trim();
+		while (fContentTypeSynonyms.get(baseContentType) != null && !baseContentType.equalsIgnoreCase(fContentTypeSynonyms.get(baseContentType))) {
+			baseContentType = fContentTypeSynonyms.get(baseContentType);
+		}
+		return baseContentType;
+	}
+
 	/**
 	 * Returns all the open on partitioner definition objects valid for contentType/partitionType/axis
 	 * @param contentType
@@ -261,6 +326,8 @@
 			return null;
 		}
 
+		String baseContentType = getBaseContentType(contentType);
+		
 		// entire list of hyperlink definition objects
 		HyperlinkPartitionerDefinition[] allDefs = getHyperlinkPartitionerDefinitions();
 		// current list of open on definitions valid for contentType/partitionType/axis
@@ -271,7 +338,7 @@
 			List contentTypes = allDefs[i].getContentTypes();
 			for(int j=0; j<contentTypes.size(); j++) {
 			    HyperlinkPartitionerDefinition.ContentType cType = (HyperlinkPartitionerDefinition.ContentType)contentTypes.get(j);
-			    if(contentType.equals(cType.getId())) {
+			    if(contentType.equals(cType.getId()) || baseContentType.equals(cType.getId())) {
 				    HyperlinkPartitionerDefinition.PartitionType pType = cType.getPartitionType(partitionType);
 				    if(pType!=null && pType.containtsAxis(axis)) {
 			            defs.add(allDefs[i]); 

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml	2011-10-24 20:23:00 UTC (rev 35959)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml	2011-10-24 23:24:33 UTC (rev 35960)
@@ -411,15 +411,6 @@
             <contentType id="org.eclipse.wst.html.core.htmlsource">
                     <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" />
             </contentType>
-            <contentType id="jsf.facelet">
-                    <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" />
-            </contentType>
-            <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 
@@ -439,27 +430,6 @@
          			<axis path="*/[http://java.sun.com/jsf/html]:graphicImage/name/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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 
@@ -471,15 +441,6 @@
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
-         	</contentType>
-         	<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 
@@ -503,33 +464,6 @@
          			<axis path="*/[http://myfaces.apache.org/tomahawk]:commandLink/action/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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 
@@ -607,115 +541,6 @@
          			<axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneRadio/converter/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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 
@@ -731,21 +556,6 @@
          			<axis path="*/[http://java.sun.com/jsf/core]:validator/validatorId/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         			<axis path="*/[http://java.sun.com/jsf/core]:validator/validatorId/" />
-         		</partitionType>
-         	</contentType>
-         	<contentType id="jsf.facelet.composite">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         			<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 
@@ -769,78 +579,7 @@
          			<axis path="*/[http://myfaces.apache.org/tomahawk]:message/for/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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"
-         	class="org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner">
-         	<contentType id="org.eclipse.jst.jsp.core.jspsource">
-         		<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>
-         	<contentType id="org.eclipse.wst.html.core.htmlsource">
-         		<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>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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 
          	id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPLoadBundleHyperlinkPartitioner"
@@ -855,76 +594,8 @@
          			<!--axis path="*/[http://java.sun.com/jsf/core]:loadBundle/basename/" /-->
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         			<!--axis path="*/[http://java.sun.com/jsf/core]:loadBundle/basename/" /-->
-         		</partitionType>
-         	</contentType>
-         	<contentType id="jsf.facelet.composite">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         			<!--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 
-         	id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPBundleHyperlinkPartitioner"
-         	class="org.jboss.tools.jsf.text.ext.hyperlink.JSPBundleHyperlinkPartitioner">
-         	<contentType id="org.eclipse.jst.jsp.core.jspsource">
-         		<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>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
-         	</contentType>
-         	<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"
-         	class="org.jboss.tools.jsf.text.ext.hyperlink.JsfJSPBundleHyperlinkPartitioner">
-         	<contentType id="org.eclipse.wst.html.core.htmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
-         	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
-         	</contentType>
-         	<contentType id="jsf.facelet.composite">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
-         	</contentType>
-		</hyperlinkPartitioner -->
-
-		<!--hyperlinkPartitioner 
-         	id="org.jboss.tools.jsf.text.ext.hyperlink.JSF2CCAttrsOpenOnPartitioner"
-         	class="org.jboss.tools.jsf.text.ext.hyperlink.JSF2CCAttrsHyperlinkPartitioner">
-         	<contentType id="org.eclipse.jst.jsp.core.jspsource">
-         		<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>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
-         	</contentType>
-         	<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.JSPClassHyperlinkPartitioner"
          	class="org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPClassHyperlinkPartitioner">
@@ -944,30 +615,6 @@
          			<axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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 
@@ -995,39 +642,6 @@
          			<axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/url/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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 
@@ -1039,15 +653,6 @@
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAGLIB" />
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAGLIB" />
-         	</contentType>
-         	<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 
@@ -1059,37 +664,8 @@
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAG_ATTRIBUTE" />
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAG_ATTRIBUTE" />
-         	</contentType>
-         	<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 
-         	id="org.jboss.tools.common.text.ext.jsf.hyperlink.JsfJSPTagNameHyperlinkPartitioner"
-         	class="org.jboss.tools.jsf.text.ext.hyperlink.JsfJSPTagNameHyperlinkPartitioner">
-         	<contentType id="org.eclipse.jst.jsp.core.jspsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" />
-         	</contentType>
-         	<contentType id="org.eclipse.wst.html.core.htmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" />
-         	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" />
-         	</contentType>
-         	<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>
 	
 	<extension

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml	2011-10-24 20:23:00 UTC (rev 35959)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml	2011-10-24 23:24:33 UTC (rev 35960)
@@ -7,46 +7,6 @@
 		id="org.jboss.tools.common.text.ext.jsf.facelets.hyperlinkPartitioner"
 		name="org.jboss.tools.common.text.ext.jsf.facelets.hyperlinkPartitioner">
 
-		<!--hyperlinkPartitioner 
-         	id="org.jboss.tools.common.text.ext.jsf.facelets.hyperlink.FaceletsExprHyperlinkPartitioner"
-         	class="org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner">
-         	<contentType id="org.eclipse.jst.jsp.core.jspsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
-         	</contentType>
-         	<contentType id="org.eclipse.wst.html.core.htmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
-         	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
-         	</contentType>
-         	<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 
-         	id="org.jboss.tools.common.text.ext.jsf.facelets.hyperlink.ExprHyperlinkPartitioner"
-         	class="org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner">
-         	<contentType id="org.eclipse.jst.jsp.core.jspsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
-         	</contentType>
-         	<contentType id="org.eclipse.wst.html.core.htmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
-         	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
-         	</contentType>
-         	<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 
          	id="org.jboss.tools.common.text.ext.jsf.facelets.hyperlink.FaceletsTemplateHyperlinkPartitioner"
          	class="org.jboss.tools.jsf.text.ext.hyperlink.JSFJSPLinkHyperlinkPartitioner">
@@ -66,137 +26,8 @@
          			<axis path="*/[http://java.sun.com/jsf/facelets]:include/src/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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 
-         	id="org.jboss.tools.common.text.ext.jsf.facelets.hyperlink.FaceletsAttributeValueWithExprHyperlinkPartitioner"
-         	class="org.jboss.tools.jsf.text.ext.facelets.hyperlink.FaceletsAttributeValueWithExprHyperlinkPartitioner">
-         	<contentType id="org.eclipse.jst.jsp.core.jspsource">
-         		<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>
-         	<contentType id="org.eclipse.wst.html.core.htmlsource">
-         		<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>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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 
-         	id="org.jboss.tools.common.text.ext.jsf.facelets.hyperlink.FaceletsAttributeValueWithNoExprHyperlinkPartitioner"
-         	class="org.jboss.tools.jsf.text.ext.facelets.hyperlink.FaceletsAttributeValueWithNoExprHyperlinkPartitioner">
-         	<contentType id="org.eclipse.jst.jsp.core.jspsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         			<axis path="*/[http://java.sun.com/jsf/facelets]:component/hotkey/" />
-         		</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://java.sun.com/jsf/facelets]:component/hotkey/" />
-         		</partitionType>
-         	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         			<axis path="*/[http://java.sun.com/jsf/facelets]:component/hotkey/" />
-         		</partitionType>
-         	</contentType>
-         	<contentType id="jsf.facelet.composite">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         			<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 
          	id="org.jboss.tools.jsf.text.ext.facelets.hyperlink.FaceletsCSSClassHyperlinkPartitioner"
          	class="org.jboss.tools.jsf.text.ext.facelets.hyperlink.FaceletsCSSClassHyperlinkPartitioner">
@@ -233,54 +64,6 @@
          			<axis path="*/[http://java.sun.com/jsf/html]:*/enabledClass/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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>

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml	2011-10-24 20:23:00 UTC (rev 35959)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml	2011-10-24 23:24:33 UTC (rev 35960)
@@ -86,120 +86,6 @@
          			<axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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 
@@ -281,120 +167,6 @@
          			<axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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 
@@ -408,42 +180,8 @@
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         		</partitionType>
-         	</contentType>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
 
-
-		<!-- hyperlinkPartitioner 
-         	id="org.jboss.tools.jsf.text.ext.richfaces.hyperlink.RichfacesJSPBundleHyperlinkPartitioner"
-         	class="org.jboss.tools.jsf.text.ext.richfaces.hyperlink.RichfacesJSPBundleHyperlinkPartitioner">
-         	<contentType id="org.eclipse.jst.jsp.core.jspsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
-         		<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.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
-         	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
-         	</contentType>
-         	<contentType id="jsf.facelet.composite">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
-         	</contentType>
-		</hyperlinkPartitioner -->
-
 		<hyperlinkPartitioner 
          	id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPForIDHyperlinkPartitioner"
          	class="org.jboss.tools.jsf.text.ext.hyperlink.JSPForIDHyperlinkPartitioner">
@@ -533,135 +271,6 @@
 					<axis path="*/[http://richfaces.ajax4jsf.org/rich]:contextMenu/attachTo/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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 
@@ -689,39 +298,6 @@
          			<axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/rowKeyConverter/" />
           		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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 
@@ -921,297 +497,6 @@
          			<axis path="*/[http://richfaces.org/rich]:*/nodeClass/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         	<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>	

Modified: trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF	2011-10-24 20:23:00 UTC (rev 35959)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF	2011-10-24 23:24:33 UTC (rev 35960)
@@ -25,8 +25,8 @@
  org.jboss.tools.common.el.core;bundle-version="3.2.0",
  org.eclipse.jface.databinding;bundle-version="1.5.0",
  org.eclipse.core.databinding.property;bundle-version="1.3.0",
- org.jboss.tools.jst.web;bundle-version="3.2.0",
- org.jboss.tools.jst.web.ui;bundle-version="3.2.0"
+ org.jboss.tools.jst.web,
+ org.jboss.tools.jst.web.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.jboss.tools.jst.css,

Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties	2011-10-24 20:23:00 UTC (rev 35959)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties	2011-10-24 23:24:33 UTC (rev 35960)
@@ -21,4 +21,5 @@
 
 vpe.toolbar.name=VPE Toolbar
 
-ContentType_JBossToolsINC=JBoss Tools JSP Include
\ No newline at end of file
+ContentType_JBossToolsINC=JBoss Tools JSP Include
+ContentType_JBossPHPSource=JBoss Tools PHP Source
\ No newline at end of file

Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml	2011-10-24 20:23:00 UTC (rev 35959)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml	2011-10-24 23:24:33 UTC (rev 35960)
@@ -250,6 +250,8 @@
             name="%editors.html.name" 
             default="true">
          <contentTypeBinding contentTypeId="org.eclipse.wst.html.core.htmlsource"/>
+         <contentTypeBinding contentTypeId="org.jboss.tools.jst.jsp.phpsource"/>
+         <contentTypeBinding contentTypeId="org.eclipse.php.core.phpsource"/>
          <contentTypeBinding contentTypeId="jsf.facelet"/>
       </editor>
       <editor
@@ -544,8 +546,15 @@
 	       	name="%ContentType_JBossToolsINC"
 	       	base-type="org.eclipse.jst.jsp.core.jspsource"
 	       	describer="org.jboss.tools.jst.jsp.jspeditor.JSPIncludeContentDescriber"
-	       	file-extensions="inc, php"
+	       	file-extensions="inc"
 	       	priority="high"/>
+      	<content-type 
+	      	id="org.jboss.tools.jst.jsp.phpsource"
+	       	name="%ContentType_JBossPHPSource"
+	       	base-type="org.eclipse.wst.html.core.htmlsource"
+	       	describer="org.jboss.tools.jst.jsp.jspeditor.JSPIncludeContentDescriber"
+	       	file-extensions="php"
+	       	priority="high"/>
 	       	
        <file-association
              content-type="org.eclipse.wst.html.core.htmlsource"
@@ -910,6 +919,18 @@
 				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
 				<partitionType id="org.eclipse.wst.css.STYLE" />
        		</contentType>
+       		<contentType id="org.jboss.tools.jst.jsp.phpsource">
+				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+				<partitionType id="org.eclipse.wst.css.STYLE" />
+       		</contentType>
+			<contentType id="org.eclipse.php.core.phpsource">
+				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+				<partitionType id="org.eclipse.wst.css.STYLE" />
+			</contentType>
        		<contentType id="jsf.facelet">
 				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
 				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />

Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml	2011-10-24 20:23:00 UTC (rev 35959)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml	2011-10-24 23:24:33 UTC (rev 35960)
@@ -17,16 +17,6 @@
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
          		<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
-         	</contentType>
-         	<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 
@@ -38,15 +28,6 @@
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
          		<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" />
-         	</contentType>
-         	<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>
 
 		<!--Maksim Areshkau, partitioner for *.taglib.xml files -->
@@ -83,13 +64,6 @@
          			<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 
@@ -100,11 +74,6 @@
          			<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 
@@ -116,12 +85,6 @@
          			<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 
@@ -133,15 +96,6 @@
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
-         	</contentType>
-         	<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
@@ -153,15 +107,6 @@
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT"/>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT"/>
-         	</contentType>
-         	<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
@@ -173,15 +118,6 @@
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" />
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" />
-         	</contentType>
-         	<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
@@ -193,15 +129,6 @@
          	<contentType id="org.eclipse.wst.html.core.htmlsource">
          		<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"/>
-         	</contentType>
-         	<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
@@ -212,11 +139,6 @@
          			<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
@@ -227,11 +149,6 @@
          			<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 
@@ -243,12 +160,6 @@
          			<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
@@ -261,13 +172,6 @@
          			<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
@@ -301,48 +205,6 @@
          			<axis path="*/link/*" ignoreCase="true"/>
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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>
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK">
-         			<axis path="*/link/*" ignoreCase="true"/>
-         		</partitionType>
-         	</contentType>
-         	<contentType id="jsf.facelet.composite">
-         		<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>
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK">
-         			<axis path="*/link/*" 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="*/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>
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK">
-         			<axis path="*/link/*" ignoreCase="true"/>
-         		</partitionType>
-         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner
@@ -372,36 +234,6 @@
          			<axis path="*/link/href/" ignoreCase="true"/>
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         			<axis path="*/a/href/" ignoreCase="true"/>
-         			<axis path="*/link/href/" ignoreCase="true"/>
-         		</partitionType>
-         	</contentType>
-         	<contentType id="jsf.facelet.composite">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         			<axis path="*/a/href/" ignoreCase="true"/>
-         			<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 -->
 

Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml	2011-10-24 20:23:00 UTC (rev 35959)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml	2011-10-24 23:24:33 UTC (rev 35960)
@@ -101,6 +101,8 @@
 
 	<contexttype id="FACELETS_PAGE_CONTEXT_TYPE">
 		<contenttype id="org.eclipse.wst.html.core.htmlsource" />
+		<contenttype id="org.jboss.tools.jst.jsp.phpsource" />
+		<contenttype id="org.eclipse.php.core.phpsource" />
 		<contenttype id="jsf.facelet" />
 		<contenttype id="jsf.facelet.composite" />
 	</contexttype>

Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml	2011-10-24 20:23:00 UTC (rev 35959)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml	2011-10-24 23:24:33 UTC (rev 35960)
@@ -62,33 +62,14 @@
          			<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/" />
          			<axis path="*/[http://jboss.com/products/seam/taglib]:link/action/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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="jsf.facelet.composite">
-         		<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>
 		</hyperlinkPartitioner>
 
-
 		<hyperlinkPartitioner 
          	class="org.jboss.tools.common.text.ext.hyperlink.xml.XMLElementHyperlinkPartitioner" 
          	id="org.jboss.tools.common.text.ext.hyperlink.xml.XMLElementHyperlinkPartitioner">
@@ -135,88 +116,6 @@
          	</contentType>
 		</hyperlinkPartitioner> 
 
-		<!--hyperlinkPartitioner 
-         	id="org.jboss.tools.seam.text.ext.hyperlink.SeamBeanHyperlinkPartitioner"
-         	class="org.jboss.tools.seam.text.ext.hyperlink.SeamBeanHyperlinkPartitioner">
-         	<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>
-         	<contentType id="jsf.facelet">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
-         	</contentType>
-         	<contentType id="jsf.facelet.composite">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
-         	</contentType>
-         	<contentType id="org.eclipse.core.runtime.xml">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
-         	</contentType>
-         	<contentType id="org.jboss.tools.common.model.ui.xml">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
-         	</contentType>
-         	<contentType id="org.jboss.tools.seam.xml.ui.pages12xmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION"/>
-         	</contentType>
-         	<contentType id="org.jboss.tools.seam.xml.ui.page12xmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION"/>
-         	</contentType>
-         	<contentType id="org.jboss.tools.seam.xml.ui.pages20xmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION"/>
-         	</contentType>
-         	<contentType id="org.jboss.tools.seam.xml.ui.page20xmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION"/>
-         	</contentType>
-         	<contentType id="org.jboss.tools.seam.xml.ui.pages21xmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION"/>
-         	</contentType>
-         	<contentType id="org.jboss.tools.seam.xml.ui.page21xmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION"/>
-         	</contentType>
-		</hyperlinkPartitioner-->
-
-		<!--hyperlinkPartitioner 
-	         id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPExprHyperlinkPartitioner1"
-   	      class="org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner">
-
-         	<contentType id="org.eclipse.core.runtime.xml">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" />
-         	</contentType>
-         	<contentType id="org.jboss.tools.common.model.ui.xml">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" />
-         	</contentType>
-         	<contentType id="org.jboss.tools.seam.xml.ui.pages12xmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" />
-         	</contentType>
-         	<contentType id="org.jboss.tools.seam.xml.ui.page12xmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" />
-         	</contentType>
-         	<contentType id="org.jboss.tools.seam.xml.ui.pages20xmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" />
-         	</contentType>
-         	<contentType id="org.jboss.tools.seam.xml.ui.page20xmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" />
-         	</contentType>
-         	<contentType id="org.jboss.tools.seam.xml.ui.pages21xmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" />
-         	</contentType>
-         	<contentType id="org.jboss.tools.seam.xml.ui.page21xmlsource">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" />
-         	</contentType>
-		</hyperlinkPartitioner-->
-		
 		<hyperlinkPartitioner 
          	id="org.jboss.tools.seam.text.ext.hyperlink.SeamViewHyperlinkPartitioner"
          	class="org.jboss.tools.seam.text.ext.hyperlink.SeamViewHyperlinkPartitioner">
@@ -226,30 +125,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/" />
          			<axis path="*/[http://jboss.com/products/seam/taglib]:link/view/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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="jsf.facelet.composite">
-         		<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.core.runtime.xml">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
 					<axis path="*/view-id/" />
@@ -272,29 +153,13 @@
          			<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/" />
          		</partitionType>
          	</contentType>
-         	<contentType id="jsf.facelet">
-         		<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="jsf.facelet.composite">
-         		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
-         			<axis path="*/[http://jboss.com/products/seam/taglib]:graphicImage/value/" />
-         		</partitionType>
-         	</contentType>
 		</hyperlinkPartitioner>
-		
-		
+
 		<!-- 
 			The following definitions are subject to move into another plugin
 			bacause of bpm and drools are not the basics of seam 

Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/plugin.xml
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/plugin.xml	2011-10-24 20:23:00 UTC (rev 35959)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/plugin.xml	2011-10-24 23:24:33 UTC (rev 35960)
@@ -408,9 +408,6 @@
          	<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>
@@ -515,102 +512,6 @@
 					<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 
@@ -629,19 +530,6 @@
 					<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 
@@ -675,47 +563,8 @@
          			
          		</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 
-         	id="org.jboss.tools.common.text.ext.struts.hyperlink.JSPRelativeLinkHyperlinkPartitioner"
-         	class="org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRelativeLinkHyperlinkPartitioner">
-         	<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]:image/page/" />
-         			<axis path="*/[http://jakarta.apache.org/struts/tags-html]:img/page/" />
-         		</partitionType>
-         	</contentType>
-        </hyperlinkPartitioner-->
-
 		<hyperlinkPartitioner 
          	id="org.jboss.tools.common.text.ext.struts.hyperlink.StrutsPageHyperlinkPartitioner"
          	class="org.jboss.tools.struts.text.ext.hyperlink.StrutsPageHyperlinkPartitioner">
@@ -764,51 +613,6 @@
          			<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 
@@ -886,78 +690,6 @@
          			<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 
@@ -1104,127 +836,6 @@
          			<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 
@@ -1290,67 +901,6 @@
          			<axis path="*/[http://struts.apache.org/tags-html]:textarea/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-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-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 
@@ -1389,39 +939,6 @@
          			
          		</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 
@@ -1448,27 +965,6 @@
          			<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 
@@ -1481,13 +977,6 @@
          			<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 
@@ -1500,13 +989,6 @@
          			<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/" />
@@ -1534,13 +1016,6 @@
          			<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 
@@ -1595,55 +1070,6 @@
          			<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 
@@ -1694,51 +1120,6 @@
          			<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 
@@ -1924,9 +1305,6 @@
          	<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 
@@ -1935,9 +1313,6 @@
          	<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 
@@ -1946,9 +1321,6 @@
          	<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>

More information about the jbosstools-commits mailing list