dev@javaserverfaces.java.net

[REVIEW] Move schema from J2EE 1.4 to Java EE 5.

From: Ryan Lubke <Ryan.Lubke_at_Sun.COM>
Date: Mon, 15 Aug 2005 16:13:15 -0700

This change relies on the latest version of glassfish.

SECTION: Modified Files
----------------------------
M jsf-api/build.xml
   - make the create.standard.xml invoke the 'attributes' target
     since these need to be created in order for the xinclusion to work

M jsf-api/doc/standard-html-renderkit.xml
  - regenerated document

M jsf-api/doc/web-facesconfig_1_2.xsd
  - Updated namespace URLs (from ns/j2ee -> ns/javaee)
  - include javaee_5.xsd instead of j2ee_1_4.xsd
  - replace all occurrences of j2ee prefix in types with javaee.

M jsf-ri/build.xml
  - set javac source to 1.5

M jsf-api/test/javax/faces/webapp/config-file-0.xml
M jsf-api/test/javax/faces/webapp/config-file-1.xml
M jsf-api/doc/standard-html-renderkit-base.xml
M jsf-ri/conf/basic/META-INF/faces-config.xml
M jsf-ri/conf/xslt/merge-config.xsl
M jsf-ri/conf/xslt/prune-tool-data.xsl
M jsf-ri/src/com/sun/faces/jsf-ri-config.xml
M jsf-ri/systest/web/WEB-INF/faces-config.xml
M jsf-ri/systest/web/WEB-INF/init-faces-config.xml
M
jsf-ri/systest-per-webapp/command-link-back-button/web/WEB-INF/faces-config.xml
M
jsf-ri/systest-per-webapp/command-link-redirect/web/WEB-INF/faces-config.xml
M jsf-ri/systest-per-webapp/el-performance/web/WEB-INF/faces-config.xml
M jsf-ri/systest-per-webapp/nested-datatables/web/WEB-INF/faces-config.xml
M jsf-ri/systest-per-webapp/replace-application/web/WEB-INF/faces-config.xml
M jsf-ri/systest-per-webapp/replace-lifecycle/web/WEB-INF/faces-config.xml
   - Updated namespace URLs (from ns/j2ee -> ns/javaee)


M
jsf-ri/systest-per-webapp/replace-statemanager/web/WEB-INF/faces-config.xml
M jsf-ri/test-sqe/web/WEB-INF/faces-config.xml
M jsf-ri/test-sqe/web/WEB-INF/init-faces-config.xml
M jsf-ri/web/test/config-with-failing-property-conversion.xml
M jsf-ri/web/test/config1.xml
M jsf-ri/web/test/config2.xml
M jsf-ri/web/test/locale-config.xml
M jsf-ri/web/test/locale-config1.xml
M jsf-ri/web/test/locale-config2.xml
M jsf-ri/web/test/runtime-components.xml
M jsf-ri/web/test/WEB-INF/config-lists-and-maps.xml
M jsf-ri/web/test/WEB-INF/faces-config-empty.xml
M jsf-ri/web/test/WEB-INF/faces-config.xml
M jsf-ri/web/test/WEB-INF/none-scoped-beans.xml
M jsf-ri/web/test-config-1/WEB-INF/embed-config.xml
M jsf-ri/web/test-config-1/WEB-INF/extra-config.xml
M jsf-ri/web/test-config-1/WEB-INF/faces-config.xml
M jsf-ri/systest-per-webapp/command-link-back-button/web/WEB-INF/web.xml
M jsf-ri/conf/share/jsf_core.tld
  - Updated namespace URLs (from ns/j2ee -> ns/javaee)

M jsf-ri/conf/test/web.xml
M jsf-ri/systest-per-webapp/command-link-redirect/web/WEB-INF/web.xml
M jsf-ri/systest-per-webapp/core-tags/web/WEB-INF/web.xml
M jsf-ri/systest-per-webapp/el-performance/web/WEB-INF/web.xml
M jsf-ri/systest-per-webapp/replace-application/web/WEB-INF/web.xml
M jsf-ri/systest-per-webapp/replace-lifecycle/web/WEB-INF/web.xml
M jsf-ri/test-sqe/web/WEB-INF/web.xml
M jsf-ri/systest-per-webapp/nested-datatables/web/WEB-INF/web.xml
M jsf-ri/systest-per-webapp/replace-statemanager/web/WEB-INF/web.xml
  - Updated to refer to web-app_2_5
  - Updated namespace URLs (from ns/j2ee -> ns/javaee)

M jsf-tools/build.xml
  - set javac source to 1.5

M jsf-tools/src/com/sun/faces/config/DigesterFactory.java
  - Update the custom EntityResolver with the new schemas
M jsf-tools/src/com/sun/faces/generate/JspTLD21Generator.java
  - Update the TLD generator to emit the correct URLs


R jsf-api/doc/j2ee_1_4.xsd
R jsf-api/doc/j2ee_web_services_1_1.xsd
R jsf-api/doc/j2ee_web_services_client_1_1.xsd

A jsf-api/doc/javaee_5.xsd
A jsf-api/doc/javaee_web_services_1_2.xsd
A jsf-api/doc/javaee_web_services_client_1_2.xsd



SECTION: Diffs
----------------------------
Index: jsf-api/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-api/build.xml,v
retrieving revision 1.149
diff -u -r1.149 build.xml
--- jsf-api/build.xml 9 Aug 2005 21:54:54 -0000 1.149
+++ jsf-api/build.xml 15 Aug 2005 22:51:17 -0000
@@ -86,6 +86,7 @@
     <pathelement location="${junit.jar}"/>
     <pathelement location="${servlet.jar}"/>
     <pathelement location="${el-api.jar}"/>
+ <pathelement location="${el-ri.jar}"/>
     <pathelement location="${jsp.jar}"/>
     <pathelement location="${jstl.jar}"/>
     <pathelement location="${commons-logging.jar}"/>
@@ -768,7 +769,7 @@
        ===================================================================
   -->
 
- <target name="create.standard.xml">
+ <target name="create.standard.xml" depends="attributes">
     <copy
file="${basedir}/../jsf-ri/src/com/sun/faces/standard-html-renderkit-impl.xml"
       todir="${basedir}/doc"/>
     <exec executable="xmllint" dir="${basedir}/doc" failonerror="true">
Index: jsf-api/doc/standard-html-renderkit-base.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-api/doc/standard-html-renderkit-base.xml,v
retrieving revision 1.16
diff -u -r1.16 standard-html-renderkit-base.xml
--- jsf-api/doc/standard-html-renderkit-base.xml 9 Aug 2005 21:52:32
-0000 1.16
+++ jsf-api/doc/standard-html-renderkit-base.xml 15 Aug 2005 22:51:17
-0000
@@ -7,10 +7,10 @@
 
 <!-- =========== FULL CONFIGURATION FILE
================================== -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config xmlns="http://java.sun.com/xml/ns/hjavaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
     <!-- Generic User Interface Components -->
Index: jsf-api/doc/standard-html-renderkit.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-api/doc/standard-html-renderkit.xml,v
retrieving revision 1.93
diff -u -r1.93 standard-html-renderkit.xml
--- jsf-api/doc/standard-html-renderkit.xml 10 Aug 2005 19:01:20
-0000 1.93
+++ jsf-api/doc/standard-html-renderkit.xml 15 Aug 2005 22:51:18 -0000
@@ -7,7 +7,7 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 <!-- =========== FULL CONFIGURATION FILE
================================== -->
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd" version="1.2">
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" version="1.2">
 <!-- Generic User Interface Components -->
   <component>
     <component-type>javax.faces.Column</component-type>
Index: jsf-api/doc/web-facesconfig_1_2.xsd
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-api/doc/web-facesconfig_1_2.xsd,v
retrieving revision 1.7
diff -u -r1.7 web-facesconfig_1_2.xsd
--- jsf-api/doc/web-facesconfig_1_2.xsd 19 Jul 2005 19:33:16 -0000 1.7
+++ jsf-api/doc/web-facesconfig_1_2.xsd 15 Aug 2005 22:51:18 -0000
@@ -1,7 +1,7 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
 <xsd:schema
