Author: swd847 Date: 2010-06-27 03:18:55 -0400 (Sun, 27 Jun 2010) New Revision: 13308 Modified: modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java modules/xml/trunk/impl/src/test/resources/META-INF/beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/iface/interface-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml Log: changed root namespace to urn:java:ee Modified: modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml =================================================================== --- modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -23,7 +23,7 @@ <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:s="urn:java:seam:core" + xmlns:s="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.injection"> <test:ProducerQualifier> @@ -50,9 +50,9 @@ </programlisting> <para>You will notice that two new namspace declarations have been added to the - <literal>beans.xml</literal> file: <literal>urn:java:seam:core</literal> and + <literal>beans.xml</literal> file: <literal>urn:java:ee</literal> and <literal>urn:java:org.jboss.seam.xml.test.injection</literal>. The - <literal>urn:java:seam:core</literal> namespace is the main one used by the XML + <literal>urn:java:ee</literal> namespace is the main one used by the XML extension, we will cover exactly what lives in this namespace later. The <literal>urn:java:org.jboss.seam.xml.test.injection</literal> namespace is used to resolve classes in the java package <literal>org.jboss.seam.xml.test.injection</literal>, @@ -136,7 +136,7 @@ <section> <title>XML Namespaces</title> - <para>The main namesapce is <literal>urn:java:seam:core</literal> contains builtin tags and types from core packages. + <para>The main namesapce is <literal>urn:java:ee</literal> contains builtin tags and types from core packages. The builting tags are:</para> <itemizedlist> @@ -287,7 +287,7 @@ <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:s="urn:java:seam:core" + xmlns:s="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.method"> <test:MethodBean> Modified: modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml =================================================================== --- modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -85,7 +85,7 @@ <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:s="urn:java:seam:core" + xmlns:s="urn:java:ee" xmlns:r="urn:java:org.example.reports"> <r:Report> @@ -110,7 +110,7 @@ </programlisting> <calloutlist> <callout arearefs="namepsace-declaration-seam"> - <para>The namespace <literal>urn:java:seam:core</literal> is seam-xml's root namespace. This is where the builtin tags and CDI annotations live.</para> + <para>The namespace <literal>urn:java:ee</literal> is seam-xml's root namespace. This is where the builtin tags and CDI annotations live.</para> </callout> <callout arearefs="namepsace-declaration-reports"> <para>The namespace <literal>urn:java:org.example.reports</literal> corresponds to the package <literal>org.example.reports</literal>, where our reporting classes live.</para> Modified: modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml =================================================================== --- modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:s="urn:java:seam:core" + xmlns:s="urn:java:ee" xmlns:p="org.jboss.seam.xml.examples.princess" xsi:schemaLocation=" http://java.sun.com/xml/ns/javaee Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-06-27 07:18:55 UTC (rev 13308) @@ -64,7 +64,7 @@ final AnnotationInstanceProvider ac = new AnnotationInstanceProvider(); - static final String ROOT_NAMESPACE = "urn:java:seam:core"; + static final String ROOT_NAMESPACE = "urn:java:ee"; static final String BEANS_ROOT_NAMESPACE = "http://java.sun.com/xml/ns/javaee"; Modified: modules/xml/trunk/impl/src/test/resources/META-INF/beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/META-INF/beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/META-INF/beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,6 +1,6 @@ <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:s="urn:java:seam:core" + xmlns:s="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.interceptor" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://docs.jboss.org/cdi/beans_1_0.xsd"> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.constructor"> <test:ValueProvider> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset"> <test:ArrayFieldValue> <overrides/> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset"> <test:CollectionFieldValue> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset"> <test:MapFieldValue> <overrides/> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset"> <test:FieldValueBean> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.generic"> <genericBean class="org.jboss.seam.xml.test.generic.GenericMain" > Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/iface/interface-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/iface/interface-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/iface/interface-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.iface"> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.injection"> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.injection"> <test:OtherQualifier> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.interceptor"> <test:InterceptedBean> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.method"> +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.method"> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.method"> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.producer"> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.simple"> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.stereotype" xmlns:int="urn:java:org.jboss.seam.xml.test.interceptor"> Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml =================================================================== --- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml 2010-06-27 07:14:41 UTC (rev 13307) +++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml 2010-06-27 07:18:55 UTC (rev 13308) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:java:seam:core" +<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.types">