[seam-commits] Seam SVN: r13307 - in modules/xml/trunk: examples/princess-rescue and 5 other directories.

Author: swd847 Date: 2010-06-27 03:14:41 -0400 (Sun, 27 Jun 2010) New Revision: 13307 Added: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java Removed: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/SpecializesXmlItem.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/examples/princess-rescue/pom.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/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/org/jboss/seam/xml/test/generic/generic-beans.xml modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml Log: rename <specialises> to <extends> 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-25 11:50:36 UTC (rev 13306) +++ modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml 2010-06-27 07:14:41 UTC (rev 13307) @@ -141,7 +141,7 @@ <itemizedlist> <listitem><para><literal>Beans</literal></para></listitem> - <listitem><para><literal>specializes</literal></para></listitem> + <listitem><para><literal>extends</literal></para></listitem> <listitem><para><literal>overrides</literal></para></listitem> <listitem><para><literal>parameters</literal></para></listitem> <listitem><para><literal>value</literal></para></listitem> @@ -193,16 +193,16 @@ <para>By configuring a bean via XML creates a new bean, however there may be cases where you want to modify an existing bean rather than adding a new one. The <literal>&lt;s:overrides&gt;</literal> and - <literal>&lt;s:specializes&gt;</literal> tags allow you to do this.</para> + <literal>&lt;s:extends&gt;</literal> tags allow you to do this.</para> <para>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:specializes&gt;</literal> tag does the same, except that it merges + <literal>&lt;s:extends&gt;</literal> tag does the same, except that it merges the annotations on the bean with the annotations defined in XML. This has the same effect as modifiying an existing bean.</para> <programlisting role="XML"><![CDATA[ <test:Report> - <s:specializes> + <s:extends> <test:NewQualifier/> </test:Report> @@ -491,7 +491,7 @@ <s:genericBean class="org.jboss.seam.xml.test.generic.GenericMain" > <test:GenericDependant> <s:ApplyQualifiers/> - <s:specializes/> + <s:extends/> <test:instance> <s:ApplyQualifiers/> </test:instance> 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-25 11:50:36 UTC (rev 13306) +++ modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml 2010-06-27 07:14:41 UTC (rev 13307) @@ -18,9 +18,9 @@ <listitem><literal>/META-INF/seam-beans.xml</literal></listitem> <listitem><literal>/seam-beans.xml</literal></listitem> </itemizedlist> - <important> + <warning> <para>It is currently not possible to load beans.xml from WEB-INF. This will be addressed before the final release of seam-xml.</para> - </important> + </warning> <para>The <literal>beans.xml</literal> file is the preferred way of configuring beans via XML, however it may be possible that some JSR-299 implementations will not allow this, so <literal>seam-beans.xml</literal> is provided as an alternative. </para> @@ -150,6 +150,10 @@ </programlistingco> </section> + <section> + <title>The Princess Rescue Example</title> + + </section> <!-- vim:et:ts=3:sw=3:tw=120 --> Modified: modules/xml/trunk/examples/princess-rescue/pom.xml =================================================================== --- modules/xml/trunk/examples/princess-rescue/pom.xml 2010-06-25 11:50:36 UTC (rev 13306) +++ modules/xml/trunk/examples/princess-rescue/pom.xml 2010-06-27 07:14:41 UTC (rev 13307) @@ -57,13 +57,13 @@ <artifactId>jsf-impl</artifactId> <scope>runtime</scope> </dependency> - + <!-- <dependency> <groupId>org.jboss.weld.servlet</groupId> <artifactId>weld-servlet</artifactId> <scope>runtime</scope> </dependency> - + --> <dependency> <groupId>org.glassfish.web</groupId> <artifactId>el-impl</artifactId> 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-25 11:50:36 UTC (rev 13306) +++ modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml 2010-06-27 07:14:41 UTC (rev 13307) @@ -13,7 +13,7 @@ </p:Room> <p:GameManager> - <s:specializes/> + <s:extends/> <p:allRooms> <s:Any/> <s:Inject/> Copied: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java (from rev 13171, modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/SpecializesXmlItem.java) =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java (rev 0) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java 2010-06-27 07:14:41 UTC (rev 13307) @@ -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 ExtendsXmlItem extends AbstractXmlItem +{ + + public ExtendsXmlItem(XmlItem parent, String document, int lineno) + { + super(XmlItemType.EXTENDS, 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/ModelBuilder.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-06-25 11:50:36 UTC (rev 13306) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-06-27 07:14:41 UTC (rev 13307) @@ -302,7 +302,7 @@ BeanResult<?> buildAnnotatedType(ClassXmlItem rb) { boolean override = !rb.getChildrenOfType(OverrideXmlItem.class).isEmpty(); - boolean extend = !rb.getChildrenOfType(SpecializesXmlItem.class).isEmpty(); + boolean extend = !rb.getChildrenOfType(ExtendsXmlItem.class).isEmpty(); BeanResultType beanType = BeanResultType.ADD; if (override && extend) { Deleted: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/SpecializesXmlItem.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/SpecializesXmlItem.java 2010-06-25 11:50:36 UTC (rev 13306) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/SpecializesXmlItem.java 2010-06-27 07:14:41 UTC (rev 13307) @@ -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 SpecializesXmlItem extends AbstractXmlItem -{ - - public SpecializesXmlItem(XmlItem parent, String document, int lineno) - { - super(XmlItemType.SPECIALIZES, 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-06-25 11:50:36 UTC (rev 13306) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-06-27 07:14:41 UTC (rev 13307) @@ -23,5 +23,5 @@ public enum XmlItemType { - CLASS, METHOD, FIELD, ANNOTATION, VALUE, ENTRY, KEY, DEPENDENCY, PARAMETERS, PARAMETER, ARRAY, OVERRIDE, SPECIALIZES, TYPE, GENERIC_BEAN; + CLASS, METHOD, FIELD, ANNOTATION, VALUE, ENTRY, KEY, DEPENDENCY, PARAMETERS, PARAMETER, ARRAY, OVERRIDE, EXTENDS, TYPE, 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-06-25 11:50:36 UTC (rev 13306) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-06-27 07:14:41 UTC (rev 13307) @@ -29,7 +29,7 @@ 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.ExtendsXmlItem; import org.jboss.seam.xml.model.TypeXmlItem; import org.jboss.seam.xml.model.ValueXmlItem; import org.jboss.seam.xml.model.XmlItem; @@ -79,9 +79,9 @@ { return new OverrideXmlItem(parent, node.getDocument(), node.getLineNo()); } - else if (item.equals("specializes")) + else if (item.equals("extends")) { - return new SpecializesXmlItem(parent, node.getDocument(), node.getLineNo()); + return new ExtendsXmlItem(parent, node.getDocument(), node.getLineNo()); } else if (item.equals("parameters")) { 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-25 11:50:36 UTC (rev 13306) +++ 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) @@ -5,19 +5,19 @@ <genericBean class="org.jboss.seam.xml.test.generic.GenericMain" > <test:GenericDependant> <ApplyQualifiers/> - <specializes/> + <extends/> <test:instance> <ApplyQualifiers/> </test:instance> </test:GenericDependant> </genericBean> - <test:GenericMain><specializes/> + <test:GenericMain><extends/> <test:HighGenericQualifier/> <test:configuredValue><value>100</value></test:configuredValue> </test:GenericMain> - <test:GenericMain><specializes/> + <test:GenericMain><extends/> <test:LowGenericQualifier/> <test:configuredValue><value>10</value></test:configuredValue> </test:GenericMain> 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-25 11:50:36 UTC (rev 13306) +++ 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) @@ -29,7 +29,7 @@ </test:OverriddenBean> <test:ExtendedBean> - <specializes/> + <extends/> <test:ExtendedQualifier2/> </test:ExtendedBean>