[jbossws-commits] JBossWS SVN: r4604 - in projects/jaxbintros/src/main/java/org/jboss/jaxb/intros: configmodel and 1 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Fri Sep 21 04:39:59 EDT 2007


Author: heiko.braun at jboss.com
Date: 2007-09-21 04:39:58 -0400 (Fri, 21 Sep 2007)
New Revision: 4604

Modified:
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/ConfigurationException.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsAnnotationReader.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsConfigParser.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassIntroConfig.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassMemberIntroConfig.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/FieldIntroConfig.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/JaxbIntros.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/MethodIntroConfig.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ObjectFactory.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAccessorTypeIntro.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAttributeIntro.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementIntro.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlRootElementIntro.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTypeIntro.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/package-info.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/ClassValue.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java
   projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java
Log:
reformat code

Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/ConfigurationException.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/ConfigurationException.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/ConfigurationException.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -23,14 +23,18 @@
 
 /**
  * JAXB Introductions configuration error.
- * 
+ *
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
-public class ConfigurationException extends RuntimeException {
-    public ConfigurationException(String message) {
-        super(message);
-    }
-    public ConfigurationException(String message, Throwable cause) {
-        super(message, cause);
-    }
+public class ConfigurationException extends RuntimeException
+{
+   public ConfigurationException(String message)
+   {
+      super(message);
+   }
+
+   public ConfigurationException(String message, Throwable cause)
+   {
+      super(message, cause);
+   }
 }

Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsAnnotationReader.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsAnnotationReader.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsAnnotationReader.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -46,325 +46,417 @@
  *
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
-public class IntroductionsAnnotationReader extends AbstractInlineAnnotationReaderImpl<Type,Class,Field,Method> implements RuntimeAnnotationReader {
+public class IntroductionsAnnotationReader extends AbstractInlineAnnotationReaderImpl<Type, Class, Field, Method> implements RuntimeAnnotationReader
+{
 
-    private static final Log logger = LogFactory.getLog(IntroductionsAnnotationReader.class);
-    private RuntimeAnnotationReader baseReader = new RuntimeInlineAnnotationReader();
-    private JaxbIntros introductions;
+   private static final Log logger = LogFactory.getLog(IntroductionsAnnotationReader.class);
+   private RuntimeAnnotationReader baseReader = new RuntimeInlineAnnotationReader();
+   private JaxbIntros introductions;
 
-    public IntroductionsAnnotationReader(JaxbIntros introductions) {
-        if(introductions == null) {
-            throw new IllegalArgumentException("arg 'introductions' is null.");
-        }
-        this.introductions = introductions;
-    }
+   public IntroductionsAnnotationReader(JaxbIntros introductions)
+   {
+      if (introductions == null)
+      {
+         throw new IllegalArgumentException("arg 'introductions' is null.");
+      }
+      this.introductions = introductions;
+   }
 
-    public <A extends Annotation> A getFieldAnnotation(Class<A> annotation, Field field, Locatable srcPos) {
-        Annotation proxy = getProxy(annotation, field);
+   public <A extends Annotation> A getFieldAnnotation(Class<A> annotation, Field field, Locatable srcPos)
+   {
+      Annotation proxy = getProxy(annotation, field);
 
-        if(proxy != null) {
-            return (A) proxy;
-        }
+      if (proxy != null)
+      {
+         return (A)proxy;
+      }
 
-        return LocatableAnnotation.create(field.getAnnotation(annotation),srcPos);
-    }
+      return LocatableAnnotation.create(field.getAnnotation(annotation), srcPos);
+   }
 
-    public boolean hasFieldAnnotation(Class<? extends Annotation> annotationType, Field field) {
-        FieldIntroConfig fieldIntroConfig = getFieldIntroConfig(field);
+   public boolean hasFieldAnnotation(Class<? extends Annotation> annotationType, Field field)
+   {
+      FieldIntroConfig fieldIntroConfig = getFieldIntroConfig(field);
 
-        if(fieldIntroConfig != null) {
-            return isMemberAnnotationIntroAvailable(annotationType, fieldIntroConfig);
-        }
+      if (fieldIntroConfig != null)
+      {
+         return isMemberAnnotationIntroAvailable(annotationType, fieldIntroConfig);
+      }
 
-        return field.isAnnotationPresent(annotationType);
-    }
+      return field.isAnnotationPresent(annotationType);
+   }
 
-    public Annotation[] getAllFieldAnnotations(Field field, Locatable srcPos) {
-        return getAllAnnotations(field, srcPos);
-    }
+   public Annotation[] getAllFieldAnnotations(Field field, Locatable srcPos)
+   {
+      return getAllAnnotations(field, srcPos);
+   }
 
-    public <A extends Annotation> A getMethodAnnotation(Class<A> annotation, Method method, Locatable srcPos) {
-        Annotation proxy = getProxy(annotation, method);
+   public <A extends Annotation> A getMethodAnnotation(Class<A> annotation, Method method, Locatable srcPos)
+   {
+      Annotation proxy = getProxy(annotation, method);
 
-        if(proxy != null) {
-            return (A) proxy;
-        }
+      if (proxy != null)
+      {
+         return (A)proxy;
+      }
 
-        return LocatableAnnotation.create(method.getAnnotation(annotation),srcPos);
-    }
+      return LocatableAnnotation.create(method.getAnnotation(annotation), srcPos);
+   }
 
-    public boolean hasMethodAnnotation(Class<? extends Annotation> annotation, Method method) {
-        MethodIntroConfig methodAnnotations = getMethodIntroConfig(method);
+   public boolean hasMethodAnnotation(Class<? extends Annotation> annotation, Method method)
+   {
+      MethodIntroConfig methodAnnotations = getMethodIntroConfig(method);
 
-        if(methodAnnotations != null) {
-            return isMemberAnnotationIntroAvailable(annotation, methodAnnotations);
-        }
+      if (methodAnnotations != null)
+      {
+         return isMemberAnnotationIntroAvailable(annotation, methodAnnotations);
+      }
 
-        return method.isAnnotationPresent(annotation);
-    }
+      return method.isAnnotationPresent(annotation);
+   }
 
-    public Annotation[] getAllMethodAnnotations(Method method, Locatable srcPos) {
-        return getAllAnnotations(method, srcPos);
-    }
+   public Annotation[] getAllMethodAnnotations(Method method, Locatable srcPos)
+   {
+      return getAllAnnotations(method, srcPos);
+   }
 
-    public <A extends Annotation> A getMethodParameterAnnotation(Class<A> annotation, Method method, int paramIndex, Locatable srcPos) {
-        return baseReader.getMethodParameterAnnotation(annotation, method, paramIndex, srcPos);
-    }
+   public <A extends Annotation> A getMethodParameterAnnotation(Class<A> annotation, Method method, int paramIndex, Locatable srcPos)
+   {
+      return baseReader.getMethodParameterAnnotation(annotation, method, paramIndex, srcPos);
+   }
 
-    public <A extends Annotation> A getClassAnnotation(Class<A> annotation, Class clazz, Locatable srcPos) {
-        Annotation proxy = getProxy(annotation, clazz);
+   public <A extends Annotation> A getClassAnnotation(Class<A> annotation, Class clazz, Locatable srcPos)
+   {
+      Annotation proxy = getProxy(annotation, clazz);
 
-        if(proxy != null) {
-            return (A) proxy;
-        }
+      if (proxy != null)
+      {
+         return (A)proxy;
+      }
 
-        return LocatableAnnotation.create(((Class<?>)clazz).getAnnotation(annotation),srcPos);
-    }
+      return LocatableAnnotation.create(((Class<?>)clazz).getAnnotation(annotation), srcPos);
+   }
 
-    public boolean hasClassAnnotation(Class clazz, Class<? extends Annotation> annotationType) {
-        ClassIntroConfig classAnnotations = getClassIntroConfig(clazz);
+   public boolean hasClassAnnotation(Class clazz, Class<? extends Annotation> annotationType)
+   {
+      ClassIntroConfig classAnnotations = getClassIntroConfig(clazz);
 
-        if(classAnnotations != null) {
-            return isClassAnnotationIntroAvailable(annotationType, classAnnotations);
-        }
+      if (classAnnotations != null)
+      {
+         return isClassAnnotationIntroAvailable(annotationType, classAnnotations);
+      }
 
-        return clazz.isAnnotationPresent(annotationType);
-    }
+      return clazz.isAnnotationPresent(annotationType);
+   }
 
-    public <A extends Annotation> A getPackageAnnotation(Class<A> a, Class clazz, Locatable srcPos) {
-        return baseReader.getPackageAnnotation(a, clazz, srcPos);
-    }
+   public <A extends Annotation> A getPackageAnnotation(Class<A> a, Class clazz, Locatable srcPos)
+   {
+      return baseReader.getPackageAnnotation(a, clazz, srcPos);
+   }
 
-    public Class getClassValue(Annotation a, String name) {
-        if(a instanceof ClassValue) {
-            return ((ClassValue)a).getClassValue(a, name);
-        }
-        return (Class) baseReader.getClassValue(a, name);
-    }
+   public Class getClassValue(Annotation a, String name)
+   {
+      if (a instanceof ClassValue)
+      {
+         return ((ClassValue)a).getClassValue(a, name);
+      }
+      return (Class)baseReader.getClassValue(a, name);
+   }
 
-    public Class[] getClassArrayValue(Annotation a, String name) {
-        if(a instanceof ClassValue) {
-            return ((ClassValue)a).getClassArrayValue(a, name);
-        }
-        return (Class[]) baseReader.getClassArrayValue(a, name);
-    }
+   public Class[] getClassArrayValue(Annotation a, String name)
+   {
+      if (a instanceof ClassValue)
+      {
+         return ((ClassValue)a).getClassArrayValue(a, name);
+      }
+      return (Class[])baseReader.getClassArrayValue(a, name);
+   }
 
-    protected String fullName(Method m) {
-        return m.getDeclaringClass().getName()+'#'+m.getName();
-    }
+   protected String fullName(Method m)
+   {
+      return m.getDeclaringClass().getName() + '#' + m.getName();
+   }
 
-    private ClassIntroConfig getClassIntroConfig(Class clazz) {
-        String className = clazz.getName();
-        ClassIntroConfig globalIntro = null;
+   private ClassIntroConfig getClassIntroConfig(Class clazz)
+   {
+      String className = clazz.getName();
+      ClassIntroConfig globalIntro = null;
 
-        for(ClassIntroConfig classIntro : introductions.getClazz()) {
-            if(classIntro.getName().equals(className)) {
-                return classIntro;
-            } else if(globalIntro == null && isRegexMatch(className, classIntro.getName())) {
-                globalIntro = classIntro;
-            }
-        }
+      for (ClassIntroConfig classIntro : introductions.getClazz())
+      {
+         if (classIntro.getName().equals(className))
+         {
+            return classIntro;
+         }
+         else if (globalIntro == null && isRegexMatch(className, classIntro.getName()))
+         {
+            globalIntro = classIntro;
+         }
+      }
 
-        return globalIntro;
-    }
+      return globalIntro;
+   }
 
-    private FieldIntroConfig getFieldIntroConfig(Field field) {
-        ClassIntroConfig classIntroConfig = getClassIntroConfig(field.getDeclaringClass());
+   private FieldIntroConfig getFieldIntroConfig(Field field)
+   {
+      ClassIntroConfig classIntroConfig = getClassIntroConfig(field.getDeclaringClass());
 
-        if(classIntroConfig != null) {
-            String fieldName = field.getName();
+      if (classIntroConfig != null)
+      {
+         String fieldName = field.getName();
 
-            for(FieldIntroConfig fieldIntro : classIntroConfig.getField()) {
-                if(fieldIntro.getName().equals(fieldName)) {
-                    return fieldIntro;
-                } else if(isRegexMatch(fieldName, fieldIntro.getName())) {
-                    return fieldIntro;
-                }
+         for (FieldIntroConfig fieldIntro : classIntroConfig.getField())
+         {
+            if (fieldIntro.getName().equals(fieldName))
+            {
+               return fieldIntro;
             }
-        }
+            else if (isRegexMatch(fieldName, fieldIntro.getName()))
+            {
+               return fieldIntro;
+            }
+         }
+      }
 
-        return null;
-    }
+      return null;
+   }
 
-    private MethodIntroConfig getMethodIntroConfig(Method method) {
-        ClassIntroConfig classIntroConfig = getClassIntroConfig(method.getDeclaringClass());
+   private MethodIntroConfig getMethodIntroConfig(Method method)
+   {
+      ClassIntroConfig classIntroConfig = getClassIntroConfig(method.getDeclaringClass());
 
-        if(classIntroConfig != null) {
-            String methodName = method.getName();
+      if (classIntroConfig != null)
+      {
+         String methodName = method.getName();
 
-            for(MethodIntroConfig methodIntro : classIntroConfig.getMethod()) {
-                if(methodIntro.getName().equals(methodName)) {
-                    return methodIntro;
-                } else if(isRegexMatch(methodName, methodIntro.getName())) {
-                    return methodIntro;
-                }
+         for (MethodIntroConfig methodIntro : classIntroConfig.getMethod())
+         {
+            if (methodIntro.getName().equals(methodName))
+            {
+               return methodIntro;
             }
-        }
+            else if (isRegexMatch(methodName, methodIntro.getName()))
+            {
+               return methodIntro;
+            }
+         }
+      }
 
-        return null;
-    }
+      return null;
+   }
 
-    private static Map<String, Pattern> patternCache = new HashMap<String, Pattern>();
-    private boolean isRegexMatch(String string, String regex) {
-        Pattern pattern = patternCache.get(regex);
+   private static Map<String, Pattern> patternCache = new HashMap<String, Pattern>();
 
-        if(pattern == null) {
-            try {
-                pattern = Pattern.compile(regex);
-            } catch(Exception e) {
-                logger.warn("Error compiling '" + regex + "' as a regular expression: " + e.getMessage());
-                return false;
-            }
-            patternCache.put(regex, pattern);
-        }
+   private boolean isRegexMatch(String string, String regex)
+   {
+      Pattern pattern = patternCache.get(regex);
 
-        return pattern.matcher(string).matches();
-    }
+      if (pattern == null)
+      {
+         try
+         {
+            pattern = Pattern.compile(regex);
+         }
+         catch (Exception e)
+         {
+            logger.warn("Error compiling '" + regex + "' as a regular expression: " + e.getMessage());
+            return false;
+         }
+         patternCache.put(regex, pattern);
+      }
 
-    private Annotation getMemberAnnotationProxy(Class annotation, ClassMemberIntroConfig memberIntroConfig) {
-        Annotation proxy = null;
+      return pattern.matcher(string).matches();
+   }
 
-        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);
-            }
-        }
+   private Annotation getMemberAnnotationProxy(Class annotation, ClassMemberIntroConfig memberIntroConfig)
+   {
+      Annotation proxy = null;
 
-        return proxy;
-    }
+      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);
+         }
+      }
 
-    private Annotation getClassAnnotationProxy(Class annotation, ClassIntroConfig classIntroConfig) {
-        Annotation proxy = null;
+      return proxy;
+   }
 
-        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);
-            }
-        }
+   private Annotation getClassAnnotationProxy(Class annotation, ClassIntroConfig classIntroConfig)
+   {
+      Annotation proxy = null;
 
-        return proxy;
-    }
+      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);
+         }
+      }
 
-    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 proxy;
+   }
 
-        return false;
-    }
+   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);
+      }
 
-    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 false;
+   }
 
-        return false;
-    }
+   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);
+      }
 
-    private Annotation[] getAllAnnotations(Member member, Locatable srcPos) {
-        Annotation[] r = ((AnnotatedElement)member).getAnnotations();
-        List<Annotation> annotations = new ArrayList<Annotation>();
+      return false;
+   }
 
-        for( int i = 0; i < r.length; i++ ) {
-            Class<? extends Object> annType = r[i].getClass();
-            if(annType == XmlAttribute.class || annType == XmlElement.class) {
-                // We'll handle these explicitly (below)!!
-                continue;
-            }
-            annotations.add(LocatableAnnotation.create(r[i], srcPos));
-        }
+   private Annotation[] getAllAnnotations(Member member, Locatable srcPos)
+   {
+      Annotation[] r = ((AnnotatedElement)member).getAnnotations();
+      List<Annotation> annotations = new ArrayList<Annotation>();
 
-        // Now we explicitly handle the supported Introduction annotations...
-        ClassMemberIntroConfig memberIntroConfig = null;
-        if(member instanceof Field) {
-            memberIntroConfig = getFieldIntroConfig((Field)member);
-        } else if(member instanceof Method) {
-            memberIntroConfig = getMethodIntroConfig((Method)member);
-        }
-        if(memberIntroConfig != null) {
-            addMemberAnnotation(XmlAttribute.class, memberIntroConfig, annotations, member, srcPos);
-            addMemberAnnotation(XmlElement.class, memberIntroConfig, annotations, member, srcPos);
-        }
+      for (int i = 0; i < r.length; i++)
+      {
+         Class<? extends Object> annType = r[i].getClass();
+         if (annType == XmlAttribute.class || annType == XmlElement.class)
+         {
+            // We'll handle these explicitly (below)!!
+            continue;
+         }
+         annotations.add(LocatableAnnotation.create(r[i], srcPos));
+      }
 
-        r = annotations.toArray(new Annotation[annotations.size()]);
+      // Now we explicitly handle the supported Introduction annotations...
+      ClassMemberIntroConfig memberIntroConfig = null;
+      if (member instanceof Field)
+      {
+         memberIntroConfig = getFieldIntroConfig((Field)member);
+      }
+      else if (member instanceof Method)
+      {
+         memberIntroConfig = getMethodIntroConfig((Method)member);
+      }
+      if (memberIntroConfig != null)
+      {
+         addMemberAnnotation(XmlAttribute.class, memberIntroConfig, annotations, member, srcPos);
+         addMemberAnnotation(XmlElement.class, memberIntroConfig, annotations, member, srcPos);
+      }
 
-        return r;
-    }
+      r = annotations.toArray(new Annotation[annotations.size()]);
 
-    private void addMemberAnnotation(Class annotationType, ClassMemberIntroConfig memberIntroConfig, List<Annotation> annotations, Member member, Locatable srcPos) {
-        Annotation annotation = getMemberAnnotationProxy(annotationType, memberIntroConfig);
-        if(annotation != null) {
-            annotations.add(annotation);
-        } else {
-            annotation = ((AnnotatedElement)member).getAnnotation(annotationType);
-            if(annotation != null) {
-                annotations.add(LocatableAnnotation.create(annotation, srcPos));
-            }
-        }
-    }
+      return r;
+   }
 
-    private Annotation getProxy(Class annotation, Field field) {
-        FieldIntroConfig fieldIntroConfig = getFieldIntroConfig(field);
+   private void addMemberAnnotation(Class annotationType, ClassMemberIntroConfig memberIntroConfig, List<Annotation> annotations, Member member, Locatable srcPos)
+   {
+      Annotation annotation = getMemberAnnotationProxy(annotationType, memberIntroConfig);
+      if (annotation != null)
+      {
+         annotations.add(annotation);
+      }
+      else
+      {
+         annotation = ((AnnotatedElement)member).getAnnotation(annotationType);
+         if (annotation != null)
+         {
+            annotations.add(LocatableAnnotation.create(annotation, srcPos));
+         }
+      }
+   }
 
-        if(fieldIntroConfig != null) {
-            Annotation proxy = getMemberAnnotationProxy(annotation, fieldIntroConfig);
-            if(proxy != null) {
-                return proxy;
-            }
-        }
+   private Annotation getProxy(Class annotation, Field field)
+   {
+      FieldIntroConfig fieldIntroConfig = getFieldIntroConfig(field);
 
-        return null;
-    }
+      if (fieldIntroConfig != null)
+      {
+         Annotation proxy = getMemberAnnotationProxy(annotation, fieldIntroConfig);
+         if (proxy != null)
+         {
+            return proxy;
+         }
+      }
 
-    private Annotation getProxy(Class annotation, Method method) {
-        MethodIntroConfig methodIntroConfig = getMethodIntroConfig(method);
+      return null;
+   }
 
-        if(methodIntroConfig != null) {
-            Annotation proxy = getMemberAnnotationProxy(annotation, methodIntroConfig);
-            if(proxy != null) {
-                return proxy;
-            }
-        }
+   private Annotation getProxy(Class annotation, Method method)
+   {
+      MethodIntroConfig methodIntroConfig = getMethodIntroConfig(method);
 
-        return null;
-    }
+      if (methodIntroConfig != null)
+      {
+         Annotation proxy = getMemberAnnotationProxy(annotation, methodIntroConfig);
+         if (proxy != null)
+         {
+            return proxy;
+         }
+      }
 
-    private Annotation getProxy(Class annotation, Class clazz) {
-        ClassIntroConfig classIntroConfig = getClassIntroConfig(clazz);
+      return null;
+   }
 
-        if(classIntroConfig != null) {
-            Annotation proxy = getClassAnnotationProxy(annotation, classIntroConfig);
-            if(proxy != null) {
-                return proxy;
-            }
-        }
+   private Annotation getProxy(Class annotation, Class clazz)
+   {
+      ClassIntroConfig classIntroConfig = getClassIntroConfig(clazz);
 
-        return null;
-    }
+      if (classIntroConfig != null)
+      {
+         Annotation proxy = getClassAnnotationProxy(annotation, classIntroConfig);
+         if (proxy != null)
+         {
+            return proxy;
+         }
+      }
 
+      return null;
+   }
 
-    
+
 }

Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsConfigParser.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsConfigParser.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsConfigParser.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -28,26 +28,31 @@
 
 /**
  * Configuration Parser for a JBossESB JAXB Annotations Introduction Configuration.
- * 
+ *
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
-public abstract class IntroductionsConfigParser {
+public abstract class IntroductionsConfigParser
+{
 
-    /**
-     * Parse a JAXB Annotations Introduction Configuration stream.
-     *
-     * @param config The configuration stream.
-     * @return The configuration model.
-     * @throws ConfigurationException Bad configuration.
-     */
-    public static JaxbIntros parseConfig(InputStream config) throws ConfigurationException {
-        try {
-            JAXBContext jaxbContext = JAXBContext.newInstance(JaxbIntros.class);
-            Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+   /**
+    * Parse a JAXB Annotations Introduction Configuration stream.
+    *
+    * @param config The configuration stream.
+    * @return The configuration model.
+    * @throws ConfigurationException Bad configuration.
+    */
+   public static JaxbIntros parseConfig(InputStream config) throws ConfigurationException
+   {
+      try
+      {
+         JAXBContext jaxbContext = JAXBContext.newInstance(JaxbIntros.class);
+         Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
 
-            return (JaxbIntros) unmarshaller.unmarshal(config);
-        } catch (JAXBException e) {
-            throw new ConfigurationException("Bad JAXB Annotations Introduction Configuration.", e);
-        }
-    }
+         return (JaxbIntros)unmarshaller.unmarshal(config);
+      }
+      catch (JAXBException e)
+      {
+         throw new ConfigurationException("Bad JAXB Annotations Introduction Configuration.", e);
+      }
+   }
 }
