[jbossws-commits] JBossWS SVN: r11185 - in projects/jaxbintros/trunk: src/main/java/org/jboss/jaxb/intros and 5 other directories.

Author: alessio.soldano(a)jboss.com Date: 2009-12-02 12:28:13 -0500 (Wed, 02 Dec 2009) New Revision: 11185 Added: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/Util.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementWrapperIntro.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlIDIntro.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlIDREFIntro.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlJavaTypeAdapterIntro.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTransientIntro.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/Handler.java Removed: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java Modified: projects/jaxbintros/trunk/jaxb-bindings.xjb projects/jaxbintros/trunk/pom.xml projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/ConfigurationException.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/IntroductionsAnnotationReader.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/IntroductionsConfigParser.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/ClassIntroConfig.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/ClassMemberIntroConfig.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/FieldIntroConfig.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/JaxbIntros.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/MethodIntroConfig.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/ObjectFactory.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAccessorTypeIntro.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAttributeIntro.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementIntro.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlRootElementIntro.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTypeIntro.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/package-info.java projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/ClassValue.java projects/jaxbintros/trunk/src/main/resources/jaxb-intros.xsd projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/IntroductionsAnnotationReaderUnitTest.java projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/IntroductionsConfigParserUnitTest.java projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Address.java projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Contact.java projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/CustomerOrder.java projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Item.java projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/OrderHeader.java projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Party.java Log: [JBWS-2751] Support all JAXB annotations in JAXBIntroductions Modified: projects/jaxbintros/trunk/jaxb-bindings.xjb =================================================================== --- projects/jaxbintros/trunk/jaxb-bindings.xjb 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/jaxb-bindings.xjb 2009-12-02 17:28:13 UTC (rev 11185) @@ -46,6 +46,31 @@ </jxb:class> </jxb:bindings> + <jxb:bindings node="//xs:complexType[@name='XmlTransient']"> + <jxb:class name="XmlTransientIntro"> + </jxb:class> + </jxb:bindings> + + <jxb:bindings node="//xs:complexType[@name='XmlID']"> + <jxb:class name="XmlIDIntro"> + </jxb:class> + </jxb:bindings> + + <jxb:bindings node="//xs:complexType[@name='XmlIDREF']"> + <jxb:class name="XmlIDREFIntro"> + </jxb:class> + </jxb:bindings> + + <jxb:bindings node="//xs:complexType[@name='XmlElementWrapper']"> + <jxb:class name="XmlElementWrapperIntro"> + </jxb:class> + </jxb:bindings> + + <jxb:bindings node="//xs:complexType[@name='XmlJavaTypeAdapter']"> + <jxb:class name="XmlJavaTypeAdapterIntro"> + </jxb:class> + </jxb:bindings> + </jxb:bindings> </jxb:bindings> Modified: projects/jaxbintros/trunk/pom.xml =================================================================== --- projects/jaxbintros/trunk/pom.xml 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/pom.xml 2009-12-02 17:28:13 UTC (rev 11185) @@ -37,6 +37,7 @@ <!-- Properties --> <properties> + <commons.beanutils.version>1.8.0</commons.beanutils.version> <commons.logging.version>1.1.1</commons.logging.version> <junit.version>3.8.2</junit.version> <jaxb.api.version>2.1</jaxb.api.version> @@ -47,6 +48,11 @@ <dependencies> <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>${commons.beanutils.version}</version> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${commons.logging.version}</version> Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/ConfigurationException.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/ConfigurationException.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/ConfigurationException.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -19,7 +19,6 @@ */ package org.jboss.jaxb.intros; -import javax.xml.bind.JAXBException; /** * JAXB Introductions configuration error. @@ -28,6 +27,8 @@ */ public class ConfigurationException extends RuntimeException { + private static final long serialVersionUID = -1332063136124847578L; + public ConfigurationException(String message) { super(message); Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/IntroductionsAnnotationReader.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/IntroductionsAnnotationReader.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/IntroductionsAnnotationReader.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -19,23 +19,48 @@ */ package org.jboss.jaxb.intros; -import com.sun.xml.bind.v2.model.annotation.*; - -import java.lang.reflect.*; import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Field; +import java.lang.reflect.Member; +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; -import java.util.ArrayList; import java.util.Map; -import java.util.HashMap; +import java.util.Set; import java.util.regex.Pattern; -import org.jboss.jaxb.intros.configmodel.*; -import org.jboss.jaxb.intros.handlers.*; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlIDREF; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jboss.jaxb.intros.configmodel.ClassIntroConfig; +import org.jboss.jaxb.intros.configmodel.ClassMemberIntroConfig; +import org.jboss.jaxb.intros.configmodel.FieldIntroConfig; +import org.jboss.jaxb.intros.configmodel.JaxbIntros; +import org.jboss.jaxb.intros.configmodel.MethodIntroConfig; +import org.jboss.jaxb.intros.handlers.ClassValue; +import org.jboss.jaxb.intros.handlers.Handler; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; +import com.sun.xml.bind.v2.model.annotation.AbstractInlineAnnotationReaderImpl; +import com.sun.xml.bind.v2.model.annotation.Locatable; +import com.sun.xml.bind.v2.model.annotation.LocatableAnnotation; +import com.sun.xml.bind.v2.model.annotation.RuntimeAnnotationReader; +import com.sun.xml.bind.v2.model.annotation.RuntimeInlineAnnotationReader; /** * JAXB Annotation Reader for the JAXB RI context interface. @@ -45,7 +70,9 @@ * interfaces. * * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a> + * @author <a href="mailto:stf@molindo.at">Stefan Fussenegger</a> */ +@SuppressWarnings("unchecked") public class IntroductionsAnnotationReader extends AbstractInlineAnnotationReaderImpl<Type, Class, Field, Method> implements RuntimeAnnotationReader { @@ -53,6 +80,28 @@ private RuntimeAnnotationReader baseReader = new RuntimeInlineAnnotationReader(); private JaxbIntros introductions; + public static Set<Class<? extends Annotation>> AVAILABLE_CLASS_ANNOTATIONS = IntroductionsAnnotationReader.<Class<? extends Annotation>>unmodifiableSet( + XmlAccessorType.class, + XmlType.class, + XmlRootElement.class, + XmlTransient.class, + XmlJavaTypeAdapter.class + ); + + public static Set<Class<? extends Annotation>> AVAILABLE_MEMBER_ANNOTATIONS = IntroductionsAnnotationReader.<Class<? extends Annotation>>unmodifiableSet( + XmlElement.class, + XmlAttribute.class, + XmlTransient.class, + XmlID.class, + XmlIDREF.class, + XmlElementWrapper.class, + XmlJavaTypeAdapter.class + ); + + private static <T> Set<T> unmodifiableSet(T ... objects) { + return Collections.unmodifiableSet(new HashSet<T>(Arrays.asList(objects))); + } + public IntroductionsAnnotationReader(JaxbIntros introductions) { if (introductions == null) @@ -68,7 +117,7 @@ if (proxy != null) { - return (A)proxy; + return annotation.cast(proxy); } return LocatableAnnotation.create(field.getAnnotation(annotation), srcPos); @@ -88,16 +137,16 @@ public Annotation[] getAllFieldAnnotations(Field field, Locatable srcPos) { - return getAllAnnotations(field, srcPos); + return getAllMemberAnnotations(field, srcPos); } public <A extends Annotation> A getMethodAnnotation(Class<A> annotation, Method method, Locatable srcPos) { - Annotation proxy = getProxy(annotation, method); + A proxy = annotation.cast(getProxy(annotation, method)); if (proxy != null) { - return (A)proxy; + return proxy; } return LocatableAnnotation.create(method.getAnnotation(annotation), srcPos); @@ -117,7 +166,7 @@ public Annotation[] getAllMethodAnnotations(Method method, Locatable srcPos) { - return getAllAnnotations(method, srcPos); + return getAllMemberAnnotations(method, srcPos); } public <A extends Annotation> A getMethodParameterAnnotation(Class<A> annotation, Method method, int paramIndex, Locatable srcPos) @@ -131,7 +180,7 @@ if (proxy != null) { - return (A)proxy; + return annotation.cast(proxy); } return LocatableAnnotation.create(((Class<?>)clazz).getAnnotation(annotation), srcPos); @@ -154,16 +203,16 @@ return baseReader.getPackageAnnotation(a, clazz, srcPos); } - public Class getClassValue(Annotation a, String name) + public Class<?> getClassValue(Annotation a, String name) { if (a instanceof ClassValue) { return ((ClassValue)a).getClassValue(a, name); } - return (Class)baseReader.getClassValue(a, name); + return (Class<?>)baseReader.getClassValue(a, name); } - public Class[] getClassArrayValue(Annotation a, String name) + public Class<?>[] getClassArrayValue(Annotation a, String name) { if (a instanceof ClassValue) { @@ -177,7 +226,7 @@ return m.getDeclaringClass().getName() + '#' + m.getName(); } - private ClassIntroConfig getClassIntroConfig(Class clazz) + private ClassIntroConfig getClassIntroConfig(Class<?> clazz) { String className = clazz.getName(); ClassIntroConfig globalIntro = null; @@ -268,95 +317,48 @@ return pattern.matcher(string).matches(); } - private Annotation getMemberAnnotationProxy(Class annotation, ClassMemberIntroConfig memberIntroConfig) + private <T extends Annotation> T getMemberAnnotationProxy(Class<T> annotationType, ClassMemberIntroConfig memberIntroConfig) { - Annotation proxy = null; - - if (annotation == javax.xml.bind.annotation.XmlAttribute.class) - { - XmlAttributeIntro xmlAttributeIntro = memberIntroConfig.getXmlAttribute(); - if (xmlAttributeIntro != null) - { - proxy = XmlAttributeHandler.createProxy(xmlAttributeIntro); - } - } - else if (annotation == javax.xml.bind.annotation.XmlElement.class) - { - XmlElementIntro xmlElementIntro = memberIntroConfig.getXmlElement(); - if (xmlElementIntro != null) - { - proxy = XmlElementHandler.createProxy(xmlElementIntro); - } - } - - return proxy; + return getAnnotationProxy(annotationType, memberIntroConfig, AVAILABLE_MEMBER_ANNOTATIONS); } - private Annotation getClassAnnotationProxy(Class annotation, ClassIntroConfig classIntroConfig) + private <T extends Annotation> T getClassAnnotationProxy(Class<T> annotationType, ClassIntroConfig classIntroConfig) { - Annotation proxy = null; + return getAnnotationProxy(annotationType, classIntroConfig, AVAILABLE_CLASS_ANNOTATIONS); + } + + private <T extends Annotation> T getAnnotationProxy(Class<T> annotation, Object introConfig, Set<Class<? extends Annotation>> availableAnnotations) + { + T proxy = null; - if (annotation == javax.xml.bind.annotation.XmlAccessorType.class) - { - XmlAccessorTypeIntro xmlAccessorTypeIntro = classIntroConfig.getXmlAccessorType(); - if (xmlAccessorTypeIntro != null) - { - proxy = XmlAccessorTypeHandler.createProxy(xmlAccessorTypeIntro); - } - } - else if (annotation == javax.xml.bind.annotation.XmlType.class) - { - XmlTypeIntro xmlTypeIntro = classIntroConfig.getXmlType(); - if (xmlTypeIntro != null) - { - proxy = XmlTypeHandler.createProxy(xmlTypeIntro); - } - } - else if (annotation == javax.xml.bind.annotation.XmlRootElement.class) - { - XmlRootElementIntro xmlRootElementIntro = classIntroConfig.getXmlRootElement(); - if (xmlRootElementIntro != null) - { - proxy = XmlRootElementHandler.createProxy(xmlRootElementIntro); - } - } - - return proxy; + if (availableAnnotations.contains(annotation)) { + Object intro; + intro = Util.getProperty(introConfig, annotation); + if (intro != null) { + proxy = annotation.cast(Handler.<T>createProxy(annotation, intro)); + } + } + return proxy; } private boolean isMemberAnnotationIntroAvailable(Class<? extends Annotation> annotation, ClassMemberIntroConfig memberIntroConfig) { - if (annotation == javax.xml.bind.annotation.XmlAttribute.class) - { - return (memberIntroConfig.getXmlAttribute() != null); - } - else if (annotation == javax.xml.bind.annotation.XmlElement.class) - { - return (memberIntroConfig.getXmlElement() != null); - } - - return false; + return isAnnotationIntroAvailable(annotation, memberIntroConfig, AVAILABLE_MEMBER_ANNOTATIONS); } private boolean isClassAnnotationIntroAvailable(Class<? extends Annotation> annotation, ClassIntroConfig classIntroConfig) { - if (annotation == javax.xml.bind.annotation.XmlType.class) - { - return (classIntroConfig.getXmlType() != null); - } - else if (annotation == javax.xml.bind.annotation.XmlAccessorType.class) - { - return (classIntroConfig.getXmlAccessorType() != null); - } - else if (annotation == javax.xml.bind.annotation.XmlRootElement.class) - { - return (classIntroConfig.getXmlRootElement() != null); - } + return isAnnotationIntroAvailable(annotation, classIntroConfig, AVAILABLE_CLASS_ANNOTATIONS); + } - return false; + private boolean isAnnotationIntroAvailable(Class<? extends Annotation> annotationType, Object introConfig, Set<Class<? extends Annotation>> availableAnnotations) { + if (availableAnnotations.contains(annotationType)) { + return Util.getProperty(introConfig, annotationType) != null; + } + return false; } - - private Annotation[] getAllAnnotations(Member member, Locatable srcPos) + + private Annotation[] getAllMemberAnnotations(Member member, Locatable srcPos) { Annotation[] r = ((AnnotatedElement)member).getAnnotations(); List<Annotation> annotations = new ArrayList<Annotation>(); @@ -364,7 +366,7 @@ for (int i = 0; i < r.length; i++) { Class<? extends Object> annType = r[i].getClass(); - if (annType == XmlAttribute.class || annType == XmlElement.class) + if (AVAILABLE_MEMBER_ANNOTATIONS.contains(annType)) { // We'll handle these explicitly (below)!! continue; @@ -384,8 +386,9 @@ } if (memberIntroConfig != null) { - addMemberAnnotation(XmlAttribute.class, memberIntroConfig, annotations, member, srcPos); - addMemberAnnotation(XmlElement.class, memberIntroConfig, annotations, member, srcPos); + for (Class<? extends Annotation> annotationType : AVAILABLE_MEMBER_ANNOTATIONS) { + addMemberAnnotation(annotationType, memberIntroConfig, annotations, member, srcPos); + } } r = annotations.toArray(new Annotation[annotations.size()]); @@ -393,7 +396,7 @@ return r; } - private void addMemberAnnotation(Class annotationType, ClassMemberIntroConfig memberIntroConfig, List<Annotation> annotations, Member member, Locatable srcPos) + private void addMemberAnnotation(Class<? extends Annotation> annotationType, ClassMemberIntroConfig memberIntroConfig, List<Annotation> annotations, Member member, Locatable srcPos) { Annotation annotation = getMemberAnnotationProxy(annotationType, memberIntroConfig); if (annotation != null) @@ -410,7 +413,7 @@ } } - private Annotation getProxy(Class annotation, Field field) + private Annotation getProxy(Class<? extends Annotation> annotation, Field field) { FieldIntroConfig fieldIntroConfig = getFieldIntroConfig(field); @@ -426,13 +429,14 @@ return null; } - private Annotation getProxy(Class annotation, Method method) + +private <T extends Annotation> T getProxy(Class<T> annotation, Method method) { MethodIntroConfig methodIntroConfig = getMethodIntroConfig(method); if (methodIntroConfig != null) { - Annotation proxy = getMemberAnnotationProxy(annotation, methodIntroConfig); + T proxy = getMemberAnnotationProxy(annotation, methodIntroConfig); if (proxy != null) { return proxy; @@ -442,13 +446,13 @@ return null; } - private Annotation getProxy(Class annotation, Class clazz) + private <T extends Annotation> T getProxy(Class<T> annotation, Class<?> clazz) { ClassIntroConfig classIntroConfig = getClassIntroConfig(clazz); if (classIntroConfig != null) { - Annotation proxy = getClassAnnotationProxy(annotation, classIntroConfig); + T proxy = getClassAnnotationProxy(annotation, classIntroConfig); if (proxy != null) { return proxy; @@ -457,6 +461,4 @@ return null; } - - } Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/IntroductionsConfigParser.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/IntroductionsConfigParser.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/IntroductionsConfigParser.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -19,13 +19,14 @@ */ package org.jboss.jaxb.intros; -import org.jboss.jaxb.intros.configmodel.JaxbIntros; +import java.io.InputStream; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; -import java.io.InputStream; +import org.jboss.jaxb.intros.configmodel.JaxbIntros; + /** * Configuration Parser for a JBossESB JAXB Annotations Introduction Configuration. * Added: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/Util.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/Util.java (rev 0) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/Util.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -0,0 +1,70 @@ +package org.jboss.jaxb.intros; + +import java.lang.annotation.Annotation; + +import org.apache.commons.beanutils.ConvertUtilsBean; +import org.apache.commons.beanutils.PropertyUtils; + +public class Util { + private static final ConvertUtilsBean CONVERT_UTILS = new ConvertUtilsBean(); + + private Util() { + + } + + public static Object getProperty(Object obj, String name) { + try { + return PropertyUtils.getProperty(obj, name); + } catch (Exception e) { + throw new RuntimeException(String.format("failed to get property %s from object %s", name, obj), e); + } + } + + public static Object getProperty(Object obj, Class<? extends Annotation> annotation) { + return getProperty(obj, getPropertyName(annotation)); + } + + private static String getPropertyName(Class<?> cls) { + String name = cls.getSimpleName(); + if (name.length() == 1) { + return name.toLowerCase(); + } else { + return name.substring(0,1).toLowerCase() + name.substring(1); + } + } + + public static Object convert(Object value, Class<?> returnType) { + if (value == null) { + return null; + } + if (value != null && !nonPrimitive(returnType).isAssignableFrom(nonPrimitive(value.getClass()))) { + if (returnType.isEnum()) { + return convertEnum(returnType, value.toString()); + } + value = CONVERT_UTILS.convert(value.toString(), returnType); + } + // don't cast due to (possibly necessary) auto-unboxing + return value; + } + + @SuppressWarnings("unchecked") + private static Object convertEnum(Class returnType, String value) { + return Enum.valueOf(returnType, value); + } + + public static Class<?> nonPrimitive(Class<?> cls) { + if (!cls.isPrimitive()) { + return cls; + } + if (boolean.class == cls) return Boolean.class; + if (byte.class == cls) return Byte.class; + if (char.class == cls) return Character.class; + if (short.class == cls) return Short.class; + if (int.class == cls) return Integer.class; + if (long.class == cls) return Long.class; + if (float.class == cls) return Float.class; + if (byte.class == cls) return Double.class; + if (void.class == cls) return Void.class; + throw new RuntimeException("undiscovered primitive type? " + cls.getName()); + } +} Property changes on: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/Util.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/ClassIntroConfig.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/ClassIntroConfig.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/ClassIntroConfig.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.4-b02-fcs +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2007.08.21 at 10:20:40 PM GMT +// Generated on: 2009.09.04 at 10:24:07 AM CEST // @@ -20,9 +20,9 @@ /** * <p>Java class for Class complex type. - * <p/> + * * <p>The following schema fragment specifies the expected content contained within this class. - * <p/> + * * <pre> * &lt;complexType name="Class"> * &lt;complexContent> @@ -31,6 +31,8 @@ * &lt;element ref="{http://www.jboss.org/xsd/jaxb/intros}XmlAccessorType" minOccurs="0"/> * &lt;element ref="{http://www.jboss.org/xsd/jaxb/intros}XmlType" minOccurs="0"/> * &lt;element ref="{http://www.jboss.org/xsd/jaxb/intros}XmlRootElement" minOccurs="0"/> + * &lt;element ref="{http://www.jboss.org/xsd/jaxb/intros}XmlTransient" minOccurs="0"/> + * &lt;element ref="{http://www.jboss.org/xsd/jaxb/intros}XmlJavaTypeAdapter" minOccurs="0"/> * &lt;element ref="{http://www.jboss.org/xsd/jaxb/intros}Field" maxOccurs="unbounded" minOccurs="0"/> * &lt;element ref="{http://www.jboss.org/xsd/jaxb/intros}Method" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> @@ -39,176 +41,239 @@ * &lt;/complexContent> * &lt;/complexType> * </pre> + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "Class", propOrder = { - "xmlAccessorType", - "xmlType", - "xmlRootElement", - "field", - "method" - }) -public class ClassIntroConfig -{ + "xmlAccessorType", + "xmlType", + "xmlRootElement", + "xmlTransient", + "xmlJavaTypeAdapter", + "field", + "method" +}) +public class ClassIntroConfig { - @XmlElement(name = "XmlAccessorType") - protected XmlAccessorTypeIntro xmlAccessorType; - @XmlElement(name = "XmlType") - protected XmlTypeIntro xmlType; - @XmlElement(name = "XmlRootElement") - protected XmlRootElementIntro xmlRootElement; - @XmlElement(name = "Field") - protected List<FieldIntroConfig> field; - @XmlElement(name = "Method") - protected List<MethodIntroConfig> method; - @XmlAttribute(required = true) - @XmlSchemaType(name = "anySimpleType") - protected String name; + @XmlElement(name = "XmlAccessorType") + protected XmlAccessorTypeIntro xmlAccessorType; + @XmlElement(name = "XmlType") + protected XmlTypeIntro xmlType; + @XmlElement(name = "XmlRootElement") + protected XmlRootElementIntro xmlRootElement; + @XmlElement(name = "XmlTransient") + protected XmlTransientIntro xmlTransient; + @XmlElement(name = "XmlJavaTypeAdapter") + protected XmlJavaTypeAdapterIntro xmlJavaTypeAdapter; + @XmlElement(name = "Field") + protected List<FieldIntroConfig> field; + @XmlElement(name = "Method") + protected List<MethodIntroConfig> method; + @XmlAttribute(required = true) + @XmlSchemaType(name = "anySimpleType") + protected String name; - /** - * Gets the value of the xmlAccessorType property. - * - * @return possible object is - * {@link XmlAccessorTypeIntro } - */ - public XmlAccessorTypeIntro getXmlAccessorType() - { - return xmlAccessorType; - } + /** + * Gets the value of the xmlAccessorType property. + * + * @return + * possible object is + * {@link XmlAccessorTypeIntro } + * + */ + public XmlAccessorTypeIntro getXmlAccessorType() { + return xmlAccessorType; + } - /** - * Sets the value of the xmlAccessorType property. - * - * @param value allowed object is - * {@link XmlAccessorTypeIntro } - */ - public void setXmlAccessorType(XmlAccessorTypeIntro value) - { - this.xmlAccessorType = value; - } + /** + * Sets the value of the xmlAccessorType property. + * + * @param value + * allowed object is + * {@link XmlAccessorTypeIntro } + * + */ + public void setXmlAccessorType(XmlAccessorTypeIntro value) { + this.xmlAccessorType = value; + } - /** - * Gets the value of the xmlType property. - * - * @return possible object is - * {@link XmlTypeIntro } - */ - public XmlTypeIntro getXmlType() - { - return xmlType; - } + /** + * Gets the value of the xmlType property. + * + * @return + * possible object is + * {@link XmlTypeIntro } + * + */ + public XmlTypeIntro getXmlType() { + return xmlType; + } - /** - * Sets the value of the xmlType property. - * - * @param value allowed object is - * {@link XmlTypeIntro } - */ - public void setXmlType(XmlTypeIntro value) - { - this.xmlType = value; - } + /** + * Sets the value of the xmlType property. + * + * @param value + * allowed object is + * {@link XmlTypeIntro } + * + */ + public void setXmlType(XmlTypeIntro value) { + this.xmlType = value; + } - /** - * Gets the value of the xmlRootElement property. - * - * @return possible object is - * {@link XmlRootElementIntro } - */ - public XmlRootElementIntro getXmlRootElement() - { - return xmlRootElement; - } + /** + * Gets the value of the xmlRootElement property. + * + * @return + * possible object is + * {@link XmlRootElementIntro } + * + */ + public XmlRootElementIntro getXmlRootElement() { + return xmlRootElement; + } - /** - * Sets the value of the xmlRootElement property. - * - * @param value allowed object is - * {@link XmlRootElementIntro } - */ - public void setXmlRootElement(XmlRootElementIntro value) - { - this.xmlRootElement = value; - } + /** + * Sets the value of the xmlRootElement property. + * + * @param value + * allowed object is + * {@link XmlRootElementIntro } + * + */ + public void setXmlRootElement(XmlRootElementIntro value) { + this.xmlRootElement = value; + } - /** - * Gets the value of the field property. - * <p/> - * <p/> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the field property. - * <p/> - * <p/> - * For example, to add a new item, do as follows: - * <pre> - * getField().add(newItem); - * </pre> - * <p/> - * <p/> - * <p/> - * Objects of the following type(s) are allowed in the list - * {@link FieldIntroConfig } - */ - public List<FieldIntroConfig> getField() - { - if (field == null) - { - field = new ArrayList<FieldIntroConfig>(); - } - return this.field; - } + /** + * Gets the value of the xmlTransient property. + * + * @return + * possible object is + * {@link XmlTransientIntro } + * + */ + public XmlTransientIntro getXmlTransient() { + return xmlTransient; + } - /** - * Gets the value of the method property. - * <p/> - * <p/> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the method property. - * <p/> - * <p/> - * For example, to add a new item, do as follows: - * <pre> - * getMethod().add(newItem); - * </pre> - * <p/> - * <p/> - * <p/> - * Objects of the following type(s) are allowed in the list - * {@link MethodIntroConfig } - */ - public List<MethodIntroConfig> getMethod() - { - if (method == null) - { - method = new ArrayList<MethodIntroConfig>(); - } - return this.method; - } + /** + * Sets the value of the xmlTransient property. + * + * @param value + * allowed object is + * {@link XmlTransientIntro } + * + */ + public void setXmlTransient(XmlTransientIntro value) { + this.xmlTransient = value; + } - /** - * Gets the value of the name property. - * - * @return possible object is - * {@link String } - */ - public String getName() - { - return name; - } + /** + * Gets the value of the xmlJavaTypeAdapter property. + * + * @return + * possible object is + * {@link XmlJavaTypeAdapterIntro } + * + */ + public XmlJavaTypeAdapterIntro getXmlJavaTypeAdapter() { + return xmlJavaTypeAdapter; + } - /** - * Sets the value of the name property. - * - * @param value allowed object is - * {@link String } - */ - public void setName(String value) - { - this.name = value; - } + /** + * Sets the value of the xmlJavaTypeAdapter property. + * + * @param value + * allowed object is + * {@link XmlJavaTypeAdapterIntro } + * + */ + public void setXmlJavaTypeAdapter(XmlJavaTypeAdapterIntro value) { + this.xmlJavaTypeAdapter = value; + } + /** + * Gets the value of the field property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the field property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getField().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link FieldIntroConfig } + * + * + */ + public List<FieldIntroConfig> getField() { + if (field == null) { + field = new ArrayList<FieldIntroConfig>(); + } + return this.field; + } + + /** + * Gets the value of the method property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the method property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getMethod().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link MethodIntroConfig } + * + * + */ + public List<MethodIntroConfig> getMethod() { + if (method == null) { + method = new ArrayList<MethodIntroConfig>(); + } + return this.method; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + } Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/ClassMemberIntroConfig.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/ClassMemberIntroConfig.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/ClassMemberIntroConfig.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.4-b02-fcs +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2007.08.21 at 10:20:40 PM GMT +// Generated on: 2009.09.04 at 10:24:07 AM CEST // @@ -19,11 +19,11 @@ /** * Java Class Member (Field, Method Constructor) JAXB Annotation Introductions configuration base type. - * <p/> + * * <p>Java class for class-member-intro-config complex type. - * <p/> + * * <p>The following schema fragment specifies the expected content contained within this class. - * <p/> + * * <pre> * &lt;complexType name="class-member-intro-config"> * &lt;complexContent> @@ -31,97 +31,244 @@ * &lt;sequence> * &lt;element ref="{http://www.jboss.org/xsd/jaxb/intros}XmlElement" minOccurs="0"/> * &lt;element ref="{http://www.jboss.org/xsd/jaxb/intros}XmlAttribute" minOccurs="0"/> + * &lt;element ref="{http://www.jboss.org/xsd/jaxb/intros}XmlTransient" minOccurs="0"/> + * &lt;element ref="{http://www.jboss.org/xsd/jaxb/intros}XmlID" minOccurs="0"/> + * &lt;element ref="{http://www.jboss.org/xsd/jaxb/intros}XmlIDREF" minOccurs="0"/> + * &lt;element ref="{http://www.jboss.org/xsd/jaxb/intros}XmlElementWrapper" minOccurs="0"/> + * &lt;element ref="{http://www.jboss.org/xsd/jaxb/intros}XmlJavaTypeAdapter" minOccurs="0"/> * &lt;/sequence> * &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" /> * &lt;/restriction> * &lt;/complexContent> * &lt;/complexType> * </pre> + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "class-member-intro-config", propOrder = { - "xmlElement", - "xmlAttribute" - }) + "xmlElement", + "xmlAttribute", + "xmlTransient", + "xmlID", + "xmlIDREF", + "xmlElementWrapper", + "xmlJavaTypeAdapter" +}) @XmlSeeAlso({ - MethodIntroConfig.class, - FieldIntroConfig.class - }) -public class ClassMemberIntroConfig -{ + FieldIntroConfig.class, + MethodIntroConfig.class +}) +public class ClassMemberIntroConfig { - @XmlElement(name = "XmlElement") - protected XmlElementIntro xmlElement; - @XmlElement(name = "XmlAttribute") - protected XmlAttributeIntro xmlAttribute; - @XmlAttribute(required = true) - @XmlSchemaType(name = "anySimpleType") - protected String name; + @XmlElement(name = "XmlElement") + protected XmlElementIntro xmlElement; + @XmlElement(name = "XmlAttribute") + protected XmlAttributeIntro xmlAttribute; + @XmlElement(name = "XmlTransient") + protected XmlTransientIntro xmlTransient; + @XmlElement(name = "XmlID") + protected XmlIDIntro xmlID; + @XmlElement(name = "XmlIDREF") + protected XmlIDREFIntro xmlIDREF; + @XmlElement(name = "XmlElementWrapper") + protected XmlElementWrapperIntro xmlElementWrapper; + @XmlElement(name = "XmlJavaTypeAdapter") + protected XmlJavaTypeAdapterIntro xmlJavaTypeAdapter; + @XmlAttribute(required = true) + @XmlSchemaType(name = "anySimpleType") + protected String name; - /** - * Gets the value of the xmlElement property. - * - * @return possible object is - * {@link XmlElementIntro } - */ - public XmlElementIntro getXmlElement() - { - return xmlElement; - } + /** + * Gets the value of the xmlElement property. + * + * @return + * possible object is + * {@link XmlElementIntro } + * + */ + public XmlElementIntro getXmlElement() { + return xmlElement; + } - /** - * Sets the value of the xmlElement property. - * - * @param value allowed object is - * {@link XmlElementIntro } - */ - public void setXmlElement(XmlElementIntro value) - { - this.xmlElement = value; - } + /** + * Sets the value of the xmlElement property. + * + * @param value + * allowed object is + * {@link XmlElementIntro } + * + */ + public void setXmlElement(XmlElementIntro value) { + this.xmlElement = value; + } - /** - * Gets the value of the xmlAttribute property. - * - * @return possible object is - * {@link XmlAttributeIntro } - */ - public XmlAttributeIntro getXmlAttribute() - { - return xmlAttribute; - } + /** + * Gets the value of the xmlAttribute property. + * + * @return + * possible object is + * {@link XmlAttributeIntro } + * + */ + public XmlAttributeIntro getXmlAttribute() { + return xmlAttribute; + } - /** - * Sets the value of the xmlAttribute property. - * - * @param value allowed object is - * {@link XmlAttributeIntro } - */ - public void setXmlAttribute(XmlAttributeIntro value) - { - this.xmlAttribute = value; - } + /** + * Sets the value of the xmlAttribute property. + * + * @param value + * allowed object is + * {@link XmlAttributeIntro } + * + */ + public void setXmlAttribute(XmlAttributeIntro value) { + this.xmlAttribute = value; + } - /** - * Gets the value of the name property. - * - * @return possible object is - * {@link String } - */ - public String getName() - { - return name; - } + /** + * Gets the value of the xmlTransient property. + * + * @return + * possible object is + * {@link XmlTransientIntro } + * + */ + public XmlTransientIntro getXmlTransient() { + return xmlTransient; + } - /** - * Sets the value of the name property. - * - * @param value allowed object is - * {@link String } - */ - public void setName(String value) - { - this.name = value; - } + /** + * Sets the value of the xmlTransient property. + * + * @param value + * allowed object is + * {@link XmlTransientIntro } + * + */ + public void setXmlTransient(XmlTransientIntro value) { + this.xmlTransient = value; + } + /** + * Gets the value of the xmlID property. + * + * @return + * possible object is + * {@link XmlIDIntro } + * + */ + public XmlIDIntro getXmlID() { + return xmlID; + } + + /** + * Sets the value of the xmlID property. + * + * @param value + * allowed object is + * {@link XmlIDIntro } + * + */ + public void setXmlID(XmlIDIntro value) { + this.xmlID = value; + } + + /** + * Gets the value of the xmlIDREF property. + * + * @return + * possible object is + * {@link XmlIDREFIntro } + * + */ + public XmlIDREFIntro getXmlIDREF() { + return xmlIDREF; + } + + /** + * Sets the value of the xmlIDREF property. + * + * @param value + * allowed object is + * {@link XmlIDREFIntro } + * + */ + public void setXmlIDREF(XmlIDREFIntro value) { + this.xmlIDREF = value; + } + + /** + * Gets the value of the xmlElementWrapper property. + * + * @return + * possible object is + * {@link XmlElementWrapperIntro } + * + */ + public XmlElementWrapperIntro getXmlElementWrapper() { + return xmlElementWrapper; + } + + /** + * Sets the value of the xmlElementWrapper property. + * + * @param value + * allowed object is + * {@link XmlElementWrapperIntro } + * + */ + public void setXmlElementWrapper(XmlElementWrapperIntro value) { + this.xmlElementWrapper = value; + } + + /** + * Gets the value of the xmlJavaTypeAdapter property. + * + * @return + * possible object is + * {@link XmlJavaTypeAdapterIntro } + * + */ + public XmlJavaTypeAdapterIntro getXmlJavaTypeAdapter() { + return xmlJavaTypeAdapter; + } + + /** + * Sets the value of the xmlJavaTypeAdapter property. + * + * @param value + * allowed object is + * {@link XmlJavaTypeAdapterIntro } + * + */ + public void setXmlJavaTypeAdapter(XmlJavaTypeAdapterIntro value) { + this.xmlJavaTypeAdapter = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + } Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/FieldIntroConfig.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/FieldIntroConfig.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/FieldIntroConfig.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.4-b02-fcs +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2007.08.21 at 10:20:40 PM GMT +// Generated on: 2009.09.04 at 10:24:07 AM CEST // @@ -15,9 +15,9 @@ /** * <p>Java class for Field complex type. - * <p/> + * * <p>The following schema fragment specifies the expected content contained within this class. - * <p/> + * * <pre> * &lt;complexType name="Field"> * &lt;complexContent> @@ -26,11 +26,13 @@ * &lt;/complexContent> * &lt;/complexType> * </pre> + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "Field") public class FieldIntroConfig - extends ClassMemberIntroConfig + extends ClassMemberIntroConfig { Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/JaxbIntros.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/JaxbIntros.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/JaxbIntros.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.4-b02-fcs +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2007.08.21 at 10:20:40 PM GMT +// Generated on: 2009.09.04 at 10:24:07 AM CEST // @@ -21,9 +21,9 @@ /** * <p>Java class for anonymous complex type. - * <p/> + * * <p>The following schema fragment specifies the expected content contained within this class. - * <p/> + * * <pre> * &lt;complexType> * &lt;complexContent> @@ -36,70 +36,73 @@ * &lt;/complexContent> * &lt;/complexType> * </pre> + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "clazz" - }) + "clazz" +}) @XmlRootElement(name = "jaxb-intros") -public class JaxbIntros -{ +public class JaxbIntros { - @XmlElement(name = "Class", required = true) - protected List<ClassIntroConfig> clazz; - @XmlAttribute(name = "default-namespace") - @XmlSchemaType(name = "anySimpleType") - protected String defaultNamespace; + @XmlElement(name = "Class", required = true) + protected List<ClassIntroConfig> clazz; + @XmlAttribute(name = "default-namespace") + @XmlSchemaType(name = "anySimpleType") + protected String defaultNamespace; - /** - * Gets the value of the clazz property. - * <p/> - * <p/> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the clazz property. - * <p/> - * <p/> - * For example, to add a new item, do as follows: - * <pre> - * getClazz().add(newItem); - * </pre> - * <p/> - * <p/> - * <p/> - * Objects of the following type(s) are allowed in the list - * {@link ClassIntroConfig } - */ - public List<ClassIntroConfig> getClazz() - { - if (clazz == null) - { - clazz = new ArrayList<ClassIntroConfig>(); - } - return this.clazz; - } + /** + * Gets the value of the clazz property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the clazz property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getClazz().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link ClassIntroConfig } + * + * + */ + public List<ClassIntroConfig> getClazz() { + if (clazz == null) { + clazz = new ArrayList<ClassIntroConfig>(); + } + return this.clazz; + } - /** - * Gets the value of the defaultNamespace property. - * - * @return possible object is - * {@link String } - */ - public String getDefaultNamespace() - { - return defaultNamespace; - } + /** + * Gets the value of the defaultNamespace property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDefaultNamespace() { + return defaultNamespace; + } - /** - * Sets the value of the defaultNamespace property. - * - * @param value allowed object is - * {@link String } - */ - public void setDefaultNamespace(String value) - { - this.defaultNamespace = value; - } + /** + * Sets the value of the defaultNamespace property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDefaultNamespace(String value) { + this.defaultNamespace = value; + } } Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/MethodIntroConfig.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/MethodIntroConfig.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/MethodIntroConfig.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.4-b02-fcs +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2007.08.21 at 10:20:40 PM GMT +// Generated on: 2009.09.04 at 10:24:07 AM CEST // @@ -15,9 +15,9 @@ /** * <p>Java class for Method complex type. - * <p/> + * * <p>The following schema fragment specifies the expected content contained within this class. - * <p/> + * * <pre> * &lt;complexType name="Method"> * &lt;complexContent> @@ -26,11 +26,13 @@ * &lt;/complexContent> * &lt;/complexType> * </pre> + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "Method") public class MethodIntroConfig - extends ClassMemberIntroConfig + extends ClassMemberIntroConfig { Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/ObjectFactory.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/ObjectFactory.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/ObjectFactory.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.4-b02-fcs +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2007.08.21 at 10:20:40 PM GMT +// Generated on: 2009.09.04 at 10:24:07 AM CEST // @@ -15,198 +15,288 @@ /** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.jboss.jaxb.intros.configmodel package. - * <p>An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.jaxb.intros.configmodel package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are * provided in this class. + * */ @XmlRegistry -public class ObjectFactory -{ +public class ObjectFactory { - private final static QName _XmlElement_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlElement"); - private final static QName _XmlRootElement_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlRootElement"); - private final static QName _Class_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "Class"); - private final static QName _XmlType_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlType"); - private final static QName _XmlAttribute_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlAttribute"); - private final static QName _Method_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "Method"); - private final static QName _Field_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "Field"); - private final static QName _XmlAccessorType_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlAccessorType"); - private final static QName _ClassMemberIntroConfig_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "class-member-intro-config"); + private final static QName _ClassMemberIntroConfig_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "class-member-intro-config"); + private final static QName _XmlJavaTypeAdapter_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlJavaTypeAdapter"); + private final static QName _Field_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "Field"); + private final static QName _XmlElementWrapper_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlElementWrapper"); + private final static QName _Method_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "Method"); + private final static QName _XmlIDREF_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlIDREF"); + private final static QName _XmlElement_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlElement"); + private final static QName _XmlAttribute_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlAttribute"); + private final static QName _XmlRootElement_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlRootElement"); + private final static QName _XmlType_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlType"); + private final static QName _XmlTransient_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlTransient"); + private final static QName _XmlID_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlID"); + private final static QName _Class_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "Class"); + private final static QName _XmlAccessorType_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros";, "XmlAccessorType"); - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.jaxb.intros.configmodel - */ - public ObjectFactory() - { - } + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.jaxb.intros.configmodel + * + */ + public ObjectFactory() { + } - /** - * Create an instance of {@link ClassIntroConfig } - */ - public ClassIntroConfig createClassIntroConfig() - { - return new ClassIntroConfig(); - } + /** + * Create an instance of {@link XmlRootElementIntro } + * + */ + public XmlRootElementIntro createXmlRootElementIntro() { + return new XmlRootElementIntro(); + } - /** - * Create an instance of {@link FieldIntroConfig } - */ - public FieldIntroConfig createFieldIntroConfig() - { - return new FieldIntroConfig(); - } + /** + * Create an instance of {@link FieldIntroConfig } + * + */ + public FieldIntroConfig createFieldIntroConfig() { + return new FieldIntroConfig(); + } - /** - * Create an instance of {@link XmlAttributeIntro } - */ - public XmlAttributeIntro createXmlAttributeIntro() - { - return new XmlAttributeIntro(); - } + /** + * Create an instance of {@link XmlIDIntro } + * + */ + public XmlIDIntro createXmlIDIntro() { + return new XmlIDIntro(); + } - /** - * Create an instance of {@link JaxbIntros } - */ - public JaxbIntros createJaxbIntros() - { - return new JaxbIntros(); - } + /** + * Create an instance of {@link XmlAccessorTypeIntro } + * + */ + public XmlAccessorTypeIntro createXmlAccessorTypeIntro() { + return new XmlAccessorTypeIntro(); + } - /** - * Create an instance of {@link XmlRootElementIntro } - */ - public XmlRootElementIntro createXmlRootElementIntro() - { - return new XmlRootElementIntro(); - } + /** + * Create an instance of {@link JaxbIntros } + * + */ + public JaxbIntros createJaxbIntros() { + return new JaxbIntros(); + } - /** - * Create an instance of {@link XmlElementIntro } - */ - public XmlElementIntro createXmlElementIntro() - { - return new XmlElementIntro(); - } + /** + * Create an instance of {@link XmlJavaTypeAdapterIntro } + * + */ + public XmlJavaTypeAdapterIntro createXmlJavaTypeAdapterIntro() { + return new XmlJavaTypeAdapterIntro(); + } - /** - * Create an instance of {@link MethodIntroConfig } - */ - public MethodIntroConfig createMethodIntroConfig() - { - return new MethodIntroConfig(); - } + /** + * Create an instance of {@link ClassMemberIntroConfig } + * + */ + public ClassMemberIntroConfig createClassMemberIntroConfig() { + return new ClassMemberIntroConfig(); + } - /** - * Create an instance of {@link ClassMemberIntroConfig } - */ - public ClassMemberIntroConfig createClassMemberIntroConfig() - { - return new ClassMemberIntroConfig(); - } + /** + * Create an instance of {@link XmlElementIntro } + * + */ + public XmlElementIntro createXmlElementIntro() { + return new XmlElementIntro(); + } - /** - * Create an instance of {@link XmlTypeIntro } - */ - public XmlTypeIntro createXmlTypeIntro() - { - return new XmlTypeIntro(); - } + /** + * Create an instance of {@link XmlTypeIntro } + * + */ + public XmlTypeIntro createXmlTypeIntro() { + return new XmlTypeIntro(); + } - /** - * Create an instance of {@link XmlAccessorTypeIntro } - */ - public XmlAccessorTypeIntro createXmlAccessorTypeIntro() - { - return new XmlAccessorTypeIntro(); - } + /** + * Create an instance of {@link XmlAttributeIntro } + * + */ + public XmlAttributeIntro createXmlAttributeIntro() { + return new XmlAttributeIntro(); + } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link XmlElementIntro }{@code >}} - */ - @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlElement") - public JAXBElement<XmlElementIntro> createXmlElement(XmlElementIntro value) - { - return new JAXBElement<XmlElementIntro>(_XmlElement_QNAME, XmlElementIntro.class, null, value); - } + /** + * Create an instance of {@link MethodIntroConfig } + * + */ + public MethodIntroConfig createMethodIntroConfig() { + return new MethodIntroConfig(); + } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link XmlRootElementIntro }{@code >}} - */ - @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlRootElement") - public JAXBElement<XmlRootElementIntro> createXmlRootElement(XmlRootElementIntro value) - { - return new JAXBElement<XmlRootElementIntro>(_XmlRootElement_QNAME, XmlRootElementIntro.class, null, value); - } + /** + * Create an instance of {@link ClassIntroConfig } + * + */ + public ClassIntroConfig createClassIntroConfig() { + return new ClassIntroConfig(); + } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ClassIntroConfig }{@code >}} - */ - @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "Class") - public JAXBElement<ClassIntroConfig> createClass(ClassIntroConfig value) - { - return new JAXBElement<ClassIntroConfig>(_Class_QNAME, ClassIntroConfig.class, null, value); - } + /** + * Create an instance of {@link XmlElementWrapperIntro } + * + */ + public XmlElementWrapperIntro createXmlElementWrapperIntro() { + return new XmlElementWrapperIntro(); + } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link XmlTypeIntro }{@code >}} - */ - @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlType") - public JAXBElement<XmlTypeIntro> createXmlType(XmlTypeIntro value) - { - return new JAXBElement<XmlTypeIntro>(_XmlType_QNAME, XmlTypeIntro.class, null, value); - } + /** + * Create an instance of {@link XmlTransientIntro } + * + */ + public XmlTransientIntro createXmlTransientIntro() { + return new XmlTransientIntro(); + } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link XmlAttributeIntro }{@code >}} - */ - @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlAttribute") - public JAXBElement<XmlAttributeIntro> createXmlAttribute(XmlAttributeIntro value) - { - return new JAXBElement<XmlAttributeIntro>(_XmlAttribute_QNAME, XmlAttributeIntro.class, null, value); - } + /** + * Create an instance of {@link XmlIDREFIntro } + * + */ + public XmlIDREFIntro createXmlIDREFIntro() { + return new XmlIDREFIntro(); + } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link MethodIntroConfig }{@code >}} - */ - @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "Method", substitutionHeadNamespace = "http://www.jboss.org/xsd/jaxb/intros", substitutionHeadName = "class-member-intro-config") - public JAXBElement<MethodIntroConfig> createMethod(MethodIntroConfig value) - { - return new JAXBElement<MethodIntroConfig>(_Method_QNAME, MethodIntroConfig.class, null, value); - } + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "class-member-intro-config") + public JAXBElement<Object> createClassMemberIntroConfig(Object value) { + return new JAXBElement<Object>(_ClassMemberIntroConfig_QNAME, Object.class, null, value); + } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link FieldIntroConfig }{@code >}} - */ - @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "Field", substitutionHeadNamespace = "http://www.jboss.org/xsd/jaxb/intros", substitutionHeadName = "class-member-intro-config") - public JAXBElement<FieldIntroConfig> createField(FieldIntroConfig value) - { - return new JAXBElement<FieldIntroConfig>(_Field_QNAME, FieldIntroConfig.class, null, value); - } + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XmlJavaTypeAdapterIntro }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlJavaTypeAdapter") + public JAXBElement<XmlJavaTypeAdapterIntro> createXmlJavaTypeAdapter(XmlJavaTypeAdapterIntro value) { + return new JAXBElement<XmlJavaTypeAdapterIntro>(_XmlJavaTypeAdapter_QNAME, XmlJavaTypeAdapterIntro.class, null, value); + } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link XmlAccessorTypeIntro }{@code >}} - */ - @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlAccessorType") - public JAXBElement<XmlAccessorTypeIntro> createXmlAccessorType(XmlAccessorTypeIntro value) - { - return new JAXBElement<XmlAccessorTypeIntro>(_XmlAccessorType_QNAME, XmlAccessorTypeIntro.class, null, value); - } + /** + * Create an instance of {@link JAXBElement }{@code <}{@link FieldIntroConfig }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "Field", substitutionHeadNamespace = "http://www.jboss.org/xsd/jaxb/intros", substitutionHeadName = "class-member-intro-config") + public JAXBElement<FieldIntroConfig> createField(FieldIntroConfig value) { + return new JAXBElement<FieldIntroConfig>(_Field_QNAME, FieldIntroConfig.class, null, value); + } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}} - */ - @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "class-member-intro-config") - public JAXBElement<Object> createClassMemberIntroConfig(Object value) - { - return new JAXBElement<Object>(_ClassMemberIntroConfig_QNAME, Object.class, null, value); - } + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XmlElementWrapperIntro }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlElementWrapper") + public JAXBElement<XmlElementWrapperIntro> createXmlElementWrapper(XmlElementWrapperIntro value) { + return new JAXBElement<XmlElementWrapperIntro>(_XmlElementWrapper_QNAME, XmlElementWrapperIntro.class, null, value); + } + /** + * Create an instance of {@link JAXBElement }{@code <}{@link MethodIntroConfig }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "Method", substitutionHeadNamespace = "http://www.jboss.org/xsd/jaxb/intros", substitutionHeadName = "class-member-intro-config") + public JAXBElement<MethodIntroConfig> createMethod(MethodIntroConfig value) { + return new JAXBElement<MethodIntroConfig>(_Method_QNAME, MethodIntroConfig.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XmlIDREFIntro }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlIDREF") + public JAXBElement<XmlIDREFIntro> createXmlIDREF(XmlIDREFIntro value) { + return new JAXBElement<XmlIDREFIntro>(_XmlIDREF_QNAME, XmlIDREFIntro.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XmlElementIntro }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlElement") + public JAXBElement<XmlElementIntro> createXmlElement(XmlElementIntro value) { + return new JAXBElement<XmlElementIntro>(_XmlElement_QNAME, XmlElementIntro.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XmlAttributeIntro }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlAttribute") + public JAXBElement<XmlAttributeIntro> createXmlAttribute(XmlAttributeIntro value) { + return new JAXBElement<XmlAttributeIntro>(_XmlAttribute_QNAME, XmlAttributeIntro.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XmlRootElementIntro }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlRootElement") + public JAXBElement<XmlRootElementIntro> createXmlRootElement(XmlRootElementIntro value) { + return new JAXBElement<XmlRootElementIntro>(_XmlRootElement_QNAME, XmlRootElementIntro.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XmlTypeIntro }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlType") + public JAXBElement<XmlTypeIntro> createXmlType(XmlTypeIntro value) { + return new JAXBElement<XmlTypeIntro>(_XmlType_QNAME, XmlTypeIntro.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XmlTransientIntro }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlTransient") + public JAXBElement<XmlTransientIntro> createXmlTransient(XmlTransientIntro value) { + return new JAXBElement<XmlTransientIntro>(_XmlTransient_QNAME, XmlTransientIntro.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XmlIDIntro }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlID") + public JAXBElement<XmlIDIntro> createXmlID(XmlIDIntro value) { + return new JAXBElement<XmlIDIntro>(_XmlID_QNAME, XmlIDIntro.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ClassIntroConfig }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "Class") + public JAXBElement<ClassIntroConfig> createClass(ClassIntroConfig value) { + return new JAXBElement<ClassIntroConfig>(_Class_QNAME, ClassIntroConfig.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XmlAccessorTypeIntro }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlAccessorType") + public JAXBElement<XmlAccessorTypeIntro> createXmlAccessorType(XmlAccessorTypeIntro value) { + return new JAXBElement<XmlAccessorTypeIntro>(_XmlAccessorType_QNAME, XmlAccessorTypeIntro.class, null, value); + } + } Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAccessorTypeIntro.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAccessorTypeIntro.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAccessorTypeIntro.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.4-b02-fcs +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2007.08.21 at 10:20:40 PM GMT +// Generated on: 2009.09.04 at 10:24:07 AM CEST // @@ -18,9 +18,9 @@ /** * <p>Java class for XmlAccessorType complex type. - * <p/> + * * <p>The following schema fragment specifies the expected content contained within this class. - * <p/> + * * <pre> * &lt;complexType name="XmlAccessorType"> * &lt;complexContent> @@ -39,43 +39,43 @@ * &lt;/complexContent> * &lt;/complexType> * </pre> + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "XmlAccessorType") -public class XmlAccessorTypeIntro -{ +public class XmlAccessorTypeIntro { - @XmlAttribute - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - protected String value; + @XmlAttribute + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String value; - /** - * Gets the value of the value property. - * - * @return possible object is - * {@link String } - */ - public String getValue() - { - if (value == null) - { - return "NONE"; - } - else - { - return value; - } - } + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + if (value == null) { + return "NONE"; + } else { + return value; + } + } - /** - * Sets the value of the value property. - * - * @param value allowed object is - * {@link String } - */ - public void setValue(String value) - { - this.value = value; - } + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } } Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAttributeIntro.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAttributeIntro.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAttributeIntro.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.4-b02-fcs +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2007.08.21 at 10:20:40 PM GMT +// Generated on: 2009.09.04 at 10:24:07 AM CEST // @@ -17,9 +17,9 @@ /** * <p>Java class for XmlAttribute complex type. - * <p/> + * * <p>The following schema fragment specifies the expected content contained within this class. - * <p/> + * * <pre> * &lt;complexType name="XmlAttribute"> * &lt;complexContent> @@ -31,106 +31,104 @@ * &lt;/complexContent> * &lt;/complexType> * </pre> + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "XmlAttribute") -public class XmlAttributeIntro -{ +public class XmlAttributeIntro { - @XmlAttribute - @XmlSchemaType(name = "anySimpleType") - protected String name; - @XmlAttribute - protected Boolean required; - @XmlAttribute - @XmlSchemaType(name = "anySimpleType") - protected String namespace; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String name; + @XmlAttribute + protected Boolean required; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String namespace; - /** - * Gets the value of the name property. - * - * @return possible object is - * {@link String } - */ - public String getName() - { - if (name == null) - { - return "##default"; - } - else - { - return name; - } - } + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + if (name == null) { + return "##default"; + } else { + return name; + } + } - /** - * Sets the value of the name property. - * - * @param value allowed object is - * {@link String } - */ - public void setName(String value) - { - this.name = value; - } + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } - /** - * Gets the value of the required property. - * - * @return possible object is - * {@link Boolean } - */ - public boolean isRequired() - { - if (required == null) - { - return false; - } - else - { - return required; - } - } + /** + * Gets the value of the required property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isRequired() { + if (required == null) { + return false; + } else { + return required; + } + } - /** - * Sets the value of the required property. - * - * @param value allowed object is - * {@link Boolean } - */ - public void setRequired(Boolean value) - { - this.required = value; - } + /** + * Sets the value of the required property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setRequired(Boolean value) { + this.required = value; + } - /** - * Gets the value of the namespace property. - * - * @return possible object is - * {@link String } - */ - public String getNamespace() - { - if (namespace == null) - { - return "##default"; - } - else - { - return namespace; - } - } + /** + * Gets the value of the namespace property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNamespace() { + if (namespace == null) { + return "##default"; + } else { + return namespace; + } + } - /** - * Sets the value of the namespace property. - * - * @param value allowed object is - * {@link String } - */ - public void setNamespace(String value) - { - this.namespace = value; - } + /** + * Sets the value of the namespace property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNamespace(String value) { + this.namespace = value; + } } Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementIntro.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementIntro.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementIntro.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.4-b02-fcs +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2007.08.21 at 10:20:40 PM GMT +// Generated on: 2009.09.04 at 10:24:07 AM CEST // @@ -17,9 +17,9 @@ /** * <p>Java class for XmlElement complex type. - * <p/> + * * <p>The following schema fragment specifies the expected content contained within this class. - * <p/> + * * <pre> * &lt;complexType name="XmlElement"> * &lt;complexContent> @@ -34,187 +34,188 @@ * &lt;/complexContent> * &lt;/complexType> * </pre> + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "XmlElement") -public class XmlElementIntro -{ +public class XmlElementIntro { - @XmlAttribute - @XmlSchemaType(name = "anySimpleType") - protected String name; - @XmlAttribute - protected Boolean nillable; - @XmlAttribute - protected Boolean required; - @XmlAttribute - @XmlSchemaType(name = "anySimpleType") - protected String namespace; - @XmlAttribute - @XmlSchemaType(name = "anySimpleType") - protected String defaultValue; - @XmlAttribute - @XmlSchemaType(name = "anySimpleType") - protected String type; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String name; + @XmlAttribute + protected Boolean nillable; + @XmlAttribute + protected Boolean required; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String namespace; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String defaultValue; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String type; - /** - * Gets the value of the name property. - * - * @return possible object is - * {@link String } - */ - public String getName() - { - if (name == null) - { - return "##default"; - } - else - { - return name; - } - } + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + if (name == null) { + return "##default"; + } else { + return name; + } + } - /** - * Sets the value of the name property. - * - * @param value allowed object is - * {@link String } - */ - public void setName(String value) - { - this.name = value; - } + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } - /** - * Gets the value of the nillable property. - * - * @return possible object is - * {@link Boolean } - */ - public boolean isNillable() - { - if (nillable == null) - { - return false; - } - else - { - return nillable; - } - } + /** + * Gets the value of the nillable property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isNillable() { + if (nillable == null) { + return false; + } else { + return nillable; + } + } - /** - * Sets the value of the nillable property. - * - * @param value allowed object is - * {@link Boolean } - */ - public void setNillable(Boolean value) - { - this.nillable = value; - } + /** + * Sets the value of the nillable property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setNillable(Boolean value) { + this.nillable = value; + } - /** - * Gets the value of the required property. - * - * @return possible object is - * {@link Boolean } - */ - public boolean isRequired() - { - if (required == null) - { - return false; - } - else - { - return required; - } - } + /** + * Gets the value of the required property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isRequired() { + if (required == null) { + return false; + } else { + return required; + } + } - /** - * Sets the value of the required property. - * - * @param value allowed object is - * {@link Boolean } - */ - public void setRequired(Boolean value) - { - this.required = value; - } + /** + * Sets the value of the required property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setRequired(Boolean value) { + this.required = value; + } - /** - * Gets the value of the namespace property. - * - * @return possible object is - * {@link String } - */ - public String getNamespace() - { - if (namespace == null) - { - return "##default"; - } - else - { - return namespace; - } - } + /** + * Gets the value of the namespace property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNamespace() { + if (namespace == null) { + return "##default"; + } else { + return namespace; + } + } - /** - * Sets the value of the namespace property. - * - * @param value allowed object is - * {@link String } - */ - public void setNamespace(String value) - { - this.namespace = value; - } + /** + * Sets the value of the namespace property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNamespace(String value) { + this.namespace = value; + } - /** - * Gets the value of the defaultValue property. - * - * @return possible object is - * {@link String } - */ - public String getDefaultValue() - { - return defaultValue; - } + /** + * Gets the value of the defaultValue property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDefaultValue() { + return defaultValue; + } - /** - * Sets the value of the defaultValue property. - * - * @param value allowed object is - * {@link String } - */ - public void setDefaultValue(String value) - { - this.defaultValue = value; - } + /** + * Sets the value of the defaultValue property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDefaultValue(String value) { + this.defaultValue = value; + } - /** - * Gets the value of the type property. - * - * @return possible object is - * {@link String } - */ - public String getType() - { - return type; - } + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } - /** - * Sets the value of the type property. - * - * @param value allowed object is - * {@link String } - */ - public void setType(String value) - { - this.type = value; - } + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } } Added: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementWrapperIntro.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementWrapperIntro.java (rev 0) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementWrapperIntro.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -0,0 +1,165 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.09.04 at 10:24:07 AM CEST +// + + +package org.jboss.jaxb.intros.configmodel; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for XmlElementWrapper complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="XmlElementWrapper"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" default="##default" /> + * &lt;attribute name="namespace" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" default="##default" /> + * &lt;attribute name="required" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> + * &lt;attribute name="nillable" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "XmlElementWrapper") +public class XmlElementWrapperIntro { + + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String name; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String namespace; + @XmlAttribute + protected Boolean required; + @XmlAttribute + protected Boolean nillable; + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + if (name == null) { + return "##default"; + } else { + return name; + } + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the namespace property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNamespace() { + if (namespace == null) { + return "##default"; + } else { + return namespace; + } + } + + /** + * Sets the value of the namespace property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNamespace(String value) { + this.namespace = value; + } + + /** + * Gets the value of the required property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isRequired() { + if (required == null) { + return false; + } else { + return required; + } + } + + /** + * Sets the value of the required property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setRequired(Boolean value) { + this.required = value; + } + + /** + * Gets the value of the nillable property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isNillable() { + if (nillable == null) { + return false; + } else { + return nillable; + } + } + + /** + * Sets the value of the nillable property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setNillable(Boolean value) { + this.nillable = value; + } + +} Property changes on: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementWrapperIntro.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlIDIntro.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlIDIntro.java (rev 0) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlIDIntro.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -0,0 +1,37 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.09.04 at 10:24:07 AM CEST +// + + +package org.jboss.jaxb.intros.configmodel; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for XmlID complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="XmlID"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "XmlID") +public class XmlIDIntro { + + +} Property changes on: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlIDIntro.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlIDREFIntro.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlIDREFIntro.java (rev 0) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlIDREFIntro.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -0,0 +1,37 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.09.04 at 10:24:07 AM CEST +// + + +package org.jboss.jaxb.intros.configmodel; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for XmlIDREF complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="XmlIDREF"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "XmlIDREF") +public class XmlIDREFIntro { + + +} Property changes on: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlIDREFIntro.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlJavaTypeAdapterIntro.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlJavaTypeAdapterIntro.java (rev 0) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlJavaTypeAdapterIntro.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -0,0 +1,95 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.09.04 at 10:24:07 AM CEST +// + + +package org.jboss.jaxb.intros.configmodel; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for XmlJavaTypeAdapter complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="XmlJavaTypeAdapter"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" /> + * &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" /> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "XmlJavaTypeAdapter") +public class XmlJavaTypeAdapterIntro { + + @XmlAttribute(required = true) + @XmlSchemaType(name = "anySimpleType") + protected String value; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String type; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + +} Property changes on: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlJavaTypeAdapterIntro.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlRootElementIntro.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlRootElementIntro.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlRootElementIntro.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.4-b02-fcs +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2007.08.21 at 10:20:40 PM GMT +// Generated on: 2009.09.04 at 10:24:07 AM CEST // @@ -17,9 +17,9 @@ /** * <p>Java class for XmlRootElement complex type. - * <p/> + * * <p>The following schema fragment specifies the expected content contained within this class. - * <p/> + * * <pre> * &lt;complexType name="XmlRootElement"> * &lt;complexContent> @@ -30,75 +30,74 @@ * &lt;/complexContent> * &lt;/complexType> * </pre> + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "XmlRootElement") -public class XmlRootElementIntro -{ +public class XmlRootElementIntro { - @XmlAttribute - @XmlSchemaType(name = "anySimpleType") - protected String namespace; - @XmlAttribute - @XmlSchemaType(name = "anySimpleType") - protected String name; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String namespace; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String name; - /** - * Gets the value of the namespace property. - * - * @return possible object is - * {@link String } - */ - public String getNamespace() - { - if (namespace == null) - { - return "##default"; - } - else - { - return namespace; - } - } + /** + * Gets the value of the namespace property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNamespace() { + if (namespace == null) { + return "##default"; + } else { + return namespace; + } + } - /** - * Sets the value of the namespace property. - * - * @param value allowed object is - * {@link String } - */ - public void setNamespace(String value) - { - this.namespace = value; - } + /** + * Sets the value of the namespace property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNamespace(String value) { + this.namespace = value; + } - /** - * Gets the value of the name property. - * - * @return possible object is - * {@link String } - */ - public String getName() - { - if (name == null) - { - return "##default"; - } - else - { - return name; - } - } + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + if (name == null) { + return "##default"; + } else { + return name; + } + } - /** - * Sets the value of the name property. - * - * @param value allowed object is - * {@link String } - */ - public void setName(String value) - { - this.name = value; - } + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } } Added: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTransientIntro.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTransientIntro.java (rev 0) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTransientIntro.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -0,0 +1,37 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.09.04 at 10:24:07 AM CEST +// + + +package org.jboss.jaxb.intros.configmodel; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for XmlTransient complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="XmlTransient"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "XmlTransient") +public class XmlTransientIntro { + + +} Property changes on: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTransientIntro.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTypeIntro.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTypeIntro.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTypeIntro.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.4-b02-fcs +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2007.08.21 at 10:20:40 PM GMT +// Generated on: 2009.09.04 at 10:24:07 AM CEST // @@ -17,9 +17,9 @@ /** * <p>Java class for XmlType complex type. - * <p/> + * * <p>The following schema fragment specifies the expected content contained within this class. - * <p/> + * * <pre> * &lt;complexType name="XmlType"> * &lt;complexContent> @@ -33,164 +33,163 @@ * &lt;/complexContent> * &lt;/complexType> * </pre> + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "XmlType") -public class XmlTypeIntro -{ +public class XmlTypeIntro { - @XmlAttribute - @XmlSchemaType(name = "anySimpleType") - protected String name; - @XmlAttribute - @XmlSchemaType(name = "anySimpleType") - protected String propOrder; - @XmlAttribute - @XmlSchemaType(name = "anySimpleType") - protected String namespace; - @XmlAttribute - @XmlSchemaType(name = "anySimpleType") - protected String factoryClass; - @XmlAttribute - @XmlSchemaType(name = "anySimpleType") - protected String factoryMethod; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String name; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String propOrder; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String namespace; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String factoryClass; + @XmlAttribute + @XmlSchemaType(name = "anySimpleType") + protected String factoryMethod; - /** - * Gets the value of the name property. - * - * @return possible object is - * {@link String } - */ - public String getName() - { - if (name == null) - { - return "##default"; - } - else - { - return name; - } - } + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + if (name == null) { + return "##default"; + } else { + return name; + } + } - /** - * Sets the value of the name property. - * - * @param value allowed object is - * {@link String } - */ - public void setName(String value) - { - this.name = value; - } + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } - /** - * Gets the value of the propOrder property. - * - * @return possible object is - * {@link String } - */ - public String getPropOrder() - { - if (propOrder == null) - { - return ""; - } - else - { - return propOrder; - } - } + /** + * Gets the value of the propOrder property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPropOrder() { + if (propOrder == null) { + return ""; + } else { + return propOrder; + } + } - /** - * Sets the value of the propOrder property. - * - * @param value allowed object is - * {@link String } - */ - public void setPropOrder(String value) - { - this.propOrder = value; - } + /** + * Sets the value of the propOrder property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPropOrder(String value) { + this.propOrder = value; + } - /** - * Gets the value of the namespace property. - * - * @return possible object is - * {@link String } - */ - public String getNamespace() - { - if (namespace == null) - { - return "##default"; - } - else - { - return namespace; - } - } + /** + * Gets the value of the namespace property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNamespace() { + if (namespace == null) { + return "##default"; + } else { + return namespace; + } + } - /** - * Sets the value of the namespace property. - * - * @param value allowed object is - * {@link String } - */ - public void setNamespace(String value) - { - this.namespace = value; - } + /** + * Sets the value of the namespace property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNamespace(String value) { + this.namespace = value; + } - /** - * Gets the value of the factoryClass property. - * - * @return possible object is - * {@link String } - */ - public String getFactoryClass() - { - return factoryClass; - } + /** + * Gets the value of the factoryClass property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFactoryClass() { + return factoryClass; + } - /** - * Sets the value of the factoryClass property. - * - * @param value allowed object is - * {@link String } - */ - public void setFactoryClass(String value) - { - this.factoryClass = value; - } + /** + * Sets the value of the factoryClass property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFactoryClass(String value) { + this.factoryClass = value; + } - /** - * Gets the value of the factoryMethod property. - * - * @return possible object is - * {@link String } - */ - public String getFactoryMethod() - { - if (factoryMethod == null) - { - return ""; - } - else - { - return factoryMethod; - } - } + /** + * Gets the value of the factoryMethod property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFactoryMethod() { + if (factoryMethod == null) { + return ""; + } else { + return factoryMethod; + } + } - /** - * Sets the value of the factoryMethod property. - * - * @param value allowed object is - * {@link String } - */ - public void setFactoryMethod(String value) - { - this.factoryMethod = value; - } + /** + * Sets the value of the factoryMethod property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFactoryMethod(String value) { + this.factoryMethod = value; + } } Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/package-info.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/package-info.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/configmodel/package-info.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,8 +1,9 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.4-b02-fcs +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2007.08.21 at 10:20:40 PM GMT +// Generated on: 2009.09.04 at 10:24:07 AM CEST // -(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/xsd/jaxb/intros", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.jboss.jaxb.intros.configmodel; +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/xsd/jaxb/intros", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package org.jboss.jaxb.intros.configmodel; Modified: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/ClassValue.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/ClassValue.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/ClassValue.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -32,7 +32,7 @@ public interface ClassValue { - Class getClassValue(Annotation a, String name); + Class<?> getClassValue(Annotation a, String name); - Class[] getClassArrayValue(Annotation a, String name); + Class<?>[] getClassArrayValue(Annotation a, String name); } Added: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/Handler.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/Handler.java (rev 0) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/Handler.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -0,0 +1,52 @@ +package org.jboss.jaxb.intros.handlers; + +import java.lang.annotation.Annotation; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; + +import org.jboss.jaxb.intros.Util; + +public class Handler implements InvocationHandler { + + public static <T extends Annotation> Annotation createProxy(Class<T> annotationClass, Object intro) { + return annotationClass.cast(Proxy + .newProxyInstance(Handler.class.getClassLoader(), new Class<?>[] { + annotationClass, ClassValue.class }, new Handler(annotationClass, intro))); + } + + private Class<? extends Annotation> _annotationClass; + private Object _intro; + + private Handler(Class<? extends Annotation> annotationClass, Object intro) { + if (annotationClass == null) { + throw new NullPointerException("annotationClass"); + } + if (intro == null) { + throw new NullPointerException("intro"); + } + _annotationClass = annotationClass; + _intro = intro; + } + + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + String methodName = method.getName(); + if (methodName.equals("getClassValue")) { + methodName = (String) args[1]; + } + + if (methodName.equals("annotationType")) { + return _annotationClass; + } + + Object value; + value = Util.getProperty(_intro, methodName); + if (value != null) { + value = Util.convert(value, method.getReturnType()); + } + if (value == null) { + value = _annotationClass.getMethod(methodName).getDefaultValue(); + } + return value; + } +} Property changes on: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/Handler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,79 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - * - * (C) 2005-2006, JBoss Inc. - */ -package org.jboss.jaxb.intros.handlers; - -import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.jaxb.intros.configmodel.XmlAccessorTypeIntro; - -/** - * @author <a href="mailto:chris@swaton.org">chris@swaton.org</a> - */ -public class XmlAccessorTypeHandler implements InvocationHandler -{ - - private static final Log logger = LogFactory.getLog(XmlAccessorTypeHandler.class); - private XmlAccessorTypeIntro xmlAccessorTypeIntro; - - private XmlAccessorTypeHandler(XmlAccessorTypeIntro xmlAccessorTypeIntro) - { - this.xmlAccessorTypeIntro = xmlAccessorTypeIntro; - } - - public static Annotation createProxy(XmlAccessorTypeIntro xmlAccessorTypeIntro) - { - return (Annotation)Proxy.newProxyInstance(XmlAccessorTypeIntro.class.getClassLoader(), - new Class[]{XmlAccessorType.class, ClassValue.class}, - new XmlAccessorTypeHandler(xmlAccessorTypeIntro)); - } - - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable - { - /* - <xsd:complexType> - <xsd:attribute name="value" use="optional" default="NONE"> - <xsd:simpleType> - <xsd:restriction base="xsd:NMTOKEN"> - <xsd:enumeration value="PROPERTY"/> - <xsd:enumeration value="FIELD"/> - <xsd:enumeration value="PUBLIC_MEMBER"/> - <xsd:enumeration value="NONE"/> - </xsd:restriction> - </xsd:simpleType> - </xsd:attribute> - </xsd:complexType> - */ - - String methodName = method.getName(); - if (methodName.equals("value")) - { - return XmlAccessType.valueOf(xmlAccessorTypeIntro.getValue()); - } - return null; - } -} Deleted: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - * - * (C) 2005-2006, JBoss Inc. - */ -package org.jboss.jaxb.intros.handlers; - -import org.jboss.jaxb.intros.configmodel.XmlAttributeIntro; - -import javax.xml.bind.annotation.XmlAttribute; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.lang.annotation.Annotation; - -/** - * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a> - */ -public class XmlAttributeHandler implements InvocationHandler -{ - - private XmlAttributeIntro xmlAttributeIntro; - - public XmlAttributeHandler(XmlAttributeIntro xmlAttributeIntro) - { - this.xmlAttributeIntro = xmlAttributeIntro; - } - - public static Annotation createProxy(XmlAttributeIntro xmlAttributeIntro) - { - return (Annotation)Proxy.newProxyInstance(XmlAttributeIntro.class.getClassLoader(), - new Class[]{XmlAttribute.class}, - new XmlAttributeHandler(xmlAttributeIntro)); - } - - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable - { - /* - <xsd:complexType> - <xsd:attribute name="name" use="optional" default="##default"/> - <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/> - <xsd:attribute name="namespace" use="optional" default="##default"/> - </xsd:complexType> - */ - - String methodName = method.getName(); - - if (methodName.equals("namespace")) - { - return xmlAttributeIntro.getNamespace(); - } - else if (methodName.equals("name")) - { - return xmlAttributeIntro.getName(); - } - else if (methodName.equals("required")) - { - return xmlAttributeIntro.isRequired(); - } - else if (methodName.equals("annotationType")) - { - return XmlAttribute.class; - } - - return null; - } -} Deleted: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,113 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - * - * (C) 2005-2006, JBoss Inc. - */ -package org.jboss.jaxb.intros.handlers; - -import org.jboss.jaxb.intros.configmodel.XmlElementIntro; -import org.jboss.jaxb.intros.ConfigurationException; - -import javax.xml.bind.annotation.XmlElement; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.lang.annotation.Annotation; - -/** - * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a> - */ -public class XmlElementHandler implements InvocationHandler -{ - - private XmlElementIntro xmlElementIntro; - - private XmlElementHandler(XmlElementIntro xmlElementIntro) - { - this.xmlElementIntro = xmlElementIntro; - } - - public static Annotation createProxy(XmlElementIntro xmlElementIntro) - { - return (Annotation)Proxy.newProxyInstance(XmlElementIntro.class.getClassLoader(), - new Class[]{XmlElement.class, ClassValue.class}, - new XmlElementHandler(xmlElementIntro)); - } - - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable - { - /* - <xsd:complexType> - <xsd:attribute name="name" use="optional" default="##default"/> - <xsd:attribute name="nillable" type="xsd:boolean" use="optional" default="false"/> - <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/> - <xsd:attribute name="namespace" use="optional" default="##default"/> - <xsd:attribute name="defaultValue" use="optional"/> - <xsd:attribute name="type" use="optional"/> - </xsd:complexType> - */ - String methodName = method.getName(); - - if (methodName.equals("getClassValue")) - { - methodName = (String)args[1]; - } - - if (methodName.equals("namespace")) - { - return xmlElementIntro.getNamespace(); - } - else if (methodName.equals("name")) - { - return xmlElementIntro.getName(); - } - else if (methodName.equals("nillable")) - { - return xmlElementIntro.isNillable(); - } - else if (methodName.equals("required")) - { - return xmlElementIntro.isRequired(); - } - else if (methodName.equals("defaultValue")) - { - String defaultVal = xmlElementIntro.getDefaultValue(); - return (defaultVal != null ? defaultVal : "\u0000"); - } - else if (methodName.equals("type")) - { - if (xmlElementIntro.getType() != null) - { - try - { - return Class.forName(xmlElementIntro.getType()); - } - catch (ClassNotFoundException e) - { - throw new ConfigurationException("Bad 'XmlElement.type' config value '" + xmlElementIntro.getType() + "' in JAXB Annotation Introduction config. Class not found."); - } - } - return XmlElement.DEFAULT.class; - } - else if (methodName.equals("annotationType")) - { - return XmlElement.class; - } - - return null; - } -} Deleted: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - * - * (C) 2005-2006, JBoss Inc. - */ -package org.jboss.jaxb.intros.handlers; - -import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; - -import javax.xml.bind.annotation.XmlRootElement; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.jaxb.intros.configmodel.XmlRootElementIntro; - -/** - * @author <a href="mailto:chris@swaton.org">chris@swaton.org</a> - */ -public class XmlRootElementHandler implements InvocationHandler -{ - - private static final Log logger = LogFactory.getLog(XmlRootElementHandler.class); - private XmlRootElementIntro xmlRootElementIntro; - - private XmlRootElementHandler(XmlRootElementIntro xmlRootElementIntro) - { - this.xmlRootElementIntro = xmlRootElementIntro; - } - - public static Annotation createProxy(XmlRootElementIntro xmlRootElementIntro) - { - return (Annotation)Proxy.newProxyInstance(XmlRootElementIntro.class.getClassLoader(), - new Class[]{XmlRootElement.class, ClassValue.class}, - new XmlRootElementHandler(xmlRootElementIntro)); - } - - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable - { - /* - <xsd:complexType> - <xsd:attribute name="namespace" use="optional" default="##default"/> - <xsd:attribute name="name" use="optional" default="##default"/> - </xsd:complexType> - */ - - String methodName = method.getName(); - if (methodName.equals("namespace")) - { - return xmlRootElementIntro.getNamespace(); - } - else if (methodName.equals("name")) - { - return xmlRootElementIntro.getName(); - } - return null; - } -} Deleted: projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java =================================================================== --- projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -1,119 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - * - * (C) 2005-2006, JBoss Inc. - */ -package org.jboss.jaxb.intros.handlers; - -import org.jboss.jaxb.intros.configmodel.XmlTypeIntro; -import org.jboss.jaxb.intros.ConfigurationException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.xml.bind.annotation.XmlType; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.lang.annotation.Annotation; - -/** - * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a> - */ -public class XmlTypeHandler implements InvocationHandler -{ - - private static final Log logger = LogFactory.getLog(XmlTypeHandler.class); - private XmlTypeIntro xmlTypeIntro; - - private XmlTypeHandler(XmlTypeIntro xmlTypeIntro) - { - this.xmlTypeIntro = xmlTypeIntro; - } - - public static Annotation createProxy(XmlTypeIntro xmlTypeIntro) - { - return (Annotation)Proxy.newProxyInstance(XmlTypeIntro.class.getClassLoader(), - new Class[]{XmlType.class, ClassValue.class}, - new XmlTypeHandler(xmlTypeIntro)); - } - - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable - { - /* - <xsd:complexType> - <xsd:attribute name="name" use="optional" default="##default"/> - <xsd:attribute name="propOrder" use="optional" default=""/> - <xsd:attribute name="namespace" use="optional" default="##default"/> - <xsd:attribute name="factoryClass" use="optional"/> - <xsd:attribute name="factoryMethod" use="optional" default=""/> - </xsd:complexType> - */ - String methodName = method.getName(); - - if (methodName.equals("getClassValue")) - { - methodName = (String)args[1]; - } - - if (methodName.equals("namespace")) - { - return xmlTypeIntro.getNamespace(); - } - else if (methodName.equals("name")) - { - return xmlTypeIntro.getName(); - } - else if (methodName.equals("propOrder")) - { - try - { - String[] propOrder = xmlTypeIntro.getPropOrder().split(","); - for (int i = 0; i < propOrder.length; i++) - { - String s = propOrder[i]; - propOrder[i] = s.trim(); - } - return propOrder; - } - catch (Exception e) - { - logger.warn("Bad 'XmlType.propOrder' config value '" + xmlTypeIntro.getPropOrder() + "' in JAXB Annotation Introduction config. Must be a CSV String."); - } - } - else if (methodName.equals("factoryClass")) - { - if (xmlTypeIntro.getFactoryClass() != null) - { - try - { - return Class.forName(xmlTypeIntro.getFactoryClass()); - } - catch (ClassNotFoundException e) - { - throw new ConfigurationException("Bad 'XmlType.factoryClass' config value '" + xmlTypeIntro.getFactoryClass() + "' in JAXB Annotation Introduction config. Class not found."); - } - } - return XmlType.DEFAULT.class; - } - else if (methodName.equals("factoryMethod")) - { - return xmlTypeIntro.getFactoryMethod(); - } - - return null; - } -} Modified: projects/jaxbintros/trunk/src/main/resources/jaxb-intros.xsd =================================================================== --- projects/jaxbintros/trunk/src/main/resources/jaxb-intros.xsd 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/main/resources/jaxb-intros.xsd 2009-12-02 17:28:13 UTC (rev 11185) @@ -23,6 +23,8 @@ <xsd:element ref="jaxb-intros:XmlAccessorType" minOccurs="0" maxOccurs="1"/> <xsd:element ref="jaxb-intros:XmlType" minOccurs="0" maxOccurs="1"/> <xsd:element ref="jaxb-intros:XmlRootElement" minOccurs="0" maxOccurs="1"/> + <xsd:element ref="jaxb-intros:XmlTransient" minOccurs="0" maxOccurs="1"/> + <xsd:element ref="jaxb-intros:XmlJavaTypeAdapter" minOccurs="0" maxOccurs="1"/> <xsd:element ref="jaxb-intros:Field" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="jaxb-intros:Method" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> @@ -42,6 +44,11 @@ <xsd:sequence> <xsd:element ref="jaxb-intros:XmlElement" minOccurs="0" maxOccurs="1"/> <xsd:element ref="jaxb-intros:XmlAttribute" minOccurs="0" maxOccurs="1"/> + <xsd:element ref="jaxb-intros:XmlTransient" minOccurs="0" maxOccurs="1"/> + <xsd:element ref="jaxb-intros:XmlID" minOccurs="0" maxOccurs="1"/> + <xsd:element ref="jaxb-intros:XmlIDREF" minOccurs="0" maxOccurs="1"/> + <xsd:element ref="jaxb-intros:XmlElementWrapper" minOccurs="0" maxOccurs="1"/> + <xsd:element ref="jaxb-intros:XmlJavaTypeAdapter" minOccurs="0" maxOccurs="1"/> </xsd:sequence> <xsd:attribute name="name" use="required"/> </xsd:complexType> @@ -131,4 +138,54 @@ </xsd:annotation> </xsd:element> + <xsd:complexType name="XmlTransient"> + </xsd:complexType> + <xsd:element name="XmlTransient" type="jaxb-intros:XmlTransient"> + <xsd:annotation> + <xsd:documentation xml:lang="en">JAXB 'XmlTransient' Annotation Introduction configuration. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:complexType name="XmlID"> + </xsd:complexType> + <xsd:element name="XmlID" type="jaxb-intros:XmlID"> + <xsd:annotation> + <xsd:documentation xml:lang="en">JAXB 'XmlID' Annotation Introduction configuration. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:complexType name="XmlIDREF"> + </xsd:complexType> + <xsd:element name="XmlIDREF" type="jaxb-intros:XmlIDREF"> + <xsd:annotation> + <xsd:documentation xml:lang="en">JAXB 'XmlIDREF' Annotation Introduction configuration. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:complexType name="XmlElementWrapper"> + <xsd:attribute name="name" use="optional" default="##default" /> + <xsd:attribute name="namespace" use="optional" default="##default" /> + <xsd:attribute name="required" use="optional" type="xsd:boolean" default="false" /> + <xsd:attribute name="nillable" use="optional" type="xsd:boolean" default="false" /> + </xsd:complexType> + <xsd:element name="XmlElementWrapper" type="jaxb-intros:XmlElementWrapper"> + <xsd:annotation> + <xsd:documentation xml:lang="en">JAXB 'XmlElementWrapper' Annotation Introduction configuration. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:complexType name="XmlJavaTypeAdapter"> + <xsd:attribute name="value" use="required" /> + <xsd:attribute name="type" use="optional" /> + </xsd:complexType> + <xsd:element name="XmlJavaTypeAdapter" type="jaxb-intros:XmlJavaTypeAdapter"> + <xsd:annotation> + <xsd:documentation xml:lang="en">JAXB 'XmlJavaTypeAdapter' Annotation Introduction configuration. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + </xsd:schema> Modified: projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/IntroductionsAnnotationReaderUnitTest.java =================================================================== --- projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/IntroductionsAnnotationReaderUnitTest.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/IntroductionsAnnotationReaderUnitTest.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -19,27 +19,28 @@ */ package org.jboss.jaxb.intros; -import junit.framework.TestCase; -import org.jboss.jaxb.intros.configmodel.JaxbIntros; -import org.jboss.jaxb.intros.testbeans.*; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.Map; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; +import javax.xml.bind.Unmarshaller; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; import javax.xml.transform.stream.StreamSource; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.Map; -import java.util.HashMap; -import java.math.BigDecimal; +import junit.framework.TestCase; +import org.jboss.jaxb.intros.configmodel.JaxbIntros; +import org.jboss.jaxb.intros.testbeans.CustomerOrder; + import com.sun.xml.bind.api.JAXBRIContext; /** @@ -86,7 +87,7 @@ JAXBContext jaxbContext = JAXBContext.newInstance(new Class[] {CustomerOrder.class}, jaxbConfig); Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); - JAXBElement jbe = unmarshaller.unmarshal(new StreamSource(new File("target/test-classes/order-message.xml").toURL().openStream()), CustomerOrder.class); + JAXBElement<?> jbe = unmarshaller.unmarshal(new StreamSource(new File("target/test-classes/order-message.xml").toURL().openStream()), CustomerOrder.class); CustomerOrder order = (CustomerOrder) jbe.getValue(); assertNotNull("null Order", order); Modified: projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/IntroductionsConfigParserUnitTest.java =================================================================== --- projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/IntroductionsConfigParserUnitTest.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/IntroductionsConfigParserUnitTest.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -21,11 +21,11 @@ import java.io.File; import java.io.IOException; -import java.net.URL; import junit.framework.TestCase; + +import org.jboss.jaxb.intros.configmodel.ClassIntroConfig; import org.jboss.jaxb.intros.configmodel.JaxbIntros; -import org.jboss.jaxb.intros.configmodel.ClassIntroConfig; /** * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a> Modified: projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Address.java =================================================================== --- projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Address.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Address.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -4,8 +4,10 @@ public class Address implements Serializable { - protected String street1; + private static final long serialVersionUID = 1L; + protected String street1; + protected String street2; protected String city; Modified: projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Contact.java =================================================================== --- projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Contact.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Contact.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -2,37 +2,69 @@ import java.io.Serializable; -public class Contact implements Serializable { +public class Contact implements Serializable +{ -protected String name; + private static final long serialVersionUID = 1L; -protected String phone; + protected String name; -protected String fax; + protected String phone; -protected String email; -public Contact(){} + protected String fax; -public Contact(String name, String phone, String fax, String email){ -this.name=name; -this.phone=phone; -this.fax=fax; -this.email=email; -} -public String getName() { return name ;} + protected String email; -public void setName(String name){ this.name=name; } + public Contact() + { + } -public String getPhone() { return phone ;} + public Contact(String name, String phone, String fax, String email) + { + this.name = name; + this.phone = phone; + this.fax = fax; + this.email = email; + } -public void setPhone(String phone){ this.phone=phone; } + public String getName() + { + return name; + } -public String getFax() { return fax ;} + public void setName(String name) + { + this.name = name; + } -public void setFax(String fax){ this.fax=fax; } + public String getPhone() + { + return phone; + } -public String getEmail() { return email ;} + public void setPhone(String phone) + { + this.phone = phone; + } -public void setEmail(String email){ this.email=email; } + public String getFax() + { + return fax; + } + public void setFax(String fax) + { + this.fax = fax; + } + + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } + } Modified: projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/CustomerOrder.java =================================================================== --- projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/CustomerOrder.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/CustomerOrder.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -4,8 +4,10 @@ public class CustomerOrder implements Serializable { - protected OrderHeader header; + private static final long serialVersionUID = 1L; + protected OrderHeader header; + protected Item[] items; public OrderHeader getHeader() { Modified: projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Item.java =================================================================== --- projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Item.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Item.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -2,44 +2,82 @@ import java.io.Serializable; -public class Item implements Serializable { +public class Item implements Serializable +{ -protected String partNumber; + private static final long serialVersionUID = 1L; -protected String description; + protected String partNumber; -protected int quantity; + protected String description; -protected java.math.BigDecimal price; + protected int quantity; -protected java.math.BigDecimal extensionAmount; -public Item(){} + protected java.math.BigDecimal price; -public Item(String partNumber, String description, int quantity, java.math.BigDecimal price, java.math.BigDecimal extensionAmount){ -this.partNumber=partNumber; -this.description=description; -this.quantity=quantity; -this.price=price; -this.extensionAmount=extensionAmount; -} -public String getPartNumber() { return partNumber ;} + protected java.math.BigDecimal extensionAmount; -public void setPartNumber(String partNumber){ this.partNumber=partNumber; } + public Item() + { + } -public String getDescription() { return description ;} + public Item(String partNumber, String description, int quantity, java.math.BigDecimal price, java.math.BigDecimal extensionAmount) + { + this.partNumber = partNumber; + this.description = description; + this.quantity = quantity; + this.price = price; + this.extensionAmount = extensionAmount; + } -public void setDescription(String description){ this.description=description; } + public String getPartNumber() + { + return partNumber; + } -public int getQuantity() { return quantity ;} + public void setPartNumber(String partNumber) + { + this.partNumber = partNumber; + } -public void setQuantity(int quantity){ this.quantity=quantity; } + public String getDescription() + { + return description; + } -public java.math.BigDecimal getPrice() { return price ;} + public void setDescription(String description) + { + this.description = description; + } -public void setPrice(java.math.BigDecimal price){ this.price=price; } + public int getQuantity() + { + return quantity; + } -public java.math.BigDecimal getExtensionAmount() { return extensionAmount ;} + public void setQuantity(int quantity) + { + this.quantity = quantity; + } -public void setExtensionAmount(java.math.BigDecimal extensionAmount){ this.extensionAmount=extensionAmount; } + public java.math.BigDecimal getPrice() + { + return price; + } + public void setPrice(java.math.BigDecimal price) + { + this.price = price; + } + + public java.math.BigDecimal getExtensionAmount() + { + return extensionAmount; + } + + public void setExtensionAmount(java.math.BigDecimal extensionAmount) + { + this.extensionAmount = extensionAmount; + } + } Modified: projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/OrderHeader.java =================================================================== --- projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/OrderHeader.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/OrderHeader.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -4,8 +4,10 @@ public class OrderHeader implements Serializable { - protected String customerNumber; + private static final long serialVersionUID = 1L; + protected String customerNumber; + protected String poNumber; protected java.util.Calendar orderDate; Modified: projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Party.java =================================================================== --- projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Party.java 2009-12-02 17:00:39 UTC (rev 11184) +++ projects/jaxbintros/trunk/src/test/java/org/jboss/jaxb/intros/testbeans/Party.java 2009-12-02 17:28:13 UTC (rev 11185) @@ -2,30 +2,56 @@ import java.io.Serializable; -public class Party implements Serializable { +public class Party implements Serializable +{ -protected String company; + private static final long serialVersionUID = 1L; -protected Contact contact; + protected String company; -protected Address address; -public Party(){} + protected Contact contact; -public Party(String company, Contact contact, Address address){ -this.company=company; -this.contact=contact; -this.address=address; -} -public String getCompany() { return company ;} + protected Address address; -public void setCompany(String company){ this.company=company; } + public Party() + { + } -public Contact getContact() { return contact ;} + public Party(String company, Contact contact, Address address) + { + this.company = company; + this.contact = contact; + this.address = address; + } -public void setContact(Contact contact){ this.contact=contact; } + public String getCompany() + { + return company; + } -public Address getAddress() { return address ;} + public void setCompany(String company) + { + this.company = company; + } -public void setAddress(Address address){ this.address=address; } + public Contact getContact() + { + return contact; + } + public void setContact(Contact contact) + { + this.contact = contact; + } + + public Address getAddress() + { + return address; + } + + public void setAddress(Address address) + { + this.address = address; + } + }