[jbosstools-commits] JBoss Tools SVN: r22814 - in trunk: jsf/plugins/org.jboss.tools.jsf and 9 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Tue Jun 15 09:29:31 EDT 2010


Author: akazakov
Date: 2010-06-15 09:29:30 -0400 (Tue, 15 Jun 2010)
New Revision: 22814

Modified:
   trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml
   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/jsf/plugins/org.jboss.tools.jsf/plugin.xml
   trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/RefactoringChangesFactory.java
   trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
   trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
   trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/ChainTextHover.java
   trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml
   trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml
Log:
https://jira.jboss.org/browse/JBIDE-6469: Migrate to new content type: jsf.facelet

Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml	2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml	2010-06-15 13:29:30 UTC (rev 22814)
@@ -223,6 +223,14 @@
          			<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>
 		</hyperlinkPartitioner>
 		
 		
@@ -620,6 +628,9 @@
          	<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.hyperlink.xml.INCLUDE_FILE" />
          	</contenttypeidentifier>
+         	<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.hyperlink.xml.INCLUDE_FILE" />
+         	</contenttypeidentifier>
 		</hyperlink>
    </extension>
 	

Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml	2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml	2010-06-15 13:29:30 UTC (rev 22814)
@@ -414,7 +414,8 @@
          <include>
             <rules>
             
-               	<contentType id="org.eclipse.wst.html.core.htmlsource"/>
+            	<contentType id="jsf.facelet"/>
+            	<contentType id="org.eclipse.wst.html.core.htmlsource"/>
 				<contentType id="org.eclipse.jst.jsp.core.jspfragmentsource"/>
          		<contentType id="org.eclipse.jst.jsp.core.tagsource"/>
                
@@ -570,6 +571,10 @@
           id="org.jboss.tools.jsf.jsf2sourcevalidator"
           scope="total">
         <contentTypeIdentifier
+               id="jsf.facelet">
+            <partitionType id="org.eclipse.wst.html.HTML_DEFAULT"/>
+         </contentTypeIdentifier>
+        <contentTypeIdentifier
                id="org.eclipse.wst.html.core.htmlsource">
             <partitionType id="org.eclipse.wst.html.HTML_DEFAULT"/>
          </contentTypeIdentifier>

Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/RefactoringChangesFactory.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/RefactoringChangesFactory.java	2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/RefactoringChangesFactory.java	2010-06-15 13:29:30 UTC (rev 22814)
@@ -42,6 +42,9 @@
 
 @SuppressWarnings("restriction")
 public class RefactoringChangesFactory {
+	private static final String JSF_CONTENT_TYPE = "jsf.facelet";
+	private static final String JSP_CONTENT_TYPE = "org.eclipse.jst.jsp.core.jspsource";
+	private static final String HTML_CONTENT_TYPE = "org.eclipse.wst.html.core.htmlsource";
 
 	private static final GroupCategorySet CATEGORY_COMPOSITE_URI_RENAME = new GroupCategorySet(
 			new GroupCategory(
@@ -217,7 +220,7 @@
 				return false;
 			}
 			String id = contentType.getId();
-			if (!"org.eclipse.jst.jsp.core.jspsource".equals(id) && !"org.eclipse.wst.html.core.htmlsource".equals(id)) { //$NON-NLS-1$ //$NON-NLS-2$
+			if (!JSP_CONTENT_TYPE.equals(id) && ! HTML_CONTENT_TYPE.equals(id) && !JSF_CONTENT_TYPE.equals(id)) { //$NON-NLS-1$ //$NON-NLS-2$
 				return false;
 			}
 		}

Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java	2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java	2010-06-15 13:29:30 UTC (rev 22814)
@@ -17,7 +17,6 @@
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
@@ -253,8 +252,9 @@
 			for (int i = 0; i < references.length; i++) {
 				if(!references[i].getSyntaxErrors().isEmpty()) {
 					for (SyntaxError error: references[i].getSyntaxErrors()) {
-						IMarker marker = addError(JSFValidationMessages.EL_SYNTAX_ERROR, JSFSeverityPreferences.EL_SYNTAX_ERROR, new String[]{"" + error.getProblem()}, 1, references[i].getStartPosition() + error.getPosition(), context.getResource());
-						references[i].addMarker(marker);
+						addError(JSFValidationMessages.EL_SYNTAX_ERROR, JSFSeverityPreferences.EL_SYNTAX_ERROR, new String[]{"" + error.getProblem()}, 1, references[i].getStartPosition() + error.getPosition(), context.getResource());
+//						IMarker marker = addError(JSFValidationMessages.EL_SYNTAX_ERROR, JSFSeverityPreferences.EL_SYNTAX_ERROR, new String[]{"" + error.getProblem()}, 1, references[i].getStartPosition() + error.getPosition(), context.getResource());
+//						references[i].addMarker(marker);
 					}
 				}
 				validateEL(references[i]);
@@ -359,8 +359,9 @@
 							startPosition = startPosition + startPr;
 							length = propertyName.length();
 						}
-						IMarker marker = addError(JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, JSFSeverityPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedMethodName, missingMethodName}, length, startPosition, file);
-						elReference.addMarker(marker);
+						addError(JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, JSFSeverityPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedMethodName, missingMethodName}, length, startPosition, file);
+//						IMarker marker = addError(JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, JSFSeverityPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedMethodName, missingMethodName}, length, startPosition, file);
+//						elReference.addMarker(marker);
 					}
 				}
 			}
