Author: scabanovich Date: 2010-01-14 10:54:01 -0500 (Thu, 14 Jan 2010) New Revision: 19748 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/build.properties trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibConstants.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibEntityRecognizer.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java Log: https://jira.jboss.org/jira/browse/JBIDE-5670 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/build.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/build.properties 2010-01-14 14:42:10 UTC (rev 19747) +++ trunk/jsf/plugins/org.jboss.tools.jsf/build.properties 2010-01-14 15:54:01 UTC (rev 19748) @@ -4,8 +4,11 @@ about.html,\ dtds/,\ images/,\ - . + .,\ + schemas/ jars.compile.order = . output.. = bin/ source.. = src/,\ resources/ +src.includes = dtds/,\ + schemas/ Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2010-01-14 14:42:10 UTC (rev 19747) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2010-01-14 15:54:01 UTC (rev 19748) @@ -13,6 +13,7 @@ <meta path="meta/jsfwizards.meta"> </meta> <meta path="meta/facelet-taglib.meta"/> + <meta path="meta/facelet-taglib2.meta"/> <meta path="meta/jsf2-components.meta"/> </extension> <extension point="org.jboss.tools.common.model.keys"> Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2010-01-14 14:42:10 UTC (rev 19747) +++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2010-01-14 15:54:01 UTC (rev 19748) @@ -1,3 +1,6 @@ +FileFaceletTaglib.editorTitle=Facelet Taglib 1.0 Editor +FileFaceletTaglib20.editorTitle=Facelet Taglib 2.0 Editor + FileSystems_RegisterInServerXML_jsf=/jsf/noHelpYet.html FacesConfig_Rename.WindowTitle=Rename @@ -632,29 +635,58 @@ JSFConfigExtensions_Properties.Title=Extensions FileFaceletTaglib_Properties.Title=File Facelet Taglib +FileFaceletTaglib20_Properties.Title=File Facelet Taglib FileFaceletTaglib_AddTag.WindowTitle=Add Tag FileFaceletTaglib_AddTag.Title=Facelet Tag +FileFaceletTaglib20_AddTag.WindowTitle=Add Tag +FileFaceletTaglib20_AddTag.Title=Facelet Tag + FileFaceletTaglib_AddFunction.WindowTitle=Add Function FileFaceletTaglib_AddFunction.Title=Facelet Function +FileFaceletTaglib20_AddFunction.WindowTitle=Add Function +FileFaceletTaglib20_AddFunction.Title=Facelet Function + FaceletTaglibTag_AddHandler.WindowTitle=New Handler FaceletTaglibTag_AddHandler.Title=Facelet Tag Handler +FaceletTaglibTag20_AddHandler.WindowTitle=New Handler +FaceletTaglibTag20_AddHandler.Title=Facelet Tag Handler + FaceletTaglibTag_AddComponent.WindowTitle=New Component FaceletTaglibTag_AddComponent.Title=Facelet Component +FaceletTaglibTag20_AddComponent.WindowTitle=New Component +FaceletTaglibTag20_AddComponent.Title=Facelet Component + +FaceletTaglibTag20_AddBehavior.WindowTitle=New Behavior +FaceletTaglibTag20_AddBehavior.Title=Facelet Behavior + FaceletTaglibTag_AddConverter.WindowTitle=New Converter FaceletTaglibTag_AddConverter.Title=Facelet Converter +FaceletTaglibTag20_AddConverter.WindowTitle=New Converter +FaceletTaglibTag20_AddConverter.Title=Facelet Converter + FaceletTaglibTag_AddValidator.WindowTitle=New Validator FaceletTaglibTag_AddValidator.Title=Facelet Validator +FaceletTaglibTag20_AddValidator.WindowTitle=New Validator +FaceletTaglibTag20_AddValidator.Title=Facelet Validator + FaceletTaglibTag_AddSource.WindowTitle=New Source FaceletTaglibTag_AddSource.Title=Facelet Tag Source +FaceletTaglibTag20_AddSource.WindowTitle=New Source +FaceletTaglibTag20_AddSource.Title=Facelet Tag Source + +FaceletTaglibTag20_AddAttribute.WindowTitle=New Attribute +FaceletTaglibTag20_AddAttribute.Title=Facelet Attribute + FaceletTaglibTag_Properties.Title=Facelet Tag +FaceletTaglibTag20_Properties.Title=Facelet Tag FaceletTaglibHandler_Properties.Title=Facelet Tag Handler FaceletTaglibComponent_Properties.Title=Facelet Component @@ -662,6 +694,14 @@ FaceletTaglibValidator_Properties.Title=Facelet Validator FaceletTaglibSource_Properties.Title=Facelet Tag Source +FaceletTaglibHandler20_Properties.Title=Facelet Tag Handler +FaceletTaglibBehavior20_Properties.Title=Facelet Behavior +FaceletTaglibComponent20_Properties.Title=Facelet Component +FaceletTaglibConverter20_Properties.Title=Facelet Converter +FaceletTaglibValidator20_Properties.Title=Facelet Validator +FaceletTaglibSource20_Properties.Title=Facelet Tag Source +FaceletTaglibAttribute20_Properties.Title=Facelet Attribute + # New Eclipse4Web JSF Project wizard newJSFLightProjectPage1_introduction=The Create New Project Wizard is used for creating a brand new project. If you already have a pre-existing project, just use the Import Project Wizard to start working with it in Eclipse4Web. newJSFLightProjectPage1_name = Project Name Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta 2010-01-14 14:42:10 UTC (rev 19747) +++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta 2010-01-14 15:54:01 UTC (rev 19748) @@ -27,6 +27,7 @@ </GROUP> <GROUP name="main"> <GROUP name="facelet"> + <ICON name="attribute" path="images/jsf/attribute.gif"/> <ICON name="component" path="images/struts/plug_in.gif"/> <ICON name="converter" path="images/jsf/convertor.gif"/> <ICON name="data-source" path="images/struts/data_source.gif"/> Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibConstants.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibConstants.java 2010-01-14 14:42:10 UTC (rev 19747) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibConstants.java 2010-01-14 15:54:01 UTC (rev 19748) @@ -18,5 +18,6 @@ public static final String DOC_PUBLICID = "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"; //$NON-NLS-1$ public static final String ENT_FACELET_TAGLIB = "FileFaceletTaglib"; //$NON-NLS-1$ + public static final String ENT_FACELET_TAGLIB_20 = "FileFaceletTaglib20"; //$NON-NLS-1$ } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibEntityRecognizer.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibEntityRecognizer.java 2010-01-14 14:42:10 UTC (rev 19747) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibEntityRecognizer.java 2010-01-14 15:54:01 UTC (rev 19748) @@ -20,7 +20,17 @@ public String getEntityName(String ext, String body) { if (body == null) return null; if (body.indexOf(DOC_PUBLICID) > 0) return ENT_FACELET_TAGLIB; + if(is20(body)) return ENT_FACELET_TAGLIB_20; return null; } + private boolean is20(String body) { + int i = body.indexOf("<facelet-taglib"); //$NON-NLS-1$ + if(i < 0) return false; + int j = body.indexOf(">", i); //$NON-NLS-1$ + if(j < 0) return false; + String s = body.substring(i, j); + return s.indexOf("version=\"2.0\"") > 0 && //$NON-NLS-1$ + s.indexOf("\"http://java.sun.com/xml/ns/javaee\"") > 0; //$NON-NLS-1$ + } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java 2010-01-14 14:42:10 UTC (rev 19747) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java 2010-01-14 15:54:01 UTC (rev 19748) @@ -89,6 +89,10 @@ static String TLD_ENTITIES = ".FileTLD_PRO.FileTLD_1_2.FileTLD_2_0.FileTLD_2_1."; protected boolean acceptFile(XModelObject o) { + if(o.getParent() == null) { + System.out.println("Null parent " + o); + return false; + } if("META-INF".equals(o.getParent().getAttributeValue("name"))) { if(TLDUtil.isFaceletTaglib(o)) return true; }