Bug 404412

[JSF 2.2] Add support for new (JCP) namespace URIs in existing tooling
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManager.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManager.java
index 64a4009..70e5439 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManager.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManager.java
@@ -82,12 +82,15 @@
             {
                 return null;
             }
-            StandardModelFactory.debug(">START getModel: "+modelContext, StandardModelFactory.DEBUG_MD_GET); //$NON-NLS-1$
 
-            MetaDataModel model = models.get(modelContext);
+            final IMetaDataModelContext context = Aliases.get(modelContext);
+
+            StandardModelFactory.debug(">START getModel: " + context, StandardModelFactory.DEBUG_MD_GET); //$NON-NLS-1$
+
+            MetaDataModel model = models.get(context);
             if (model == null) {
                 // long in = System.currentTimeMillis();
-                model = loadMetadata(modelContext);
+                model = loadMetadata(context);
                 //System.out.println("Time to load "+modelContext.getURI()+": "+
                 // String.valueOf(System.currentTimeMillis() - in));
             } else if (model.needsRefresh()) {
@@ -95,7 +98,7 @@
                     model.reload();
                 } catch (ModelNotSetException e) {
                     // simply load it - should not get here
-                    model = loadMetadata(modelContext);
+                    model = loadMetadata(context);
                 }
             }
             
@@ -103,7 +106,7 @@
 //                ((Model) model.getRoot())
 //                        .setCurrentModelContext(modelContext);
 
-            StandardModelFactory.debug(">END getModel: "+modelContext, StandardModelFactory.DEBUG_MD_GET); //$NON-NLS-1$
+            StandardModelFactory.debug(">END getModel: " + context, StandardModelFactory.DEBUG_MD_GET); //$NON-NLS-1$
             if (model != null && !model.isEmpty()){			
     			return (Model)model.getRoot();
     		}
@@ -236,4 +239,45 @@
             return buf.toString();
         }
     }
