Author: pete.muir(a)jboss.org Date: 2010-09-26 15:49:17 -0400 (Sun, 26 Sep 2010) New Revision: 13775 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/core/BeanResult.java modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/ArrayFieldSet.java modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/CollectionFieldSet.java modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/MapFieldSet.java modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/SimpleFieldValue.java modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/AnnotationUtils.java 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/PropertyXmlItem.java modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java Log: updates latest weldx changes to package names 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-09-26 19:20:25 UTC (rev 13774) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java 2010-09-26 19:49:17 UTC (rev 13775) @@ -30,8 +30,8 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; -import java.util.Map.Entry; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterBeanDiscovery; @@ -55,7 +55,7 @@ import org.jboss.seam.xml.parser.ParserMain; import org.jboss.seam.xml.parser.SaxNode; import org.jboss.seam.xml.util.FileDataReader; -import org.jboss.weld.extensions.util.AnnotationInstanceProvider; +import org.jboss.weld.extensions.reflection.AnnotationInstanceProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/BeanResult.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/BeanResult.java 2010-09-26 19:20:25 UTC (rev 13774) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/BeanResult.java 2010-09-26 19:49:17 UTC (rev 13775) @@ -26,8 +26,8 @@ import java.util.List; import org.jboss.seam.xml.fieldset.FieldValueObject; -import org.jboss.weld.extensions.annotated.AnnotatedTypeBuilder; import org.jboss.weld.extensions.core.Veto; +import org.jboss.weld.extensions.reflection.annotated.AnnotatedTypeBuilder; public class BeanResult<X> { Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/ArrayFieldSet.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/ArrayFieldSet.java 2010-09-26 19:20:25 UTC (rev 13774) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/ArrayFieldSet.java 2010-09-26 19:49:17 UTC (rev 13775) @@ -29,7 +29,7 @@ import javax.enterprise.inject.spi.BeanManager; import org.jboss.seam.xml.model.ValueXmlItem; -import org.jboss.weld.extensions.util.properties.Property; +import org.jboss.weld.extensions.properties.Property; /** * class responsible for setting the value of array properties. @@ -39,11 +39,11 @@ */ public class ArrayFieldSet implements FieldValueObject { - final private Property field; + final private Property<Object> field; final private List<FieldValue> values; final private Class<?> arrayType; - public ArrayFieldSet(Property<?> field, List<ValueXmlItem> items) + public ArrayFieldSet(Property<Object> field, List<ValueXmlItem> items) { this.field = field; this.values = new ArrayList<FieldValue>(); Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/CollectionFieldSet.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/CollectionFieldSet.java 2010-09-26 19:20:25 UTC (rev 13774) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/CollectionFieldSet.java 2010-09-26 19:49:17 UTC (rev 13775) @@ -38,7 +38,7 @@ import org.jboss.seam.xml.model.ValueXmlItem; import org.jboss.seam.xml.util.TypeReader; -import org.jboss.weld.extensions.util.properties.Property; +import org.jboss.weld.extensions.properties.Property; /** * class responsible for setting the value of collection properties. @@ -51,12 +51,12 @@ */ public class CollectionFieldSet implements FieldValueObject { - private final Property field; + private final Property<Object> field; private final List<FieldValue> values; private final Class<?> elementType; private final Class<? extends Collection> collectionType; - public CollectionFieldSet(Property field, List<ValueXmlItem> items) + public CollectionFieldSet(Property<Object> field, List<ValueXmlItem> items) { this.field = field; this.values = new ArrayList<FieldValue>(); Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/MapFieldSet.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/MapFieldSet.java 2010-09-26 19:20:25 UTC (rev 13774) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/MapFieldSet.java 2010-09-26 19:49:17 UTC (rev 13775) @@ -28,16 +28,16 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.SortedMap; import java.util.TreeMap; -import java.util.Map.Entry; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.BeanManager; import org.jboss.seam.xml.model.EntryXmlItem; import org.jboss.seam.xml.util.TypeReader; -import org.jboss.weld.extensions.util.properties.Property; +import org.jboss.weld.extensions.properties.Property; /** * class responsible for setting the value of map properties. @@ -48,13 +48,13 @@ */ public class MapFieldSet implements FieldValueObject { - private final Property field; + private final Property<Object> field; private final List<Entry<FieldValue, FieldValue>> values; private final Class<?> keyType; private final Class<?> valueType; private final Class<? extends Map> collectionType; - public MapFieldSet(Property field, List<EntryXmlItem> items) + public MapFieldSet(Property<Object> field, List<EntryXmlItem> items) { this.field = field; this.values = new ArrayList<Entry<FieldValue, FieldValue>>(); Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/SimpleFieldValue.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/SimpleFieldValue.java 2010-09-26 19:20:25 UTC (rev 13774) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/SimpleFieldValue.java 2010-09-26 19:49:17 UTC (rev 13775) @@ -24,7 +24,7 @@ import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.BeanManager; -import org.jboss.weld.extensions.util.properties.Property; +import org.jboss.weld.extensions.properties.Property; /** * Field value object for a simple field @@ -35,13 +35,13 @@ public class SimpleFieldValue implements FieldValueObject { - private final Property field; + private final Property<Object> field; private final FieldValue value; private final Class<?> type; - public SimpleFieldValue(Class<?> javaObject, final Property<?> f, FieldValue value, Class<?> type) + public SimpleFieldValue(Class<?> javaObject, final Property<Object> f, FieldValue value, Class<?> type) { this.field = f; this.value = value; Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/AnnotationUtils.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/AnnotationUtils.java 2010-09-26 19:20:25 UTC (rev 13774) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/AnnotationUtils.java 2010-09-26 19:49:17 UTC (rev 13775) @@ -31,7 +31,7 @@ import org.jboss.seam.xml.util.XmlConfigurationException; import org.jboss.seam.xml.util.XmlObjectConverter; -import org.jboss.weld.extensions.util.AnnotationInstanceProvider; +import org.jboss.weld.extensions.reflection.AnnotationInstanceProvider; /** * 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-09-26 19:20:25 UTC (rev 13774) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java 2010-09-26 19:49:17 UTC (rev 13775) @@ -29,8 +29,8 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; -import java.util.Map.Entry; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.util.AnnotationLiteral; @@ -42,13 +42,13 @@ import org.jboss.seam.xml.fieldset.FieldValueObject; import org.jboss.seam.xml.util.TypeOccuranceInformation; import org.jboss.seam.xml.util.XmlConfigurationException; -import org.jboss.weld.extensions.annotated.AnnotatedTypeBuilder; -import org.jboss.weld.extensions.util.Reflections; -import org.jboss.weld.extensions.util.properties.Properties; -import org.jboss.weld.extensions.util.properties.Property; -import org.jboss.weld.extensions.util.properties.query.NamedPropertyCriteria; -import org.jboss.weld.extensions.util.properties.query.PropertyQueries; -import org.jboss.weld.extensions.util.properties.query.PropertyQuery; +import org.jboss.weld.extensions.properties.Properties; +import org.jboss.weld.extensions.properties.Property; +import org.jboss.weld.extensions.properties.query.NamedPropertyCriteria; +import org.jboss.weld.extensions.properties.query.PropertyQueries; +import org.jboss.weld.extensions.properties.query.PropertyQuery; +import org.jboss.weld.extensions.reflection.Reflections; +import org.jboss.weld.extensions.reflection.annotated.AnnotatedTypeBuilder; public class ClassXmlItem extends AbstractXmlItem { @@ -80,7 +80,7 @@ { PropertyQuery<Object> query = PropertyQueries.createQuery(getJavaClass()); query.addCriteria(new NamedPropertyCriteria(e.getKey())); - Property<?> property = query.getFirstResult(); + Property<Object> property = query.getFirstResult(); if (property != null) { values.add(new PropertyXmlItem(this, property, e.getValue(), null, document, lineno)); Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/PropertyXmlItem.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/PropertyXmlItem.java 2010-09-26 19:20:25 UTC (rev 13774) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/PropertyXmlItem.java 2010-09-26 19:49:17 UTC (rev 13775) @@ -42,23 +42,23 @@ import org.jboss.seam.xml.fieldset.SimpleFieldValue; import org.jboss.seam.xml.util.TypeOccuranceInformation; import org.jboss.seam.xml.util.XmlConfigurationException; -import org.jboss.weld.extensions.util.properties.Property; +import org.jboss.weld.extensions.properties.Property; public class PropertyXmlItem extends AbstractXmlItem { - private final Property<?> property; + private final Property<Object> property; private final HashSet<TypeOccuranceInformation> allowed = new HashSet<TypeOccuranceInformation>(); private final Class<?> fieldType; private final List<BeanResult<?>> inlineBeans = new ArrayList<BeanResult<?>>(); private FieldValueObject fieldValue; - public PropertyXmlItem(XmlItem parent, Property<?> property, String innerText, String document, int lineno) + public PropertyXmlItem(XmlItem parent, Property<Object> property, String innerText, String document, int lineno) { this(parent, property, innerText, null, document, lineno); } - public PropertyXmlItem(XmlItem parent, Property<?> property, String innerText, Class<?> overridenFieldType, String document, int lineno) + public PropertyXmlItem(XmlItem parent, Property<Object> property, String innerText, Class<?> overridenFieldType, String document, int lineno) { super(XmlItemType.FIELD, parent, parent.getJavaClass(), innerText, null, document, lineno); this.property = property; Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java 2010-09-26 19:20:25 UTC (rev 13774) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java 2010-09-26 19:49:17 UTC (rev 13775) @@ -36,11 +36,11 @@ import org.jboss.seam.xml.parser.SaxNode; import org.jboss.seam.xml.util.TypeOccuranceInformation; import org.jboss.seam.xml.util.XmlConfigurationException; -import org.jboss.weld.extensions.util.Reflections; -import org.jboss.weld.extensions.util.properties.Property; -import org.jboss.weld.extensions.util.properties.query.NamedPropertyCriteria; -import org.jboss.weld.extensions.util.properties.query.PropertyQueries; -import org.jboss.weld.extensions.util.properties.query.PropertyQuery; +import org.jboss.weld.extensions.properties.Property; +import org.jboss.weld.extensions.properties.query.NamedPropertyCriteria; +import org.jboss.weld.extensions.properties.query.PropertyQueries; +import org.jboss.weld.extensions.properties.query.PropertyQuery; +import org.jboss.weld.extensions.reflection.Reflections; public class PackageNamespaceElementResolver implements NamespaceElementResolver { @@ -125,7 +125,7 @@ boolean methodFound = Reflections.methodExists(p, name); PropertyQuery<Object> query = PropertyQueries.createQuery(parent.getJavaClass()); query.addCriteria(new NamedPropertyCriteria(name)); - Property<?> property = query.getFirstResult(); + Property<Object> property = query.getFirstResult(); if (methodFound && property != null) {