Author: akazakov Date: 2009-06-04 14:44:52 -0400 (Thu, 04 Jun 2009) New Revision: 15717 Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibrary.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/resources/kbCustomTagLibSchema-1.0.dtd trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractAttribute.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FacesConfigAttribute.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FacesConfigComponent.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml Log: https://jira.jboss.org/jira/browse/JBIDE-2808 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/resources/kbCustomTagLibSchema-1.0.dtd =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/resources/kbCustomTagLibSchema-1.0.dtd 2009-06-04 18:22:36 UTC (rev 15716) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/resources/kbCustomTagLibSchema-1.0.dtd 2009-06-04 18:44:52 UTC (rev 15717) @@ -12,7 +12,7 @@ --> <!ELEMENT tag-lib (component*, componentExtension?)> -<!ATTLIST schema dafault-prefix CDATA #IMPLIED> +<!ATTLIST tag-lib dafaultPrefix CDATA #IMPLIED> <!-- component describes a component. Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractAttribute.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractAttribute.java 2009-06-04 18:22:36 UTC (rev 15716) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractAttribute.java 2009-06-04 18:44:52 UTC (rev 15717) @@ -123,10 +123,20 @@ return proposals.toArray(new TextProposal[proposals.size()]); } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#clone() + */ + @Override public AbstractAttribute clone() throws CloneNotSupportedException { return (AbstractAttribute)super.clone(); } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#merge(org.jboss.tools.jst.web.kb.internal.KbObject) + */ + @Override public List<Change> merge(KbObject s) { List<Change> changes = super.merge(s); @@ -147,10 +157,20 @@ return changes; } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#getXMLName() + */ + @Override public String getXMLName() { return KbXMLStoreConstants.TAG_ATTRIBUTE; } - + + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#toXML(org.w3c.dom.Element, java.util.Properties) + */ + @Override public Element toXML(Element parent, Properties context) { Element element = super.toXML(parent, context); @@ -161,6 +181,11 @@ return element; } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#loadXML(org.w3c.dom.Element, java.util.Properties) + */ + @Override public void loadXML(Element element, Properties context) { super.loadXML(element, context); @@ -171,9 +196,12 @@ if(name == null && element.hasAttribute(XMLStoreConstants.ATTR_NAME)) { name = element.getAttribute(XMLStoreConstants.ATTR_NAME); } - } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#saveAttributesInfo(org.w3c.dom.Element, java.util.Properties) + */ @Override protected void saveAttributesInfo(Element element, Properties context) { if(context.get(XMLStoreConstants.KEY_MODEL_OBJECT) == getId()) { @@ -183,6 +211,10 @@ } } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#loadAttributesInfo(org.w3c.dom.Element, java.util.Properties) + */ @Override protected void loadAttributesInfo(Element element, Properties context) { if(context.get(XMLStoreConstants.KEY_MODEL_OBJECT) == getId() && getId() != null) { @@ -194,5 +226,4 @@ super.loadAttributesInfo(element, context); } } - } \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2009-06-04 18:22:36 UTC (rev 15716) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2009-06-04 18:44:52 UTC (rev 15717) @@ -164,10 +164,20 @@ this.components = components; } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#getSourcePath() + */ + @Override public IPath getSourcePath() { return source; } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#setSourcePath(org.eclipse.core.runtime.IPath) + */ + @Override public void setSourcePath(IPath source) { this.source = source; } @@ -275,6 +285,11 @@ return proposals.toArray(new TextProposal[proposals.size()]); } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#clone() + */ + @Override public AbstractTagLib clone() throws CloneNotSupportedException { AbstractTagLib t = (AbstractTagLib)super.clone(); t.components = new HashMap<String, IComponent>(); @@ -285,16 +300,31 @@ return t; } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#merge(org.jboss.tools.jst.web.kb.internal.KbObject) + */ + @Override public List<Change> merge(KbObject s) { List<Change> changes = super.merge(s); //TODO return changes; } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#getXMLName() + */ + @Override public String getXMLName() { return KbXMLStoreConstants.TAG_LIBRARY; } - + + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#toXML(org.w3c.dom.Element, java.util.Properties) + */ + @Override public Element toXML(Element parent, Properties context) { Element element = super.toXML(parent, context); @@ -313,6 +343,11 @@ protected void saveAttributeValues(Element element) { } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#loadXML(org.w3c.dom.Element, java.util.Properties) + */ + @Override public void loadXML(Element element, Properties context) { super.loadXML(element, context); Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibrary.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibrary.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibrary.java 2009-06-04 18:44:52 UTC (rev 15717) @@ -0,0 +1,123 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.web.kb.internal.taglib; + +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.jboss.tools.jst.web.kb.WebKbPlugin; +import org.jboss.tools.jst.web.kb.taglib.ICustomTagLibrary; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +/** + * @author Alexey Kazakov + */ +public class CustomTagLibrary extends AbstractTagLib implements ICustomTagLibrary { + + private static final String DEFAULT_PREFIX = "defaultPrefix"; //$NON-NLS-1$ + private static final String TAG_LIB = "tag-lib"; //$NON-NLS-1$ + private static final String COMPONENT = "component"; //$NON-NLS-1$ + private static final String CLOSE_TAG = "closeTag"; //$NON-NLS-1$ + private static final String TRUE = "true"; //$NON-NLS-1$ + private static final String NAME = "name"; //$NON-NLS-1$ + private static final String ATTRIBUTE = "attribute"; //$NON-NLS-1$ + private static final String REQUIRED = "required"; //$NON-NLS-1$ + private static final String PROPOSAL = "proposal"; //$NON-NLS-1$ + private static final String TYPE = "type"; //$NON-NLS-1$ + private static final String ENUMERATION = "enumeration"; //$NON-NLS-1$ + private static final String PARAM = "param"; //$NON-NLS-1$ + private static final String VALUE = "value"; //$NON-NLS-1$ + private static final String COMPONET_EXTENSION = "componentExtension"; //$NON-NLS-1$ + private static final String DEFAULT_VALUE = "defaultValue"; //$NON-NLS-1$ + private static final String EXTENDED = "extended"; //$NON-NLS-1$ + private static final String DESCRIPTION = "description"; //$NON-NLS-1$ + + protected String defaultPrefix; + + public CustomTagLibrary(File file, String uri, String version, String name) { + Document document = null; + try { + DocumentBuilder builder = createDocumentBuilder(false); + document = builder.parse(file); + } catch (SAXException e) { + WebKbPlugin.getDefault().logError(e); + } catch (IOException e) { + WebKbPlugin.getDefault().logError(e); + } catch (ParserConfigurationException e) { + WebKbPlugin.getDefault().logError(e); + } + defaultPrefix = document.getDocumentElement().getAttribute(DEFAULT_PREFIX); + Element tagLib = document.getDocumentElement(); + NodeList children = tagLib.getChildNodes(); + for (int i = 0; i < children.getLength(); i++) { + Node child = children.item(i); + if(child instanceof Element) { + if(child.getNodeName().equals(COMPONENT)) { + parseComponent((Element)child); + } else if (child.getNodeName().equals(COMPONET_EXTENSION)) { + parseComponentExtension((Element)child); + } + } + } + } + + private void parseComponent(Element component) { + String name = component.getAttribute(NAME); + boolean closeTag = TRUE.equalsIgnoreCase(component.getAttribute(CLOSE_TAG)); + NodeList children = component.getChildNodes(); + for (int i = 0; i < children.getLength(); i++) { + Node child = children.item(i); + if(child instanceof Element) { + if(child.getNodeName().equals(ATTRIBUTE)) { + Element attribute = (Element)child; + String attributeName = attribute.getAttribute(NAME); + boolean required = TRUE.equalsIgnoreCase(attribute.getAttribute(REQUIRED)); + } + } + } + + //TODO + } + + private void parseComponentExtension(Element extension) { + //TODO + } + + private DocumentBuilder createDocumentBuilder(boolean validate) throws ParserConfigurationException { + DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); + documentBuilderFactory.setValidating(validate); + DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); + + if(!validate) { + documentBuilder.setEntityResolver(new EntityResolver() { + public InputSource resolveEntity(java.lang.String publicId, java.lang.String systemId) throws SAXException, java.io.IOException { + if((systemId != null) && systemId.toLowerCase().endsWith(".dtd")) { // this deactivates DTD //$NON-NLS-1$ + return new InputSource(new ByteArrayInputStream("<?xml version='1.0' encoding='UTF-8'?>".getBytes())); //$NON-NLS-1$ + } else { + return null; + } + } + }); + } + return documentBuilder; + } +} \ No newline at end of file Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibrary.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FacesConfigAttribute.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FacesConfigAttribute.java 2009-06-04 18:22:36 UTC (rev 15716) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FacesConfigAttribute.java 2009-06-04 18:44:52 UTC (rev 15717) @@ -24,10 +24,19 @@ */ public class FacesConfigAttribute extends AbstractAttribute { + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#getXMLClass() + */ + @Override public String getXMLClass() { return KbXMLStoreConstants.CLS_FACESCONFIG_LIBRARY; } - + + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.taglib.AbstractAttribute#loadAttributesInfo(org.w3c.dom.Element, java.util.Properties) + */ @Override protected void loadAttributesInfo(Element element, Properties context) { if(context.get(XMLStoreConstants.KEY_MODEL_OBJECT) == getId() && getId() != null) { @@ -40,5 +49,4 @@ super.loadAttributesInfo(element, context); } } - -} +} \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FacesConfigComponent.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FacesConfigComponent.java 2009-06-04 18:22:36 UTC (rev 15716) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FacesConfigComponent.java 2009-06-04 18:44:52 UTC (rev 15717) @@ -30,12 +30,22 @@ Map<String,Facet> facets = new HashMap<String, Facet>(); Facet[] facetArray = EMPTY_FACET_SET; + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.taglib.AbstractComponent#getFacet(java.lang.String) + */ + @Override public Facet getFacet(String name) { return facets.get(name); } public static final Facet[] EMPTY_FACET_SET = new Facet[0]; + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.taglib.AbstractComponent#getFacets() + */ + @Override public Facet[] getFacets() { if(facetArray == null) { synchronized (facets) { @@ -49,6 +59,11 @@ return facetArray; } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.taglib.AbstractComponent#getFacets(java.lang.String) + */ + @Override public Facet[] getFacets(String nameTemplate) { Facet[] fs = getFacets(); if(fs.length == 0) return EMPTY_FACET_SET; @@ -70,6 +85,11 @@ } } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.taglib.AbstractComponent#clone() + */ + @Override public FacesConfigComponent clone() throws CloneNotSupportedException { FacesConfigComponent copy = new FacesConfigComponent(); copy.facets = new HashMap<String, Facet>(); @@ -79,10 +99,20 @@ return copy; } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.KbObject#getXMLClass() + */ + @Override public String getXMLClass() { return KbXMLStoreConstants.CLS_FACESCONFIG_LIBRARY; } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.taglib.AbstractComponent#merge(org.jboss.tools.jst.web.kb.internal.KbObject) + */ + @Override public List<Change> merge(KbObject s) { List<Change> changes = super.merge(s); FacesConfigComponent c = (FacesConfigComponent)s; @@ -123,6 +153,11 @@ } } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.taglib.AbstractComponent#toXML(org.w3c.dom.Element, java.util.Properties) + */ + @Override public Element toXML(Element parent, Properties context) { Element element = super.toXML(parent, context); @@ -133,6 +168,11 @@ return element; } + /* + * (non-Javadoc) + * @see org.jboss.tools.jst.web.kb.internal.taglib.AbstractComponent#loadXML(org.w3c.dom.Element, java.util.Properties) + */ + @Override public void loadXML(Element element, Properties context) { super.loadXML(element, context); @@ -143,5 +183,4 @@ addFacet(f); } } - -} +} \ No newline at end of file Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java 2009-06-04 18:44:52 UTC (rev 15717) @@ -0,0 +1,89 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.web.kb.taglib; + +import java.io.File; +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtension; +import org.eclipse.core.runtime.IExtensionPoint; +import org.eclipse.core.runtime.IExtensionRegistry; +import org.eclipse.core.runtime.Platform; +import org.jboss.tools.jst.web.kb.WebKbPlugin; +import org.jboss.tools.jst.web.kb.internal.taglib.CustomTagLibrary; +import org.osgi.framework.Bundle; + +/** + * @author Alexey Kazakov + */ +public class CustomTagLibManager { + + private static final CustomTagLibManager INSTANCE = new CustomTagLibManager(); + + private ICustomTagLibrary[] libs = null; + + private CustomTagLibManager() { + } + + public static CustomTagLibManager getInstance() { + return INSTANCE; + } + + /** + * Returns all custom tag libraries which are defined via extension point org.jboss.tools.jst.web.kb.KbTagLib. + * @param project + * @param uri + * @return + */ + public ICustomTagLibrary[] getLibraries() { + if(libs==null) { + Set<ICustomTagLibrary> libSet = new HashSet<ICustomTagLibrary>(); + IExtensionRegistry registry = Platform.getExtensionRegistry(); + IExtensionPoint extensionPoint = registry.getExtensionPoint("org.jboss.tools.jst.web.kb.KbTagLib"); //$NON-NLS-1$ + IExtension[] extensions = extensionPoint.getExtensions(); + for (int i=0; i<extensions.length; i++) { + IExtension extension = extensions[i]; + IConfigurationElement[] elements = extension.getConfigurationElements(); + for(int j=0; j<elements.length; j++) { + String uri = elements[j].getAttribute("uri"); //$NON-NLS-1$ + String location = elements[j].getAttribute("location"); //$NON-NLS-1$ + String version = elements[j].getAttribute("version"); //$NON-NLS-1$ + String name = elements[j].getAttribute("version"); //$NON-NLS-1$ + Bundle sourcePlugin = Platform.getBundle(elements[j].getNamespaceIdentifier()); + File schemaLocation = null; + try { + String pluginPath = FileLocator.resolve(sourcePlugin.getEntry("/")).getPath(); + if(uri==null || uri.length()==0 || location==null || location.length()==0) { + WebKbPlugin.getDefault().logWarning("Incorrect org.jboss.tools.jst.web.kb.KbTagLib extension in " + pluginPath + " plugin. URI or location can't be empty."); //$NON-NLS-1$ $NON-NLS-2$ + continue; + } + schemaLocation = new File(pluginPath, location); + } catch (IOException e) { + WebKbPlugin.getDefault().logError(e); + continue; + } + if(schemaLocation.isFile()) { + CustomTagLibrary lib = new CustomTagLibrary(schemaLocation, uri, version, name); + libSet.add(lib); + } else { + WebKbPlugin.getDefault().logWarning("Can't load KB schema: " + schemaLocation); //$NON-NLS-1$ + } + } + } + libs = libSet.toArray(new ICustomTagLibrary[0]); + } + return libs; + } +} \ No newline at end of file Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml 2009-06-04 18:22:36 UTC (rev 15716) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml 2009-06-04 18:44:52 UTC (rev 15717) @@ -2,7 +2,7 @@ <!DOCTYPE tag-lib PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 2.0//EN" "http://anonsvn.jboss.org/repos/jbosstools/trunk/jst/plugins/org.jboss.tools.jst.web.kb/resources/kbCustomTagLibSchema-1.0.dtd"> <tag-lib defaultPrefix="f"> <component closeTag="true" name="convertDateTime"> - <attribute name="dateStyle" required="false"> + <attribute name="dateStyle"> <proposal type="enumeration"> <param value="default" /> <param value="short" /> @@ -11,7 +11,7 @@ <param value="full" /> </proposal> </attribute> - <attribute name="timeStyle" required="false"> + <attribute name="timeStyle"> <proposal type="enumeration"> <param value="default" /> <param value="short" /> @@ -20,7 +20,7 @@ <param value="full" /> </proposal> </attribute> - <attribute name="type" required="false"> + <attribute name="type"> <proposal type="enumeration"> <param value="date" /> <param value="time" /> @@ -29,19 +29,19 @@ </attribute> </component> <component closeTag="true" name="convertNumber"> - <attribute name="groupingUsed" required="false"> + <attribute name="groupingUsed"> <proposal type="enumeration"> <param value="true" /> <param value="false" /> </proposal> </attribute> - <attribute name="integerOnly" required="false"> + <attribute name="integerOnly"> <proposal type="enumeration"> <param value="true" /> <param value="false" /> </proposal> </attribute> - <attribute name="type" required="false"> + <attribute name="type"> <proposal type="enumeration"> <param value="number" /> <param value="currency" /> @@ -51,7 +51,7 @@ </component> <component closeTag="true" name="selectItem"> - <attribute name="itemDisabled" required="false"> + <attribute name="itemDisabled"> <proposal type="enumeration"> <param value="true" /> <param value="false" /> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml 2009-06-04 18:22:36 UTC (rev 15716) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml 2009-06-04 18:44:52 UTC (rev 15717) @@ -12,7 +12,7 @@ value="#{facesContext.externalContext.requestContextPath}" /> </proposal> </attribute> - <attribute name="type" required="false"> + <attribute name="type"> <proposal type="enumeration"> <param value="submit" /> <param value="reset" />