+
+
+
+	private static class Aliases {
+		private static final HashMap<String, String> aliasMap = new HashMap<String, String>(6);
+		static {
+			aliasMap.put(
+					"http://xmlns.jcp.org/jsf/composite", //$NON-NLS-1$
+					"http://java.sun.com/jsf/composite"); //$NON-NLS-1$
+			aliasMap.put(
+					"http://xmlns.jcp.org/jsf/core", //$NON-NLS-1$
+					"http://java.sun.com/jsf/core"); //$NON-NLS-1$
+			aliasMap.put(
+					"http://xmlns.jcp.org/jsf/html", //$NON-NLS-1$
+					"http://java.sun.com/jsf/html"); //$NON-NLS-1$
+			aliasMap.put(
+					"http://xmlns.jcp.org/jsf/jstl/core", //$NON-NLS-1$
+					"http://java.sun.com/jsf/jstl/core"); //$NON-NLS-1$
+			aliasMap.put(
+					"http://xmlns.jcp.org/jsf/jstl/functions", //$NON-NLS-1$
+					"http://java.sun.com/jsf/jstl/functions"); //$NON-NLS-1$
+			aliasMap.put(
+					"http://xmlns.jcp.org/jsf/facelets", //$NON-NLS-1$
+					"http://java.sun.com/jsf/facelets"); //$NON-NLS-1$
+		}
+
+		private static IMetaDataModelContext get(final IMetaDataModelContext context) {
+			IMetaDataModelContext copy = context;
+			if (context instanceof MetaDataModelContext) {
+				final String alias = aliasMap.get(context.getModelIdentifier());
+				if (alias != null) {
+					copy = new MetaDataModelContext(
+							(IProject) context.getAdapter(IProject.class),
+							context.getDomainId(),
+							alias);
+				}
+			}
+			return copy;
+		}
+	}
+
 }
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/IJSFConstants.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/IJSFConstants.java
index c90d203..60048fb 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/IJSFConstants.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/IJSFConstants.java
@@ -1,1023 +1,1053 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- *     Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.tld;
-
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-
-/**
- * Constants covering the JSF Core and JSF HTML tag and tag attribute names
- */
-public interface IJSFConstants 
-{
-
-	/**
-	 * actionListener tagname
-	 */
-	final static public String TAG_ACTIONLISTENER = "actionListener"; //$NON-NLS-1$
-
-	/**
-	 * attribute tagname
-	 */
-	final static public String TAG_ATTRIBUTE = "attribute"; //$NON-NLS-1$
-
-	/**
-	 * convertDateTime tagname
-	 */
-	final static public String TAG_CONVERTDATETIME = "convertDateTime"; //$NON-NLS-1$
-
-	/**
-	 * converter tagname
-	 */
-	final static public String TAG_CONVERTER = "converter"; //$NON-NLS-1$
-
-	/**
-	 * convertNumber tagname
-	 */
-	final static public String TAG_CONVERTNUMBER = "convertNumber"; //$NON-NLS-1$
-
-	/**
-	 * facet tagname
-	 */
-	final static public String TAG_FACET = "facet"; //$NON-NLS-1$
-
-	/**
-	 * loadBundle tagname
-	 */
-	final static public String TAG_LOADBUNDLE = "loadBundle"; //$NON-NLS-1$
-
-	/**
-	 * param tagname
-	 */
-	final static public String TAG_PARAM = "param"; //$NON-NLS-1$
-
-    /**
-     * phaseListener tagname
-     */
-	final static public String TAG_PHASELISTENER = "phaseListener"; //$NON-NLS-1$
-	
-	/**
-	 * selectItem tagname
-	 */
-	final static public String TAG_SELECTITEM = "selectItem"; //$NON-NLS-1$
-
-	/**
-	 * selectItems tagname
-	 */
-	final static public String TAG_SELECTITEMS = "selectItems"; //$NON-NLS-1$
-
-	/**
-	 * setPropertyActionListener tagname
-	 */
-	final static public String TAG_SETPROPERTYACTIONLISTENER = "setPropertyActionListener"; //$NON-NLS-1$
-	
-	/**
-	 * subview tagname
-	 */
-	final static public String TAG_SUBVIEW = "subview"; //$NON-NLS-1$
-
-	/**
-	 * validateBean tagname
-	 */
-	final static public String TAG_VALIDATEBEAN = "validateBean"; //$NON-NLS-1$
-
-	/**
-	 * validateDoubleRange tagname
-	 */
-	final static public String TAG_VALIDATEDOUBLERANGE = "validateDoubleRange"; //$NON-NLS-1$
-
-	/**
-	 * validateLength tagname
-	 */
-	final static public String TAG_VALIDATELENGTH = "validateLength"; //$NON-NLS-1$
-
-	/**
-	 * validateLongRange tagname
-	 */
-	final static public String TAG_VALIDATELONGRANGE = "validateLongRange"; //$NON-NLS-1$
-
-	/**
-	 * validateRegex tagname
-	 */
-	final static public String TAG_VALIDATEREGEX = "validateRegex"; //$NON-NLS-1$
-
-	/**
-	 * validateRequired tagname
-	 */
-	final static public String TAG_VALIDATEREQUIRED = "validateRequired"; //$NON-NLS-1$
-
-	/**
-	 * validator tagname
-	 */
-	final static public String TAG_VALIDATOR = "validator"; //$NON-NLS-1$
-
-	/**
-	 * valueChangeListener tagname
-	 */
-	final static public String TAG_VALUECHANGELISTENER = "valueChangeListener"; //$NON-NLS-1$
-
-	/**
-	 * verbatim tagname
-	 */
-	final static public String TAG_VERBATIM = "verbatim"; //$NON-NLS-1$
-
-	/**
-	 * view tagname
-	 */
-	final static public String TAG_VIEW = "view"; //$NON-NLS-1$
-
-	/**
-	 * viewParam tagname
-	 */
-	final static public String TAG_VIEWPARAM = "viewParam"; //$NON-NLS-1$
-
-	/**
-	 * column tagname
-	 */
-	final static public String TAG_COLUMN = "column"; //$NON-NLS-1$
-
-	/**
-	 * commandButton tagname
-	 */
-	final static public String TAG_COMMANDBUTTON = "commandButton"; //$NON-NLS-1$
-
-	/**
-	 * commandLink tagname
-	 */
-	final static public String TAG_COMMANDLINK = "commandLink"; //$NON-NLS-1$
-
-	/**
-	 * dataTable tagname
-	 */
-	final static public String TAG_DATATABLE = "dataTable"; //$NON-NLS-1$
-
-	/**
-	 * form tagname
-	 */
-	final static public String TAG_FORM = "form"; //$NON-NLS-1$
-
-	/**
-	 * graphicImage tagname
-	 */
-	final static public String TAG_GRAPHICIMAGE = "graphicImage"; //$NON-NLS-1$
-
-	/**
-	 * inputHidden tagname
-	 */
-	final static public String TAG_INPUTHIDDEN = "inputHidden"; //$NON-NLS-1$
-
-	/**
-	 * inputSecret tagname
-	 */
-	final static public String TAG_INPUTSECRET = "inputSecret"; //$NON-NLS-1$
-
-	/**
-	 * inputText tagname
-	 */
-	final static public String TAG_INPUTTEXT = "inputText"; //$NON-NLS-1$
-
-	/**
-	 * inputTextarea tagname
-	 */
-	final static public String TAG_INPUTTEXTAREA = "inputTextarea"; //$NON-NLS-1$
-
-	/**
-	 * message tagname
-	 */
-	final static public String TAG_MESSAGE = "message"; //$NON-NLS-1$
-
-	/**
-	 * messages tagname
-	 */
-	final static public String TAG_MESSAGES = "messages"; //$NON-NLS-1$
-
-	/**
-	 * outputFormat tagname
-	 */
-	final static public String TAG_OUTPUTFORMAT = "outputFormat"; //$NON-NLS-1$
-
-	/**
-	 * outputLabel tagname
-	 */
-	final static public String TAG_OUTPUTLABEL = "outputLabel"; //$NON-NLS-1$
-
-	/**
-	 * outputLink tagname
-	 */
-	final static public String TAG_OUTPUTLINK = "outputLink"; //$NON-NLS-1$
-
-	/**
-	 * outputText tagname
-	 */
-	final static public String TAG_OUTPUTTEXT = "outputText"; //$NON-NLS-1$
-
-	/**
-	 * panelGrid tagname
-	 */
-	final static public String TAG_PANELGRID = "panelGrid"; //$NON-NLS-1$
-
-	/**
-	 * panelGroup tagname
-	 */
-	final static public String TAG_PANELGROUP = "panelGroup"; //$NON-NLS-1$
-
-	/**
-	 * selectBooleanCheckbox tagname
-	 */
-	final static public String TAG_SELECTBOOLEANCHECKBOX = "selectBooleanCheckbox"; //$NON-NLS-1$
-
-	/**
-	 * selectManyCheckbox tagname
-	 */
-	final static public String TAG_SELECTMANYCHECKBOX = "selectManyCheckbox"; //$NON-NLS-1$
-
-	/**
-	 * selectManyListbox tagname
-	 */
-	final static public String TAG_SELECTMANYLISTBOX = "selectManyListbox"; //$NON-NLS-1$
-
-	/**
-	 * selectManyMenu tagname
-	 */
-	final static public String TAG_SELECTMANYMENU = "selectManyMenu"; //$NON-NLS-1$
-
-	/**
-	 * selectOneListbox tagname
-	 */
-	final static public String TAG_SELECTONELISTBOX = "selectOneListbox"; //$NON-NLS-1$
-
-	/**
-	 * selectOneMenu tagname
-	 */
-	final static public String TAG_SELECTONEMENU = "selectOneMenu"; //$NON-NLS-1$
-
-	/**
-	 * selectOneMenu tagname
-	 */
-	final static public String TAG_SELECTONERADIO = "selectOneRadio"; //$NON-NLS-1$
-
-    // tag identifiers
-    /**
-     * TagIdentifier for TAG_VIEW
-     */
-    final static TagIdentifier TAG_IDENTIFIER_VIEW =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VIEW);
-
-    /**
-     * TagIdentifier for TAG_VIEWPARAM
-     */
-    final static TagIdentifier TAG_IDENTIFIER_VIEWPARAM =
-    	TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VIEWPARAM);
-
-    /**
-     * TagIdentifier for TAG_LOADBUNDLE
-     */
-    final static TagIdentifier TAG_IDENTIFIER_LOADBUNDLE =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_LOADBUNDLE);
-
-    /**
-     * TagIdentifier for TAG_FACET
-     */
-    final static TagIdentifier TAG_IDENTIFIER_FACET =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_FACET);
-    
-    /**
-     * TagIdentifier for TAG_VERBATIM
-     */
-    final static TagIdentifier TAG_IDENTIFIER_VERBATIM =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VERBATIM);
-    
-    /**
-     * TagIdentifier for TAG_DATATABLE
-     */
-    final static TagIdentifier TAG_IDENTIFIER_DATA_TABLE = 
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_DATATABLE);
-
-    /**
-     * TagIdentifier for TAG_PANELGRID
-     */
-    final static TagIdentifier TAG_IDENTIFIER_PANEL_GRID =
-       TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_PANELGRID);
-
-    /**
-     * TagIdentifier for TAG_COLUMN
-     */
-    final static TagIdentifier TAG_IDENTIFIER_COLUMN =
-       TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_COLUMN);
-
-    /**
-     * TagIdentifier for TAG_FORM
-     */
-    final static TagIdentifier TAG_IDENTIFIER_FORM =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_FORM);
-
-    /**
-     * TagIdentifier for TAG_INPUTTEXT
-     */
-    final static TagIdentifier TAG_IDENTIFIER_INPUTTEXT =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_INPUTTEXT);
-    
-    /**
-     * TagIdentifier for TAG_INPUTSECRET
-     */
-    final static TagIdentifier TAG_IDENTIFIER_INPUTSECRET =
-    	TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_INPUTSECRET);
-
-    /**
-     * TagIdentifier for TAG_INPUTTEXTAREA
-     */
-    final static TagIdentifier TAG_IDENTIFIER_INPUTTEXTAREA =
-    	TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_INPUTTEXTAREA);
-
-    /**
-     * TagIdentifier for TAG_OUTPUTTEXT
-     */
-    final static TagIdentifier TAG_IDENTIFIER_OUTPUTTEXT =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_OUTPUTTEXT);
-    
-    /**
-     * TagIdentifier for TAG_OUTPUTLABEL
-     */
-    final static TagIdentifier TAG_IDENTIFIER_OUTPUTLABEL =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_OUTPUTLABEL);
-    
-    /**
-     * TagIdentifier for TAG_GRAPHICIMAGE
-     */
-    final static TagIdentifier TAG_IDENTIFIER_GRAPHICIMAGE =
-    	TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_GRAPHICIMAGE);
-
-    /**
-     * TagIdentifier for TAG_COMMANDBUTTON
-     */
-    final static TagIdentifier TAG_IDENTIFIER_COMMANDBUTTON =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_COMMANDBUTTON);
-
-    /**
-     * TagIdentifier for TAG_COMMANDLINK
-     */
-    final static TagIdentifier TAG_IDENTIFIER_COMMANDLINK =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_COMMANDLINK);
-
-    /**
-     * TagIdentifier for TAG_INPUTHIDDEN
-     */
-    final static TagIdentifier TAG_IDENTIFIER_INPUTHIDDEN =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_INPUTHIDDEN);
-
-    /**
-     * TagIdentifier for TAG_MESSAGE
-     */
-    final static TagIdentifier TAG_IDENTIFIER_MESSAGE =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_MESSAGE);
-
-    /**
-     * TagIdentifier for TAG_MESSAGES
-     */
-    final static  TagIdentifier TAG_IDENTIFIER_MESSAGES =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_MESSAGES);
-
-    /**
-     * TagIdentifier for TAG_OUTPUTFORMAT
-     */
-    final static TagIdentifier TAG_IDENTIFIER_OUTPUTFORMAT =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_OUTPUTFORMAT);
-
-    /**
-     * TagIdentifier for TAG_OUTPUTLINK
-     */
-    final static TagIdentifier TAG_IDENTIFIER_OUTPUTLINK =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_OUTPUTLINK);
-
-    /**
-     * TagIdentifier for TAG_PANELGROUP
-     */
-    final static TagIdentifier TAG_IDENTIFIER_PANEL_GROUP =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_PANELGROUP);
-
-    /**
-     * TagIdentifier for TAG_SELECTBOOLEANCHECKBOX
-     */
-    final static TagIdentifier TAG_IDENTIFIER_SELECTBOOLEANCHECKBOX = 
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_SELECTBOOLEANCHECKBOX);
-
-    /**
-     * TagIdentifier for TAG_SELECTMANYCHECKBOX
-     */
-    final static TagIdentifier TAG_IDENTIFIER_SELECTMANYCHECKBOX = 
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_SELECTMANYCHECKBOX);
-
-    /**
-     * TagIdentifier for TAG_SELECTMANYLISTBOX
-     */
-    final static TagIdentifier TAG_IDENTIFIER_SELECTMANYLISTBOX = 
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_SELECTMANYLISTBOX);
-
-    /**
-     * TagIdentifier for TAG_SELECTMANYMENU
-     */
-    final static  TagIdentifier TAG_IDENTIFIER_SELECTMANYMENU =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_SELECTMANYMENU);
-
-    /**
-     * TagIdentifier for TAG_SELECTONELISTBOX
-     */
-    final static TagIdentifier TAG_IDENTIFIER_SELECTONELISTBOX =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_SELECTONELISTBOX);
-    
-    /**
-     * TagIdentifier for TAG_SELECTONEMENU
-     */
-    final static TagIdentifier TAG_IDENTIFIER_SELECTONEMENU =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_SELECTONEMENU);
-
-    /**
-     * TagIdentifier for TAG_SELECTONERADIO
-     */
-    final static TagIdentifier TAG_IDENTIFIER_SELECTONERADIO =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_SELECTONERADIO);
-
-    /**
-     * TagIdentifier for TAG_ACTIONLISTENER
-     */
-    final static TagIdentifier TAG_IDENTIFIER_ACTIONLISTENER = 
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_ACTIONLISTENER);
-
-    /**
-     * TagIdentifier for TAG_ATTRIBUTE
-     */
-    final static TagIdentifier TAG_IDENTIFIER_ATTRIBUTE = 
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_ATTRIBUTE);
-
-    /**
-     * TagIdentifier for TAG_CONVERTDATETIME
-     */
-    final static TagIdentifier TAG_IDENTIFIER_CONVERTDATETIME = 
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_CONVERTDATETIME);
-
-    /**
-     * TagIdentifier for TAG_CONVERTNUMBER
-     */
-    final static TagIdentifier TAG_IDENTIFIER_CONVERTNUMBER = 
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_CONVERTNUMBER);
-
-    /**
-     * TagIdentifier for TAG_CONVERTER
-     */
-    final static TagIdentifier TAG_IDENTIFIER_CONVERTER = 
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_CONVERTER);
-
-    /**
-     * TagIdentifier for TAG_PARAM
-     */
-    final static TagIdentifier TAG_IDENTIFIER_PARAM =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_PARAM);
-
-    /**
-     * TagIdentifier for TAG_PHASELISTENER
-     */
-    final static TagIdentifier TAG_IDENTIFIER_PHASELISTENER =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_PHASELISTENER);
-
-    /**
-     * TagIdentifier for TAG_SELECTITEM
-     */
-    final static TagIdentifier TAG_IDENTIFIER_SELECTITEM = 
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_SELECTITEM);
-
-    /**
-     * TagIdentifier for TAG_SELECTITEMS
-     */
-    final static TagIdentifier TAG_IDENTIFIER_SELECTITEMS =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_SELECTITEMS);
-
-    /**
-     * TagIdentifier for TAG_SETPROPERTYACTIONLISTENER
-     */
-    final static TagIdentifier TAG_IDENTIFIER_SETPROPERTYACTIONLISTENER =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_SETPROPERTYACTIONLISTENER);
-
-    /**
-     * TagIdentifier for TAG_SUBVIEW
-     */
-    final static TagIdentifier TAG_IDENTIFIER_SUBVIEW =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_SUBVIEW);
-
-    /**
-     * TagIdentifier for TAG_VALIDATEBEAN
-     */
-    final static TagIdentifier TAG_IDENTIFIER_VALIDATEBEAN =
-    	TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALIDATEBEAN);
-
-    /**
-     * TagIdentifier for TAG_VALIDATEDOUBLERANGE
-     */
-    final static TagIdentifier TAG_IDENTIFIER_VALIDATEDOUBLERANGE =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALIDATEDOUBLERANGE);
-
-    /**
-     * TagIdentifier for TAG_VALIDATELENGTH
-     */
-    final static TagIdentifier TAG_IDENTIFIER_VALIDATELENGTH =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALIDATELENGTH);
-
-    /**
-     * TagIdentifier for TAG_VALIDATELONGRANGE
-     */
-    final static TagIdentifier TAG_IDENTIFIER_VALIDATELONGRANGE =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALIDATELONGRANGE);
-
-    /**
-     * TagIdentifier for TAG_VALIDATEREGEX
-     */
-    final static TagIdentifier TAG_IDENTIFIER_VALIDATEREGEX =
-    	TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALIDATEREGEX);
-
-    /**
-     * TagIdentifier for TAG_VALIDATEREQUIRED
-     */
-    final static TagIdentifier TAG_IDENTIFIER_VALIDATEREQUIRED =
-    	TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALIDATEREQUIRED);
-
-    /**
-     * TagIdentifier for TAG_VALIDATOR
-     */
-    final static TagIdentifier TAG_IDENTIFIER_VALIDATOR =
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALIDATOR);
-
-    /**
-     * TagIdentifier for TAG_VALUECHANGELISTENER
-     */
-    final static TagIdentifier TAG_IDENTIFIER_VALUECHANGELISTENER = 
-        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALUECHANGELISTENER);
-
-    // attribute names
-	/**
-	 * accept tag attribute name
-	 */
-	final static public String ATTR_ACCEPT = "accept"; //$NON-NLS-1$
-
-	/**
-	 * acceptcharset tag attribute name
-	 */
-	final static public String ATTR_ACCEPTCHARSET = "acceptcharset"; //$NON-NLS-1$
-
-	/**
-	 * accesskey tag attribute name
-	 */
-	final static public String ATTR_ACCESSKEY = "accesskey"; //$NON-NLS-1$
-
-	/**
-	 * action tag attribute name
-	 */
-	final static public String ATTR_ACTION = "action"; //$NON-NLS-1$
-
-	/**
-	 * actionListener tag attribute name
-	 */
-	final static public String ATTR_ACTIONLISTENER = "actionListener"; //$NON-NLS-1$
-
-	/**
-	 * alt tag attribute name
-	 */
-	final static public String ATTR_ALT = "alt"; //$NON-NLS-1$
-
-	/**
-	 * basename tag attribute name
-	 */
-	final static public String ATTR_BASENAME = "basename"; //$NON-NLS-1$
-
-	/**
-	 * bgcolor tag attribute name
-	 */
-	final static public String ATTR_BGCOLOR = "bgcolor"; //$NON-NLS-1$
-
-	/**
-	 * binding tag attribute name
-	 */
-	final static public String ATTR_BINDING = "binding"; //$NON-NLS-1$
-
-	/**
-	 * border tag attribute name
-	 */
-	final static public String ATTR_BORDER = "border"; //$NON-NLS-1$
-
-	/**
-	 * cellpadding tag attribute name
-	 */
-	final static public String ATTR_CELLPADDING = "cellpadding"; //$NON-NLS-1$
-
-	/**
-	 * cellspacing tag attribute name
-	 */
-	final static public String ATTR_CELLSPACING = "cellspacing"; //$NON-NLS-1$
-
-	/**
-	 * charset tag attribute name
-	 */
-	final static public String ATTR_CHARSET = "charset"; //$NON-NLS-1$
-
-	/**
-	 * cols tag attribute name
-	 */
-	final static public String ATTR_COLS = "cols"; //$NON-NLS-1$
-
-	/**
-	 * columnClasses tag attribute name
-	 */
-	final static public String ATTR_COLUMNCLASSES = "columnClasses"; //$NON-NLS-1$
-
-	/**
-	 * columns tag attribute name
-	 */
-	final static public String ATTR_COLUMNS = "columns"; //$NON-NLS-1$
-
-	/**
-	 * converterId tag attribute name
-	 */
-	final static public String ATTR_CONVERTERID = "converterId"; //$NON-NLS-1$
-
-	/**
-	 * coords tag attribute name
-	 */
-	final static public String ATTR_COORDS = "coords"; //$NON-NLS-1$
-
-	/**
-	 * currencyCode tag attribute name
-	 */
-	final static public String ATTR_CURRENCYCODE = "currencyCode"; //$NON-NLS-1$
-
-	/**
-	 * currencySymbol tag attribute name
-	 */
-	final static public String ATTR_CURRENCYSYMBOL = "currencySymbol"; //$NON-NLS-1$
-
-	/**
-	 * dateStyle tag attribute name
-	 */
-	final static public String ATTR_DATESTYLE = "dateStyle"; //$NON-NLS-1$
-
-	/**
-	 * dir tag attribute name
-	 */
-	final static public String ATTR_DIR = "dir"; //$NON-NLS-1$
-
-	/**
-	 * disabled tag attribute name
-	 */
-	final static public String ATTR_DISABLED = "disabled"; //$NON-NLS-1$
-
-	/**
-	 * errorClass tag attribute name
-	 */
-	final static public String ATTR_ERRORCLASS = "errorClass"; //$NON-NLS-1$
-
-	/**
-	 * errorStyle tag attribute name
-	 */
-	final static public String ATTR_ERRORSTYLE = "errorStyle"; //$NON-NLS-1$
-
-	/**
-	 * escape tag attribute name
-	 */
-	final static public String ATTR_ESCAPE = "escape"; //$NON-NLS-1$
-
-	/**
-	 * fatalClass tag attribute name
-	 */
-	final static public String ATTR_FATALCLASS = "fatalClass"; //$NON-NLS-1$
-
-	/**
-	 * fatalStyle tag attribute name
-	 */
-	final static public String ATTR_FATALSTYLE = "fatalStyle"; //$NON-NLS-1$
-
-	/**
-	 * first tag attribute name
-	 */
-	final static public String ATTR_FIRST = "first"; //$NON-NLS-1$
-
-	/**
-	 * footerClass tag attribute name
-	 */
-	final static public String ATTR_FOOTERCLASS = "footerClass"; //$NON-NLS-1$
-
-	/**
-	 * for tag attribute name
-	 */
-	final static public String ATTR_FOR = "for"; //$NON-NLS-1$
-
-	/**
-	 * frame tag attribute name
-	 */
-	final static public String ATTR_FRAME = "frame"; //$NON-NLS-1$
-
-	/**
-	 * globalOnly tag attribute name
-	 */
-	final static public String ATTR_GLOBEONLY = "globalOnly"; //$NON-NLS-1$
-
-	/**
-	 * headerClass tag attribute name
-	 */
-	final static public String ATTR_HEADERCLASS = "headerClass"; //$NON-NLS-1$
-
-	/**
-	 * hreflang tag attribute name
-	 */
-	final static public String ATTR_HREFLANG = "hreflang"; //$NON-NLS-1$
-
-	/**
-	 * id tag attribute name
-	 */
-	final static public String ATTR_ID = "id"; //$NON-NLS-1$
-
-	/**
-	 * image tag attribute name
-	 */
-	final static public String ATTR_IMAGE = "image"; //$NON-NLS-1$
-
-	/**
-	 * immediate tag attribute name
-	 */
-	final static public String ATTR_IMMEDIATE = "immediate"; //$NON-NLS-1$
-
-	/**
-	 * infoClass tag attribute name
-	 */
-	final static public String ATTR_INFOCLASS = "infoClass"; //$NON-NLS-1$
-
-	/**
-	 * infoStyle tag attribute name
-	 */
-	final static public String ATTR_INFOSTYLE = "infoStyle"; //$NON-NLS-1$
-
-	/**
-	 * itemDescription tag attribute name
-	 */
-	final static public String ATTR_ITEMDESCRIPTION = "itemDescription"; //$NON-NLS-1$
-
-	/**
-	 * itemDisabled tag attribute name
-	 */
-	final static public String ATTR_ITEMDISABLED = "itemDisabled"; //$NON-NLS-1$
-
-	/**
-	 * itemLabel tag attribute name
-	 */
-	final static public String ATTR_ITEMLABEL = "itemLabel"; //$NON-NLS-1$
-
-	/**
-	 * itemValue tag attribute name
-	 */
-	final static public String ATTR_ITEMVALUE = "itemValue"; //$NON-NLS-1$
-
-	/**
-	 * lang tag attribute name
-	 */
-	final static public String ATTR_LANG = "lang"; //$NON-NLS-1$
-
-	/**
-	 * layout tag attribute name
-	 */
-	final static public String ATTR_LAYOUT = "layout"; //$NON-NLS-1$
-
-	/**
-	 * locale tag attribute name
-	 */
-	final static public String ATTR_LOCALE = "locale"; //$NON-NLS-1$
-
-	/**
-	 * maximum tag attribute name
-	 */
-	final static public String ATTR_MAXIMUM = "maximum"; //$NON-NLS-1$
-
-	/**
-	 * minimum tag attribute name
-	 */
-	final static public String ATTR_MINIMUM = "minimum"; //$NON-NLS-1$
-
-	/**
-	 * name tag attribute name
-	 */
-	final static public String ATTR_NAME = "name"; //$NON-NLS-1$
-
-	/**
-	 * onblur tag attribute name
-	 */
-	final static public String ATTR_ONBLUR = "onblur"; //$NON-NLS-1$
-
-	/**
-	 * onchange tag attribute name
-	 */
-	final static public String ATTR_ONCHANGE = "onchange"; //$NON-NLS-1$
-
-	/**
-	 * onclick tag attribute name
-	 */
-	final static public String ATTR_ONCLICK = "onclick"; //$NON-NLS-1$
-
-	/**
-	 * ondblclick tag attribute name
-	 */
-	final static public String ATTR_ONDBLCLICK = "ondblclick"; //$NON-NLS-1$
-
-	/**
-	 * onfocus tag attribute name
-	 */
-	final static public String ATTR_ONFOCUS = "onfocus"; //$NON-NLS-1$
-
-	/**
-	 * onkeydown tag attribute name
-	 */
-	final static public String ATTR_ONKEYDOWN = "onkeydown"; //$NON-NLS-1$
-
-	/**
-	 * onkeypress tag attribute name
-	 */
-	final static public String ATTR_ONKEYPRESS = "onkeypress"; //$NON-NLS-1$
-
-	/**
-	 * onkeyup tag attribute name
-	 */
-	final static public String ATTR_ONKEYUP = "onkeyup"; //$NON-NLS-1$
-
-	/**
-	 * onmousedown tag attribute name
-	 */
-	final static public String ATTR_ONMOUSEDOWN = "onmousedown"; //$NON-NLS-1$
-
-	/**
-	 * onmousemove tag attribute name
-	 */
-	final static public String ATTR_ONMOUSEMOVE = "onmousemove"; //$NON-NLS-1$
-
-	/**
-	 * onmouseout tag attribute name
-	 */
-	final static public String ATTR_ONMOUSEOUT = "onmouseout"; //$NON-NLS-1$
-
-	/**
-	 * onmouseover tag attribute name
-	 */
-	final static public String ATTR_ONMOUSEOVER = "onmouseover"; //$NON-NLS-1$
-
-	/**
-	 * onmouseup tag attribute name
-	 */
-	final static public String ATTR_ONMOUSEUP = "onmouseup"; //$NON-NLS-1$
-
-	/**
-	 * onselect tag attribute name
-	 */
-	final static public String ATTR_ONSELECT = "onselect"; //$NON-NLS-1$
-
-	/**
-	 * pattern tag attribute name
-	 */
-	final static public String ATTR_PATTERN = "pattern"; //$NON-NLS-1$
-
-	/**
-	 * readonly tag attribute name
-	 */
-	final static public String ATTR_READONLY = "readonly"; //$NON-NLS-1$
-
-	/**
-	 * rel tag attribute name
-	 */
-	final static public String ATTR_REL = "rel"; //$NON-NLS-1$
-
-	/**
-	 * rendered tag attribute name
-	 */
-	final static public String ATTR_RENDERED = "rendered"; //$NON-NLS-1$
-
-	/**
-	 * rev tag attribute name
-	 */
-	final static public String ATTR_REV = "rev"; //$NON-NLS-1$
-
-	/**
-	 * rowClasses tag attribute name
-	 */
-	final static public String ATTR_ROWCLASSES = "rowClasses"; //$NON-NLS-1$
-
-	/**
-	 * rows tag attribute name
-	 */
-	final static public String ATTR_ROWS = "rows"; //$NON-NLS-1$
-
-	/**
-	 * rules tag attribute name
-	 */
-	final static public String ATTR_RULES = "rules"; //$NON-NLS-1$
-
-	/**
-	 * shape tag attribute name
-	 */
-	final static public String ATTR_SHAPE = "shape"; //$NON-NLS-1$
-
-	/**
-	 *  showDetail tag attribute name
-	 */
-	final static public String ATTR_SHOWDETAIL = "showDetail"; //$NON-NLS-1$
-
-	/**
-	 * showSummary tag attribute name
-	 */
-	final static public String ATTR_SHOWSUMMARY = "showSummary"; //$NON-NLS-1$
-
-	/**
-	 * size tag attribute name
-	 */
-	final static public String ATTR_SIZE = "size"; //$NON-NLS-1$
-
-	/**
-	 * style tag attribute name
-	 */
-	final static public String ATTR_STYLE = "style"; //$NON-NLS-1$
-
-	/**
-	 * styleClass tag attribute name
-	 */
-	final static public String ATTR_STYLECLASS = "styleClass"; //$NON-NLS-1$
-
-	/**
-	 * summary tag attribute name
-	 */
-	final static public String ATTR_SUMMARY = "summary"; //$NON-NLS-1$
-
-	/**
-	 * tabindex tag attribute name
-	 */
-	final static public String ATTR_TABINDEX = "tabindex"; //$NON-NLS-1$
-
-	/**
-	 * target tag attribute name
-	 */
-	final static public String ATTR_TARGET = "target"; //$NON-NLS-1$
-
-	/**
-	 * timeStyle tag attribute name
-	 */
-	final static public String ATTR_TIMESTYLE = "timeStyle"; //$NON-NLS-1$
-
-	/**
-	 * title tag attribute name
-	 */
-	final static public String ATTR_TITLE = "title"; //$NON-NLS-1$
-
-	/**
-	 * tooltip tag attribute name
-	 */
-	final static public String ATTR_TOOLTIP = "tooltip"; //$NON-NLS-1$
-
-	/**
-	 * type tag attribute name
-	 */
-	final static public String ATTR_TYPE = "type"; //$NON-NLS-1$
-
-	/**
-	 * url tag attribute name
-	 */
-	final static public String ATTR_URL = "url"; //$NON-NLS-1$
-
-	/**
-	 * validatorId tag attribute name
-	 */
-	final static public String ATTR_VALIDATORID = "validatorId"; //$NON-NLS-1$
-
-	/**
-	 * value tag attribute name
-	 */
-	final static public String ATTR_VALUE = "value"; //$NON-NLS-1$
-
-	/**
-	 * var tag attribute name
-	 */
-	final static public String ATTR_VAR = "var"; //$NON-NLS-1$
-
-	/**
-	 * warnClass tag attribute name
-	 */
-	final static public String ATTR_WARNCLASS = "warnClass"; //$NON-NLS-1$
-
-	/**
-	 * warnStyle tag attribute name
-	 */
-	final static public String ATTR_WARNSTYLE = "warnStyle"; //$NON-NLS-1$
-
-	/**
-	 * width tag attribute name
-	 */
-	final static public String ATTR_WIDTH = "width"; //$NON-NLS-1$
-
-}
+/*******************************************************************************

+ * Copyright (c) 2006 Sybase, Inc. and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are 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:

+ *     Sybase, Inc. - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.jst.jsf.core.internal.tld;

+

+import org.eclipse.jst.jsf.common.dom.TagIdentifier;

+

+/**

+ * Constants covering the JSF Core and JSF HTML tag and tag attribute names

+ */