- targetNamespace="http://java.sun.com/xml/ns/j2ee"
- xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+ targetNamespace="http://java.sun.com/xml/ns/javaee"
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee"
      xmlns:xsd="http://www.w3.org/2001/XMLSchema"
      xmlns:xml="http://www.w3.org/XML/1998/namespace"
      elementFormDefault="qualified"
@@ -17,7 +17,7 @@
     <xsd:annotation>
         <xsd:documentation>
 
- Copyright 2004 Sun Microsystems, Inc., 901 San Antonio
+ Copyright 2005 Sun Microsystems, Inc., 901 San Antonio
             Road, Palo Alto, California 94303, U.S.A. All rights
             reserved.
 
@@ -38,7 +38,7 @@
             Third-party software, including font technology, is
             copyrighted and licensed from Sun suppliers.
 
- Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
+ Sun, Sun Microsystems, the Sun logo, Solaris, Java, Java EE,
             JavaServer Pages, Enterprise JavaBeans and the Java Coffee
             Cup logo are trademarks or registered trademarks of Sun
             Microsystems, Inc. in the U.S. and other countries.
@@ -61,12 +61,12 @@
             the JavaServer Faces schema by indicating the JavaServer
             Faces namespace:
 
- http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/javaee
 
             and by indicating the version of the schema by
             using the version element as shown below:
 
- <faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+ <faces-config xmlns="http://java.sun.com/xml/ns/javaee"
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                     xsi:schemaLocation="..."
                     version="1.2">
@@ -75,20 +75,20 @@
 
             The instance documents may indicate the published
             version of the schema using xsi:schemaLocation attribute
- for J2EE namespace with the following location:
+ for javaee namespace with the following location:
 
- http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd
+ http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd
 
             ]]>
 
         </xsd:documentation>
     </xsd:annotation>
 
- <xsd:include schemaLocation="j2ee_1_4.xsd"/>
+ <xsd:include schemaLocation="javaee_5.xsd"/>
 
     <!-- **************************************************** -->
 
- <xsd:element name = "faces-config" type="j2ee:faces-configType">
+ <xsd:element name = "faces-config" type="javaee:faces-configType">
         <xsd:annotation>
             <xsd:documentation>
 
@@ -108,8 +108,8 @@
                 </xsd:documentation>
             </xsd:annotation>
 
- <xsd:selector xpath="j2ee:converter"/>
- <xsd:field xpath="j2ee:converter-id"/>
+ <xsd:selector xpath="javaee:converter"/>
+ <xsd:field xpath="javaee:converter-id"/>
         </xsd:unique>
 
         <xsd:unique name="faces-config-converter-for-class-uniqueness">
@@ -122,8 +122,8 @@
                 </xsd:documentation>
             </xsd:annotation>
 
- <xsd:selector xpath="j2ee:converter"/>
- <xsd:field xpath="j2ee:converter-for-class"/>
+ <xsd:selector xpath="javaee:converter"/>
+ <xsd:field xpath="javaee:converter-for-class"/>
         </xsd:unique>
 
         <xsd:unique name="faces-config-validator-ID-uniqueness">
@@ -135,8 +135,8 @@
                 </xsd:documentation>
             </xsd:annotation>
 
- <xsd:selector xpath="j2ee:validator"/>
- <xsd:field xpath="j2ee:validator-id"/>
+ <xsd:selector xpath="javaee:validator"/>
+ <xsd:field xpath="javaee:validator-id"/>
         </xsd:unique>
 
         <xsd:unique name="faces-config-managed-bean-name-uniqueness">
@@ -148,8 +148,8 @@
                 </xsd:documentation>
             </xsd:annotation>
 
- <xsd:selector xpath="j2ee:managed-bean"/>
- <xsd:field xpath="j2ee:managed-bean-name"/>
+ <xsd:selector xpath="javaee:managed-bean"/>
+ <xsd:field xpath="javaee:managed-bean-name"/>
         </xsd:unique>
     </xsd:element>
 
@@ -167,33 +167,33 @@
         </xsd:annotation>
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
             <xsd:element name="application"
- type="j2ee:faces-config-applicationType"/>
+ type="javaee:faces-config-applicationType"/>
             <xsd:element name="factory"
- type="j2ee:faces-config-factoryType"/>
+ type="javaee:faces-config-factoryType"/>
             <xsd:element name="component"
- type="j2ee:faces-config-componentType"/>
+ type="javaee:faces-config-componentType"/>
             <xsd:element name="converter"
- type="j2ee:faces-config-converterType"/>
+ type="javaee:faces-config-converterType"/>
             <xsd:element name="managed-bean"
- type="j2ee:faces-config-managed-beanType"/>
+ type="javaee:faces-config-managed-beanType"/>
             <xsd:element name="navigation-rule"
- type="j2ee:faces-config-navigation-ruleType"/>
+ type="javaee:faces-config-navigation-ruleType"/>
             <xsd:element name="referenced-bean"
- type="j2ee:faces-config-referenced-beanType"/>
+ type="javaee:faces-config-referenced-beanType"/>
             <xsd:element name="render-kit"
- type="j2ee:faces-config-render-kitType"/>
+ type="javaee:faces-config-render-kitType"/>
             <xsd:element name="lifecycle"
- type="j2ee:faces-config-lifecycleType"/>
+ type="javaee:faces-config-lifecycleType"/>
             <xsd:element name="validator"
- type="j2ee:faces-config-validatorType"/>
+ type="javaee:faces-config-validatorType"/>
             <xsd:element name="faces-config-extension"
- type="j2ee:faces-config-extensionType"
+ type="javaee:faces-config-extensionType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
         </xsd:choice>
             <xsd:attribute name = "id" type = "xsd:ID"/>
             <xsd:attribute name="version"
- type="j2ee:faces-config-versionType"
+ type="javaee:faces-config-versionType"
                 use="required"/>
     </xsd:complexType>
 
@@ -236,7 +236,7 @@
 
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
             <xsd:element name="action-listener"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
                             
@@ -250,7 +250,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="default-render-kit-id"
- type="j2ee:string">
+ type="javaee:string">
                 <xsd:annotation>
                     <xsd:documentation>
                             
@@ -262,7 +262,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="message-bundle"
- type="j2ee:string">
+ type="javaee:string">
                 <xsd:annotation>
                     <xsd:documentation>
                             
@@ -275,7 +275,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="navigation-handler"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
                             
@@ -290,7 +290,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="view-handler"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
                             
@@ -305,7 +305,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="state-manager"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
                             
@@ -321,7 +321,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="el-resolver"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
                             
@@ -335,7 +335,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="property-resolver"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
                             
@@ -348,7 +348,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="variable-resolver"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
 
@@ -361,11 +361,11 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="locale-config"
- type="j2ee:faces-config-locale-configType"/>
+ type="javaee:faces-config-locale-configType"/>
             <xsd:element name="resource-bundle"
-
type="j2ee:faces-config-application-resource-bundleType"/>
+
type="javaee:faces-config-application-resource-bundleType"/>
             <xsd:element name="application-extension"
- type="j2ee:faces-config-application-extensionType"
+
type="javaee:faces-config-application-extensionType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
             </xsd:choice>
@@ -388,9 +388,9 @@
         </xsd:annotation>
 
         <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
             <xsd:element name="base-name"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
                         
@@ -401,7 +401,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="var"
- type="j2ee:string">
+ type="javaee:string">
                 <xsd:annotation>
                     <xsd:documentation>
                         
@@ -454,7 +454,7 @@
 
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
             <xsd:element name="application-factory"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
                             
@@ -468,7 +468,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="faces-context-factory"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
                             
@@ -481,7 +481,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="lifecycle-factory"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
                             
@@ -494,7 +494,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="render-kit-factory"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
 
@@ -507,7 +507,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="factory-extension"
- type="j2ee:faces-config-factory-extensionType"
+ type="javaee:faces-config-factory-extensionType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
         </xsd:choice>
@@ -553,9 +553,9 @@
         </xsd:annotation>
 
         <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
             <xsd:element name="attribute-name"
- type="j2ee:string">
+ type="javaee:string">
                 <xsd:annotation>
                     <xsd:documentation>
                         
@@ -567,7 +567,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="attribute-class"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
 
@@ -578,13 +578,13 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="default-value"
- type="j2ee:faces-config-default-valueType"
+ type="javaee:faces-config-default-valueType"
                          minOccurs="0"/>
             <xsd:element name="suggested-value"
