svn commit: r916266 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java

[ja...@apache.org]

Author: jakobk
Date: Thu Feb 25 12:27:16 2010
New Revision: 916266

URL: http://svn.apache.org/viewvc?rev=916266&view=rev
Log:
MYFACES-2543 Facelets Taglib jars are not recognized (removed the version check of facelet-taglib in TagLibraryConfig)

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java?rev=916266&r1=916265&r2=916266&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java Thu Feb 25 12:27:16 2010
@@ -26,7 +26,6 @@
 import java.util.logging.Logger;
 
 import javax.faces.FacesException;
-import javax.faces.application.ProjectStage;
 import javax.faces.application.Resource;
 import javax.faces.application.ResourceHandler;
 import javax.faces.context.FacesContext;
@@ -253,7 +252,7 @@
      * a pre-2.0 document.  If it is, we really need to construct a DTD validating, non-namespace
      * aware parser. Otherwise, we have to construct a schema validating, namespace-aware parser.
      */
-    private static class VersionCheckHandler extends DefaultHandler
+    /*private static class VersionCheckHandler extends DefaultHandler
     {
         private boolean version20OrLater;
         
@@ -287,7 +286,7 @@
                 //throw new SAXException();
             }
         }
-    }
+    }*/
     
     private static class LibraryHandler extends DefaultHandler
     {
@@ -321,8 +320,6 @@
         
         private String compositeLibraryName;
         
-        private boolean version20OrLater;
-
         public LibraryHandler(URL source)
         {
             this.source = source;
@@ -331,11 +328,7 @@
 
         public TagLibrary getLibrary()
         {
-            if (this.version20OrLater)
-            {
-                return this.library;
-            }
-            return null;
+            return this.library;
         }
 
         public void endElement(String uri, String localName, String qName) throws SAXException
@@ -346,10 +339,6 @@
                 {
                     ; // Nothing to do
                 }                
-                else if (!version20OrLater)
-                {
-                    return;
-                }
                 else if ("library-class".equals(qName))
                 {
                     this.processLibraryClass();
@@ -602,25 +591,6 @@
         public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
         {
             this.buffer.setLength(0);
-            if ("facelet-taglib".equals(qName))
-            {
-                int length = attributes.getLength();
-                
-                for (int i = 0; i < length; ++i)
-                {
-                    if (attributes.getLocalName (i).equals ("version"))
-                    {
-                        // This document has a "version" attribute in the <facelet-taglib> element, so
-                        // it must be a 2.0 or later document as this attribute was never required before.
-
-                        this.version20OrLater = true;
-                    }
-                }
-            }
-            else if (!version20OrLater)
-            {
-                return;
-            }
             if ("tag".equals(qName))
             {
                 this.handlerClass = null;