+public interface IJSFConstants 

+{

+

+	/**

+	 * actionListener tagname

+	 */

+	final static public String TAG_ACTIONLISTENER = "actionListener"; //$NON-NLS-1$

+

+	/**

+	 * attribute tagname

+	 */

+	final static public String TAG_ATTRIBUTE = "attribute"; //$NON-NLS-1$

+

+	/**

+	 * convertDateTime tagname

+	 */

+	final static public String TAG_CONVERTDATETIME = "convertDateTime"; //$NON-NLS-1$

+

+	/**

+	 * converter tagname

+	 */

+	final static public String TAG_CONVERTER = "converter"; //$NON-NLS-1$

+

+	/**

+	 * convertNumber tagname

+	 */

+	final static public String TAG_CONVERTNUMBER = "convertNumber"; //$NON-NLS-1$

+

+	/**

+	 * facet tagname

+	 */

+	final static public String TAG_FACET = "facet"; //$NON-NLS-1$

+

+	/**

+	 * loadBundle tagname

+	 */

+	final static public String TAG_LOADBUNDLE = "loadBundle"; //$NON-NLS-1$

+

+	/**

+	 * param tagname

+	 */

+	final static public String TAG_PARAM = "param"; //$NON-NLS-1$

+

+    /**

+     * phaseListener tagname

+     */

+	final static public String TAG_PHASELISTENER = "phaseListener"; //$NON-NLS-1$

+	

+	/**

+	 * selectItem tagname

+	 */

+	final static public String TAG_SELECTITEM = "selectItem"; //$NON-NLS-1$

+

+	/**

+	 * selectItems tagname

+	 */

+	final static public String TAG_SELECTITEMS = "selectItems"; //$NON-NLS-1$

+

+	/**

+	 * setPropertyActionListener tagname

+	 */

+	final static public String TAG_SETPROPERTYACTIONLISTENER = "setPropertyActionListener"; //$NON-NLS-1$

+	

+	/**

+	 * subview tagname

+	 */

+	final static public String TAG_SUBVIEW = "subview"; //$NON-NLS-1$

+

+	/**

+	 * validateBean tagname

+	 */

+	final static public String TAG_VALIDATEBEAN = "validateBean"; //$NON-NLS-1$

+

+	/**

+	 * validateDoubleRange tagname

+	 */

+	final static public String TAG_VALIDATEDOUBLERANGE = "validateDoubleRange"; //$NON-NLS-1$

+

+	/**

+	 * validateLength tagname

+	 */

+	final static public String TAG_VALIDATELENGTH = "validateLength"; //$NON-NLS-1$

+

+	/**

+	 * validateLongRange tagname

+	 */

+	final static public String TAG_VALIDATELONGRANGE = "validateLongRange"; //$NON-NLS-1$

+

+	/**

+	 * validateRegex tagname

+	 */

+	final static public String TAG_VALIDATEREGEX = "validateRegex"; //$NON-NLS-1$

+

+	/**

+	 * validateRequired tagname

+	 */

+	final static public String TAG_VALIDATEREQUIRED = "validateRequired"; //$NON-NLS-1$

+

+	/**

+	 * validator tagname

+	 */

+	final static public String TAG_VALIDATOR = "validator"; //$NON-NLS-1$

+

+	/**

+	 * valueChangeListener tagname

+	 */

+	final static public String TAG_VALUECHANGELISTENER = "valueChangeListener"; //$NON-NLS-1$

+

+	/**

+	 * verbatim tagname

+	 */

+	final static public String TAG_VERBATIM = "verbatim"; //$NON-NLS-1$

+

+	/**

+	 * view tagname

+	 */

+	final static public String TAG_VIEW = "view"; //$NON-NLS-1$

+

+	/**

+	 * viewParam tagname

+	 */

+	final static public String TAG_VIEWPARAM = "viewParam"; //$NON-NLS-1$

+

+	/**

+	 * column tagname

+	 */

+	final static public String TAG_COLUMN = "column"; //$NON-NLS-1$

+

+	/**

+	 * commandButton tagname

+	 */

+	final static public String TAG_COMMANDBUTTON = "commandButton"; //$NON-NLS-1$

+

+	/**

+	 * commandLink tagname

+	 */

+	final static public String TAG_COMMANDLINK = "commandLink"; //$NON-NLS-1$

+

+	/**

+	 * dataTable tagname

+	 */

+	final static public String TAG_DATATABLE = "dataTable"; //$NON-NLS-1$

+

+	/**

+	 * form tagname

+	 */

+	final static public String TAG_FORM = "form"; //$NON-NLS-1$

+

+	/**

+	 * graphicImage tagname

+	 */

+	final static public String TAG_GRAPHICIMAGE = "graphicImage"; //$NON-NLS-1$

+

+	/**

+	 * inputHidden tagname

+	 */

+	final static public String TAG_INPUTHIDDEN = "inputHidden"; //$NON-NLS-1$

+

+	/**

+	 * inputSecret tagname

+	 */

+	final static public String TAG_INPUTSECRET = "inputSecret"; //$NON-NLS-1$

+

+	/**

+	 * inputText tagname

+	 */

+	final static public String TAG_INPUTTEXT = "inputText"; //$NON-NLS-1$

+

+	/**

+	 * inputTextarea tagname

+	 */

+	final static public String TAG_INPUTTEXTAREA = "inputTextarea"; //$NON-NLS-1$

+

+	/**

+	 * message tagname

+	 */

+	final static public String TAG_MESSAGE = "message"; //$NON-NLS-1$

+

+	/**

+	 * messages tagname

+	 */

+	final static public String TAG_MESSAGES = "messages"; //$NON-NLS-1$

+

+	/**

+	 * outputFormat tagname

+	 */

+	final static public String TAG_OUTPUTFORMAT = "outputFormat"; //$NON-NLS-1$

+

+	/**

+	 * outputLabel tagname

+	 */

+	final static public String TAG_OUTPUTLABEL = "outputLabel"; //$NON-NLS-1$

+

+	/**

+	 * outputLink tagname

+	 */

+	final static public String TAG_OUTPUTLINK = "outputLink"; //$NON-NLS-1$

+

+	/**

+	 * outputText tagname

+	 */

+	final static public String TAG_OUTPUTTEXT = "outputText"; //$NON-NLS-1$

+

+	/**

+	 * panelGrid tagname

+	 */

+	final static public String TAG_PANELGRID = "panelGrid"; //$NON-NLS-1$

+

+	/**

+	 * panelGroup tagname

+	 */

+	final static public String TAG_PANELGROUP = "panelGroup"; //$NON-NLS-1$

+

+	/**

+	 * selectBooleanCheckbox tagname

+	 */

+	final static public String TAG_SELECTBOOLEANCHECKBOX = "selectBooleanCheckbox"; //$NON-NLS-1$

+

+	/**

+	 * selectManyCheckbox tagname

+	 */

+	final static public String TAG_SELECTMANYCHECKBOX = "selectManyCheckbox"; //$NON-NLS-1$

+

+	/**

+	 * selectManyListbox tagname

+	 */

+	final static public String TAG_SELECTMANYLISTBOX = "selectManyListbox"; //$NON-NLS-1$

+

+	/**

+	 * selectManyMenu tagname

+	 */

+	final static public String TAG_SELECTMANYMENU = "selectManyMenu"; //$NON-NLS-1$

+

+	/**

+	 * selectOneListbox tagname

+	 */

+	final static public String TAG_SELECTONELISTBOX = "selectOneListbox"; //$NON-NLS-1$

+

+	/**

+	 * selectOneMenu tagname

+	 */

+	final static public String TAG_SELECTONEMENU = "selectOneMenu"; //$NON-NLS-1$

+

+	/**

+	 * selectOneMenu tagname

+	 */

+	final static public String TAG_SELECTONERADIO = "selectOneRadio"; //$NON-NLS-1$

+

+    // tag identifiers

+    /**

+     * TagIdentifier for TAG_VIEW

+     */

+    final static TagIdentifier TAG_IDENTIFIER_VIEW =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VIEW);