- type="j2ee:faces-config-suggested-valueType"
+ type="javaee:faces-config-suggested-valueType"
                          minOccurs="0"/>
             <xsd:element name="attribute-extension"
- type="j2ee:faces-config-attribute-extensionType"
+ type="javaee:faces-config-attribute-extensionType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
         </xsd:sequence>
@@ -633,9 +633,9 @@
         </xsd:annotation>
 
         <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
             <xsd:element name="component-type"
- type="j2ee:string">
+ type="javaee:string">
                 <xsd:annotation>
                     <xsd:documentation>
                         
@@ -647,7 +647,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="component-class"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
                         
@@ -659,19 +659,19 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="facet"
- type="j2ee:faces-config-facetType"
+ type="javaee:faces-config-facetType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
             <xsd:element name="attribute"
- type="j2ee:faces-config-attributeType"
+ type="javaee:faces-config-attributeType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
             <xsd:element name="property"
- type="j2ee:faces-config-propertyType"
+ type="javaee:faces-config-propertyType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
             <xsd:element name="component-extension"
- type="j2ee:faces-config-component-extensionType"
+ type="javaee:faces-config-component-extensionType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
         </xsd:sequence>
@@ -713,7 +713,7 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:simpleContent>
- <xsd:extension base="j2ee:faces-config-localeType">
+ <xsd:extension base="javaee:faces-config-localeType">
                 <xsd:attribute name="id" type="xsd:ID"/>
             </xsd:extension>
         </xsd:simpleContent>
@@ -735,7 +735,7 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:simpleContent>
- <xsd:restriction base="j2ee:string"/>
+ <xsd:restriction base="javaee:string"/>
         </xsd:simpleContent>
     </xsd:complexType>
 
@@ -769,9 +769,9 @@
         </xsd:annotation>
 
         <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
             <xsd:element name="facet-name"
- type="j2ee:java-identifierType">
+ type="javaee:java-identifierType">
                 <xsd:annotation>
                     <xsd:documentation>
 
@@ -783,7 +783,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="facet-extension"
- type="j2ee:faces-config-facet-extensionType"
+ type="javaee:faces-config-facet-extensionType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
         </xsd:sequence>
@@ -835,7 +835,7 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:simpleContent>
- <xsd:restriction base="j2ee:string"/>
+ <xsd:restriction base="javaee:string"/>
         </xsd:simpleContent>
     </xsd:complexType>
 
@@ -855,7 +855,7 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:simpleContent>
- <xsd:extension base="j2ee:faces-config-el-expressionType">
+ <xsd:extension base="javaee:faces-config-el-expressionType">
                 <xsd:attribute name="id" type="xsd:ID"/>
             </xsd:extension>
         </xsd:simpleContent>
@@ -886,10 +886,10 @@
         </xsd:annotation>
 
         <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
             <xsd:choice>
                 <xsd:element name="converter-id"
- type="j2ee:string">
+ type="javaee:string">
                     <xsd:annotation>
                         <xsd:documentation>
 
@@ -902,7 +902,7 @@
                 </xsd:element>
                 
                 <xsd:element name="converter-for-class"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                     <xsd:annotation>
                         <xsd:documentation>
 
@@ -916,7 +916,7 @@
             </xsd:choice>
             
             <xsd:element name="converter-class"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
 
@@ -928,7 +928,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="attribute"
- type="j2ee:faces-config-attributeType"
+ type="javaee:faces-config-attributeType"
                          minOccurs="0"
                          maxOccurs="unbounded">
                 <xsd:annotation>
@@ -945,7 +945,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="property"
- type="j2ee:faces-config-propertyType"
+ type="javaee:faces-config-propertyType"
                          minOccurs="0"
                          maxOccurs="unbounded">
                 <xsd:annotation>
@@ -962,7 +962,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="converter-extension"
- type="j2ee:faces-config-converter-extensionType"
+ type="javaee:faces-config-converter-extensionType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
         </xsd:sequence>
@@ -1007,7 +1007,7 @@
 
         <xsd:sequence>
             <xsd:element name="phase-listener"
- type="j2ee:fully-qualified-classType"
+ type="javaee:fully-qualified-classType"
                          minOccurs="0"
                          maxOccurs="unbounded">
                 
@@ -1022,7 +1022,7 @@
             </xsd:annotation>
             </xsd:element>
             <xsd:element name="lifecycle-extension"
- type="j2ee:faces-config-lifecycle-extensionType"
+ type="javaee:faces-config-lifecycle-extensionType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
 
@@ -1084,11 +1084,11 @@
         
         <xsd:sequence>
             <xsd:element name="default-locale"
- type="j2ee:faces-config-default-localeType"
+ type="javaee:faces-config-default-localeType"
                          minOccurs="0">
             </xsd:element>
             <xsd:element name="supported-locale"
- type="j2ee:faces-config-supported-localeType"
+ type="javaee:faces-config-supported-localeType"
                          minOccurs="0"
                          maxOccurs="unbounded">
             </xsd:element>
@@ -1116,9 +1116,9 @@
         </xsd:annotation>
 
         <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
             <xsd:element name="managed-bean-name"
- type="j2ee:java-identifierType">
+ type="javaee:java-identifierType">
                 <xsd:annotation>
                     <xsd:documentation>
 
@@ -1131,7 +1131,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="managed-bean-class"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
 
@@ -1149,7 +1149,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="managed-bean-scope"
-
type="j2ee:faces-config-managed-bean-scopeOrNoneType">
+
type="javaee:faces-config-managed-bean-scopeOrNoneType">
                 <xsd:annotation>
                     <xsd:documentation>
 
@@ -1162,16 +1162,16 @@
             </xsd:element>
             <xsd:choice>
                 <xsd:element name="managed-property"
- type="j2ee:faces-config-managed-propertyType"
+
type="javaee:faces-config-managed-propertyType"
                              minOccurs="0"
                              maxOccurs="unbounded"/>
                 <xsd:element name="map-entries"
- type="j2ee:faces-config-map-entriesType"/>
+ type="javaee:faces-config-map-entriesType"/>
                 <xsd:element name="list-entries"
- type="j2ee:faces-config-list-entriesType"/>
+ type="javaee:faces-config-list-entriesType"/>
             </xsd:choice>
             <xsd:element name="managed-bean-extension"
-
type="j2ee:faces-config-managed-bean-extensionType"
+
type="javaee:faces-config-managed-bean-extensionType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
         </xsd:sequence>
@@ -1218,7 +1218,7 @@
         </xsd:annotation>
 
         <xsd:simpleContent>
- <xsd:restriction base="j2ee:string">
+ <xsd:restriction base="javaee:string">
                 <xsd:enumeration value="request"/>
                 <xsd:enumeration value="session"/>
                 <xsd:enumeration value="application"/>
@@ -1241,9 +1241,9 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
             <xsd:element name="property-name"
- type="j2ee:string">
+ type="javaee:string">
                 <xsd:annotation>
                     <xsd:documentation>
                         
@@ -1255,7 +1255,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="property-class"
- type="j2ee:java-typeType"
+ type="javaee:java-typeType"
                          minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
@@ -1272,14 +1272,14 @@
             </xsd:element>
             <xsd:choice>
                 <xsd:element name="map-entries"
- type="j2ee:faces-config-map-entriesType"/>
+ type="javaee:faces-config-map-entriesType"/>
                 <xsd:element name="null-value"
- type="j2ee:faces-config-null-valueType">
+ type="javaee:faces-config-null-valueType">
                 </xsd:element>
                 <xsd:element name="value"
- type="j2ee:faces-config-valueType"/>
+ type="javaee:faces-config-valueType"/>
                 <xsd:element name="list-entries"
- type="j2ee:faces-config-list-entriesType"/>
+ type="javaee:faces-config-list-entriesType"/>
             </xsd:choice>
         </xsd:sequence>
         <xsd:attribute name="id" type="xsd:ID"/>
@@ -1299,7 +1299,7 @@
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="key"
- type="j2ee:string">
+ type="javaee:string">
                 <xsd:annotation>
                     <xsd:documentation>
 
@@ -1312,9 +1312,9 @@
             </xsd:element>
             <xsd:choice>
                 <xsd:element name="null-value"
