Index: navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowView.java
===================================================================
RCS file: /cvs/web/jsf/navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowView.java,v
--- navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowView.java	2 Oct 2007 04:54:37 -0000	1.114
+++ navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowView.java	8 Oct 2007 14:55:16 -0000
@@ -867,4 +867,4 @@ 
     public void setMultiview(PageFlowElement multiview) {
         this.multiviewRef = new WeakReference<PageFlowElement>(multiview);
     }
-}
+}
Index: src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigComponentFactoryImpl.java
===================================================================
RCS file: /cvs/web/jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigComponentFactoryImpl.java,v
--- src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigComponentFactoryImpl.java	4 Oct 2007 08:09:48 -0000	1.7
+++ src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigComponentFactoryImpl.java	8 Oct 2007 14:55:19 -0000
@@ -52,7 +52,7 @@ 
  * @author Petr Pisl
  */
 public class JSFConfigComponentFactoryImpl implements JSFConfigComponentFactory {
-    
+
     private static final Logger LOGGER = Logger.getLogger(JSFConfigComponentFactoryImpl.class.getName());
     
     private final JSFConfigModelImpl model;
@@ -133,16 +133,10 @@ 
     
     public static boolean areSameQName(JSFConfigQNames jsfqname,Element element) {
         QName qname = AbstractDocumentComponent.getQName(element);
-        boolean aresame = false;
-        JSFVersion version = JSFVersion.JSF_1_1;
-        if (element.getNamespaceURI() != null && element.getNamespaceURI().length()>0)
-            version = JSFVersion.JSF_1_2;
-        if (element.getNamespaceURI() != null){
-            aresame = jsfqname.getQName(version).equals(qname);
-        } else {
-            aresame = jsfqname.getLocalName().equals(qname.getLocalPart());
+        if (JSFConfigQNames.JSF_1_2_NS.equals(element.getNamespaceURI())){
+            return jsfqname.getQName(JSFVersion.JSF_1_2).equals(qname);
         }
-        return aresame;
+        return jsfqname.getLocalName().equals(qname.getLocalPart());
     }
     
     public static class CreateVisitor extends JSFConfigVisitor.Default {
Index: src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigModelImpl.java
===================================================================
RCS file: /cvs/web/jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigModelImpl.java,v
--- src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigModelImpl.java	4 Oct 2007 08:09:48 -0000	1.5
+++ src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigModelImpl.java	8 Oct 2007 14:55:19 -0000
@@ -99,7 +99,7 @@ 
     public JSFVersion getVersion() {
         String namespaceURI = getRootComponent().getPeer().getNamespaceURI();
         JSFVersion version = JSFVersion.JSF_1_1;
-        if (namespaceURI != null){
+        if (JSFConfigQNames.JSF_1_2_NS.equals(namespaceURI)){
             version = JSFVersion.JSF_1_2;
         }
         return version;
Index: test/unit/data/faces-config_1_1_with_ns.xml
===================================================================
RCS file: test/unit/data/faces-config_1_1_with_ns.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ test/unit/data/faces-config_1_1_with_ns.xml	8 Oct 2007 14:55:23 -0000
@@ -0,0 +1,12 @@ 
+<?xml version='1.0' encoding='UTF-8'?>
+
+
+<!DOCTYPE faces-config PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<!-- =========== FULL CONFIGURATION FILE ================================== -->
+
+<faces-config xmlns="http://java.sun.com/JSF/Configuration">
+    
+  
+</faces-config>
Index: test/unit/data/faces-config_1_1_without_ns.xml
===================================================================
RCS file: test/unit/data/faces-config_1_1_without_ns.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ test/unit/data/faces-config_1_1_without_ns.xml	8 Oct 2007 14:55:23 -0000
@@ -0,0 +1,13 @@ 
+<?xml version='1.0' encoding='UTF-8'?>
+
+
+<!DOCTYPE faces-config PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+
+<!-- =========== FULL CONFIGURATION FILE ================================== -->
+
+<faces-config>
+    
+  
+</faces-config>
Index: test/unit/data/faces-config_1_2.xml
===================================================================
RCS file: test/unit/data/faces-config_1_2.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ test/unit/data/faces-config_1_2.xml	8 Oct 2007 14:55:23 -0000
@@ -0,0 +1,11 @@ 
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- =========== FULL CONFIGURATION FILE ================================== -->
+
+<faces-config version="1.2" 
+    xmlns="http://java.sun.com/xml/ns/javaee" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+
+
+</faces-config>