[jboss-cvs] JBossAS SVN: r103031 - projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain.

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

Author: alex.loubyansky at jboss.com
Date: 2010-03-26 07:16:17 -0400 (Fri, 26 Mar 2010)
New Revision: 103031

Modified:
   projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/AbstractDomainMetaData.java
Log:
some xb binding fixes for the domain model

Modified: projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/AbstractDomainMetaData.java
===================================================================
--- projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/AbstractDomainMetaData.java	2010-03-26 11:15:50 UTC (rev 103030)
+++ projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/AbstractDomainMetaData.java	2010-03-26 11:16:17 UTC (rev 103031)
@@ -26,6 +26,7 @@
 import javax.xml.bind.annotation.XmlAnyElement;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
@@ -34,7 +35,9 @@
 import org.jboss.profileservice.domain.resources.JdbcResource;
 import org.jboss.profileservice.domain.spi.DomainFeatureNode;
 import org.jboss.profileservice.domain.spi.DomainMetaData;
+import org.jboss.profileservice.domain.threadpool.BasicThreadPoolMetaData;
 import org.jboss.profileservice.domain.threadpool.IThreadPool;
+import org.jboss.xb.annotations.JBossXmlNsPrefix;
 import org.jboss.xb.annotations.JBossXmlSchema;
 
 /**
@@ -46,7 +49,9 @@
 @JBossXmlSchema(namespace=DomainMetaData.DOMAIN_NAMESPACE,
       elementFormDefault=XmlNsForm.QUALIFIED,
       normalizeSpace=true,
-      replacePropertyRefs=true)
+      replacePropertyRefs=true,
+      xmlns={@XmlNs(namespaceURI=DomainMetaData.SERVER_NAMESPACE, prefix="server"),
+      @XmlNs(namespaceURI=DomainMetaData.THREAD_POOL_NAMESPACE, prefix="tp")})
 @XmlRootElement(name = "domain")
 @XmlType(name = "domainType", propOrder = {"server", "jdbcResources", "threadPools", "features"})
 public class AbstractDomainMetaData implements DomainMetaData
@@ -86,7 +91,7 @@
     * 
     * @return the server meta data
     */
-   @XmlElement(namespace=DomainMetaData.SERVER_NAMESPACE)
+   @JBossXmlNsPrefix(prefix="server")
    public ServerMetaData getServer()
    {
       return server;
@@ -98,7 +103,7 @@
    }
 
    @XmlElementWrapper(name="jdbc-resources")
-   @XmlElement(name="jdbc-resource", namespace=DomainMetaData.THREAD_POOL_NAMESPACE)
+   @XmlElement(name="jdbc-resource")
    public List<JdbcResource> getJdbcResources()
    {
       return jdbcResources;
@@ -108,7 +113,9 @@
       this.jdbcResources = jdbcResources;
    }
 
-   @XmlElement(name="thread-pools", namespace=DomainMetaData.THREAD_POOL_NAMESPACE)
+   @XmlElementWrapper(name="thread-pools", namespace=DomainMetaData.THREAD_POOL_NAMESPACE)
+   @JBossXmlNsPrefix(prefix="tp")
+   @XmlElement(name="thread-pool", type=BasicThreadPoolMetaData.class)
    public List<IThreadPool> getThreadPools()
    {
       return threadPools;