[seam-commits] Seam SVN: r13660 - in modules/xml/trunk: impl and 8 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Fri Aug 27 20:25:28 EDT 2010
Author: swd847
Date: 2010-08-27 20:25:27 -0400 (Fri, 27 Aug 2010)
New Revision: 13660
Removed:
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/annotations/internal/
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlProcessAnnotatedType.java
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/GenericBeanResult.java
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/GenericBeanXmlItem.java
modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/
Modified:
modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml
modules/xml/trunk/impl/pom.xml
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/XmlResult.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/main/java/org/jboss/seam/xml/util/XmlConfigurationException.java
Log:
remove generic beans, they are being replaced by weld-extensions generic beans instead
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-08-28 00:21:50 UTC (rev 13659)
+++ modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml 2010-08-28 00:25:27 UTC (rev 13660)
@@ -520,37 +520,7 @@
</programlisting>
</section>
-
<section>
- <title>Generic Beans</title>
- <para>Gereric beans allow for multiple beans to be created from a single bean definition. They are
- designed for use by framework writers. From the users perspective there is no
- special configuration required, if you configure a bean that a framework writer has marked as a generic
- bean then you will end up with multiple beans instead.</para>
- <para>Generic beans are configured using the syntax described above. For every bean that the user
- configures, a corresponding bean from the generic bean declaration is created. For example in the
- framework xml configuration:</para>
-<programlisting role="XML" >
- <![CDATA[
-<s:genericBean class="org.jboss.seam.xml.test.generic.GenericMain" >
- <test:GenericDependant>
- <s:ApplyQualifiers/>
- <s:modifies/>
- <test:instance>
- <s:ApplyQualifiers/>
- </test:instance>
- </test:GenericDependant>
-</s:genericBean>
-]]>
- </programlisting>
- <para>The declaration above means that for every <literal>GenericMain</literal> that a user configures via xml
- a corresponding <literal>GenericDependant</literal> is created as well. The
- <literal><s:ApplyQualifiers /></literal> is replaced with the qualifiers that are present on the user
- configured bean.</para>
- </section>
-
-
- <section>
<title>More Information</title>
<para>For further information look at the units tests in the seam-xml distribution, also the
JSR-299 Public Review Draft section on XML Configuration was the base for this extension,
Modified: modules/xml/trunk/impl/pom.xml
===================================================================
--- modules/xml/trunk/impl/pom.xml 2010-08-28 00:21:50 UTC (rev 13659)
+++ modules/xml/trunk/impl/pom.xml 2010-08-28 00:25:27 UTC (rev 13660)
@@ -20,6 +20,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
+ <version>1.0-SP2</version>
</dependency>
<dependency>
@@ -30,13 +31,14 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-se</artifactId>
- <version>1.0.1-Final</version>
+ <groupId>org.jboss.weld.se</groupId>
+ <artifactId>weld-se-core</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java 2010-08-28 00:21:50 UTC (rev 13659)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java 2010-08-28 00:25:27 UTC (rev 13660)
@@ -22,7 +22,6 @@
package org.jboss.seam.xml.bootstrap;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
@@ -50,10 +49,7 @@
import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Named;
-import org.jboss.seam.xml.annotations.internal.ApplyQualifiers;
import org.jboss.seam.xml.core.BeanResult;
-import org.jboss.seam.xml.core.BeanResultType;
-import org.jboss.seam.xml.core.GenericBeanResult;
import org.jboss.seam.xml.core.XmlConfiguredBean;
import org.jboss.seam.xml.core.XmlId;
import org.jboss.seam.xml.core.XmlResult;
@@ -65,8 +61,6 @@
import org.jboss.seam.xml.util.FileDataReader;
import org.jboss.weld.extensions.annotated.AnnotatedTypeBuilder;
import org.jboss.weld.extensions.core.Exact;
-import org.jboss.weld.extensions.core.Veto;
-import org.jboss.weld.extensions.literal.DefaultLiteral;
import org.jboss.weld.extensions.util.AnnotationInstanceProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -93,8 +87,6 @@
List<Exception> errors = new ArrayList<Exception>();
- Map<Class<?>, GenericBeanResult> genericBeans = new HashMap<Class<?>, GenericBeanResult>();
-
/**
* This is the entry point for the extension
*/
@@ -128,11 +120,6 @@
// build the generic bean data
for (XmlResult r : results)
{
- for (GenericBeanResult b : r.getGenericBeans())
- {
- genericBeans.put(b.getGenericBean(), b);
- }
-
// add the qualifiers as we need them before we process the generic
// bean info
for (Class<? extends Annotation> b : r.getQualifiers())
@@ -176,24 +163,6 @@
}
for (BeanResult<?> bb : r.getFlattenedBeans())
{
- GenericBeanResult found = null;
- for (Class<?> g : genericBeans.keySet())
- {
- if (g.isAssignableFrom(bb.getType()))
- {
- found = genericBeans.get(g);
- break;
- }
- }
- if (found != null)
- {
- List<AnnotatedType<?>> types = processGenericBeans(bb, found, beanManager);
- for (AnnotatedType<?> i : types)
- {
- event.addAnnotatedType(i);
- }
- }
-
bb.getBuilder().addToClass(new AnnotationLiteral<XmlConfiguredBean>()
{
});
@@ -282,134 +251,6 @@
return ret;
}
- /**
- * installs a set of secondary beans for a given generic bean, the secondary
- * beans have the same qualifiers added to them as the generic bean, in
- * addition the generic beans qualifiers are added whereever the
- * ApplyQualiers annotation is found
- *
- */
- public List<AnnotatedType<?>> processGenericBeans(BeanResult<?> bean, GenericBeanResult genericBeans, BeanManager beanManager)
- {
- List<AnnotatedType<?>> ret = new ArrayList<AnnotatedType<?>>();
- AnnotatedType<?> rootType = bean.getBuilder().create();
- // ret.add(rootType);
- Set<Annotation> qualifiers = new HashSet<Annotation>();
-
- for (Annotation i : rootType.getAnnotations())
- {
- if (beanManager.isQualifier(i.annotationType()))
- {
- qualifiers.add(i);
- }
- }
- for (BeanResult<?> c : genericBeans.getSecondaryBeans())
- {
-
- AnnotatedType<?> type = c.getBuilder().create();
- AnnotatedTypeBuilder<?> gb = new AnnotatedTypeBuilder().setJavaClass(type.getJavaClass());
- if (c.getBeanType() == BeanResultType.MODIFIES)
- {
- gb.readFromType((Class) type.getJavaClass());
- // we don't want to keep the veto annotation on the class
- gb.removeFromClass(Veto.class);
- }
- // if the original type was qualified @Default we add that as well
- if (!isQualifierPresent(type, beanManager))
- {
- gb.addToClass(DefaultLiteral.INSTANCE);
- }
- // we always apply qualifiers to the actual type
- for (Annotation q : qualifiers)
- {
- gb.addToClass(q);
- }
- for (AnnotatedField<?> f : type.getFields())
- {
- if (f.isAnnotationPresent(ApplyQualifiers.class))
- {
- // we need to manually add @default as it stops being applied
- // when
- // we add our qualifiers, however if we are deling with the main
- // type we do not
- // bother, as it should not be qualified @Default
- if (!isQualifierPresent(f, beanManager) && f.getJavaMember().getType() != rootType.getJavaClass())
- {
- gb.addToField(f.getJavaMember(), DefaultLiteral.INSTANCE);
- }
- for (Annotation q : qualifiers)
- {
- gb.addToField(f.getJavaMember(), q);
- }
- }
- }
- for (AnnotatedMethod<?> m : type.getMethods())
- {
-
- if (m.isAnnotationPresent(ApplyQualifiers.class))
- {
- if (!isQualifierPresent(m, beanManager))
- {
- gb.addToMethod(m.getJavaMember(), DefaultLiteral.INSTANCE);
- }
- for (Annotation q : qualifiers)
- {
- gb.addToMethod(m.getJavaMember(), q);
- }
- }
-
- for (AnnotatedParameter<?> p : m.getParameters())
- {
-
- if (p.isAnnotationPresent(ApplyQualifiers.class))
- {
- if (!isQualifierPresent(p, beanManager) && p.getBaseType() != rootType.getJavaClass())
- {
- gb.addToMethodParameter(m.getJavaMember(), p.getPosition(), DefaultLiteral.INSTANCE);
- }
- for (Annotation q : qualifiers)
- {
- gb.addToMethodParameter(m.getJavaMember(), p.getPosition(), q);
- }
- }
- }
- }
-
- for (AnnotatedConstructor<?> con : type.getConstructors())
- {
- if (con.isAnnotationPresent(ApplyQualifiers.class))
- {
- if (!isQualifierPresent(con, beanManager))
- {
- gb.addToConstructor((Constructor) con.getJavaMember(), DefaultLiteral.INSTANCE);
- }
- for (Annotation q : qualifiers)
- {
- gb.addToConstructor((Constructor) con.getJavaMember(), q);
- }
- }
-
- for (AnnotatedParameter<?> p : con.getParameters())
- {
- if (p.isAnnotationPresent(ApplyQualifiers.class) && p.getBaseType() != rootType.getJavaClass())
- {
- if (!isQualifierPresent(p, beanManager))
- {
- gb.addToConstructorParameter((Constructor) con.getJavaMember(), p.getPosition(), DefaultLiteral.INSTANCE);
- }
- for (Annotation q : qualifiers)
- {
- gb.addToConstructorParameter((Constructor) con.getJavaMember(), p.getPosition(), q);
- }
- }
- }
- }
-
- ret.add(fixExactSupport(gb).create());
- }
- return ret;
- }
-
public boolean isQualifierPresent(Annotated f, BeanManager beanManager)
{
for (Annotation a : f.getAnnotations())
Deleted: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlProcessAnnotatedType.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlProcessAnnotatedType.java 2010-08-28 00:21:50 UTC (rev 13659)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlProcessAnnotatedType.java 2010-08-28 00:25:27 UTC (rev 13660)
@@ -1,50 +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.bootstrap;
-
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-
-public class XmlProcessAnnotatedType implements ProcessAnnotatedType
-{
- final AnnotatedType annotatedType;
-
- XmlProcessAnnotatedType(AnnotatedType annotatedType)
- {
- this.annotatedType = annotatedType;
- }
-
- public AnnotatedType getAnnotatedType()
- {
- return annotatedType;
- }
-
- public void setAnnotatedType(AnnotatedType type)
- {
- // nop for now
- }
-
- public void veto()
- {
- // nop for now
- }
-}
Deleted: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/GenericBeanResult.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/GenericBeanResult.java 2010-08-28 00:21:50 UTC (rev 13659)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/GenericBeanResult.java 2010-08-28 00:25:27 UTC (rev 13660)
@@ -1,49 +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.core;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class GenericBeanResult
-{
- final Class<?> genericBean;
-
- final Set<BeanResult<?>> secondaryBeans;
-
- public GenericBeanResult(Class<?> genericBean, Set<BeanResult<?>> secondaryBeans)
- {
- this.genericBean = genericBean;
- this.secondaryBeans = new HashSet<BeanResult<?>>(secondaryBeans);
- }
-
- public Class<?> getGenericBean()
- {
- return genericBean;
- }
-
- public Set<BeanResult<?>> getSecondaryBeans()
- {
- return secondaryBeans;
- }
-
-}
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/XmlResult.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/XmlResult.java 2010-08-28 00:21:50 UTC (rev 13659)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/XmlResult.java 2010-08-28 00:25:27 UTC (rev 13660)
@@ -48,8 +48,6 @@
private final List<BeanResult<?>> beans = new ArrayList<BeanResult<?>>();
- private final List<GenericBeanResult> genericBeans = new ArrayList<GenericBeanResult>();
-
private final String sortKey;
public XmlResult(String fileUrl)
@@ -146,16 +144,6 @@
return veto;
}
- public void addGenericBean(GenericBeanResult result)
- {
- genericBeans.add(result);
- }
-
- public List<GenericBeanResult> getGenericBeans()
- {
- return genericBeans;
- }
-
public int compareTo(XmlResult o)
{
return sortKey.compareTo(o.sortKey);
Deleted: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/GenericBeanXmlItem.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/GenericBeanXmlItem.java 2010-08-28 00:21:50 UTC (rev 13659)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/GenericBeanXmlItem.java 2010-08-28 00:25:27 UTC (rev 13660)
@@ -1,83 +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.Map;
-import java.util.Set;
-
-import org.jboss.seam.xml.util.TypeOccuranceInformation;
-import org.jboss.seam.xml.util.XmlConfigurationException;
-
-public class GenericBeanXmlItem extends AbstractXmlItem
-{
-
- Class<?> javaClass;
-
- public GenericBeanXmlItem(XmlItem parent, Map<String, String> attributes, String document, int lineno)
- {
- super(XmlItemType.GENERIC_BEAN, parent, null, null, attributes, document, lineno);
- if (attributes.containsKey("class"))
- {
- javaClass = getClass(attributes.get("class"), document, lineno);
- }
- else
- {
- throw new XmlConfigurationException("<genericBean> element must have a class attribute", document, lineno);
- }
- }
-
- public Set<TypeOccuranceInformation> getAllowedItem()
- {
- return Collections.singleton(TypeOccuranceInformation.of(XmlItemType.CLASS, 1, null));
- }
-
- public Class<?> getClass(String className, String document, int lineno)
- {
- try
- {
- if (Thread.currentThread().getContextClassLoader() != null)
- {
- return Thread.currentThread().getContextClassLoader().loadClass(className);
- }
- }
- catch (ClassNotFoundException e)
- {
-
- }
- try
- {
- return getClass().getClassLoader().loadClass(className);
- }
- catch (ClassNotFoundException e1)
- {
- throw new XmlConfigurationException("could not find class <genericBean>", document, lineno);
- }
- }
-
- @Override
- public Class<?> getJavaClass()
- {
- return javaClass;
- }
-
-}
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-08-28 00:21:50 UTC (rev 13659)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-08-28 00:25:27 UTC (rev 13660)
@@ -23,7 +23,6 @@
import java.lang.annotation.Annotation;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -35,7 +34,6 @@
import org.jboss.seam.xml.core.BeanResult;
import org.jboss.seam.xml.core.BeanResultType;
-import org.jboss.seam.xml.core.GenericBeanResult;
import org.jboss.seam.xml.core.XmlResult;
import org.jboss.seam.xml.parser.SaxNode;
import org.jboss.seam.xml.parser.namespace.CompositeNamespaceElementResolver;
@@ -150,22 +148,6 @@
addStereotypeToResult(ret, xmlItem);
}
}
- else if (xmlItem.getType() == XmlItemType.GENERIC_BEAN)
- {
-
- GenericBeanXmlItem item = (GenericBeanXmlItem) xmlItem;
- Set<BeanResult<?>> classes = new HashSet<BeanResult<?>>();
- for (ClassXmlItem c : xmlItem.getChildrenOfType(ClassXmlItem.class))
- {
- BeanResult<?> br = c.createBeanResult(manager);
- if (br.getBeanType() != BeanResultType.ADD)
- {
- ret.addVeto(br.getType());
- }
- classes.add(br);
- }
- ret.addGenericBean(new GenericBeanResult(item.getJavaClass(), classes));
- }
}
/**
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-08-28 00:21:50 UTC (rev 13659)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-08-28 00:25:27 UTC (rev 13660)
@@ -23,5 +23,5 @@
public enum XmlItemType
{
- CLASS, METHOD, FIELD, ANNOTATION, VALUE, ENTRY, KEY, DEPENDENCY, PARAMETERS, PARAMETER, ARRAY, REPLACE, MODIFIES, GENERIC_BEAN;
+ CLASS, METHOD, FIELD, ANNOTATION, VALUE, ENTRY, KEY, DEPENDENCY, PARAMETERS, PARAMETER, ARRAY, REPLACE, MODIFIES;
}
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-08-28 00:21:50 UTC (rev 13659)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-08-28 00:25:27 UTC (rev 13660)
@@ -24,12 +24,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.GenericBeanXmlItem;
import org.jboss.seam.xml.model.KeyXmlItem;
import org.jboss.seam.xml.model.ModifiesXmlItem;
-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.ReplacesXmlItem;
import org.jboss.seam.xml.model.ValueXmlItem;
import org.jboss.seam.xml.model.XmlItem;
import org.jboss.seam.xml.model.XmlItemType;
@@ -86,10 +85,6 @@
{
return new ParametersXmlItem(parent, node.getDocument(), node.getLineNo());
}
- else if (item.equals("genericBean"))
- {
- return new GenericBeanXmlItem(parent, node.getAttributes(), node.getDocument(), node.getLineNo());
- }
// now deal with primitive types
Class<?> primType = null;
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/util/XmlConfigurationException.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/util/XmlConfigurationException.java 2010-08-28 00:21:50 UTC (rev 13659)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/util/XmlConfigurationException.java 2010-08-28 00:25:27 UTC (rev 13660)
@@ -33,6 +33,13 @@
this.lineno = lineno;
}
+ public XmlConfigurationException(String message, String document, int lineno, Throwable cause)
+ {
+ super(message, cause);
+ this.document = document;
+ this.lineno = lineno;
+ }
+
@Override
public String getMessage()
{
More information about the seam-commits
mailing list