1.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/taglib/EncodingTag.java	Sun Apr 06 18:21:29 2008 -0700
     1.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/taglib/EncodingTag.java	Mon Apr 07 16:45:17 2008 -0700
     1.3 @@ -65,7 +65,7 @@
     1.4       * <p>Return the component type required by this tag handler.</p>
     1.5       */
     1.6      public String getComponentType()
     1.7 -    { return "com.sun.jsfcl.Encoding"; }                              //NOI18N
     1.8 +    { return "com.sun.rave.faces.Encoding"; }                              //NOI18N
     1.9  
    1.10  
    1.11  
    1.12 @@ -73,7 +73,7 @@
    1.13       * <p>Return the renderer type required by this tag handler.</p>
    1.14       */
    1.15      public String getRendererType()
    1.16 -    { return "com.sun.jsfcl.Encoding"; }                              //NOI18N
    1.17 +    { return "com.sun.rave.faces.Encoding"; }                              //NOI18N
    1.18  
    1.19  
    1.20      // ------------------------------------------------------- Protected Methods

     2.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/Bundle-JSF-base.properties	Sun Apr 06 18:21:29 2008 -0700
     2.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/Bundle-JSF-base.properties	Mon Apr 07 16:45:17 2008 -0700
     2.3 @@ -42,3 +42,5 @@
     2.4  EncodingComponent_DisplayName=Encoding
     2.5  EncodingComponent_value_Description=The character encoding to be set on the current response.
     2.6  EncodingComponent_value_DisplayName=Response Character Encoding
     2.7 +EncodingComponent_id_DisplayName=id
     2.8 +EncodingComponent_id_Description=id

     3.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/EncodingComponentBeanInfoBase.java	Sun Apr 06 18:21:29 2008 -0700
     3.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/EncodingComponentBeanInfoBase.java	Mon Apr 07 16:45:17 2008 -0700
     3.3 @@ -101,7 +101,7 @@
     3.4          beanDescriptor.setValue(Constants.BeanDescriptor.PROPERTY_CATEGORIES,getCategoryDescriptors());
     3.5          beanDescriptor.setValue(Constants.BeanDescriptor.TAG_NAME,"encoding");
     3.6          beanDescriptor.setValue(Constants.BeanDescriptor.TAGLIB_PREFIX,"j");
     3.7 -        beanDescriptor.setValue(Constants.BeanDescriptor.TAGLIB_URI,"http://www.sun.com/creator/rave.faces");
     3.8 +        beanDescriptor.setValue(Constants.BeanDescriptor.TAGLIB_URI,"http://www.sun.com/creator/jsfcl");
     3.9          beanDescriptor.setValue(Constants.BeanDescriptor.TRAY_COMPONENT,Boolean.TRUE);
    3.10          return beanDescriptor;
    3.11  
    3.12 @@ -162,8 +162,19 @@
    3.13              prop_value.setValue(Constants.PropertyDescriptor.CATEGORY,com.sun.rave.designtime.base.CategoryDescriptors.DATA);
    3.14              prop_value.setValue("com.sun.rave.propertyeditors.DOMAIN_CLASS", com.sun.rave.propertyeditors.domains.CharacterSetsDomain.class);
    3.15  
    3.16 +            PropertyDescriptor prop_id = new PropertyDescriptor("id",beanClass,"getId","setId");
    3.17 +            prop_id.setDisplayName(resources.getString("EncodingComponent_id_DisplayName"));
    3.18 +            prop_id.setShortDescription(resources.getString("EncodingComponent_id_Description"));
    3.19 +            prop_id.setExpert(false);
    3.20 +            prop_id.setHidden(true);
    3.21 +            prop_id.setPreferred(false);
    3.22 +            attrib = new AttributeDescriptor("id",false,null,true);
    3.23 +            prop_id.setValue(Constants.PropertyDescriptor.ATTRIBUTE_DESCRIPTOR,attrib);
    3.24 +            prop_id.setValue(Constants.PropertyDescriptor.CATEGORY,com.sun.rave.designtime.base.CategoryDescriptors.GENERAL);            
    3.25 +            
    3.26              propDescriptors = new PropertyDescriptor[] {
    3.27                  prop_value,
    3.28 +                prop_id
    3.29              };
    3.30              return propDescriptors;
    3.31  

     4.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/JsfTagSupport.java	Sun Apr 06 18:21:29 2008 -0700
     4.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/JsfTagSupport.java	Mon Apr 07 16:45:17 2008 -0700
     4.3 @@ -55,10 +55,7 @@
     4.4          try {
     4.5              Enumeration<URL> urls = classLoader.getResources("META-INF/faces-config.xml");
     4.6              while (urls.hasMoreElements()) {
     4.7 -                URL url = urls.nextElement();
     4.8 -                if (!url.getPath().contains("jsfcl.jar")) {
     4.9 -                    addTaglibFacesConfigMapEntry(url);
    4.10 -                }
    4.11 +                addTaglibFacesConfigMapEntry(urls.nextElement());
    4.12              }
    4.13  
    4.14              // Bug Fix 124610 - Unfortunately the JSF RI component informations are not kept
    4.15 @@ -140,7 +137,7 @@
    4.16  
    4.17      public String getComponentClass(
    4.18              ClassLoader classLoader, String tagName) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
    4.19 -        if(tagName.equals("view") || tagName.equals("subview")) {
    4.20 +        if(tagName.equals("view") || tagName.equals("subview") || tagName.equals("verbatim")) {
    4.21              return null;
    4.22          }
    4.23          UIComponentTagBase componentTag = (UIComponentTagBase) getTagHandler(classLoader, tagName);