+

+    /**

+     * TagIdentifier for TAG_VIEWPARAM

+     */

+    final static TagIdentifier TAG_IDENTIFIER_VIEWPARAM =

+    	TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VIEWPARAM);

+

+    /**

+     * TagIdentifier for TAG_LOADBUNDLE

+     */

+    final static TagIdentifier TAG_IDENTIFIER_LOADBUNDLE =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_LOADBUNDLE);

+

+    /**

+     * JCP version of TagIdentifier for TAG_LOADBUNDLE

+     */

+    final static TagIdentifier TAG_IDENTIFIER_LOADBUNDLE_JCP =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE_JCP, TAG_LOADBUNDLE);

+

+    /**

+     * TagIdentifier for TAG_FACET

+     */

+    final static TagIdentifier TAG_IDENTIFIER_FACET =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_FACET);

+    

+    /**

+     * JCP version of TagIdentifier for TAG_FACET

+     */

+    final static TagIdentifier TAG_IDENTIFIER_FACET_JCP =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE_JCP, TAG_FACET);

+    

+    /**

+     * TagIdentifier for TAG_VERBATIM

+     */

+    final static TagIdentifier TAG_IDENTIFIER_VERBATIM =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VERBATIM);

+    

+    /**

+     * TagIdentifier for TAG_DATATABLE

+     */

+    final static TagIdentifier TAG_IDENTIFIER_DATA_TABLE = 

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_DATATABLE);

+

+    /**

+     * JCP version of TagIdentifier for TAG_DATATABLE

+     */

+    final static TagIdentifier TAG_IDENTIFIER_DATA_TABLE_JCP = 

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML_JCP, TAG_DATATABLE);

+

+    /**

+     * TagIdentifier for TAG_PANELGRID

+     */

+    final static TagIdentifier TAG_IDENTIFIER_PANEL_GRID =

+       TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_PANELGRID);

+

+    /**

+     * JCP version of TagIdentifier for TAG_PANELGRID

+     */

+    final static TagIdentifier TAG_IDENTIFIER_PANEL_GRID_JCP =