\ No newline at end of file

Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassIntroConfig.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassIntroConfig.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassIntroConfig.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -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>
@@ -39,185 +39,176 @@
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "Class", propOrder = {
-    "xmlAccessorType",
-    "xmlType",
-    "xmlRootElement",
-    "field",
-    "method"
-})
-public class ClassIntroConfig {
+  "xmlAccessorType",
+  "xmlType",
+  "xmlRootElement",
+  "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 = "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>
-     * 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 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 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 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;
+   }
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+   /**
+    * 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;
-    }
+   /**
+    * 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/src/main/java/org/jboss/jaxb/intros/configmodel/ClassMemberIntroConfig.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassMemberIntroConfig.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassMemberIntroConfig.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -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>
@@ -37,98 +37,91 @@
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "class-member-intro-config", propOrder = {
-    "xmlElement",
-    "xmlAttribute"
-})
+  "xmlElement",
+  "xmlAttribute"
+  })
 @XmlSeeAlso({
-    MethodIntroConfig.class,
-    FieldIntroConfig.class
-})
-public class ClassMemberIntroConfig {
+  MethodIntroConfig.class,
+  FieldIntroConfig.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;
+   @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 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;
-    }
+   /**
+    * 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/src/main/java/org/jboss/jaxb/intros/configmodel/FieldIntroConfig.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/FieldIntroConfig.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/FieldIntroConfig.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -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,13 +26,11 @@
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "Field")
 public class FieldIntroConfig
-    extends ClassMemberIntroConfig
+  extends ClassMemberIntroConfig
 {
 
 

Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/JaxbIntros.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/JaxbIntros.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/JaxbIntros.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -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,73 +36,70 @@
  *   &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>
-     * 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 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 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/src/main/java/org/jboss/jaxb/intros/configmodel/MethodIntroConfig.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/MethodIntroConfig.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/MethodIntroConfig.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -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,13 +26,11 @@
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "Method")
 public class MethodIntroConfig
-    extends ClassMemberIntroConfig
+  extends ClassMemberIntroConfig
 {
 
 

Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ObjectFactory.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ObjectFactory.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ObjectFactory.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -15,198 +15,198 @@
 
 
 /**
- * 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 _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");
 
-    /**
-     * 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 ClassIntroConfig }
+    */
+   public ClassIntroConfig createClassIntroConfig()
+   {
+      return new ClassIntroConfig();
+   }
 
