[jboss-cvs] JBossAS SVN: r90688 - projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-06-30 04:22:54 -0400 (Tue, 30 Jun 2009)
New Revision: 90688

Modified:
   projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TBlueprint.java
Log:
Add namespace qualifiers to JAXB annotations

Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TBlueprint.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TBlueprint.java	2009-06-30 08:20:26 UTC (rev 90687)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TBlueprint.java	2009-06-30 08:22:54 UTC (rev 90688)
@@ -47,29 +47,28 @@
 
 /**
  * The blueprint element is the top element.
- *  
- * The definitions consist of two sections: 
- * the type-converter section and the components section.
  * 
+ * The definitions consist of two sections: the type-converter section and the components section.
+ * 
  * blueprint ::= <type-converters> component 
  * component ::= <bean> | <service> | service-reference 
  * service-reference ::= <reference> | <ref-list> | <ref-set>
- * type-converter ::= <bean> | <ref> 
+ * type-converter ::= <bean> | <ref>
  * 
  * @author thomas.diesler at jboss.com
  * @since 13-May-2009
  */
- at JBossXmlSchema(namespace=BlueprintContext.XMLNS_BLUEPRINT, elementFormDefault= XmlNsForm.QUALIFIED)
- at XmlRootElement(name="blueprint")
- at XmlType(name="Tblueprint")
+ at JBossXmlSchema(namespace = BlueprintContext.XMLNS_BLUEPRINT, elementFormDefault = XmlNsForm.QUALIFIED)
+ at XmlRootElement(name = "blueprint", namespace = BlueprintContext.XMLNS_BLUEPRINT)
+ at XmlType(name = "Tblueprint", namespace = BlueprintContext.XMLNS_BLUEPRINT)
 public class TBlueprint
 {
    protected String description;
    protected TTypeConverters typeConverters;
    @XmlElements({
-      @XmlElement(name="bean", type=TBean.class), 
-      @XmlElement(name="service", type=TService.class), 
-      @XmlElement(name="reference", type=TReference.class)})
+      @XmlElement(name="bean", namespace = BlueprintContext.XMLNS_BLUEPRINT, type=TBean.class), 
+      @XmlElement(name="service", namespace = BlueprintContext.XMLNS_BLUEPRINT, type=TService.class), 
+      @XmlElement(name="reference", namespace = BlueprintContext.XMLNS_BLUEPRINT, type=TReference.class)})
    protected List<TComponent> components;
    protected Boolean defaultLazyInit;
    protected String defaultInitMethod;
@@ -138,7 +137,7 @@
       }
       return Collections.unmodifiableSet(compIds);
    }
-   
+
    @SuppressWarnings("unchecked")
    public <T extends TComponent> Collection<T> getMetadata(Class<T> type)
    {
@@ -155,7 +154,7 @@
    {
       if (name == null)
          throw new IllegalArgumentException("Cannot get metadata for id: null");
-      
+
       TComponent compMetadata = null;
       for (TComponent comp : getComponents())
       {
@@ -165,13 +164,13 @@
             break;
          }
       }
-      
+
       if (compMetadata == null)
          throw new NoSuchComponentException(name);
-      
+
       return compMetadata;
    }
-   
+
    /**
     * Gets the value of the defaultLazyInit property.
     *