+       TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML_JCP, TAG_PANELGRID);

+

+    /**

+     * TagIdentifier for TAG_COLUMN

+     */

+    final static TagIdentifier TAG_IDENTIFIER_COLUMN =

+       TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_COLUMN);

+

+    /**

+     * JCP version of TagIdentifier for TAG_COLUMN

+     */

+    final static TagIdentifier TAG_IDENTIFIER_COLUMN_JCP =

+       TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML_JCP, TAG_COLUMN);

+

+    /**

+     * TagIdentifier for TAG_FORM

+     */

+    final static TagIdentifier TAG_IDENTIFIER_FORM =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_FORM);

+

+    /**

+     * TagIdentifier for TAG_INPUTTEXT

+     */

+    final static TagIdentifier TAG_IDENTIFIER_INPUTTEXT =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_INPUTTEXT);

+    

+    /**

+     * TagIdentifier for TAG_INPUTSECRET

+     */

+    final static TagIdentifier TAG_IDENTIFIER_INPUTSECRET =

+    	TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_INPUTSECRET);

+

+    /**

+     * TagIdentifier for TAG_INPUTTEXTAREA

+     */

+    final static TagIdentifier TAG_IDENTIFIER_INPUTTEXTAREA =

+    	TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_INPUTTEXTAREA);

+

+    /**

+     * TagIdentifier for TAG_OUTPUTTEXT

+     */

+    final static TagIdentifier TAG_IDENTIFIER_OUTPUTTEXT =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_OUTPUTTEXT);

+    

+    /**

+     * TagIdentifier for TAG_OUTPUTLABEL

+     */

+    final static TagIdentifier TAG_IDENTIFIER_OUTPUTLABEL =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_OUTPUTLABEL);

+    

+    /**

+     * TagIdentifier for TAG_GRAPHICIMAGE

+     */

+    final static TagIdentifier TAG_IDENTIFIER_GRAPHICIMAGE =

+    	TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_GRAPHICIMAGE);

+

+    /**

+     * TagIdentifier for TAG_COMMANDBUTTON

+     */

+    final static TagIdentifier TAG_IDENTIFIER_COMMANDBUTTON =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_COMMANDBUTTON);

+

+    /**

+     * TagIdentifier for TAG_COMMANDLINK

+     */

+    final static TagIdentifier TAG_IDENTIFIER_COMMANDLINK =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_COMMANDLINK);

+

+    /**

+     * TagIdentifier for TAG_INPUTHIDDEN

+     */

+    final static TagIdentifier TAG_IDENTIFIER_INPUTHIDDEN =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_INPUTHIDDEN);

+

+    /**

+     * TagIdentifier for TAG_MESSAGE

+     */

+    final static TagIdentifier TAG_IDENTIFIER_MESSAGE =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_MESSAGE);

+

+    /**

+     * TagIdentifier for TAG_MESSAGES

+     */

+    final static  TagIdentifier TAG_IDENTIFIER_MESSAGES =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_MESSAGES);

+

+    /**

+     * TagIdentifier for TAG_OUTPUTFORMAT

+     */

+    final static TagIdentifier TAG_IDENTIFIER_OUTPUTFORMAT =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_OUTPUTFORMAT);

+

+    /**

+     * TagIdentifier for TAG_OUTPUTLINK

+     */

+    final static TagIdentifier TAG_IDENTIFIER_OUTPUTLINK =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_OUTPUTLINK);

+

+    /**

+     * TagIdentifier for TAG_PANELGROUP

+     */

+    final static TagIdentifier TAG_IDENTIFIER_PANEL_GROUP =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_PANELGROUP);

+

+    /**

+     * TagIdentifier for TAG_SELECTBOOLEANCHECKBOX

+     */

+    final static TagIdentifier TAG_IDENTIFIER_SELECTBOOLEANCHECKBOX = 

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_SELECTBOOLEANCHECKBOX);

+

+    /**

+     * TagIdentifier for TAG_SELECTMANYCHECKBOX

+     */

+    final static TagIdentifier TAG_IDENTIFIER_SELECTMANYCHECKBOX = 

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_SELECTMANYCHECKBOX);

+

+    /**

+     * TagIdentifier for TAG_SELECTMANYLISTBOX

+     */

+    final static TagIdentifier TAG_IDENTIFIER_SELECTMANYLISTBOX = 

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_SELECTMANYLISTBOX);

+

+    /**

+     * TagIdentifier for TAG_SELECTMANYMENU

+     */

+    final static  TagIdentifier TAG_IDENTIFIER_SELECTMANYMENU =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_SELECTMANYMENU);

+

+    /**

+     * TagIdentifier for TAG_SELECTONELISTBOX

+     */

+    final static TagIdentifier TAG_IDENTIFIER_SELECTONELISTBOX =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_SELECTONELISTBOX);

+    

+    /**

+     * TagIdentifier for TAG_SELECTONEMENU

+     */

+    final static TagIdentifier TAG_IDENTIFIER_SELECTONEMENU =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_SELECTONEMENU);

+

+    /**

+     * TagIdentifier for TAG_SELECTONERADIO

+     */

+    final static TagIdentifier TAG_IDENTIFIER_SELECTONERADIO =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_HTML, TAG_SELECTONERADIO);

+

+    /**

+     * TagIdentifier for TAG_ACTIONLISTENER

+     */

+    final static TagIdentifier TAG_IDENTIFIER_ACTIONLISTENER = 

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_ACTIONLISTENER);

+

+    /**

+     * TagIdentifier for TAG_ATTRIBUTE

+     */

+    final static TagIdentifier TAG_IDENTIFIER_ATTRIBUTE = 

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_ATTRIBUTE);

+

+    /**

+     * TagIdentifier for TAG_CONVERTDATETIME

+     */

+    final static TagIdentifier TAG_IDENTIFIER_CONVERTDATETIME = 

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_CONVERTDATETIME);

+

+    /**

+     * TagIdentifier for TAG_CONVERTNUMBER

+     */

+    final static TagIdentifier TAG_IDENTIFIER_CONVERTNUMBER = 

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_CONVERTNUMBER);

+

+    /**

+     * TagIdentifier for TAG_CONVERTER

+     */

+    final static TagIdentifier TAG_IDENTIFIER_CONVERTER = 

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_CONVERTER);

+

+    /**

+     * TagIdentifier for TAG_PARAM

+     */

+    final static TagIdentifier TAG_IDENTIFIER_PARAM =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_PARAM);

+

+    /**

+     * TagIdentifier for TAG_PHASELISTENER

+     */

+    final static TagIdentifier TAG_IDENTIFIER_PHASELISTENER =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_PHASELISTENER);

+

+    /**

+     * TagIdentifier for TAG_SELECTITEM

+     */

+    final static TagIdentifier TAG_IDENTIFIER_SELECTITEM = 

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_SELECTITEM);

+

+    /**

+     * TagIdentifier for TAG_SELECTITEMS

+     */

+    final static TagIdentifier TAG_IDENTIFIER_SELECTITEMS =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_SELECTITEMS);

+

+    /**

+     * TagIdentifier for TAG_SETPROPERTYACTIONLISTENER

+     */

+    final static TagIdentifier TAG_IDENTIFIER_SETPROPERTYACTIONLISTENER =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_SETPROPERTYACTIONLISTENER);

+

+    /**

+     * TagIdentifier for TAG_SUBVIEW

+     */

+    final static TagIdentifier TAG_IDENTIFIER_SUBVIEW =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_SUBVIEW);

+

+    /**

+     * TagIdentifier for TAG_VALIDATEBEAN

+     */

+    final static TagIdentifier TAG_IDENTIFIER_VALIDATEBEAN =

+    	TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALIDATEBEAN);

+

+    /**

+     * TagIdentifier for TAG_VALIDATEDOUBLERANGE

+     */

+    final static TagIdentifier TAG_IDENTIFIER_VALIDATEDOUBLERANGE =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALIDATEDOUBLERANGE);

+

+    /**

+     * TagIdentifier for TAG_VALIDATELENGTH

+     */

+    final static TagIdentifier TAG_IDENTIFIER_VALIDATELENGTH =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALIDATELENGTH);

+

+    /**

+     * TagIdentifier for TAG_VALIDATELONGRANGE

+     */

+    final static TagIdentifier TAG_IDENTIFIER_VALIDATELONGRANGE =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALIDATELONGRANGE);

+

+    /**

+     * TagIdentifier for TAG_VALIDATEREGEX

+     */

+    final static TagIdentifier TAG_IDENTIFIER_VALIDATEREGEX =

+    	TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALIDATEREGEX);

+

+    /**

+     * TagIdentifier for TAG_VALIDATEREQUIRED

+     */

+    final static TagIdentifier TAG_IDENTIFIER_VALIDATEREQUIRED =

+    	TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALIDATEREQUIRED);

+

+    /**

+     * TagIdentifier for TAG_VALIDATOR

+     */

+    final static TagIdentifier TAG_IDENTIFIER_VALIDATOR =

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALIDATOR);

+

+    /**

+     * TagIdentifier for TAG_VALUECHANGELISTENER

+     */

+    final static TagIdentifier TAG_IDENTIFIER_VALUECHANGELISTENER = 

+        TagIdentifierFactory.createJSPTagWrapper(ITLDConstants.URI_JSF_CORE, TAG_VALUECHANGELISTENER);

+

+    // attribute names

+	/**

+	 * accept tag attribute name

+	 */

+	final static public String ATTR_ACCEPT = "accept"; //$NON-NLS-1$

+

+	/**

+	 * acceptcharset tag attribute name

+	 */

+	final static public String ATTR_ACCEPTCHARSET = "acceptcharset"; //$NON-NLS-1$

+

+	/**

+	 * accesskey tag attribute name

+	 */

+	final static public String ATTR_ACCESSKEY = "accesskey"; //$NON-NLS-1$

+

+	/**

+	 * action tag attribute name

+	 */

+	final static public String ATTR_ACTION = "action"; //$NON-NLS-1$

+

+	/**

+	 * actionListener tag attribute name

+	 */

+	final static public String ATTR_ACTIONLISTENER = "actionListener"; //$NON-NLS-1$

+

+	/**

+	 * alt tag attribute name

+	 */

+	final static public String ATTR_ALT = "alt"; //$NON-NLS-1$

+

+	/**

+	 * basename tag attribute name

+	 */

+	final static public String ATTR_BASENAME = "basename"; //$NON-NLS-1$

+

+	/**

+	 * bgcolor tag attribute name

+	 */

+	final static public String ATTR_BGCOLOR = "bgcolor"; //$NON-NLS-1$

+

+	/**

+	 * binding tag attribute name

+	 */

+	final static public String ATTR_BINDING = "binding"; //$NON-NLS-1$

+

+	/**

+	 * border tag attribute name

+	 */

+	final static public String ATTR_BORDER = "border"; //$NON-NLS-1$

+

+	/**

+	 * cellpadding tag attribute name

+	 */

+	final static public String ATTR_CELLPADDING = "cellpadding"; //$NON-NLS-1$

+

+	/**

+	 * cellspacing tag attribute name

+	 */

+	final static public String ATTR_CELLSPACING = "cellspacing"; //$NON-NLS-1$

+

+	/**

+	 * charset tag attribute name

+	 */

+	final static public String ATTR_CHARSET = "charset"; //$NON-NLS-1$

+

+	/**

+	 * cols tag attribute name

+	 */

+	final static public String ATTR_COLS = "cols"; //$NON-NLS-1$

+

+	/**

+	 * columnClasses tag attribute name

+	 */

+	final static public String ATTR_COLUMNCLASSES = "columnClasses"; //$NON-NLS-1$

+

+	/**

+	 * columns tag attribute name

+	 */