@@ -394,11 +395,13 @@
 		}
 		// Mark invalid EL
 		if(unresolvedTokenIsVariable) {
-			IMarker marker = addError(JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_NAME, new String[]{varName}, lengthOfVarName, offsetOfVarName, file);
-			elReference.addMarker(marker);
+			addError(JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_NAME, new String[]{varName}, lengthOfVarName, offsetOfVarName, file);
+//			IMarker marker = addError(JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_NAME, new String[]{varName}, lengthOfVarName, offsetOfVarName, file);
+//			elReference.addMarker(marker);
 		} else {
-			IMarker marker = addError(JSFValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new String[]{varName}, lengthOfVarName, offsetOfVarName, file);
-			elReference.addMarker(marker);
+			addError(JSFValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new String[]{varName}, lengthOfVarName, offsetOfVarName, file);
+//			IMarker marker = addError(JSFValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new String[]{varName}, lengthOfVarName, offsetOfVarName, file);
+//			elReference.addMarker(marker);
 		}
 	}
 

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml	2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml	2010-06-15 13:29:30 UTC (rev 22814)
@@ -411,6 +411,9 @@
             <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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -430,6 +433,13 @@
          			<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -441,6 +451,9 @@
          	<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -464,6 +477,15 @@
          			<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -541,6 +563,42 @@
          			<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -556,6 +614,11 @@
          			<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -579,6 +642,15 @@
          			<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>
 		</hyperlinkPartitioner>
 		<hyperlinkPartitioner 
          	id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPExprHyperlinkPartitioner"
@@ -599,6 +671,14 @@
          		<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -614,6 +694,11 @@
          			<!--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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -629,6 +714,9 @@
          	<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -650,6 +738,14 @@
          			<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -659,9 +755,8 @@
          		<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="*/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/" />
@@ -671,14 +766,24 @@
          		<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="*/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">
+         		<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 
@@ -690,6 +795,9 @@
          	<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>
 		</hyperlinkPartitioner>
          
 		<hyperlinkPartitioner 
@@ -701,6 +809,9 @@
          	<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -712,6 +823,9 @@
          	<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>
 		</hyperlinkPartitioner>
 
 	</extension>	
@@ -822,6 +936,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_LOADBUNDLE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_LOADBUNDLE" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -837,6 +954,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
             	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+            	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -871,6 +991,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource"> 
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FORWARD" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet"> 
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FORWARD" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -882,6 +1005,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
             	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_NAVIGATION_CASE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+            	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_NAVIGATION_CASE" />
+			</contenttypeidentifier>
 		</hyperlink>
       
 		<hyperlink 
@@ -893,6 +1019,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
             	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CONVERTER" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+            	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CONVERTER" />
+			</contenttypeidentifier>
 			<contenttypeidentifier id="org.eclipse.jst.jsf.facesconfig.facesConfigFile">
 				<partitiontype id="org.jboss.tools.common.text.ext.xml.XML_CONVERTER" />
 			</contenttypeidentifier>
@@ -922,6 +1051,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_VALIDATOR" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_VALIDATOR" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -933,6 +1065,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FOR_ID" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FOR_ID" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<!-- Faces Config File -->
@@ -963,6 +1098,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_LINK" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_LINK" />
+			</contenttypeidentifier>
 		</hyperlink>
 		
 		<hyperlink 
@@ -974,6 +1112,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF2_JSP_LINK" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF2_JSP_LINK" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -985,6 +1126,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_XMLNS" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_XMLNS" />
+			</contenttypeidentifier>
 		</hyperlink>
 	
 		<hyperlink 