- type="j2ee:faces-config-null-valueType"/>
+ type="javaee:faces-config-null-valueType"/>
                 <xsd:element name="value"
- type="j2ee:faces-config-valueType"/>
+ type="javaee:faces-config-valueType"/>
             </xsd:choice>
         </xsd:sequence>
         <xsd:attribute name="id" type="xsd:ID"/>
@@ -1336,7 +1336,7 @@
 
         <xsd:sequence>
             <xsd:element name="key-class"
- type="j2ee:fully-qualified-classType"
+ type="javaee:fully-qualified-classType"
                          minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
@@ -1350,10 +1350,10 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="value-class"
- type="j2ee:faces-config-value-classType"
+ type="javaee:faces-config-value-classType"
                          minOccurs="0"/>
             <xsd:element name="map-entry"
- type="j2ee:faces-config-map-entryType"
+ type="javaee:faces-config-map-entryType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
         </xsd:sequence>
@@ -1373,13 +1373,13 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
             <xsd:element name="from-action"
- type="j2ee:faces-config-from-actionType"
+ type="javaee:faces-config-from-actionType"
                          minOccurs="0">
             </xsd:element>
             <xsd:element name="from-outcome"
- type="j2ee:string" minOccurs="0">
+ type="javaee:string" minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
 
@@ -1396,7 +1396,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="to-view-id"
- type="j2ee:string">
+ type="javaee:string">
                 <xsd:annotation>
                     <xsd:documentation>
 
@@ -1408,7 +1408,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="redirect"
- type="j2ee:faces-config-redirectType"
minOccurs="0"/>
+ type="javaee:faces-config-redirectType"
minOccurs="0"/>
         </xsd:sequence>
         <xsd:attribute name="id" type="xsd:ID"/>
     </xsd:complexType>
@@ -1427,16 +1427,16 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
             <xsd:element name="from-view-id"
- type="j2ee:faces-config-from-view-idType"
+ type="javaee:faces-config-from-view-idType"
                          minOccurs="0"/>
             <xsd:element name="navigation-case"
- type="j2ee:faces-config-navigation-caseType"
+ type="javaee:faces-config-navigation-caseType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
             <xsd:element name="navigation-rule-extension"
-
type="j2ee:faces-config-navigation-rule-extensionType"
+
type="javaee:faces-config-navigation-rule-extensionType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
         </xsd:sequence>
@@ -1504,9 +1504,9 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
             <xsd:element name="property-name"
- type="j2ee:string">
+ type="javaee:string">
                 <xsd:annotation>
                     <xsd:documentation>
                         
@@ -1517,7 +1517,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="property-class"
- type="j2ee:java-typeType">
+ type="javaee:java-typeType">
                 <xsd:annotation>
                     <xsd:documentation>
                         
@@ -1532,13 +1532,13 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="default-value"
- type="j2ee:faces-config-default-valueType"
+ type="javaee:faces-config-default-valueType"
                          minOccurs="0"/>
             <xsd:element name="suggested-value"
- type="j2ee:faces-config-suggested-valueType"
+ type="javaee:faces-config-suggested-valueType"
                          minOccurs="0"/>
             <xsd:element name="property-extension"
- type="j2ee:faces-config-property-extensionType"
+ type="javaee:faces-config-property-extensionType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
         </xsd:sequence>
@@ -1599,9 +1599,9 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
             <xsd:element name="referenced-bean-name"
- type="j2ee:java-identifierType">
+ type="javaee:java-identifierType">
                 <xsd:annotation>
                     <xsd:documentation>
                         
@@ -1614,7 +1614,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="referenced-bean-class"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
 
@@ -1646,9 +1646,9 @@
         </xsd:annotation>
         
         <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
             <xsd:element name="render-kit-id"
- type="j2ee:string"
+ type="javaee:string"
                          minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
@@ -1661,7 +1661,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="render-kit-class"
- type="j2ee:fully-qualified-classType"
+ type="javaee:fully-qualified-classType"
                          minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
@@ -1674,11 +1674,11 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="renderer"
- type="j2ee:faces-config-rendererType"
+ type="javaee:faces-config-rendererType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
             <xsd:element name="render-kit-extension"
- type="j2ee:faces-config-render-kit-extensionType"
+
type="javaee:faces-config-render-kit-extensionType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
         </xsd:sequence>
@@ -1706,9 +1706,9 @@
         </xsd:annotation>
         
         <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
             <xsd:element name="component-family"
- type="j2ee:string">
+ type="javaee:string">
                 <xsd:annotation>
                     <xsd:documentation>
                         
@@ -1720,7 +1720,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="renderer-type"
- type="j2ee:string">
+ type="javaee:string">
                 <xsd:annotation>
                     <xsd:documentation>
                         
@@ -1732,7 +1732,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="renderer-class"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
 
@@ -1744,15 +1744,15 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="facet"
- type="j2ee:faces-config-facetType"
+ type="javaee:faces-config-facetType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
             <xsd:element name="attribute"
- type="j2ee:faces-config-attributeType"
+ type="javaee:faces-config-attributeType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
             <xsd:element name="renderer-extension"
- type="j2ee:faces-config-renderer-extensionType"
+ type="javaee:faces-config-renderer-extensionType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
         </xsd:sequence>
@@ -1815,7 +1815,7 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:simpleContent>
- <xsd:restriction base="j2ee:string"/>
+ <xsd:restriction base="javaee:string"/>
         </xsd:simpleContent>
     </xsd:complexType>
 
@@ -1835,7 +1835,7 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:simpleContent>
- <xsd:extension base="j2ee:faces-config-localeType">
+ <xsd:extension base="javaee:faces-config-localeType">
                 <xsd:attribute name="id" type="xsd:ID"/>
             </xsd:extension>
         </xsd:simpleContent>
@@ -1865,9 +1865,9 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:group ref="javaee:descriptionGroup"/>
             <xsd:element name="validator-id"
- type="j2ee:string">
+ type="javaee:string">
                 <xsd:annotation>
                     <xsd:documentation>
                         
@@ -1879,7 +1879,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="validator-class"
- type="j2ee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType">
                 <xsd:annotation>
                     <xsd:documentation>
                         
@@ -1891,7 +1891,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="attribute"
- type="j2ee:faces-config-attributeType"
+ type="javaee:faces-config-attributeType"
                          minOccurs="0"
                          maxOccurs="unbounded">
                 <xsd:annotation>
@@ -1909,7 +1909,7 @@
 
             </xsd:element>
             <xsd:element name="property"
- type="j2ee:faces-config-propertyType"
+ type="javaee:faces-config-propertyType"
                          minOccurs="0"
                          maxOccurs="unbounded">
                 <xsd:annotation>
@@ -1926,7 +1926,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="validator-extension"
- type="j2ee:faces-config-validator-extensionType"
+ type="javaee:faces-config-validator-extensionType"
                          minOccurs="0"
                          maxOccurs="unbounded"/>
         </xsd:sequence>
@@ -1969,7 +1969,7 @@
 
             </xsd:documentation>
         </xsd:annotation>
- <xsd:union memberTypes="j2ee:faces-config-el-expressionType
xsd:string"/>
+ <xsd:union memberTypes="javaee:faces-config-el-expressionType
xsd:string"/>
     </xsd:simpleType>
     
     <!-- **************************************************** -->
@@ -1987,7 +1987,7 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:simpleContent>
- <xsd:restriction base="j2ee:fully-qualified-classType"/>
+ <xsd:restriction base="javaee:fully-qualified-classType"/>
         </xsd:simpleContent>
     </xsd:complexType>
 
@@ -2007,13 +2007,13 @@
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="value-class"
- type="j2ee:faces-config-value-classType"
+ type="javaee:faces-config-value-classType"
                          minOccurs="0"/>
             <xsd:choice minOccurs="0" maxOccurs="unbounded">
                 <xsd:element name="null-value"
- type="j2ee:faces-config-null-valueType"/>
+ type="javaee:faces-config-null-valueType"/>
                 <xsd:element name="value"
- type="j2ee:faces-config-valueType"/>
+ type="javaee:faces-config-valueType"/>
             </xsd:choice>
         </xsd:sequence>
         <xsd:attribute name="id" type="xsd:ID"/>