+	final static public String ATTR_COLUMNS = "columns"; //$NON-NLS-1$

+

+	/**

+	 * converterId tag attribute name

+	 */

+	final static public String ATTR_CONVERTERID = "converterId"; //$NON-NLS-1$

+

+	/**

+	 * coords tag attribute name

+	 */

+	final static public String ATTR_COORDS = "coords"; //$NON-NLS-1$

+

+	/**

+	 * currencyCode tag attribute name

+	 */

+	final static public String ATTR_CURRENCYCODE = "currencyCode"; //$NON-NLS-1$

+

+	/**

+	 * currencySymbol tag attribute name

+	 */

+	final static public String ATTR_CURRENCYSYMBOL = "currencySymbol"; //$NON-NLS-1$

+

+	/**

+	 * dateStyle tag attribute name

+	 */

+	final static public String ATTR_DATESTYLE = "dateStyle"; //$NON-NLS-1$

+

+	/**

+	 * dir tag attribute name

+	 */

+	final static public String ATTR_DIR = "dir"; //$NON-NLS-1$

+

+	/**

+	 * disabled tag attribute name

+	 */

+	final static public String ATTR_DISABLED = "disabled"; //$NON-NLS-1$

+

+	/**

+	 * errorClass tag attribute name

+	 */

+	final static public String ATTR_ERRORCLASS = "errorClass"; //$NON-NLS-1$

+

+	/**

+	 * errorStyle tag attribute name

+	 */

+	final static public String ATTR_ERRORSTYLE = "errorStyle"; //$NON-NLS-1$

+

+	/**

+	 * escape tag attribute name

+	 */

+	final static public String ATTR_ESCAPE = "escape"; //$NON-NLS-1$

+

+	/**

+	 * fatalClass tag attribute name

+	 */

+	final static public String ATTR_FATALCLASS = "fatalClass"; //$NON-NLS-1$

+

+	/**

+	 * fatalStyle tag attribute name

+	 */

+	final static public String ATTR_FATALSTYLE = "fatalStyle"; //$NON-NLS-1$

+

+	/**

+	 * first tag attribute name

+	 */

+	final static public String ATTR_FIRST = "first"; //$NON-NLS-1$

+

+	/**

+	 * footerClass tag attribute name

+	 */

+	final static public String ATTR_FOOTERCLASS = "footerClass"; //$NON-NLS-1$

+

+	/**

+	 * for tag attribute name

+	 */

+	final static public String ATTR_FOR = "for"; //$NON-NLS-1$

+

+	/**

+	 * frame tag attribute name

+	 */

+	final static public String ATTR_FRAME = "frame"; //$NON-NLS-1$

+

+	/**

+	 * globalOnly tag attribute name

+	 */

+	final static public String ATTR_GLOBEONLY = "globalOnly"; //$NON-NLS-1$

+

+	/**

+	 * headerClass tag attribute name

+	 */

+	final static public String ATTR_HEADERCLASS = "headerClass"; //$NON-NLS-1$

+

+	/**

+	 * hreflang tag attribute name

+	 */

+	final static public String ATTR_HREFLANG = "hreflang"; //$NON-NLS-1$

+

+	/**

+	 * id tag attribute name

+	 */

+	final static public String ATTR_ID = "id"; //$NON-NLS-1$

+

+	/**

+	 * image tag attribute name

+	 */

+	final static public String ATTR_IMAGE = "image"; //$NON-NLS-1$

+

+	/**

+	 * immediate tag attribute name

+	 */

+	final static public String ATTR_IMMEDIATE = "immediate"; //$NON-NLS-1$

+

+	/**

+	 * infoClass tag attribute name

+	 */

+	final static public String ATTR_INFOCLASS = "infoClass"; //$NON-NLS-1$

+

+	/**

+	 * infoStyle tag attribute name

+	 */

+	final static public String ATTR_INFOSTYLE = "infoStyle"; //$NON-NLS-1$

+

+	/**

+	 * itemDescription tag attribute name

+	 */

+	final static public String ATTR_ITEMDESCRIPTION = "itemDescription"; //$NON-NLS-1$

+

+	/**

+	 * itemDisabled tag attribute name

+	 */

+	final static public String ATTR_ITEMDISABLED = "itemDisabled"; //$NON-NLS-1$

+

+	/**

+	 * itemLabel tag attribute name

+	 */

+	final static public String ATTR_ITEMLABEL = "itemLabel"; //$NON-NLS-1$

+

+	/**

+	 * itemValue tag attribute name

+	 */

+	final static public String ATTR_ITEMVALUE = "itemValue"; //$NON-NLS-1$

+

+	/**

+	 * lang tag attribute name

+	 */

+	final static public String ATTR_LANG = "lang"; //$NON-NLS-1$

+

+	/**

+	 * layout tag attribute name

+	 */

+	final static public String ATTR_LAYOUT = "layout"; //$NON-NLS-1$

+

+	/**

+	 * locale tag attribute name

+	 */

+	final static public String ATTR_LOCALE = "locale"; //$NON-NLS-1$

+

+	/**

+	 * maximum tag attribute name

+	 */

+	final static public String ATTR_MAXIMUM = "maximum"; //$NON-NLS-1$

+

+	/**

+	 * minimum tag attribute name

+	 */

+	final static public String ATTR_MINIMUM = "minimum"; //$NON-NLS-1$

+

+	/**

+	 * name tag attribute name

+	 */

+	final static public String ATTR_NAME = "name"; //$NON-NLS-1$

+

+	/**

+	 * onblur tag attribute name

+	 */

+	final static public String ATTR_ONBLUR = "onblur"; //$NON-NLS-1$

+

+	/**

+	 * onchange tag attribute name

+	 */

+	final static public String ATTR_ONCHANGE = "onchange"; //$NON-NLS-1$

+

+	/**

+	 * onclick tag attribute name

+	 */

+	final static public String ATTR_ONCLICK = "onclick"; //$NON-NLS-1$

+

+	/**

+	 * ondblclick tag attribute name

+	 */

+	final static public String ATTR_ONDBLCLICK = "ondblclick"; //$NON-NLS-1$

+

+	/**

+	 * onfocus tag attribute name

+	 */

+	final static public String ATTR_ONFOCUS = "onfocus"; //$NON-NLS-1$

+

+	/**

+	 * onkeydown tag attribute name

+	 */

+	final static public String ATTR_ONKEYDOWN = "onkeydown"; //$NON-NLS-1$

+

+	/**

+	 * onkeypress tag attribute name

+	 */

+	final static public String ATTR_ONKEYPRESS = "onkeypress"; //$NON-NLS-1$

+

+	/**

+	 * onkeyup tag attribute name

+	 */

+	final static public String ATTR_ONKEYUP = "onkeyup"; //$NON-NLS-1$

+

+	/**

+	 * onmousedown tag attribute name

+	 */

+	final static public String ATTR_ONMOUSEDOWN = "onmousedown"; //$NON-NLS-1$

+

+	/**

+	 * onmousemove tag attribute name

+	 */

+	final static public String ATTR_ONMOUSEMOVE = "onmousemove"; //$NON-NLS-1$

+

+	/**

+	 * onmouseout tag attribute name

+	 */

+	final static public String ATTR_ONMOUSEOUT = "onmouseout"; //$NON-NLS-1$

+

+	/**

+	 * onmouseover tag attribute name

+	 */

+	final static public String ATTR_ONMOUSEOVER = "onmouseover"; //$NON-NLS-1$

+

+	/**

+	 * onmouseup tag attribute name

+	 */

+	final static public String ATTR_ONMOUSEUP = "onmouseup"; //$NON-NLS-1$

+

+	/**

+	 * onselect tag attribute name

+	 */

+	final static public String ATTR_ONSELECT = "onselect"; //$NON-NLS-1$

+

+	/**

+	 * pattern tag attribute name

+	 */

+	final static public String ATTR_PATTERN = "pattern"; //$NON-NLS-1$

+

+	/**

+	 * readonly tag attribute name

+	 */

+	final static public String ATTR_READONLY = "readonly"; //$NON-NLS-1$

+

+	/**

+	 * rel tag attribute name

+	 */

+	final static public String ATTR_REL = "rel"; //$NON-NLS-1$

+

+	/**

+	 * rendered tag attribute name

+	 */

+	final static public String ATTR_RENDERED = "rendered"; //$NON-NLS-1$

+

+	/**

+	 * rev tag attribute name

+	 */

+	final static public String ATTR_REV = "rev"; //$NON-NLS-1$

+

+	/**

+	 * rowClasses tag attribute name

+	 */

+	final static public String ATTR_ROWCLASSES = "rowClasses"; //$NON-NLS-1$

+

+	/**

+	 * rows tag attribute name

+	 */

+	final static public String ATTR_ROWS = "rows"; //$NON-NLS-1$

+

+	/**

+	 * rules tag attribute name

+	 */

+	final static public String ATTR_RULES = "rules"; //$NON-NLS-1$

+

+	/**

+	 * shape tag attribute name

+	 */

+	final static public String ATTR_SHAPE = "shape"; //$NON-NLS-1$

+

+	/**

+	 *  showDetail tag attribute name

+	 */

+	final static public String ATTR_SHOWDETAIL = "showDetail"; //$NON-NLS-1$

+

+	/**

+	 * showSummary tag attribute name

+	 */

+	final static public String ATTR_SHOWSUMMARY = "showSummary"; //$NON-NLS-1$

+

+	/**

+	 * size tag attribute name

+	 */

+	final static public String ATTR_SIZE = "size"; //$NON-NLS-1$

+

+	/**

+	 * style tag attribute name

+	 */

+	final static public String ATTR_STYLE = "style"; //$NON-NLS-1$

+

+	/**

+	 * styleClass tag attribute name

+	 */

+	final static public String ATTR_STYLECLASS = "styleClass"; //$NON-NLS-1$

+

+	/**

+	 * summary tag attribute name

+	 */

+	final static public String ATTR_SUMMARY = "summary"; //$NON-NLS-1$

+

+	/**

+	 * tabindex tag attribute name

+	 */

+	final static public String ATTR_TABINDEX = "tabindex"; //$NON-NLS-1$

+

+	/**

+	 * target tag attribute name

+	 */

+	final static public String ATTR_TARGET = "target"; //$NON-NLS-1$

+

+	/**

+	 * timeStyle tag attribute name

+	 */

+	final static public String ATTR_TIMESTYLE = "timeStyle"; //$NON-NLS-1$

+

+	/**

+	 * title tag attribute name

+	 */

+	final static public String ATTR_TITLE = "title"; //$NON-NLS-1$

+

+	/**

+	 * tooltip tag attribute name

+	 */

+	final static public String ATTR_TOOLTIP = "tooltip"; //$NON-NLS-1$

+

+	/**

+	 * type tag attribute name

+	 */

+	final static public String ATTR_TYPE = "type"; //$NON-NLS-1$

+

+	/**

+	 * url tag attribute name

+	 */

+	final static public String ATTR_URL = "url"; //$NON-NLS-1$

+

+	/**

+	 * validatorId tag attribute name

+	 */

+	final static public String ATTR_VALIDATORID = "validatorId"; //$NON-NLS-1$

+

+	/**

+	 * value tag attribute name

+	 */

+	final static public String ATTR_VALUE = "value"; //$NON-NLS-1$

+

+	/**

+	 * var tag attribute name

+	 */

+	final static public String ATTR_VAR = "var"; //$NON-NLS-1$

+

+	/**

+	 * warnClass tag attribute name

+	 */

+	final static public String ATTR_WARNCLASS = "warnClass"; //$NON-NLS-1$

+

+	/**

+	 * warnStyle tag attribute name

+	 */

