Author: swd847 Date: 2010-03-31 00:16:47 -0400 (Wed, 31 Mar 2010) New Revision: 12338 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/XmlItemType.java modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.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/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/types/types-test-beans.xml modules/xml/trunk/docs/en-US/xml-general.xml Log: changed <extends> to <specializes> and <override> to <overrides> 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-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-03-31 04:16:47 UTC (rev 12338) @@ -239,7 +239,7 @@ BeanResult<?> buildAnnotatedType(ClassXmlItem rb) { boolean override = !rb.getChildrenOfType(OverrideXmlItem.class).isEmpty(); - boolean extend = !rb.getChildrenOfType(ExtendsXmlItem.class).isEmpty(); + boolean extend = !rb.getChildrenOfType(SpecializesXmlItem.class).isEmpty(); // if it is an extend we want to read the annotations from the underlying // class Modified: modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/XmlItemType.java =================================================================== --- modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-03-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-03-31 04:16:47 UTC (rev 12338) @@ -6,5 +6,5 @@ public enum XmlItemType { - CLASS, METHOD, FIELD, ANNOTATION, VALUE, VETO, ENTRY, KEY, DEPENDENCY, PARAMETERS, PARAMETER, ARRAY, OVERRIDE, EXTENDS, TYPE; + CLASS, METHOD, FIELD, ANNOTATION, VALUE, VETO, ENTRY, KEY, DEPENDENCY, PARAMETERS, PARAMETER, ARRAY, OVERRIDE, SPECIALIZES, TYPE; } Modified: modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java =================================================================== --- modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-03-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-03-31 04:16:47 UTC (rev 12338) @@ -7,11 +7,11 @@ import org.jboss.seam.xml.model.ArrayXmlItem; import org.jboss.seam.xml.model.ClassXmlItem; import org.jboss.seam.xml.model.EntryXmlItem; -import org.jboss.seam.xml.model.ExtendsXmlItem; import org.jboss.seam.xml.model.KeyXmlItem; import org.jboss.seam.xml.model.OverrideXmlItem; import org.jboss.seam.xml.model.ParameterXmlItem; import org.jboss.seam.xml.model.ParametersXmlItem; +import org.jboss.seam.xml.model.SpecializesXmlItem; import org.jboss.seam.xml.model.TypeXmlItem; import org.jboss.seam.xml.model.ValueXmlItem; import org.jboss.seam.xml.model.XmlItem; @@ -57,13 +57,13 @@ { return new ArrayXmlItem(parent, node.getAttributes(), node.getDocument(), node.getLineNo()); } - else if (item.equals("override")) + else if (item.equals("overrides")) { return new OverrideXmlItem(parent, node.getDocument(), node.getLineNo()); } - else if (item.equals("extends")) + else if (item.equals("specializes")) { - return new ExtendsXmlItem(parent, node.getDocument(), node.getLineNo()); + return new SpecializesXmlItem(parent, node.getDocument(), node.getLineNo()); } else if (item.equals("parameters")) { 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-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/test/resources/META-INF/beans.xml 2010-03-31 04:16:47 UTC (rev 12338) @@ -13,7 +13,7 @@ </test:InterceptorBinding> <test:InterceptorBean> - <s:override/> + <s:overrides/> <s:Interceptor/> <test:InterceptorBinding/> <test:myMethod> 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-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml 2010-03-31 04:16:47 UTC (rev 12338) @@ -10,7 +10,7 @@ </test:ValueProvider> <test:ConstructedBean> - <override/> + <overrides/> <parameters><int/></parameters> </test:ConstructedBean> 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-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-03-31 04:16:47 UTC (rev 12338) @@ -2,7 +2,7 @@ <beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset"> <test:ArrayFieldValue> - <override/> + <overrides/> <test:iarray> <value>1</value> <value>2</value> 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-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-03-31 04:16:47 UTC (rev 12338) @@ -3,7 +3,7 @@ xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset"> <test:CollectionFieldValue> - <override/> + <overrides/> <test:iset> <value>1</value> <value>2</value> 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-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-03-31 04:16:47 UTC (rev 12338) @@ -2,7 +2,7 @@ <beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset"> <test:MapFieldValue> - <override/> + <overrides/> <test:map1> <entry><key>1</key><value>hello</value></entry> <entry><key>2</key><value>world</value></entry> 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-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-03-31 04:16:47 UTC (rev 12338) @@ -3,7 +3,7 @@ xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset"> <test:FieldValueBean> - <override/> + <overrides/> <test:init> <Inject/> </test:init> 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-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-03-31 04:16:47 UTC (rev 12338) @@ -8,7 +8,7 @@ </test:ProducerQualifier> <test:ProducerBean> - <override/> + <overrides/> <test:value> <Produces/> <test:ProducerQualifier/> @@ -17,7 +17,7 @@ </test:ProducerBean> <test:RecieverBean> - <override/> + <overrides/> <test:value> <test:ProducerQualifier/> <Inject/> 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-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-03-31 04:16:47 UTC (rev 12338) @@ -15,7 +15,7 @@ </test:QualifiedBean2> <test:QualifierTestBean> - <override/> + <overrides/> <test:bean1> <test:OtherQualifier value1="AA" value2="1" value="A" /> <Inject/> 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-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-03-31 04:16:47 UTC (rev 12338) @@ -3,7 +3,7 @@ xmlns:test="urn:java:org.jboss.seam.xml.test.interceptor"> <test:InterceptedBean> - <override/> + <overrides/> <test:method> <test:InterceptorBinding/> </test:method> 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-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-03-31 04:16:47 UTC (rev 12338) @@ -40,7 +40,7 @@ </test:MethodBean> <test:MethodTarget> - <override/> + <overrides/> <test:value1> <Inject /> </test:value1> 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-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-03-31 04:16:47 UTC (rev 12338) @@ -4,7 +4,7 @@ <test:Producer> - <override/> + <overrides/> <test:value> <Produces/> <test:ProducerQualifier value="1" /> @@ -30,7 +30,7 @@ <test:Reciever> - <override/> + <overrides/> <test:val1> <Inject/> <test:ProducerQualifier value="1" /> 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-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-03-31 04:16:47 UTC (rev 12338) @@ -17,19 +17,19 @@ </test:Bean1> <test:Bean2> - <override/> + <overrides/> <test:produceBean3> <Produces/> </test:produceBean3> </test:Bean2> <test:OverriddenBean> - <override/> + <overrides/> <Named>someBean</Named> </test:OverriddenBean> <test:ExtendedBean> - <extends/> + <specializes/> <test:ExtendedQualifier2/> </test:ExtendedBean> Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml 2010-03-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml 2010-03-31 04:16:47 UTC (rev 12338) @@ -4,7 +4,7 @@ <test:TypeInjectedClass> - <override/> + <overrides/> <test:value> <Inject/> <type> Modified: modules/xml/trunk/docs/en-US/xml-general.xml =================================================================== --- modules/xml/trunk/docs/en-US/xml-general.xml 2010-03-31 03:14:32 UTC (rev 12337) +++ modules/xml/trunk/docs/en-US/xml-general.xml 2010-03-31 04:16:47 UTC (rev 12338) @@ -132,8 +132,8 @@ <itemizedlist> <listitem><para><literal>Beans</literal></para></listitem> - <listitem><para><literal>extends</literal></para></listitem> - <listitem><para><literal>override</literal></para></listitem> + <listitem><para><literal>specializes</literal></para></listitem> + <listitem><para><literal>overrides</literal></para></listitem> <listitem><para><literal>parameters</literal></para></listitem> <listitem><para><literal>value</literal></para></listitem> <listitem><para><literal>key</literal></para></listitem> @@ -175,21 +175,21 @@ <section> <title>Overriding and extending beans</title> <para>There may be cases where you want to modify an existing bean rather than - adding a new one. The <literal>&lt;s:override&gt;</literal> and - <literal>&lt;s:extends&gt;</literal> tags allow you to do this. The - <literal>&lt;s:override&gt;</literal> tag prevents the existing bean from being + adding a new one. The <literal>&lt;s:overrides&gt;</literal> and + <literal>&lt;s:specializes&gt;</literal> tags allow you to do this. The + <literal>&lt;s:overrides&gt;</literal> tag prevents the existing bean from being installed, and registers a new one with the given configuration. The - <literal>&lt;s:extends&gt;</literal> tag allows you to add extra configuration + <literal>&lt;s:specializes&gt;</literal> tag allows you to add extra configuration to an existing bean.</para> <programlisting><![CDATA[ <test:MyBean> - <s:extends> + <s:specializes> <test:NewQualifier/> </test:MyBean> <test:OtherBean> - <s:override> + <s:overrides> <test:NewQualifier/> </test:OtherBean> ]]>