Index: jsf-api/test/javax/faces/webapp/config-file-0.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-api/test/javax/faces/webapp/config-file-0.xml,v
retrieving revision 1.5
diff -u -r1.5 config-file-0.xml
--- jsf-api/test/javax/faces/webapp/config-file-0.xml 8 Nov 2004
19:23:04 -0000 1.5
+++ jsf-api/test/javax/faces/webapp/config-file-0.xml 15 Aug 2005
22:51:18 -0000
@@ -7,7 +7,7 @@
 
 <!-- ========== EMPTY CONFIGURATION FILE
================================== -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2"/>
Index: jsf-api/test/javax/faces/webapp/config-file-1.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-api/test/javax/faces/webapp/config-file-1.xml,v
retrieving revision 1.14
diff -u -r1.14 config-file-1.xml
--- jsf-api/test/javax/faces/webapp/config-file-1.xml 8 Nov 2004
20:15:58 -0000 1.14
+++ jsf-api/test/javax/faces/webapp/config-file-1.xml 15 Aug 2005
22:51:18 -0000
@@ -5,9 +5,9 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <!-- Initial application element with partial values -->
Index: jsf-ri/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/build.xml,v
retrieving revision 1.186
diff -u -r1.186 build.xml
--- jsf-ri/build.xml 25 Jul 2005 19:51:24 -0000 1.186
+++ jsf-ri/build.xml 15 Aug 2005 22:51:18 -0000
@@ -335,7 +335,7 @@
            destdir="${build.classes}"
              debug="${compile.debug}"
        deprecation="${compile.deprecation}"
- source="1.4"
+ source="1.5"
           optimize="${compile.optimize}">
       <classpath refid="compile.classpath"/>
     </javac>
@@ -637,7 +637,7 @@
             style="conf/xslt/prune-tool-data.xsl">
       </xslt>
       <replace
file="${build.home}/classes/com/sun/faces/jsf-ri-runtime.xml">
-
<replacetoken><![CDATA[xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xi="http://www.w3.org/2001/XInclude"]]></replacetoken>
+
<replacetoken><![CDATA[xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xi="http://www.w3.org/2001/XInclude"]]></replacetoken>
       </replace>
       <replace
file="${build.home}/classes/com/sun/faces/jsf-ri-runtime.xml">
           <replacetoken><![CDATA[ >]]></replacetoken>
@@ -646,9 +646,9 @@
       <replace
