[seam-commits] Seam SVN: r13424 - in modules/xml/trunk: impl/src/main/java/org/jboss/seam/xml/model and 10 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Sun Jul 18 00:26:39 EDT 2010
Author: swd847
Date: 2010-07-18 00:26:36 -0400 (Sun, 18 Jul 2010)
New Revision: 13424
Added:
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ReplacesXmlItem.java
Removed:
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/OverrideXmlItem.java
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/impl/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java
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/XmlItemType.java
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.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/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/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/types/types-test-beans.xml
Log:
SEAMXML-13 Change <override> to <replaces>
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -208,7 +208,7 @@
</test:Report>
<test:ReportDatasource>
- <s:overrides>
+ <s:replaces>
<test:NewQualifier/>
</test:ReportDatasource>]]>
</programlisting>
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -97,7 +97,7 @@
</r:Report>
<r:Report filename="billing.jrxml">
- <s:overrides/>
+ <s:replaces/>
<r:datasource>
<s:Inject/>
<s:Exact>org.example.reports.BillingDatasource</s:Exact>
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java 2010-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java 2010-07-18 04:26:36 UTC (rev 13424)
@@ -98,7 +98,7 @@
public BeanResult<?> createBeanResult()
{
- boolean override = !getChildrenOfType(OverrideXmlItem.class).isEmpty();
+ boolean override = !getChildrenOfType(ReplacesXmlItem.class).isEmpty();
boolean extend = !getChildrenOfType(ModifiesXmlItem.class).isEmpty();
BeanResultType beanType = BeanResultType.ADD;
if (override && extend)
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-07-18 04:26:36 UTC (rev 13424)
@@ -107,23 +107,23 @@
}
@SuppressWarnings("unchecked")
- private void addNodeToResult(XmlResult ret, XmlItem rb)
+ private void addNodeToResult(XmlResult ret, XmlItem xmlItem)
{
- if (rb.getType() == XmlItemType.CLASS || rb.getType() == XmlItemType.ANNOTATION)
+ if (xmlItem.getType() == XmlItemType.CLASS || xmlItem.getType() == XmlItemType.ANNOTATION)
{
- ResultType type = getItemType(rb);
+ ResultType resultType = getItemType(xmlItem);
// if we are configuring a bean
- if (type == ResultType.BEAN)
+ if (resultType == ResultType.BEAN)
{
- ClassXmlItem cxml = (ClassXmlItem) rb;
+ ClassXmlItem cxml = (ClassXmlItem) xmlItem;
// get the AnnotatedType information
- BeanResult<?> tp = cxml.createBeanResult();
- ret.addBean(tp);
+ BeanResult<?> beanResult = cxml.createBeanResult();
+ ret.addBean(beanResult);
// <override> or <speciailizes> need to veto the bean
- if (tp.getBeanType() != BeanResultType.ADD)
+ if (beanResult.getBeanType() != BeanResultType.ADD)
{
- ret.addVeto(tp.getType());
+ ret.addVeto(beanResult.getType());
}
// get all the field values from the bean
Set<String> configuredFields = new HashSet<String>();
@@ -149,35 +149,35 @@
if (!fields.isEmpty())
{
- if (rb.getJavaClass().isInterface())
+ if (xmlItem.getJavaClass().isInterface())
{
- ret.addInterfaceFieldValues(tp.getType(), fields);
+ ret.addInterfaceFieldValues(beanResult.getType(), fields);
}
else
{
- ret.addFieldValue(tp, fields);
+ ret.addFieldValue(beanResult, fields);
}
}
}
- else if (type == ResultType.QUALIFIER)
+ else if (resultType == ResultType.QUALIFIER)
{
- ret.addQualifier((Class) rb.getJavaClass());
+ ret.addQualifier((Class) xmlItem.getJavaClass());
}
- else if (type == ResultType.INTERCEPTOR_BINDING)
+ else if (resultType == ResultType.INTERCEPTOR_BINDING)
{
- ret.addInterceptorBinding((Class) rb.getJavaClass());
+ ret.addInterceptorBinding((Class) xmlItem.getJavaClass());
}
- else if (type == ResultType.STEREOTYPE)
+ else if (resultType == ResultType.STEREOTYPE)
{
- addStereotypeToResult(ret, rb);
+ addStereotypeToResult(ret, xmlItem);
}
}
- else if (rb.getType() == XmlItemType.GENERIC_BEAN)
+ else if (xmlItem.getType() == XmlItemType.GENERIC_BEAN)
{
- GenericBeanXmlItem item = (GenericBeanXmlItem) rb;
+ GenericBeanXmlItem item = (GenericBeanXmlItem) xmlItem;
Set<BeanResult<?>> classes = new HashSet<BeanResult<?>>();
- for (ClassXmlItem c : rb.getChildrenOfType(ClassXmlItem.class))
+ for (ClassXmlItem c : xmlItem.getChildrenOfType(ClassXmlItem.class))
{
BeanResult<?> br = c.createBeanResult();
if (br.getBeanType() != BeanResultType.ADD)
Deleted: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/OverrideXmlItem.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/OverrideXmlItem.java 2010-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/OverrideXmlItem.java 2010-07-18 04:26:36 UTC (rev 13424)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.seam.xml.model;
-
-import java.util.Collections;
-import java.util.Set;
-
-public class OverrideXmlItem extends AbstractXmlItem
-{
-
- public OverrideXmlItem(XmlItem parent, String document, int lineno)
- {
- super(XmlItemType.OVERRIDE, parent, null, null, null, document, lineno);
-
- }
-
- public Set<XmlItemType> getAllowedItem()
- {
- return Collections.emptySet();
- }
-
-}
Copied: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ReplacesXmlItem.java (from rev 13387, modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/OverrideXmlItem.java)
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ReplacesXmlItem.java (rev 0)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ReplacesXmlItem.java 2010-07-18 04:26:36 UTC (rev 13424)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.xml.model;
+
+import java.util.Collections;
+import java.util.Set;
+
+public class ReplacesXmlItem extends AbstractXmlItem
+{
+
+ public ReplacesXmlItem(XmlItem parent, String document, int lineno)
+ {
+ super(XmlItemType.REPLACE, parent, null, null, null, document, lineno);
+
+ }
+
+ public Set<XmlItemType> getAllowedItem()
+ {
+ return Collections.emptySet();
+ }
+
+}
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/XmlItemType.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-07-18 04:26:36 UTC (rev 13424)
@@ -23,5 +23,5 @@
public enum XmlItemType
{
- CLASS, METHOD, FIELD, ANNOTATION, VALUE, ENTRY, KEY, DEPENDENCY, PARAMETERS, PARAMETER, ARRAY, OVERRIDE, MODIFIES, GENERIC_BEAN;
+ CLASS, METHOD, FIELD, ANNOTATION, VALUE, ENTRY, KEY, DEPENDENCY, PARAMETERS, PARAMETER, ARRAY, REPLACE, MODIFIES, GENERIC_BEAN;
}
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-07-18 04:26:36 UTC (rev 13424)
@@ -27,7 +27,7 @@
import org.jboss.seam.xml.model.GenericBeanXmlItem;
import org.jboss.seam.xml.model.KeyXmlItem;
import org.jboss.seam.xml.model.ModifiesXmlItem;
-import org.jboss.seam.xml.model.OverrideXmlItem;
+import org.jboss.seam.xml.model.ReplacesXmlItem;
import org.jboss.seam.xml.model.ParameterXmlItem;
import org.jboss.seam.xml.model.ParametersXmlItem;
import org.jboss.seam.xml.model.ValueXmlItem;
@@ -74,9 +74,9 @@
{
return new ArrayXmlItem(parent, node.getAttributes(), node.getDocument(), node.getLineNo());
}
- else if (item.equals("overrides"))
+ else if (item.equals("replaces"))
{
- return new OverrideXmlItem(parent, node.getDocument(), node.getLineNo());
+ return new ReplacesXmlItem(parent, node.getDocument(), node.getLineNo());
}
else if (item.equals("modifies"))
{
Modified: modules/xml/trunk/impl/src/test/resources/META-INF/beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/META-INF/beans.xml 2010-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/test/resources/META-INF/beans.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -13,7 +13,7 @@
</test:InterceptorBinding>
<test:InterceptorBean>
- <s:overrides/>
+ <s:replaces/>
<s:Interceptor/>
<test:InterceptorBinding/>
<test:myMethod>
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -10,7 +10,7 @@
</test:ValueProvider>
<test:ConstructedBean>
- <overrides/>
+ <replaces/>
<parameters><int/></parameters>
</test:ConstructedBean>
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -2,7 +2,7 @@
<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:ArrayFieldValue>
- <overrides/>
+ <replaces/>
<test:iarray>
<value>1</value>
<value>2</value>
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -3,7 +3,7 @@
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:CollectionFieldValue>
- <overrides/>
+ <replaces/>
<test:iset>
<value>1</value>
<value>2</value>
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -2,7 +2,7 @@
<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:MapFieldValue>
- <overrides/>
+ <replaces/>
<test:map1>
<entry><key>1</key><value>hello</value></entry>
<entry><key>2</key><value>world</value></entry>
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -3,7 +3,7 @@
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:FieldValueBean>
- <overrides/>
+ <replaces/>
<test:init>
<Inject/>
</test:init>
@@ -20,7 +20,7 @@
</test:FieldValueBean>
<test:FieldValueBean ivalue="10" stringValue="hello world" enumValue="A" fvalue="0" dvalue="0" bvalue="true" lvalue="23" svalue="4" bigDecimalValue="10" noField="7" >
- <overrides/>
+ <replaces/>
<test:init>
<Inject/>
</test:init>
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -8,7 +8,7 @@
</test:ProducerQualifier>
<test:ProducerBean>
- <overrides/>
+ <replaces/>
<test:value>
<Produces/>
<test:ProducerQualifier/>
@@ -17,7 +17,7 @@
</test:ProducerBean>
<test:RecieverBean>
- <overrides/>
+ <replaces/>
<test:value>
<test:ProducerQualifier/>
<Inject/>
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -15,7 +15,7 @@
</test:QualifiedBean2>
<test:QualifierTestBean>
- <overrides/>
+ <replaces/>
<test:bean1>
<test:OtherQualifier value1="AA" value2="1" value="A" />
<Inject/>
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -3,7 +3,7 @@
xmlns:test="urn:java:org.jboss.seam.xml.test.interceptor">
<test:InterceptedBean>
- <overrides/>
+ <replaces/>
<test:method>
<test:InterceptorBinding/>
</test:method>
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -49,7 +49,7 @@
</test:MethodBean>
<test:MethodTarget>
- <overrides/>
+ <replaces/>
<test:value1>
<Inject />
</test:value1>
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -4,7 +4,7 @@
<test:Producer>
- <overrides/>
+ <replaces/>
<test:value>
<Produces/>
<test:ProducerQualifier value="1" />
@@ -30,7 +30,7 @@
<test:Reciever>
- <overrides/>
+ <replaces/>
<test:val1>
<Inject/>
<test:ProducerQualifier value="1" />
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -4,7 +4,7 @@
<test:Bean1>
- <overrides/>
+ <replaces/>
<test:bean2>
<Inject/>
</test:bean2>
@@ -17,14 +17,14 @@
</test:Bean1>
<test:Bean2>
- <overrides/>
+ <replaces/>
<test:produceBean3>
<Produces/>
</test:produceBean3>
</test:Bean2>
<test:OverriddenBean>
- <overrides/>
+ <replaces/>
<Named>someBean</Named>
</test:OverriddenBean>
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-07-18 03:40:48 UTC (rev 13423)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml 2010-07-18 04:26:36 UTC (rev 13424)
@@ -4,7 +4,7 @@
<test:TypeInjectedClass>
- <overrides/>
+ <replaces/>
<test:value>
<Inject/>
<Exact>org.jboss.seam.xml.test.types.AllowedType</Exact>
More information about the seam-commits
mailing list