+	final static public String ATTR_WARNSTYLE = "warnStyle"; //$NON-NLS-1$

+

+	/**

+	 * width tag attribute name

+	 */

+	final static public String ATTR_WIDTH = "width"; //$NON-NLS-1$

+

+}

diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/ITLDConstants.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/ITLDConstants.java
index 3ec16f4..ba6843f 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/ITLDConstants.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/ITLDConstants.java
@@ -1,38 +1,46 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- *     Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.tld;
-
-/**
- * Global tag library constants
- * 
- * @author cbateman
- *
- */
-public interface ITLDConstants {
-
-    /**
-     * The JSF core (f) component URI
-     */
-    public static final String URI_JSF_CORE = "http://java.sun.com/jsf/core"; //$NON-NLS-1$
-    /**
-     * The JSF html (h) component URI
-     */
-    public static final String URI_JSF_HTML = "http://java.sun.com/jsf/html"; //$NON-NLS-1$
-    /**
-     * The last component of the html uri
-     */
-    public static final String URI_HTML = "html"; //$NON-NLS-1$
-    /**
-     * The last component of the core uri
-     */
-    public static final String URI_JSP = "jsp"; //$NON-NLS-1$
-
-}
+/*******************************************************************************

+ * Copyright (c) 2001, 2007 Oracle Corporation and others.

+ * All rights reserved. This program and the accompanying materials

+ * are 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:

+ *     Oracle Corporation - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.jst.jsf.core.internal.tld;

+

+/**

+ * Global tag library constants

+ * 

+ * @author cbateman

+ *

+ */

+public interface ITLDConstants {

+

+    /**

+     * The JSF core (f) component URI

+     */

+    public static final String URI_JSF_CORE = "http://java.sun.com/jsf/core"; //$NON-NLS-1$

+    /**

+     * The JCP version of the JSF core (f) component URI

+     */

+    public static final String URI_JSF_CORE_JCP = "http://xmlns.jcp.org/jsf/core"; //$NON-NLS-1$

+    /**

+     * The JSF html (h) component URI

+     */

+    public static final String URI_JSF_HTML = "http://java.sun.com/jsf/html"; //$NON-NLS-1$

+    /**

+     * The JCP version of the JSF html (h) component URI

+     */

+    public static final String URI_JSF_HTML_JCP = "http://xmlns.jcp.org/jsf/html"; //$NON-NLS-1$

+    /**

+     * The last component of the html uri

+     */

+    public static final String URI_HTML = "html"; //$NON-NLS-1$

+    /**

+     * The last component of the core uri

+     */

+    public static final String URI_JSP = "jsp"; //$NON-NLS-1$

+

+}

diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPDefaultSymbolFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPDefaultSymbolFactory.java
index 4e70942..6023569 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPDefaultSymbolFactory.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPDefaultSymbolFactory.java
@@ -1,217 +1,217 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- *    Cameron Bateman/Oracle - initial API and implementation
- *    
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.designtime.internal.jsp;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IComponentSymbol;
-import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.source.AbstractContextSymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.source.IAdditionalContextSymbolInfo;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.jsf.designtime.internal.symbols.ResourceBundleMapSourceFactory;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * @author cbateman
- *
- */
-public class JSPDefaultSymbolFactory extends AbstractContextSymbolFactory 
-{
-    protected ISymbol internalCreate(String symbolName,int scope,IAdaptable context,List problems, IAdditionalContextSymbolInfo additionInfo) 
-    {
-        final IStructuredDocumentContext sContext =
-            (IStructuredDocumentContext) 
-                context.getAdapter(IStructuredDocumentContext.class);
-        
-        final IDOMContextResolver domResolver = 
-            IStructuredDocumentContextResolverFactory.INSTANCE.getDOMContextResolver(sContext);
-        
-        if (domResolver != null)
-        {
-            final Node curNode = domResolver.getNode();
-            
-            if (curNode instanceof Attr)
-            {
-                final Attr attr = (Attr) curNode;
-                final Node owningElement = attr.getOwnerElement();
-                
-                if (owningElement != null)
-                {
-                    return handleSymbolCreation(symbolName, sContext, attr, owningElement, problems);
-                }
-            }
-        }
-        
-        return null;
-    }
-
-    
-    private ISymbol handleSymbolCreation(final String symbolName, 
-                                         final IStructuredDocumentContext context,
-                                         final Attr attr, 
-                                         final Node owningElement,
-                                         final List problems)
-    {
-        final ITaglibContextResolver resolver = 
-            IStructuredDocumentContextResolverFactory.INSTANCE.getTaglibContextResolver(context);
-        
-        
-        if (resolver == null
-                || !resolver.canResolveContext(context))
-        {
-            return null;
-        }
-        
-        final String uri = resolver.getTagURIForNodeName(owningElement);
-        
-        // process core taglib
-        if (ITLDConstants.URI_JSF_CORE.equals(uri))
-        {
-            return handleCoreTags(symbolName, owningElement, attr, context, problems);
-        }
-        else if (ITLDConstants.URI_JSF_HTML.equals(uri))
-        {
-            return handleHtmlTags(symbolName, owningElement, attr, context, problems);
-        }
-        
-        return null;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.jsf.context.symbol.source.AbstractContextSymbolFactory#supports(org.eclipse.core.runtime.IAdaptable)
-     */
-    public boolean supports(IAdaptable context) 
-    {
-        return context != null && 
-        	context.getAdapter(IStructuredDocumentContext.class) != null;
-    }
-    
-    private ISymbol handleHtmlTags(String symbolName, Node owningElement, Attr attr, IStructuredDocumentContext context, List problems)
-    {
-        final String elementName = owningElement.getLocalName();
-        final String attrName = attr.getName();
-        
-        if (IJSFConstants.TAG_DATATABLE.equals(elementName))
-        {
-            if (IJSFConstants.ATTR_VAR.equals(attrName))
-            {
-                return DataModelVariableFactory.getInstance()
-                    .createSymbolForDataTableValue(symbolName, (Element) owningElement, context);
-            }
-        }
-
-        return null;
-    }
-    
-    private ISymbol handleCoreTags(String symbolName, Node owningElement, Attr attr, IStructuredDocumentContext context, List problems)
-    {
-        final String elementName = owningElement.getLocalName();
-        
-        if (IJSFConstants.TAG_LOADBUNDLE.equals(elementName))
-        {
-//            long startTime = System.currentTimeMillis();
-            ISymbol symbol = handleLoadBundleTag(symbolName, owningElement, attr, context, problems);
-            
-//            long endTime = System.currentTimeMillis();
-//            long totalTime = endTime-startTime;
-            //System.out.println("Loadbundle resolution for symbol "+symbolName+" took: "+totalTime+"ms");
-            return symbol;
-        }
-        return null;
-    }
-    
-    private ISymbol handleLoadBundleTag(String symbolName, Node owningElement, Attr attr, IStructuredDocumentContext context, List problems)
-    {
-        final String attrName = attr.getName();
-        if (IJSFConstants.ATTR_VAR.equals(attrName))
-        {
-            final NamedNodeMap attrMap = owningElement.getAttributes();
-            final Node baseNameNode = attrMap.getNamedItem(IJSFConstants.ATTR_BASENAME);
-
-            
-            if (baseNameNode != null)
-            {
-                try
-                {
-                    final IWorkspaceContextResolver wkspaceResolver =
-                        IStructuredDocumentContextResolverFactory.INSTANCE.getWorkspaceContextResolver(context);
-                    IProject project = wkspaceResolver.getProject();
-                    
-                    if (project == null)
-                    {
-                        throw new RuntimeException("Error acquiring project"); //$NON-NLS-1$
-                    }
-                    
-                    final Map source = 
-                        ResourceBundleMapSourceFactory
-                            .getResourceBundleMapSource(project, baseNameNode.getNodeValue());
-                    final IMapTypeDescriptor typeDesc = 
-                        SymbolFactory.eINSTANCE.createIMapTypeDescriptor();
-                    typeDesc.setMapSource(source);
-                    final IComponentSymbol symbol = 
-                        SymbolFactory.eINSTANCE.createIComponentSymbol();
-                    symbol.setName(symbolName);
-                    symbol.setTypeDescriptor(typeDesc);
-                    symbol.setDetailedDescription(Messages.getString("JSPDefaultSymbolFactory.Resource.bundle.map.detailedDescription")+baseNameNode.getNodeValue()+"</i>"); //$NON-NLS-1$ //$NON-NLS-2$
-                    
-                    return symbol;
-                }
-                catch (IOException ioe)
-                {
-                    problems.add(new Status(IStatus.ERROR, JSFCorePlugin.PLUGIN_ID, 0,Messages.getString("JSPDefaultSymbolFactory.Problem.ErrorCreatingVariable"), ioe)); //$NON-NLS-1$
-                }
-                catch (JavaModelException jme)
-                {
-                    problems.add(new Status(IStatus.ERROR, JSFCorePlugin.PLUGIN_ID, 0,Messages.getString("JSPDefaultSymbolFactory.Problem.ErrorCreatingVariable"), jme)); //$NON-NLS-1$
-                }
-                catch (CoreException ce)
-                {
-                    problems.add(new Status(IStatus.ERROR, JSFCorePlugin.PLUGIN_ID, 0,Messages.getString("JSPDefaultSymbolFactory.Problem.ErrorCreatingVariable"), ce)); //$NON-NLS-1$
-                }
-                
-                final IBoundedJavaTypeDescriptor typeDesc = SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor();
-                typeDesc.setTypeSignatureDelegate( TypeConstants.TYPE_JAVAOBJECT );
-                final IComponentSymbol symbol = SymbolFactory.eINSTANCE.createIComponentSymbol();
-                symbol.setName(symbolName);
-                symbol.setTypeDescriptor(typeDesc);
-                symbol.setDetailedDescription(Messages.getString("JSPDefaultSymbolFactory.Resource.bundle.map.detailedDescription")+baseNameNode.getNodeValue()+"</i>"); //$NON-NLS-1$ //$NON-NLS-2$
-                
-                return symbol;
-            }
-        }
-        return null;
-    }
-}
+/*******************************************************************************

+ * Copyright (c) 2006 Oracle Corporation.

+ * All rights reserved. This program and the accompanying materials

+ * are 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:

+ *    Cameron Bateman/Oracle - initial API and implementation

+ *    

+ ********************************************************************************/

+

+package org.eclipse.jst.jsf.designtime.internal.jsp;

+

+import java.io.IOException;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.jdt.core.JavaModelException;

+import org.eclipse.jst.jsf.common.internal.types.TypeConstants;

+import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver;

+import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;

+import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver;

+import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver;

+import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;

+import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;

+import org.eclipse.jst.jsf.context.symbol.IComponentSymbol;

+import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor;

+import org.eclipse.jst.jsf.context.symbol.ISymbol;

+import org.eclipse.jst.jsf.context.symbol.SymbolFactory;

+import org.eclipse.jst.jsf.context.symbol.source.AbstractContextSymbolFactory;

+import org.eclipse.jst.jsf.context.symbol.source.IAdditionalContextSymbolInfo;

+import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;

+import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;

+import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;

+import org.eclipse.jst.jsf.designtime.internal.symbols.ResourceBundleMapSourceFactory;

+import org.w3c.dom.Attr;

+import org.w3c.dom.Element;

+import org.w3c.dom.NamedNodeMap;

+import org.w3c.dom.Node;

+

+/**

+ * @author cbateman

+ *

+ */

+public class JSPDefaultSymbolFactory extends AbstractContextSymbolFactory 

+{

+    protected ISymbol internalCreate(String symbolName,int scope,IAdaptable context,List problems, IAdditionalContextSymbolInfo additionInfo) 

+    {

+        final IStructuredDocumentContext sContext =

+            (IStructuredDocumentContext) 

+                context.getAdapter(IStructuredDocumentContext.class);

+        

+        final IDOMContextResolver domResolver = 

+            IStructuredDocumentContextResolverFactory.INSTANCE.getDOMContextResolver(sContext);

+        

+        if (domResolver != null)

+        {

+            final Node curNode = domResolver.getNode();

+            

+            if (curNode instanceof Attr)

+            {

+                final Attr attr = (Attr) curNode;

+                final Node owningElement = attr.getOwnerElement();

+                

+                if (owningElement != null)

+                {

+                    return handleSymbolCreation(symbolName, sContext, attr, owningElement, problems);

+                }

+            }

+        }

+        

+        return null;

+    }

+

+    

+    private ISymbol handleSymbolCreation(final String symbolName, 

+                                         final IStructuredDocumentContext context,

+                                         final Attr attr, 

+                                         final Node owningElement,

+                                         final List problems)

+    {

+        final ITaglibContextResolver resolver = 

+            IStructuredDocumentContextResolverFactory.INSTANCE.getTaglibContextResolver(context);

+        

+        

+        if (resolver == null

+                || !resolver.canResolveContext(context))

+        {

+            return null;

+        }

+        

+        final String uri = resolver.getTagURIForNodeName(owningElement);

+        

+        // process core taglib

+        if (ITLDConstants.URI_JSF_CORE.equals(uri) || ITLDConstants.URI_JSF_CORE_JCP.equals(uri))

+        {

+            return handleCoreTags(symbolName, owningElement, attr, context, problems);

+        }

+        else if (ITLDConstants.URI_JSF_HTML.equals(uri) || ITLDConstants.URI_JSF_HTML_JCP.equals(uri))

+        {

+            return handleHtmlTags(symbolName, owningElement, attr, context, problems);

+        }

+        

+        return null;

+    }

+    

+    /* (non-Javadoc)

+     * @see org.eclipse.jst.jsf.context.symbol.source.AbstractContextSymbolFactory#supports(org.eclipse.core.runtime.IAdaptable)

+     */

+    public boolean supports(IAdaptable context) 

+    {

+        return context != null && 

+        	context.getAdapter(IStructuredDocumentContext.class) != null;

+    }

+    

+    private ISymbol handleHtmlTags(String symbolName, Node owningElement, Attr attr, IStructuredDocumentContext context, List problems)

+    {

+        final String elementName = owningElement.getLocalName();

+        final String attrName = attr.getName();

+        

+        if (IJSFConstants.TAG_DATATABLE.equals(elementName))

+        {

+            if (IJSFConstants.ATTR_VAR.equals(attrName))

+            {

+                return DataModelVariableFactory.getInstance()

+                    .createSymbolForDataTableValue(symbolName, (Element) owningElement, context);

+            }

+        }

+

+        return null;

+    }

+    

+    private ISymbol handleCoreTags(String symbolName, Node owningElement, Attr attr, IStructuredDocumentContext context, List problems)

+    {

+        final String elementName = owningElement.getLocalName();

+        

+        if (IJSFConstants.TAG_LOADBUNDLE.equals(elementName))

+        {

+//            long startTime = System.currentTimeMillis();

+            ISymbol symbol = handleLoadBundleTag(symbolName, owningElement, attr, context, problems);

+            

+//            long endTime = System.currentTimeMillis();

+//            long totalTime = endTime-startTime;

+            //System.out.println("Loadbundle resolution for symbol "+symbolName+" took: "+totalTime+"ms");

+            return symbol;

+        }

+        return null;

+    }

+    

+    private ISymbol handleLoadBundleTag(String symbolName, Node owningElement, Attr attr, IStructuredDocumentContext context, List problems)

+    {

+        final String attrName = attr.getName();

+        if (IJSFConstants.ATTR_VAR.equals(attrName))

+        {

+            final NamedNodeMap attrMap = owningElement.getAttributes();

+            final Node baseNameNode = attrMap.getNamedItem(IJSFConstants.ATTR_BASENAME);

+

+            

+            if (baseNameNode != null)

+            {

+                try

+                {

+                    final IWorkspaceContextResolver wkspaceResolver =

+                        IStructuredDocumentContextResolverFactory.INSTANCE.getWorkspaceContextResolver(context);

+                    IProject project = wkspaceResolver.getProject();

+                    

+                    if (project == null)

+                    {

+                        throw new RuntimeException("Error acquiring project"); //$NON-NLS-1$

+                    }

+                    

+                    final Map source = 

+                        ResourceBundleMapSourceFactory

+                            .getResourceBundleMapSource(project, baseNameNode.getNodeValue());

+                    final IMapTypeDescriptor typeDesc = 

+                        SymbolFactory.eINSTANCE.createIMapTypeDescriptor();

+                    typeDesc.setMapSource(source);

+                    final IComponentSymbol symbol = 

+                        SymbolFactory.eINSTANCE.createIComponentSymbol();

+                    symbol.setName(symbolName);

+                    symbol.setTypeDescriptor(typeDesc);

+                    symbol.setDetailedDescription(Messages.getString("JSPDefaultSymbolFactory.Resource.bundle.map.detailedDescription")+baseNameNode.getNodeValue()+"</i>"); //$NON-NLS-1$ //$NON-NLS-2$

+                    

+                    return symbol;

+                }

+                catch (IOException ioe)

+                {

+                    problems.add(new Status(IStatus.ERROR, JSFCorePlugin.PLUGIN_ID, 0,Messages.getString("JSPDefaultSymbolFactory.Problem.ErrorCreatingVariable"), ioe)); //$NON-NLS-1$

+                }

+                catch (JavaModelException jme)

+                {

+                    problems.add(new Status(IStatus.ERROR, JSFCorePlugin.PLUGIN_ID, 0,Messages.getString("JSPDefaultSymbolFactory.Problem.ErrorCreatingVariable"), jme)); //$NON-NLS-1$

+                }

+                catch (CoreException ce)

+                {

+                    problems.add(new Status(IStatus.ERROR, JSFCorePlugin.PLUGIN_ID, 0,Messages.getString("JSPDefaultSymbolFactory.Problem.ErrorCreatingVariable"), ce)); //$NON-NLS-1$

+                }

+                

+                final IBoundedJavaTypeDescriptor typeDesc = SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor();

+                typeDesc.setTypeSignatureDelegate( TypeConstants.TYPE_JAVAOBJECT );

+                final IComponentSymbol symbol = SymbolFactory.eINSTANCE.createIComponentSymbol();

+                symbol.setName(symbolName);

+                symbol.setTypeDescriptor(typeDesc);

+                symbol.setDetailedDescription(Messages.getString("JSPDefaultSymbolFactory.Resource.bundle.map.detailedDescription")+baseNameNode.getNodeValue()+"</i>"); //$NON-NLS-1$ //$NON-NLS-2$

+                

+                return symbol;

+            }

+        }

+        return null;

+    }

+}

diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.xml b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.xml
index cb0ccd1..e8d6c19 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.xml
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.xml
@@ -15,6 +15,28 @@
 				varTypeMode="BUNDLE" varTypeString="basename" varName="var"
 				tagName="loadBundle" />
 		</taglib>
+  <taglib
+        uri="http://xmlns.jcp.org/jsf/html">
+     <tag
+           tagName="dataTable"
+           varName="var"
+           varNameIsAttr="true"
+           varTypeMode="EXPRESSION_COLLECTION_ITEM"
+           varTypeString="value"
+           varTypeStringIsAttr="true">
+     </tag>
+  </taglib>
+  <taglib
+        uri="http://xmlns.jcp.org/jsf/core">
+     <tag
+           tagName="loadBundle"
+           varName="var"
+           varNameIsAttr="true"
+           varTypeMode="BUNDLE"
+           varTypeString="basename"
+           varTypeStringIsAttr="true">
+     </tag>
+  </taglib>
 	</extension>
 	<extension
 		point="org.eclipse.ui.views.properties.tabbed.propertySections">
@@ -130,8 +152,14 @@
 		point="org.eclipse.jst.pagedesigner.pageDesignerExtension">
 		<elementEditFactory
 			class="org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml.JSFHTMLElementEditFactory" />
+  <elementEditFactory
+        class="org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml.JSFHTMLJCPElementEditFactory">
+  </elementEditFactory>
 		<elementEditFactory
 			class="org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore.JSFCoreElementEditFactory" />
+  <elementEditFactory
+        class="org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore.JSFCoreJCPElementEditFactory">
+  </elementEditFactory>
 		<linkCreator
 			class="org.eclipse.jst.pagedesigner.jsf.ui.actions.JSFCommandLinkCreator"
 			linkIdentifier="JSF CommandLink" />
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JSFCoreJCPElementEditFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JSFCoreJCPElementEditFactory.java
new file mode 100644
index 0000000..fb01aa9
--- /dev/null
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JSFCoreJCPElementEditFactory.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Sybase, Inc. and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * Sybase, Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore;
+
+import org.eclipse.jst.jsf.common.dom.TagIdentifier;
+import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
+import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
+import org.eclipse.jst.pagedesigner.elementedit.IElementEdit;
+import org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory;
+
+/**
+ * @author mengbo
+ * @version 1.5
+ */
+public class JSFCoreJCPElementEditFactory implements IElementEditFactory
+{
+    /* (non-Javadoc)
+     * @see org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory#createElementEdit(org.w3c.dom.Element)
+     */
+    public IElementEdit createElementEdit(TagIdentifier tagIdentifier)
+    {
+        if (IJSFConstants.TAG_IDENTIFIER_LOADBUNDLE_JCP.isSameTagType(tagIdentifier))
+        {
+            return new LoadBundleElementEdit();
+        }
+        else if(IJSFConstants.TAG_IDENTIFIER_FACET_JCP.isSameTagType(tagIdentifier))
+        {
+            return new FacetElementEdit();
+        }
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory#getSupportedURI()
+     */
+    public String getSupportedURI()
+    {
+        return ITLDConstants.URI_JSF_CORE_JCP;
+    }
+}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/JSFHTMLJCPElementEditFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/JSFHTMLJCPElementEditFactory.java
new file mode 100644
index 0000000..753aa7e
--- /dev/null
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/JSFHTMLJCPElementEditFactory.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Sybase, Inc. and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * Sybase, Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml;
+
+import org.eclipse.jst.jsf.common.dom.TagIdentifier;
+import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
+import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
+import org.eclipse.jst.pagedesigner.elementedit.IElementEdit;
+import org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory;
+
+/**
+ * @author mengbo
+ * @version 1.5
+ */
+public class JSFHTMLJCPElementEditFactory implements IElementEditFactory
+{
+    /* (non-Javadoc)
+     * @see org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory#createElementEdit(org.w3c.dom.Element)
+     */
+    public IElementEdit createElementEdit(final TagIdentifier tagIdentifier)
+    {
+        if (IJSFConstants.TAG_IDENTIFIER_DATA_TABLE_JCP.isSameTagType(tagIdentifier))
+        {
+            return new DataTableElementEdit();
+        }
+        else if (IJSFConstants.TAG_IDENTIFIER_PANEL_GRID_JCP.isSameTagType(tagIdentifier))
+        {
+            return new PanelGridElementEdit();
+        }
+        else if (IJSFConstants.TAG_IDENTIFIER_COLUMN_JCP.isSameTagType(tagIdentifier))
+        {
+            return new ColumnElementEdit();
+        }
+        return new DefaultJSFHTMLElementEdit();
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory#getSupportedURI()
+     */
+    public String getSupportedURI()
+    {
+        return ITLDConstants.URI_JSF_HTML_JCP;
+    }
+
+}