file="${build.home}/classes/com/sun/faces/jsf-ri-runtime.xml">
           <replacetoken><![CDATA[<faces-config>]]></replacetoken>
           <replacevalue><![CDATA[
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">]]>
           </replacevalue>
       </replace>
@@ -671,7 +671,7 @@
                      destdir="${basedir}/build/test"
                        debug="${compile.debug}"
                     optimize="${compile.optimize}"
- source="1.4"
+ source="1.5"
                  deprecation="${compile.deprecation}">
 
         <classpath refid="test.classpath"/>
Index: jsf-ri/conf/basic/META-INF/faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/conf/basic/META-INF/faces-config.xml,v
retrieving revision 1.6
diff -u -r1.6 faces-config.xml
--- jsf-ri/conf/basic/META-INF/faces-config.xml 8 Nov 2004 19:23:07
-0000 1.6
+++ jsf-ri/conf/basic/META-INF/faces-config.xml 15 Aug 2005 22:51:18
-0000
@@ -5,7 +5,7 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2"/>
Index: jsf-ri/conf/share/jsf_core.tld
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/conf/share/jsf_core.tld,v
retrieving revision 1.55
diff -u -r1.55 jsf_core.tld
--- jsf-ri/conf/share/jsf_core.tld 25 Jul 2005 18:40:25 -0000 1.55
+++ jsf-ri/conf/share/jsf_core.tld 15 Aug 2005 22:51:18 -0000
@@ -6,9 +6,9 @@
 -->
 
 
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+<taglib 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_1.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
     version="2.1">
 
 
Index: jsf-ri/conf/test/web.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/conf/test/web.xml,v
retrieving revision 1.25
diff -u -r1.25 web.xml
--- jsf-ri/conf/test/web.xml 3 Jul 2005 06:14:37 -0000 1.25
+++ jsf-ri/conf/test/web.xml 15 Aug 2005 22:51:18 -0000
@@ -6,10 +6,10 @@
 -->
 
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
         <param-value>server</param-value>
Index: jsf-ri/conf/xslt/merge-config.xsl
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/conf/xslt/merge-config.xsl,v
retrieving revision 1.2
diff -u -r1.2 merge-config.xsl
--- jsf-ri/conf/xslt/merge-config.xsl 8 Nov 2004 19:23:08 -0000 1.2
+++ jsf-ri/conf/xslt/merge-config.xsl 15 Aug 2005 22:51:18 -0000
@@ -8,7 +8,7 @@
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:jsf="http://java.sun.com/xml/ns/j2ee"
+ xmlns:jsf="http://java.sun.com/xml/ns/javaee"
                 version="1.0">
     <xsl:output method="xml" indent="yes"/>
 
Index: jsf-ri/conf/xslt/prune-tool-data.xsl
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/conf/xslt/prune-tool-data.xsl,v
retrieving revision 1.2
diff -u -r1.2 prune-tool-data.xsl
--- jsf-ri/conf/xslt/prune-tool-data.xsl 8 Nov 2004 19:23:08 -0000 1.2
+++ jsf-ri/conf/xslt/prune-tool-data.xsl 15 Aug 2005 22:51:18 -0000
@@ -8,7 +8,7 @@
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:jsf="http://java.sun.com/xml/ns/j2ee"
+ xmlns:jsf="http://java.sun.com/xml/ns/javaee"
                 version="1.0">
     <xsl:output method="xml" indent="yes"/>
 
Index: jsf-ri/src/com/sun/faces/jsf-ri-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/jsf-ri-config.xml,v
retrieving revision 1.63
diff -u -r1.63 jsf-ri-config.xml
--- jsf-ri/src/com/sun/faces/jsf-ri-config.xml 5 May 2005 20:51:18
-0000 1.63
+++ jsf-ri/src/com/sun/faces/jsf-ri-config.xml 15 Aug 2005 22:51:18 -0000
@@ -7,9 +7,9 @@
 
 <!-- =========== RI CONFIGURATION FILE
===================================== -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
 
Index: jsf-ri/systest/web/WEB-INF/faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest/web/WEB-INF/faces-config.xml,v
retrieving revision 1.42
diff -u -r1.42 faces-config.xml
--- jsf-ri/systest/web/WEB-INF/faces-config.xml 3 Aug 2005 21:34:14
-0000 1.42
+++ jsf-ri/systest/web/WEB-INF/faces-config.xml 15 Aug 2005 22:51:19
-0000
@@ -6,9 +6,9 @@
 -->
 
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
 
Index: jsf-ri/systest/web/WEB-INF/init-faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest/web/WEB-INF/init-faces-config.xml,v
retrieving revision 1.7
diff -u -r1.7 init-faces-config.xml
--- jsf-ri/systest/web/WEB-INF/init-faces-config.xml 8 Nov 2004
19:23:09 -0000 1.7
+++ jsf-ri/systest/web/WEB-INF/init-faces-config.xml 15 Aug 2005
22:51:19 -0000
@@ -6,9 +6,9 @@
 -->
 
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
 
Index: jsf-ri/systest/web/WEB-INF/web.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/WEB-INF/web.xml,v
retrieving revision 1.11
diff -u -r1.11 web.xml
--- jsf-ri/systest/web/WEB-INF/web.xml 20 Apr 2004 18:27:26 -0000 1.11
+++ jsf-ri/systest/web/WEB-INF/web.xml 15 Aug 2005 22:51:19 -0000
@@ -5,10 +5,10 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app 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/j2ee
web-app_2_4.xsd"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
web-app_2_5.xsd"
+ version="2.5">
 
     <description>
        JSF Systests
Index:
jsf-ri/systest-per-webapp/command-link-back-button/web/WEB-INF/faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/command-link-back-button/web/WEB-INF/faces-config.xml,v
retrieving revision 1.3
diff -u -r1.3 faces-config.xml
---
jsf-ri/systest-per-webapp/command-link-back-button/web/WEB-INF/faces-config.xml
 8 Nov 2004 19:23:09 -0000 1.3
+++
jsf-ri/systest-per-webapp/command-link-back-button/web/WEB-INF/faces-config.xml
 15 Aug 2005 22:51:19 -0000
@@ -6,9 +6,9 @@
 -->
 
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <managed-bean>
Index:
jsf-ri/systest-per-webapp/command-link-back-button/web/WEB-INF/web.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/command-link-back-button/web/WEB-INF/web.xml,v
retrieving revision 1.1
diff -u -r1.1 web.xml
---
jsf-ri/systest-per-webapp/command-link-back-button/web/WEB-INF/web.xml
 21 Oct 2004 21:25:10 -0000 1.1
+++
jsf-ri/systest-per-webapp/command-link-back-button/web/WEB-INF/web.xml
 15 Aug 2005 22:51:19 -0000
@@ -5,10 +5,10 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app 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/j2ee
web-app_2_4.xsd"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
web-app_2_5.xsd"
+ version="2.5">
 
     <description>
        JSF Systests
Index:
jsf-ri/systest-per-webapp/command-link-redirect/web/WEB-INF/faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/command-link-redirect/web/WEB-INF/faces-config.xml,v
retrieving revision 1.3
diff -u -r1.3 faces-config.xml
---
jsf-ri/systest-per-webapp/command-link-redirect/web/WEB-INF/faces-config.xml
 8 Nov 2004 19:23:09 -0000 1.3
+++
jsf-ri/systest-per-webapp/command-link-redirect/web/WEB-INF/faces-config.xml
 15 Aug 2005 22:51:19 -0000
@@ -6,9 +6,9 @@
 -->
 
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <navigation-rule>
Index: jsf-ri/systest-per-webapp/command-link-redirect/web/WEB-INF/web.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/command-link-redirect/web/WEB-INF/web.xml,v
retrieving revision 1.1
diff -u -r1.1 web.xml
---
jsf-ri/systest-per-webapp/command-link-redirect/web/WEB-INF/web.xml
 12 May 2004 02:25:47 -0000 1.1
+++
jsf-ri/systest-per-webapp/command-link-redirect/web/WEB-INF/web.xml
 15 Aug 2005 22:51:19 -0000
@@ -5,10 +5,10 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app 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/j2ee
web-app_2_4.xsd"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
web-app_2_5.xsd"
+ version="2.5">
 
     <description>
        JSF Systests
Index: jsf-ri/systest-per-webapp/core-tags/web/WEB-INF/web.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/core-tags/web/WEB-INF/web.xml,v
retrieving revision 1.1
diff -u -r1.1 web.xml
--- jsf-ri/systest-per-webapp/core-tags/web/WEB-INF/web.xml 20 Dec
2004 21:26:37 -0000 1.1
+++ jsf-ri/systest-per-webapp/core-tags/web/WEB-INF/web.xml 15 Aug
2005 22:51:19 -0000
@@ -5,10 +5,10 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app 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/j2ee
web-app_2_4.xsd"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
web-app_2_5.xsd"
+ version="2.5">
 
     <description>
        JSF Systests
Index: jsf-ri/systest-per-webapp/el-performance/web/WEB-INF/faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/el-performance/web/WEB-INF/faces-config.xml,v
retrieving revision 1.4
diff -u -r1.4 faces-config.xml
---
jsf-ri/systest-per-webapp/el-performance/web/WEB-INF/faces-config.xml
 8 Nov 2004 19:23:09 -0000 1.4
+++
jsf-ri/systest-per-webapp/el-performance/web/WEB-INF/faces-config.xml
 15 Aug 2005 22:51:19 -0000
@@ -6,9 +6,9 @@
 -->
 
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <managed-bean>
Index: jsf-ri/systest-per-webapp/el-performance/web/WEB-INF/web.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/el-performance/web/WEB-INF/web.xml,v
retrieving revision 1.1
diff -u -r1.1 web.xml
--- jsf-ri/systest-per-webapp/el-performance/web/WEB-INF/web.xml 8
May 2004 17:00:50 -0000 1.1
+++ jsf-ri/systest-per-webapp/el-performance/web/WEB-INF/web.xml 15
Aug 2005 22:51:19 -0000
@@ -5,10 +5,10 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app 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/j2ee
web-app_2_4.xsd"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
web-app_2_5.xsd"
+ version="2.5">
 
     <description>
        JSF Systests
Index:
jsf-ri/systest-per-webapp/nested-datatables/web/WEB-INF/faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/nested-datatables/web/WEB-INF/faces-config.xml,v
retrieving revision 1.8
diff -u -r1.8 faces-config.xml
---
jsf-ri/systest-per-webapp/nested-datatables/web/WEB-INF/faces-config.xml
 4 Aug 2005 20:39:53 -0000 1.8
+++
jsf-ri/systest-per-webapp/nested-datatables/web/WEB-INF/faces-config.xml
 15 Aug 2005 22:51:19 -0000
@@ -6,9 +6,9 @@
 -->
 
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
     
   <managed-bean>
Index: jsf-ri/systest-per-webapp/nested-datatables/web/WEB-INF/web.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/nested-datatables/web/WEB-INF/web.xml,v
retrieving revision 1.1
diff -u -r1.1 web.xml
--- jsf-ri/systest-per-webapp/nested-datatables/web/WEB-INF/web.xml 9
Jun 2004 21:28:21 -0000 1.1
+++ jsf-ri/systest-per-webapp/nested-datatables/web/WEB-INF/web.xml
 15 Aug 2005 22:51:19 -0000
@@ -5,10 +5,10 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app 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/j2ee
web-app_2_4.xsd"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
web-app_2_5.xsd"
+ version="2.5">
 
     <description>
        JSF Systests
Index:
jsf-ri/systest-per-webapp/replace-application/web/WEB-INF/faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/replace-application/web/WEB-INF/faces-config.xml,v
retrieving revision 1.4
diff -u -r1.4 faces-config.xml
---
jsf-ri/systest-per-webapp/replace-application/web/WEB-INF/faces-config.xml
 8 Nov 2004 19:23:10 -0000 1.4
+++
jsf-ri/systest-per-webapp/replace-application/web/WEB-INF/faces-config.xml
 15 Aug 2005 22:51:19 -0000
@@ -6,9 +6,9 @@
 -->
 
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <application>
Index: jsf-ri/systest-per-webapp/replace-application/web/WEB-INF/web.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/replace-application/web/WEB-INF/web.xml,v
retrieving revision 1.1
diff -u -r1.1 web.xml
--- jsf-ri/systest-per-webapp/replace-application/web/WEB-INF/web.xml
 5 May 2004 16:18:38 -0000 1.1
+++ jsf-ri/systest-per-webapp/replace-application/web/WEB-INF/web.xml
 15 Aug 2005 22:51:19 -0000
@@ -5,10 +5,10 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app 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/j2ee
web-app_2_4.xsd"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
web-app_2_5.xsd"
+ version="2.5">
 
     <description>
        JSF Systests
Index:
jsf-ri/systest-per-webapp/replace-lifecycle/web/WEB-INF/faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/replace-lifecycle/web/WEB-INF/faces-config.xml,v
retrieving revision 1.1
diff -u -r1.1 faces-config.xml
---
jsf-ri/systest-per-webapp/replace-lifecycle/web/WEB-INF/faces-config.xml
 13 Jan 2005 19:57:50 -0000 1.1
+++
jsf-ri/systest-per-webapp/replace-lifecycle/web/WEB-INF/faces-config.xml
 15 Aug 2005 22:51:19 -0000
@@ -6,9 +6,9 @@
 -->
 
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
    <factory>
Index: jsf-ri/systest-per-webapp/replace-lifecycle/web/WEB-INF/web.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/replace-lifecycle/web/WEB-INF/web.xml,v
retrieving revision 1.2
diff -u -r1.2 web.xml
--- jsf-ri/systest-per-webapp/replace-lifecycle/web/WEB-INF/web.xml
 25 Jul 2005 21:07:58 -0000 1.2
+++ jsf-ri/systest-per-webapp/replace-lifecycle/web/WEB-INF/web.xml
 15 Aug 2005 22:51:19 -0000
@@ -3,7 +3,7 @@
  Copyright 2004 Sun Microsystems, Inc. All rights reserved.
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-app_2_4.xsd">
+<web-app version="2.5" 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 web-app_2_5.xsd">
   <description>
        JSF Systests
     </description>
Index:
jsf-ri/systest-per-webapp/replace-statemanager/web/WEB-INF/faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/replace-statemanager/web/WEB-INF/faces-config.xml,v
retrieving revision 1.1
diff -u -r1.1 faces-config.xml
---
jsf-ri/systest-per-webapp/replace-statemanager/web/WEB-INF/faces-config.xml
 18 Mar 2005 22:12:52 -0000 1.1
+++
jsf-ri/systest-per-webapp/replace-statemanager/web/WEB-INF/faces-config.xml
 15 Aug 2005 22:51:19 -0000
@@ -6,9 +6,9 @@
 -->
 
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <application>
Index: jsf-ri/systest-per-webapp/replace-statemanager/web/WEB-INF/web.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/replace-statemanager/web/WEB-INF/web.xml,v
retrieving revision 1.1
diff -u -r1.1 web.xml
--- jsf-ri/systest-per-webapp/replace-statemanager/web/WEB-INF/web.xml
 18 Mar 2005 22:12:52 -0000 1.1
+++ jsf-ri/systest-per-webapp/replace-statemanager/web/WEB-INF/web.xml
 15 Aug 2005 22:51:19 -0000
@@ -5,10 +5,10 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app 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/j2ee
web-app_2_4.xsd"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
web-app_2_5.xsd"
+ version="2.5">
 
     <description>
        JSF Systests
Index: jsf-ri/test-sqe/web/WEB-INF/faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/test-sqe/web/WEB-INF/faces-config.xml,v
retrieving revision 1.1
diff -u -r1.1 faces-config.xml
--- jsf-ri/test-sqe/web/WEB-INF/faces-config.xml 25 Jul 2005 18:35:13
-0000 1.1
+++ jsf-ri/test-sqe/web/WEB-INF/faces-config.xml 15 Aug 2005 22:51:19
-0000
@@ -6,9 +6,9 @@
 -->
 
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
 
Index: jsf-ri/test-sqe/web/WEB-INF/init-faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/test-sqe/web/WEB-INF/init-faces-config.xml,v
retrieving revision 1.1
diff -u -r1.1 init-faces-config.xml
--- jsf-ri/test-sqe/web/WEB-INF/init-faces-config.xml 25 Jul 2005
18:35:13 -0000 1.1
+++ jsf-ri/test-sqe/web/WEB-INF/init-faces-config.xml 15 Aug 2005
22:51:19 -0000
@@ -6,9 +6,9 @@
 -->
 
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
 
Index: jsf-ri/test-sqe/web/WEB-INF/web.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test-sqe/web/WEB-INF/web.xml,v
retrieving revision 1.1
diff -u -r1.1 web.xml
--- jsf-ri/test-sqe/web/WEB-INF/web.xml 25 Jul 2005 18:35:14 -0000 1.1
+++ jsf-ri/test-sqe/web/WEB-INF/web.xml 15 Aug 2005 22:51:19 -0000
@@ -5,10 +5,10 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app 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/j2ee
web-app_2_4.xsd"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
web-app_2_5.xsd"
+ version="2.5">
 
     <description>
        JSF Systests
Index: jsf-ri/web/test/config-with-failing-property-conversion.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/web/test/config-with-failing-property-conversion.xml,v
retrieving revision 1.6
diff -u -r1.6 config-with-failing-property-conversion.xml
--- jsf-ri/web/test/config-with-failing-property-conversion.xml 8 Nov
2004 19:23:11 -0000 1.6
+++ jsf-ri/web/test/config-with-failing-property-conversion.xml 15
Aug 2005 22:51:19 -0000
@@ -5,9 +5,9 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <managed-bean>
Index: jsf-ri/web/test/config1.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/web/test/config1.xml,v
retrieving revision 1.10
diff -u -r1.10 config1.xml
--- jsf-ri/web/test/config1.xml 8 Nov 2004 19:23:11 -0000 1.10
+++ jsf-ri/web/test/config1.xml 15 Aug 2005 22:51:19 -0000
@@ -5,9 +5,9 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <managed-bean>
Index: jsf-ri/web/test/config2.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/web/test/config2.xml,v
retrieving revision 1.6
diff -u -r1.6 config2.xml
--- jsf-ri/web/test/config2.xml 8 Nov 2004 19:23:11 -0000 1.6
+++ jsf-ri/web/test/config2.xml 15 Aug 2005 22:51:19 -0000
@@ -5,9 +5,9 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <managed-bean>
Index: jsf-ri/web/test/locale-config.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/web/test/locale-config.xml,v
retrieving revision 1.7
diff -u -r1.7 locale-config.xml
--- jsf-ri/web/test/locale-config.xml 8 Nov 2004 19:23:11 -0000 1.7
+++ jsf-ri/web/test/locale-config.xml 15 Aug 2005 22:51:19 -0000
@@ -5,9 +5,9 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <application>
Index: jsf-ri/web/test/locale-config1.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/web/test/locale-config1.xml,v
retrieving revision 1.7
diff -u -r1.7 locale-config1.xml
--- jsf-ri/web/test/locale-config1.xml 8 Nov 2004 19:23:11 -0000 1.7
+++ jsf-ri/web/test/locale-config1.xml 15 Aug 2005 22:51:19 -0000
@@ -5,9 +5,9 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <application>
Index: jsf-ri/web/test/locale-config2.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/web/test/locale-config2.xml,v
retrieving revision 1.7
diff -u -r1.7 locale-config2.xml
--- jsf-ri/web/test/locale-config2.xml 8 Nov 2004 19:23:11 -0000 1.7
+++ jsf-ri/web/test/locale-config2.xml 15 Aug 2005 22:51:19 -0000
@@ -5,9 +5,9 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <application>
Index: jsf-ri/web/test/runtime-components.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/web/test/runtime-components.xml,v
retrieving revision 1.8
diff -u -r1.8 runtime-components.xml
--- jsf-ri/web/test/runtime-components.xml 8 Nov 2004 19:23:11
-0000 1.8
+++ jsf-ri/web/test/runtime-components.xml 15 Aug 2005 22:51:19 -0000
@@ -5,9 +5,9 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <application>
Index: jsf-ri/web/test/WEB-INF/config-lists-and-maps.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/web/test/WEB-INF/config-lists-and-maps.xml,v
retrieving revision 1.7
diff -u -r1.7 config-lists-and-maps.xml
--- jsf-ri/web/test/WEB-INF/config-lists-and-maps.xml 8 Nov 2004
19:23:11 -0000 1.7
+++ jsf-ri/web/test/WEB-INF/config-lists-and-maps.xml 15 Aug 2005
22:51:19 -0000
@@ -5,9 +5,9 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <managed-bean>
Index: jsf-ri/web/test/WEB-INF/faces-config-empty.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/web/test/WEB-INF/faces-config-empty.xml,v
retrieving revision 1.7
diff -u -r1.7 faces-config-empty.xml
--- jsf-ri/web/test/WEB-INF/faces-config-empty.xml 8 Nov 2004
19:23:12 -0000 1.7
+++ jsf-ri/web/test/WEB-INF/faces-config-empty.xml 15 Aug 2005
22:51:19 -0000
@@ -8,7 +8,7 @@
 
 <!-- ========== EMPTY CONFIGURATION FILE
================================== -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2"/>
Index: jsf-ri/web/test/WEB-INF/faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/web/test/WEB-INF/faces-config.xml,v
retrieving revision 1.27
diff -u -r1.27 faces-config.xml
--- jsf-ri/web/test/WEB-INF/faces-config.xml 9 Aug 2005 17:38:29
-0000 1.27
+++ jsf-ri/web/test/WEB-INF/faces-config.xml 15 Aug 2005 22:51:19 -0000
@@ -5,9 +5,9 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <!-- Initial application element with partial values -->
Index: jsf-ri/web/test/WEB-INF/none-scoped-beans.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/web/test/WEB-INF/none-scoped-beans.xml,v
retrieving revision 1.5
diff -u -r1.5 none-scoped-beans.xml
--- jsf-ri/web/test/WEB-INF/none-scoped-beans.xml 8 Nov 2004 19:23:12
-0000 1.5
+++ jsf-ri/web/test/WEB-INF/none-scoped-beans.xml 15 Aug 2005
22:51:19 -0000
@@ -6,9 +6,9 @@
 -->
 
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <managed-bean>
Index: jsf-ri/web/test-config-1/WEB-INF/embed-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/web/test-config-1/WEB-INF/embed-config.xml,v
retrieving revision 1.6
diff -u -r1.6 embed-config.xml
--- jsf-ri/web/test-config-1/WEB-INF/embed-config.xml 8 Nov 2004
19:23:12 -0000 1.6
+++ jsf-ri/web/test-config-1/WEB-INF/embed-config.xml 15 Aug 2005
22:51:19 -0000
@@ -10,9 +10,9 @@
      implicitly included as a web application class loader resource
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <component>
Index: jsf-ri/web/test-config-1/WEB-INF/extra-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/web/test-config-1/WEB-INF/extra-config.xml,v
retrieving revision 1.6
diff -u -r1.6 extra-config.xml
--- jsf-ri/web/test-config-1/WEB-INF/extra-config.xml 8 Nov 2004
19:23:13 -0000 1.6
+++ jsf-ri/web/test-config-1/WEB-INF/extra-config.xml 15 Aug 2005
22:51:19 -0000
@@ -10,9 +10,9 @@
      explicitly listed in a context initialization parameter.
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <component>
Index: jsf-ri/web/test-config-1/WEB-INF/faces-config.xml
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/web/test-config-1/WEB-INF/faces-config.xml,v
retrieving revision 1.6
diff -u -r1.6 faces-config.xml
--- jsf-ri/web/test-config-1/WEB-INF/faces-config.xml 8 Nov 2004
19:23:13 -0000 1.6
+++ jsf-ri/web/test-config-1/WEB-INF/faces-config.xml 15 Aug 2005
22:51:19 -0000
@@ -10,9 +10,9 @@
      explicitly listed in a context initialization parameter.
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/j2ee"
+<faces-config 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/j2ee
http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
   <component>
Index: jsf-tools/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/build.xml,v
retrieving revision 1.47
diff -u -r1.47 build.xml
--- jsf-tools/build.xml 9 Aug 2005 21:54:54 -0000 1.47
+++ jsf-tools/build.xml 15 Aug 2005 22:51:19 -0000
@@ -213,7 +213,7 @@
            destdir="${build.classes}"
            debug="${debug}"
            deprecation="${deprecation}"
- source="1.4"
+ source="1.5"
            optimize="${optimize}" >
       <classpath refid="compile.classpath" />
       <classpath refid="run.classpath" />
Index: jsf-tools/src/com/sun/faces/config/DigesterFactory.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/DigesterFactory.java,v
retrieving revision 1.5
diff -u -r1.5 DigesterFactory.java
--- jsf-tools/src/com/sun/faces/config/DigesterFactory.java 27 Jul
2005 21:59:13 -0000 1.5
+++ jsf-tools/src/com/sun/faces/config/DigesterFactory.java 15 Aug
2005 22:51:19 -0000
@@ -89,7 +89,6 @@
     /**
      * <p>Returns a new <code>DigesterFactory</code> instance that will
create
      * a non-validating <code>Digester</code> instance.</p>
- * @return
      */
     public static DigesterFactory newInstance() {
 
@@ -119,7 +118,6 @@
     /**
      * <p>Creates a new <code>Digester</code> instance configured for use
      * with JSF.</p>
- * @return
      */
     public Digester createDigester() {
 
@@ -222,12 +220,12 @@
                 "/com/sun/faces/web-facesconfig_1_2.xsd"
             },
             {
- "j2ee_1_4.xsd",
- "/com/sun/faces/j2ee_1_4.xsd"
+ "javaee_5.xsd",
+ "/com/sun/faces/javaee_5.xsd"
             },
             {
- "j2ee_web_services_client_1_1.xsd",
- "/com/sun/faces/j2ee_web_services_client_1_1.xsd"
+ "javaee_web_services_client_1_2.xsd",
+ "/com/sun/faces/javaee_web_services_client_1_2.xsd"
             },
             {
                 "xml.xsd",
@@ -239,7 +237,7 @@
          * <p>Contains mapping between grammar name and the local URL
to the
          * physical resource.</p>
          */
- private HashMap entities = new HashMap();
+ private HashMap<String,String> entities = new HashMap<String,
String>();
 
 
         // --------------------------------------------------------
Constructors
@@ -252,17 +250,20 @@
             // cannot be found, then rely on default entity resolution
             // and hope a firewall isn't in the way or a proxy has
             // been configured
- for (int i = 0; i < DTD_SCHEMA_INFO.length; i++) {
- URL url =
this.getClass().getResource(DTD_SCHEMA_INFO[i][1]);
+ for (String[] aDTD_SCHEMA_INFO : DTD_SCHEMA_INFO) {
+ URL url = this.getClass().getResource(aDTD_SCHEMA_INFO[1]);
                 if (url == null) {
                     if (logger.isLoggable(Level.WARNING)) {
- logger.log(Level.WARNING, "Unable to locate
local resource '" +
- DTD_SCHEMA_INFO[i][1] + "'. Standard
entity " +
- "resolution will be used when request are
present" +
- " for '" + DTD_SCHEMA_INFO[i][0] + '\'');
+ logger.log(Level.WARNING,
+ "nable to locate local resource '"
+ + aDTD_SCHEMA_INFO[1]
+ + "'. Standard entity "
+ + "resolution will be used when
request "
+ + "is present for '"
+ + aDTD_SCHEMA_INFO[0] + '\'');
                     }
                 } else {
- entities.put(DTD_SCHEMA_INFO[i][0], url.toString());
+ entities.put(aDTD_SCHEMA_INFO[0], url.toString());
                 }
             }
 
@@ -288,22 +289,22 @@
 
             // If no system ID, defer to superclass
             if (systemId == null) {
- InputSource result = null;
- try {
- result = super.resolveEntity(publicId, systemId);
- }
- catch (Exception e) {
- throw new SAXException(e);
- }
+ InputSource result;
+ try {
+ result = super.resolveEntity(publicId, systemId);
+ }
+ catch (Exception e) {
+ throw new SAXException(e);
+ }
                 return result;
             }
 
             String grammarName =
                 systemId.substring(systemId.lastIndexOf('/') + 1);
 
- String entityURL = (String) entities.get(grammarName);
+ String entityURL = entities.get(grammarName);
 
- InputSource source = null;
+ InputSource source;
             if (entityURL == null) {
                 // we don't have a registered mapping, so defer to our
                 // superclass for resolution
@@ -311,12 +312,12 @@
                 if (logger.isLoggable(Level.FINE)) {
                     logger.log(Level.FINE, "Unknown entity, deferring
to superclass.");
                 }
- try {
- source = super.resolveEntity(publicId, systemId);
- }
- catch (Exception e) {
- throw new SAXException(e);
- }
+ try {
+ source = super.resolveEntity(publicId, systemId);
+ }
+ catch (Exception e) {
+ throw new SAXException(e);
+ }
 
             } else {
 
Index: jsf-tools/src/com/sun/faces/generate/JspTLD21Generator.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/generate/JspTLD21Generator.java,v
retrieving revision 1.3
diff -u -r1.3 JspTLD21Generator.java
--- jsf-tools/src/com/sun/faces/generate/JspTLD21Generator.java 18
May 2005 17:57:10 -0000 1.3
+++ jsf-tools/src/com/sun/faces/generate/JspTLD21Generator.java 15
Aug 2005 22:51:19 -0000
@@ -35,11 +35,11 @@
     private static Map TAG_LIB_SCHEMA_ATTRIBUTES = new HashMap();
     static {
         TAG_LIB_SCHEMA_ATTRIBUTES.put("xmlns",
- "http://java.sun.com/xml/ns/j2ee");
+ "http://java.sun.com/xml/ns/javaee");
         TAG_LIB_SCHEMA_ATTRIBUTES.put("xmlns:xsi",
             "http://www.w3.org/2001/XMLSchema-instance");
         TAG_LIB_SCHEMA_ATTRIBUTES.put("xsi:schemaLocation",
- "http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_1.xsd");
+ "http://java.sun.com/xml/ns/javaee web-jsptaglibrary_2_1.xsd");
         TAG_LIB_SCHEMA_ATTRIBUTES.put("version", JSP_VERSION);
     }