-    /**
-     * 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 XmlAttributeIntro }
+    */
+   public XmlAttributeIntro createXmlAttributeIntro()
+   {
+      return new XmlAttributeIntro();
+   }
 
-    /**
-     * Create an instance of {@link JaxbIntros }
-     * 
-     */
-    public JaxbIntros createJaxbIntros() {
-        return new JaxbIntros();
-    }
+   /**
+    * Create an instance of {@link JaxbIntros }
+    */
+   public JaxbIntros createJaxbIntros()
+   {
+      return new JaxbIntros();
+   }
 
-    /**
-     * Create an instance of {@link XmlRootElementIntro }
-     * 
-     */
-    public XmlRootElementIntro createXmlRootElementIntro() {
-        return new XmlRootElementIntro();
-    }
+   /**
+    * Create an instance of {@link XmlRootElementIntro }
+    */
+   public XmlRootElementIntro createXmlRootElementIntro()
+   {
+      return new XmlRootElementIntro();
+   }
 
-    /**
-     * Create an instance of {@link XmlElementIntro }
-     * 
-     */
-    public XmlElementIntro createXmlElementIntro() {
-        return new XmlElementIntro();
-    }
+   /**
+    * Create an instance of {@link XmlElementIntro }
+    */
+   public XmlElementIntro createXmlElementIntro()
+   {
+      return new XmlElementIntro();
+   }
 