@@ -996,6 +1140,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAGLIB_DIRECTIVE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAGLIB_DIRECTIVE" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -1007,6 +1154,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_ATTRIBUTE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_ATTRIBUTE" />
+			</contenttypeidentifier>
 		</hyperlink>
 	
 		<hyperlink 
@@ -1018,6 +1168,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_NAME" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_NAME" />
+			</contenttypeidentifier>
 		</hyperlink>
 		
 		<hyperlink 
@@ -1029,6 +1182,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
+			</contenttypeidentifier>
 			<contenttypeidentifier id="org.eclipse.core.runtime.xml">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
 			</contenttypeidentifier>

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	2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml	2010-06-15 13:29:30 UTC (rev 22814)
@@ -16,6 +16,9 @@
          	<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -27,6 +30,9 @@
          	<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -48,6 +54,14 @@
          			<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -58,16 +72,11 @@
          		<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>
@@ -77,20 +86,29 @@
          		<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -106,6 +124,11 @@
          			<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>
 		</hyperlinkPartitioner>
 		
 		<hyperlinkPartitioner 
@@ -144,6 +167,22 @@
          			<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>
 		</hyperlinkPartitioner>
 		
 	</extension>
@@ -162,6 +201,9 @@
    			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.FACELETS_CSS_CLASS" />
 			</contenttypeidentifier>
+   			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.FACELETS_CSS_CLASS" />
+			</contenttypeidentifier>
 		</hyperlink>
 		
 	</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	2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml	2010-06-15 13:29:30 UTC (rev 22814)
@@ -86,6 +86,44 @@
          			<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -167,6 +205,44 @@
          			<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -180,6 +256,10 @@
          		<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>
 		</hyperlinkPartitioner>
 
 
@@ -194,6 +274,10 @@
          		<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -285,6 +369,49 @@
 					<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -312,6 +439,17 @@
          			<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -511,6 +649,103 @@
          			<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>
 		</hyperlinkPartitioner>
 
 	</extension>	
@@ -529,6 +764,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_LOADBUNDLE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_LOADBUNDLE" />
+			</contenttypeidentifier>
 		</hyperlink>
 	
 		<hyperlink 
@@ -540,6 +778,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
             	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_BUNDLE" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+            	<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_BUNDLE" />
+			</contenttypeidentifier>
 		</hyperlink>
 		
 	</extension>

Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml	2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml	2010-06-15 13:29:30 UTC (rev 22814)
@@ -100,6 +100,49 @@
       		type="preferencepages"
             value="org.eclipse.wst.sse.ui.preferences.jsp.occurrences"
             target="org.eclipse.wst.html.core.htmlsource"/>
+
+	      <sourceViewerConfiguration
+				class="org.jboss.tools.jst.jsp.HTMLTextViewerConfiguration"
+	            target="jsf.facelet"/>
+	      <contentOutlineConfiguration
+	            class="org.eclipse.wst.html.ui.views.contentoutline.HTMLContentOutlineConfiguration"
+	            target="jsf.facelet"/>
+	      <propertySheetConfiguration
+	            class="org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration"
+	            target="jsf.facelet"/>
+	      <provisionalConfiguration
+	      		type="sourceeditingtexttools"
+	            class="org.eclipse.wst.xml.ui.internal.provisional.XMLSourceEditingTextTools"
+	            target="jsf.facelet"/>
+	      <provisionalConfiguration
+	      		type="characterpairmatcher"
+	            class="org.eclipse.wst.html.ui.internal.text.HTMLDocumentRegionEdgeMatcher"
+	            target="jsf.facelet"/>
+	      <provisionalConfiguration
+	      		type="structuredtextfoldingprovider"
+	            class="org.eclipse.wst.html.ui.internal.projection.StructuredTextFoldingProviderHTML"
+	            target="jsf.facelet"/>
+	      <provisionalDefinition 
+	      		type="preferencepages"
+	            value="org.eclipse.wst.html.ui.preferences"
+	            target="jsf.facelet"/>
+	      <provisionalDefinition 
+	      		type="preferencepages"
+	            value="org.eclipse.wst.html.ui.preferences.source"
+	            target="jsf.facelet"/>
+	      <provisionalDefinition 
+	      		type="preferencepages"
+	            value="org.eclipse.wst.html.ui.preferences.templates"
+	            target="jsf.facelet"/>
+	      <provisionalDefinition 
+	      		type="preferencepages"
+	            value="org.eclipse.wst.html.ui.preferences.styles"
+	            target="jsf.facelet"/>
+      <provisionalDefinition
+      		type="preferencepages"
+            value="org.eclipse.wst.sse.ui.preferences.jsp.occurrences"
+            target="jsf.facelet"/>
+
       <provisionalConfiguration
             class="org.eclipse.wst.xml.ui.internal.projection.StructuredTextFoldingProviderXML"
             target="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"
