Author: swd847 Date: 2010-03-10 16:20:30 -0500 (Wed, 10 Mar 2010) New Revision: 12159 Modified: modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java modules/xml/trunk/core/src/test/resources/META-INF/beans.xml modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml modules/xml/trunk/docs/en-US/xml-general.xml modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/seam-beans.xml Log: changed root namspace to urn:java:seam:core Modified: modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java =================================================================== --- modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-03-10 21:20:30 UTC (rev 12159) @@ -44,7 +44,7 @@ AnnotationInstanceProvider ac = new AnnotationInstanceProvider(); - static final String ROOT_NAMESPACE = "urn:seam:core"; + static final String ROOT_NAMESPACE = "urn:java:seam:core"; static final String BEANS_ROOT_NAMESPACE = "http://java.sun.com/xml/ns/javaee"; @@ -63,7 +63,7 @@ } if (!(ROOT_NAMESPACE.equals(root.getNamespaceUri()) || BEANS_ROOT_NAMESPACE.equals(root.getNamespaceUri()))) { - throw new XmlConfigurationException("Wrong root namespace for XML config file, expected:" + ROOT_NAMESPACE + " or " + BEANS_ROOT_NAMESPACE +" found:" + root.getNamespaceUri(), root.getDocument(), root.getLineNo()); + throw new XmlConfigurationException("Wrong root namespace for XML config file, expected:" + ROOT_NAMESPACE + " or " + BEANS_ROOT_NAMESPACE + " found:" + root.getNamespaceUri(), root.getDocument(), root.getLineNo()); } resolvers.put(ROOT_NAMESPACE, new RootNamespaceElementResolver()); @@ -76,10 +76,10 @@ // nodes with a null namespace are whitespace nodes etc if (node.getNamespaceUri() != null) { - if(node.getNamespaceUri().equals(BEANS_ROOT_NAMESPACE)) - { - continue; - } + if (node.getNamespaceUri().equals(BEANS_ROOT_NAMESPACE)) + { + continue; + } XmlItem rb = resolveNode(node, null); // validateXmlItem(rb); addNodeToResult(ret, rb); Modified: modules/xml/trunk/core/src/test/resources/META-INF/beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/META-INF/beans.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/test/resources/META-INF/beans.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -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:seam:core" + xmlns:s="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.interceptor" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.constructor"> <test:ValueProvider> Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset"> <test:ArrayFieldValue> <override/> Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset"> <test:CollectionFieldValue> Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset"> <test:MapFieldValue> <override/> Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset"> <test:FieldValueBean> Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.injection"> Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.injection"> <test:OtherQualifier> Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.interceptor"> <test:InterceptedBean> Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.method"> +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.method"> Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.method"> Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.producer"> Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.simple"> Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.stereotype" xmlns:int="urn:java:org.jboss.seam.xml.test.interceptor"> Modified: modules/xml/trunk/docs/en-US/xml-general.xml =================================================================== --- modules/xml/trunk/docs/en-US/xml-general.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/docs/en-US/xml-general.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -31,7 +31,7 @@ <programlisting> <![CDATA[ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.injection"> <test:ProducerQualifier> @@ -59,7 +59,7 @@ <para>From the top:</para> - <para>The root element of the file has to be <literal>&lt;Beans/&gt;</literal>, and the root namespace should be <literal>urn:seam:core</literal>. + <para>The root element of the file has to be <literal>&lt;Beans/&gt;</literal>, and the root namespace should be <literal>urn:java:seam:core</literal>. You will also notice that there is a second namespace defined, <literal>urn:java:org.jboss.seam.xml.test.injection</literal>, this namespace is used to resolve classes in the java package <literal>org.jboss.seam.xml.test.injection</literal>.</para> <programlisting> @@ -240,7 +240,7 @@ <programlisting> <![CDATA[ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.method"> <test:MethodBean> <test:method> Modified: modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/seam-beans.xml =================================================================== --- modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/seam-beans.xml 2010-03-10 15:52:17 UTC (rev 12158) +++ modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/seam-beans.xml 2010-03-10 21:20:30 UTC (rev 12159) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="urn:seam:core" +<beans xmlns="urn:java:seam:core" xmlns:p="org.jboss.seam.xml.examples.princess"> <!-- Makes the Room annotation a qualifier --> <p:Room>