-    /**
-     * Create an instance of {@link MethodIntroConfig }
-     * 
-     */
-    public MethodIntroConfig createMethodIntroConfig() {
-        return new MethodIntroConfig();
-    }
+   /**
+    * 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 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 XmlAccessorTypeIntro }
+    */
+   public XmlAccessorTypeIntro createXmlAccessorTypeIntro()
+   {
+      return new XmlAccessorTypeIntro();
+   }
 
-    /**
-     * 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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);
+   }
 
 }

Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAccessorTypeIntro.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAccessorTypeIntro.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAccessorTypeIntro.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -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/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAttributeIntro.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAttributeIntro.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAttributeIntro.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -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,104 +31,106 @@
  *   &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/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementIntro.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementIntro.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementIntro.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -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,188 +34,187 @@
  *   &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;
+   }
 
 }

Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlRootElementIntro.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlRootElementIntro.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlRootElementIntro.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -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,74 +30,75 @@
  *   &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;
+   }
 
 }

Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTypeIntro.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTypeIntro.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTypeIntro.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -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,163 +33,164 @@
  *   &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/src/main/java/org/jboss/jaxb/intros/configmodel/package-info.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/package-info.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/package-info.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -5,5 +5,4 @@
 // Generated on: 2007.08.21 at 10:20:40 PM GMT 
 //
 
- at 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;
+ at 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/src/main/java/org/jboss/jaxb/intros/handlers/ClassValue.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/ClassValue.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/ClassValue.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -29,9 +29,10 @@
  *
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
-public interface ClassValue {
+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);
 }

Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -34,41 +34,46 @@
 /**
  * @author <a href="mailto:chris at swaton.org">chris at swaton.org</a>
  */