@@ -163,6 +206,7 @@
             name="%editors.html.name" 
             default="true">
          <contentTypeBinding contentTypeId="org.eclipse.wst.html.core.htmlsource"/>
+         <contentTypeBinding contentTypeId="jsf.facelet"/>
       </editor>
    </extension>
 
@@ -554,6 +598,12 @@
 				<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" />
+				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+				<partitiontype id="org.eclipse.wst.css.STYLE" />
+			</contenttype>
 		</contentAssistProcessor>
 
   </extension>

Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/ChainTextHover.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/ChainTextHover.java	2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/ChainTextHover.java	2010-06-15 13:29:30 UTC (rev 22814)
@@ -18,6 +18,7 @@
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextHover;
 import org.eclipse.jface.text.ITextHoverExtension;
+import org.eclipse.jface.text.ITextHoverExtension2;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.wst.sse.ui.internal.Logger;
 import org.eclipse.wst.sse.ui.internal.taginfo.AnnotationHoverProcessor;
@@ -111,7 +112,14 @@
 			Iterator<ITextHover> i = getTextHovers().iterator();
 			while ((i.hasNext()) && (displayInfo == null)) {
 				ITextHover hover = (ITextHover) i.next();
-				displayInfo = hover.getHoverInfo(viewer, hoverRegion);
+				if(hover instanceof ITextHoverExtension2) {
+					Object displayInfoObject = ((ITextHoverExtension2)hover).getHoverInfo2(viewer, hoverRegion);
+					if(displayInfoObject!=null) {
+						displayInfo = displayInfoObject.toString();
+					}
+				} else {
+					displayInfo = hover.getHoverInfo(viewer, hoverRegion);
+				}
 			}
 		}
 		return displayInfo;

Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml	2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml	2010-06-15 13:29:30 UTC (rev 22814)
@@ -17,6 +17,9 @@
          	<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner 
@@ -30,6 +33,10 @@
          		<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>
 		</hyperlinkPartitioner>
 
 		<!--Maksim Areshkau, partitioner for *.taglib.xml files -->
@@ -98,6 +105,9 @@
          	<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>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner
@@ -109,6 +119,9 @@
          	<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>
 		</hyperlinkPartitioner>
          
 		<hyperlinkPartitioner
@@ -120,6 +133,9 @@
          	<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>
 		</hyperlinkPartitioner> 
 
 		<hyperlinkPartitioner
@@ -131,6 +147,9 @@
          	<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>
 		</hyperlinkPartitioner> 
 
 		<hyperlinkPartitioner
@@ -201,6 +220,17 @@
          			<!--axis path="*/style/" /-->
          		</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>
+         	</contentType>
 		</hyperlinkPartitioner>
 
 		<hyperlinkPartitioner
@@ -230,6 +260,12 @@
          			<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>
 		</hyperlinkPartitioner>
 		<!-- End of Common HTML and/or JSP hyperlink partitioners -->
 
@@ -249,6 +285,9 @@
    			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.CSS_CLASS" />
 			</contenttypeidentifier>
+   			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.CSS_CLASS" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 
@@ -280,6 +319,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_STYLESHEET_REL_LINK" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_STYLESHEET_REL_LINK" />
+			</contenttypeidentifier>
 		</hyperlink>
 		
 		<hyperlink 
@@ -371,6 +413,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
+			</contenttypeidentifier>
 		</hyperlink>
 
 		<hyperlink 

Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml	2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml	2010-06-15 13:29:30 UTC (rev 22814)
@@ -68,6 +68,12 @@
          			<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>
 		</hyperlinkPartitioner>
 
 
@@ -126,6 +132,9 @@
          	<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="org.eclipse.core.runtime.xml">
          		<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
          	</contentType>
@@ -205,6 +214,12 @@
          			<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="org.eclipse.core.runtime.xml">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
@@ -233,6 +248,11 @@
          			<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>
 		</hyperlinkPartitioner>
 		
 		
@@ -290,6 +310,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" />
+			</contenttypeidentifier>
 			<contenttypeidentifier id="org.eclipse.core.runtime.xml">
 				<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" />
 			</contenttypeidentifier>
@@ -325,6 +348,9 @@
 			<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
 				<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" />
 			</contenttypeidentifier>
+			<contenttypeidentifier id="jsf.facelet">
+				<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" />
+			</contenttypeidentifier>
 			
 			<contenttypeidentifier id="org.eclipse.core.runtime.xml">
 				<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" />



More information about the jbosstools-commits mailing list