Author: akazakov Date: 2009-08-24 08:03:10 -0400 (Mon, 24 Aug 2009) New Revision: 17233 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/CustomTagLibrary.java 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/taglibs/Ajax4jsf.xml trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JBossSeam.xml trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/componentExtension.xml Log: Renamed <componentExtension> to <component-extension> in custom KB schemas. 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-08-23 20:16:54 UTC (rev 17232) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/resources/kbCustomTagLibSchema-1.0.dtd 2009-08-24 12:03:10 UTC (rev 17233) @@ -10,7 +10,7 @@ dafault-prefix - Default prefix. ignoreCase - "true" - Ignore case of letters in name of attributes and components --> -<!ELEMENT tag-lib (component*, componentExtension?)> +<!ELEMENT tag-lib (component*, component-extension?)> <!ATTLIST tag-lib dafaultPrefix CDATA #IMPLIED> <!ATTLIST tag-lib ignoreCase %Boolean; #IMPLIED> @@ -72,4 +72,4 @@ for component attributes in case these attributes are present in other types of tag libs. For example this element could add proposals for every "rendered" attributes for any tag lib. --> -<!ELEMENT componentExtension (attribute*) > \ No newline at end of file +<!ELEMENT component-extension (attribute*) > \ 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/CustomTagLibrary.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibrary.java 2009-08-23 20:16:54 UTC (rev 17232) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibrary.java 2009-08-24 12:03:10 UTC (rev 17233) @@ -39,7 +39,7 @@ public class CustomTagLibrary extends AbstractTagLib implements ICustomTagLibrary { protected static final String DEFAULT_PREFIX = "defaultPrefix"; //$NON-NLS-1$ - protected static final String TAG_LIB = "tag-lib"; //$NON-NLS-1$ + public static final String TAG_LIB = "tag-lib"; //$NON-NLS-1$ protected static final String COMPONENT = "component"; //$NON-NLS-1$ protected static final String CLOSE_TAG = "closeTag"; //$NON-NLS-1$ protected static final String TRUE = "true"; //$NON-NLS-1$ @@ -51,7 +51,7 @@ protected static final String ENUMERATION = "enumeration"; //$NON-NLS-1$ protected static final String PARAM = "param"; //$NON-NLS-1$ protected static final String VALUE = "value"; //$NON-NLS-1$ - protected static final String COMPONET_EXTENSION = "componentExtension"; //$NON-NLS-1$ + public static final String COMPONET_EXTENSION = "component-extension"; //$NON-NLS-1$ protected static final String DEFAULT_VALUE = "defaultValue"; //$NON-NLS-1$ protected static final String EXTENDED = "extended"; //$NON-NLS-1$ protected static final String DESCRIPTION = "description"; //$NON-NLS-1$ Modified: 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 2009-08-23 20:16:54 UTC (rev 17232) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java 2009-08-24 12:03:10 UTC (rev 17233) @@ -91,7 +91,7 @@ IConfigurationElement[] elements = extension.getConfigurationElements(); for(int j=0; j<elements.length; j++) { String elementName = elements[j].getName(); - if("tag-lib".equals(elementName)) { //$NON-NLS-1$ + if(CustomTagLibrary.TAG_LIB.equals(elementName)) { 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$ @@ -115,7 +115,7 @@ } else { WebKbPlugin.getDefault().logWarning("Can't load KB schema: " + schemaLocation); //$NON-NLS-1$ } - } else if("component-extension".equals(elementName)) { //$NON-NLS-1$ + } else if(CustomTagLibrary.COMPONET_EXTENSION.equals(elementName)) { String location = elements[j].getAttribute("location"); //$NON-NLS-1$ Bundle sourcePlugin = Platform.getBundle(elements[j].getNamespaceIdentifier()); File schemaLocation = null; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml 2009-08-23 20:16:54 UTC (rev 17232) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml 2009-08-24 12:03:10 UTC (rev 17233) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!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="a4j"> - <customExtension> + <custom-extension> <attribute name="ajaxSingle"> <proposal type="enumeration"> <param value="true" /> @@ -38,7 +38,7 @@ <param value="false" /> </proposal> </attribute> - </customExtension> + </custom-extension> <component closeTag="true" name="loadBundle"> <attribute name="basename"> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JBossSeam.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JBossSeam.xml 2009-08-23 20:16:54 UTC (rev 17232) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JBossSeam.xml 2009-08-24 12:03:10 UTC (rev 17233) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!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="s"> - <customExtension> + <custom-extension> <attribute name="propagation"> <proposal type="enumeration"> <param value="begin" /> @@ -11,7 +11,7 @@ <param value="end" /> </proposal> </attribute> - </customExtension> + </custom-extension> <component name="button"> <attribute name="view"> <proposal type="file"> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml 2009-08-23 20:16:54 UTC (rev 17232) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml 2009-08-24 12:03:10 UTC (rev 17233) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!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="rich"> - <customExtension> + <custom-extension> <attribute name="focus"> <proposal type="id"/> </attribute> @@ -71,7 +71,7 @@ <param value="false" /> </proposal> </attribute> - </customExtension> + </custom-extension> <component name="extendedDataTable"> <attribute name="align"> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/componentExtension.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/componentExtension.xml 2009-08-23 20:16:54 UTC (rev 17232) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/componentExtension.xml 2009-08-24 12:03:10 UTC (rev 17233) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE customExtension 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"> -<customExtension> +<component-extension> <attribute name="action"> <proposal type="viewActions" /> </attribute> @@ -64,4 +64,4 @@ <attribute name="converter"> <proposal type="converterID"/> </attribute> -</customExtension> \ No newline at end of file +</component-extension> \ No newline at end of file