-public class XmlAccessorTypeHandler implements InvocationHandler {
+public class XmlAccessorTypeHandler implements InvocationHandler
+{
 
-    private static final Log logger = LogFactory.getLog(XmlAccessorTypeHandler.class);
-    private XmlAccessorTypeIntro xmlAccessorTypeIntro;
+   private static final Log logger = LogFactory.getLog(XmlAccessorTypeHandler.class);
+   private XmlAccessorTypeIntro xmlAccessorTypeIntro;
 
-    private XmlAccessorTypeHandler(XmlAccessorTypeIntro xmlAccessorTypeIntro) {
-        this.xmlAccessorTypeIntro = xmlAccessorTypeIntro;
-    }
+   private XmlAccessorTypeHandler(XmlAccessorTypeIntro xmlAccessorTypeIntro)
+   {
+      this.xmlAccessorTypeIntro = xmlAccessorTypeIntro;
+   }
 
-    public static Annotation createProxy(XmlAccessorTypeIntro xmlAccessorTypeIntro) {
-        return (Annotation) Proxy.newProxyInstance(XmlAccessorType.class.getClassLoader(),
-                                          new Class[] { XmlAccessorType.class, ClassValue.class },
-                                          new XmlAccessorTypeHandler(xmlAccessorTypeIntro));
-    }
+   public static Annotation createProxy(XmlAccessorTypeIntro xmlAccessorTypeIntro)
+   {
+      return (Annotation)Proxy.newProxyInstance(XmlAccessorType.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>
-        */
+   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;
-    }
+      String methodName = method.getName();
+      if (methodName.equals("value"))
+      {
+         return XmlAccessType.valueOf(xmlAccessorTypeIntro.getValue());
+      }
+      return null;
+   }
 }

Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -30,41 +30,52 @@
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
-public class XmlAttributeHandler implements InvocationHandler {
+public class XmlAttributeHandler implements InvocationHandler
+{
 
-    private XmlAttributeIntro xmlAttributeIntro;
+   private XmlAttributeIntro xmlAttributeIntro;
 
-    public XmlAttributeHandler(XmlAttributeIntro xmlAttributeIntro) {
-        this.xmlAttributeIntro = xmlAttributeIntro;
-    }
+   public XmlAttributeHandler(XmlAttributeIntro xmlAttributeIntro)
+   {
+      this.xmlAttributeIntro = xmlAttributeIntro;
+   }
 
-    public static Annotation createProxy(XmlAttributeIntro xmlAttributeIntro) {
-        return (Annotation) Proxy.newProxyInstance(XmlAttribute.class.getClassLoader(),
-                                          new Class[] { XmlAttribute.class },
-                                          new XmlAttributeHandler(xmlAttributeIntro));
-    }
+   public static Annotation createProxy(XmlAttributeIntro xmlAttributeIntro)
+   {
+      return (Annotation)Proxy.newProxyInstance(XmlAttribute.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>
-         */
+   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();
+      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;
-        }
+      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;
-    }
+      return null;
+   }
 }

Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -31,61 +31,83 @@
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
-public class XmlElementHandler implements InvocationHandler {
+public class XmlElementHandler implements InvocationHandler
+{
 
-    private XmlElementIntro xmlElementIntro;
+   private XmlElementIntro xmlElementIntro;
 
-    private XmlElementHandler(XmlElementIntro xmlElementIntro) {
-        this.xmlElementIntro = xmlElementIntro;
-    }
+   private XmlElementHandler(XmlElementIntro xmlElementIntro)
+   {
+      this.xmlElementIntro = xmlElementIntro;
+   }
 
-    public static Annotation createProxy(XmlElementIntro xmlElementIntro) {
-        return (Annotation) Proxy.newProxyInstance(XmlElement.class.getClassLoader(),
-                                          new Class[] { XmlElement.class, ClassValue.class },
-                                          new XmlElementHandler(xmlElementIntro));
-    }
+   public static Annotation createProxy(XmlElementIntro xmlElementIntro)
+   {
+      return (Annotation)Proxy.newProxyInstance(XmlElement.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();
+   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("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.");
-                }
+      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());
             }
-            return XmlElement.DEFAULT.class;
-        } else if(methodName.equals("annotationType")) {
-            return XmlElement.class;
-        }
+            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;
-    }
+      return null;
+   }
 }

Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -33,35 +33,42 @@
 /**
  * @author <a href="mailto:chris at swaton.org">chris at swaton.org</a>
  */
-public class XmlRootElementHandler implements InvocationHandler {
+public class XmlRootElementHandler implements InvocationHandler
+{
 
-    private static final Log logger = LogFactory.getLog(XmlRootElementHandler.class);
-    private XmlRootElementIntro xmlRootElementIntro;
+   private static final Log logger = LogFactory.getLog(XmlRootElementHandler.class);
+   private XmlRootElementIntro xmlRootElementIntro;
 
-    private XmlRootElementHandler(XmlRootElementIntro xmlRootElementIntro) {
-        this.xmlRootElementIntro = xmlRootElementIntro;
-    }
+   private XmlRootElementHandler(XmlRootElementIntro xmlRootElementIntro)
+   {
+      this.xmlRootElementIntro = xmlRootElementIntro;
+   }
 
-    public static Annotation createProxy(XmlRootElementIntro xmlRootElementIntro) {
-        return (Annotation) Proxy.newProxyInstance(XmlRootElement.class.getClassLoader(),
-                                          new Class[] { XmlRootElement.class, ClassValue.class },
-                                          new XmlRootElementHandler(xmlRootElementIntro));
-    }
+   public static Annotation createProxy(XmlRootElementIntro xmlRootElementIntro)
+   {
+      return (Annotation)Proxy.newProxyInstance(XmlRootElement.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>
-        */
+   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;
-    }
+      String methodName = method.getName();
+      if (methodName.equals("namespace"))
+      {
+         return xmlRootElementIntro.getNamespace();
+      }
+      else if (methodName.equals("name"))
+      {
+         return xmlRootElementIntro.getName();
+      }
+      return null;
+   }
 }

Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java	2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java	2007-09-21 08:39:58 UTC (rev 4604)
@@ -33,60 +33,81 @@
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
-public class XmlTypeHandler implements InvocationHandler {
+public class XmlTypeHandler implements InvocationHandler
+{
 
-    private static final Log logger = LogFactory.getLog(XmlTypeHandler.class);
-    private XmlTypeIntro xmlTypeIntro;
+   private static final Log logger = LogFactory.getLog(XmlTypeHandler.class);
+   private XmlTypeIntro xmlTypeIntro;
 
-    private XmlTypeHandler(XmlTypeIntro xmlTypeIntro) {
-        this.xmlTypeIntro = xmlTypeIntro;
-    }
+   private XmlTypeHandler(XmlTypeIntro xmlTypeIntro)
+   {
+      this.xmlTypeIntro = xmlTypeIntro;
+   }
 
-    public static Annotation createProxy(XmlTypeIntro xmlTypeIntro) {
-        return (Annotation) Proxy.newProxyInstance(XmlType.class.getClassLoader(),
-                                          new Class[] { XmlType.class, ClassValue.class },
-                                          new XmlTypeHandler(xmlTypeIntro));
-    }
+   public static Annotation createProxy(XmlTypeIntro xmlTypeIntro)
+   {
+      return (Annotation)Proxy.newProxyInstance(XmlType.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();
+   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("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 {
-                return xmlTypeIntro.getPropOrder().split(",");
-            } catch(Exception e) {
-                logger.warn("Bad 'XmlType.propOrder' config value '" + xmlTypeIntro.getPropOrder() + "' in JAXB Annotation Introduction config.  Must be a CSV String.");
+      if (methodName.equals("namespace"))
+      {
+         return xmlTypeIntro.getNamespace();
+      }
+      else if (methodName.equals("name"))
+      {
+         return xmlTypeIntro.getName();
+      }
+      else if (methodName.equals("propOrder"))
+      {
+         try
+         {
+            return xmlTypeIntro.getPropOrder().split(",");
+         }
+         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());
             }
-        } 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.");
-                }
+            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 XmlType.DEFAULT.class;
+      }
+      else if (methodName.equals("factoryMethod"))
+      {
+         return xmlTypeIntro.getFactoryMethod();
+      }
 
-        return null;
-    }
+      return null;
+   }
 }




More information about the jbossws-commits mailing list