[jboss-cvs] JBossAS SVN: r106163 - in projects/profileservice/trunk/domain/src/test: resources/schemas and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Jun 18 10:38:44 EDT 2010


Author: alex.loubyansky at jboss.com
Date: 2010-06-18 10:38:44 -0400 (Fri, 18 Jun 2010)
New Revision: 106163

Removed:
   projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-servers.xsd
Modified:
   projects/profileservice/trunk/domain/src/test/java/org/jboss/test/profileservice/domain/parsing/test/XSDValidationUnitTestCase.java
   projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-common.xsd
   projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-host.xsd
   projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain.xsd
Log:
merged servers into common schema

Modified: projects/profileservice/trunk/domain/src/test/java/org/jboss/test/profileservice/domain/parsing/test/XSDValidationUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/domain/src/test/java/org/jboss/test/profileservice/domain/parsing/test/XSDValidationUnitTestCase.java	2010-06-18 14:32:40 UTC (rev 106162)
+++ projects/profileservice/trunk/domain/src/test/java/org/jboss/test/profileservice/domain/parsing/test/XSDValidationUnitTestCase.java	2010-06-18 14:38:44 UTC (rev 106163)
@@ -30,11 +30,6 @@
       validateSchema("jboss-domain-common.xsd");
    }
 
-   public void testServers() throws Exception
-   {
-      validateSchema("jboss-domain-servers.xsd");
-   }
-
    public void testDomain() throws Exception
    {
       validateSchema("jboss-domain.xsd");

Modified: projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-common.xsd
===================================================================
--- projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-common.xsd	2010-06-18 14:32:40 UTC (rev 106162)
+++ projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-common.xsd	2010-06-18 14:38:44 UTC (rev 106163)
@@ -4,6 +4,191 @@
     xmlns="urn:jboss:domain:1.0"
     >
 
+    <!-- Include the logging schema definitions for reuse -->
+    <xs:include schemaLocation="jboss-domain-logging.xsd"/>
+
+    <xs:complexType name="server-groupType">
+        <xs:sequence>
+            <xs:element name="java-config" type="java-configType" />
+
+            <xs:element name="subsystems" type="disabledSubsystemsType"/>
+            <xs:element name="deployments" type="disabledDeploymentsType"/>
+
+            <xs:element name="resources" minOccurs="0" maxOccurs="unbounded" type="resourcesType"/>
+            <xs:element name="system-properties" minOccurs="0" type="propertiesType"/>
+        </xs:sequence>
+        <xs:attribute name="group-name" type="xs:ID">
+            <xs:annotation>
+                <xs:documentation>
+                    The name of the server group
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+
+    <xs:complexType name="clustersType">
+        <xs:complexContent>
+            <xs:extension base="server-groupType">
+                <xs:sequence>
+                    <xs:element name="subsystems" type="disabledSubsystemsType"/>
+                    <xs:element name="partition-name" type="xs:string"/>
+                    <xs:element name="state-transfer-timeout" type="xs:integer"/>
+                    <xs:element name="method-call-timeout" type="xs:integer"/>
+                </xs:sequence>
+                <xs:attribute name="category" type="xs:string" use="required"/>                    
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="serverType">
+        <xs:sequence>
+            <xs:element name="server-group-ref" minOccurs="1" maxOccurs="unbounded" type="server-group-refType" />
+            <xs:element name="java-config" minOccurs="0" type="java-configType" />
+
+            <!-- this element is present if the server is started at boot; otherwise, the server is configured but idle -->
+            <xs:element name="running" minOccurs="0"/>
+
+            <xs:element name="interfaces" type="interfacesType" minOccurs="0"/>
+            <xs:element name="port-group" type="attributeNameType" minOccurs="0"/>
+
+
+            <xs:element name="loggers" type="loggersType" />
+            <xs:element name="system-properties" type="propertiesType"/>
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+    </xs:complexType>
+
+    <xs:complexType name="server-group-refType">
+        <xs:attribute name="ref" type="xs:IDREF">
+            <xs:annotation>
+                <xs:documentation>
+                    The name of the server group or cluster the server is associated with.
+                </xs:documentation>
+            </xs:annotation>            
+        </xs:attribute>
+    </xs:complexType>
+
+    <xs:complexType name="interfacesType">
+        <xs:sequence>
+            <xs:element name="interface" type="interfaceType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="interfaceType">
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="address" type="xs:string" use="required"/>
+    </xs:complexType>
+
+
+  <xs:complexType name="disabledSubsystemsType">
+    <xs:annotation>
+      <xs:documentation>Contains a list of disabled subsystems per server-group</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="disable" type="attributeNameType" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="disabledDeploymentsType">
+    <xs:annotation>
+      <xs:documentation>Contains a list of disabled deplyments per server-group</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="disable" type="attributeNameType" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+    <!-- resources related definitions -->
+    <xs:complexType name="resourcesType">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element name="external-jndi-resource" type="external-jndi-resourceType"/>
+            <xs:element name="jdbc-resource" type="external-jndi-resourceType"/>
+            <xs:element name="mail-resource" type="mail-resourceType"/>
+            <xs:element name="persistence-manager-factory-resource"
+                type="persistence-manager-factory-resourceType"/>
+            <!-- 
+            <xs:group ref="connector-resource"/>
+            <xs:group ref="resource-adapter-config"/>
+            <xs:group ref="connector-connection-pool"/>
+            -->
+        </xs:choice>
+        <xs:attribute name="name"/>
+        <xs:attribute name="jndi-name">
+            <xs:annotation>
+                <xs:documentation>The JNDI name under which to bind the resource</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="factory-class">
+            <xs:annotation>
+                <xs:documentation>The class name of the ObjectFactory</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+
+    <xs:complexType name="external-jndi-resourceType">
+        <xs:complexContent>
+            <xs:extension base="resource-commonType">
+                <xs:attribute name="jndi-lookup-name" use="required"/>
+                <xs:attribute name="res-type" use="required"/>
+                <xs:attribute name="factory-class" use="required"/>
+                <xs:attribute name="enabled" default="true" type="xs:boolean"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="jdbc-resourceType">
+        <xs:complexContent>
+            <xs:extension base="resource-commonType">
+                <xs:attribute name="pool-name" use="required"/>
+                <xs:attribute name="enabled" default="true" type="xs:boolean"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:attributeGroup name="jdbc-connection-pool">
+        <xs:attribute name="name" use="required"/>
+    </xs:attributeGroup>
+
+    <xs:complexType name="mail-resourceType">
+        <xs:complexContent>
+            <xs:extension base="resource-commonType">
+                <xs:sequence minOccurs="0" maxOccurs="1">
+                    <xs:annotation>
+                        <xs:documentation>The JavaMail connection properties</xs:documentation>
+                    </xs:annotation>
+                    <xs:element name="mail.store.protocol" type="xs:string"/>
+                    <xs:element name="mail.transport.protocol" type="xs:string"/>
+                    <xs:element name="mail.user" type="xs:string"/>
+                    <xs:element name="mail.pop3.host" type="xs:string"/>
+                    <xs:element name="mail.smtp.host" type="xs:string"/>
+                    <xs:element name="mail.smtp.port" type="xs:string"/>
+                    <xs:element name="mail.from" type="xs:string"/>
+                    <xs:element name="mail.debug" type="xs:string"/>
+                </xs:sequence>
+                <xs:attribute name="user" use="required"/>
+                <xs:attribute name="password" use="required"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="persistence-manager-factory-resourceType">
+        <xs:complexContent>
+            <xs:extension base="resource-commonType">
+                <xs:attribute name="factory-class" use="required">
+                    <xs:annotation>
+                        <xs:documentation>The class name of the JPA factory</xs:documentation>
+                    </xs:annotation>
+                </xs:attribute>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="resource-commonType">
+        <xs:sequence minOccurs="0" maxOccurs="1">
+            <xs:element name="properties" type="propertiesType"/>
+        </xs:sequence>
+    </xs:complexType>
+
 <!-- Common definitions -->
     <xs:complexType name="java-configType">
         <xs:all minOccurs="0" maxOccurs="1">

Modified: projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-host.xsd
===================================================================
--- projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-host.xsd	2010-06-18 14:32:40 UTC (rev 106162)
+++ projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-host.xsd	2010-06-18 14:38:44 UTC (rev 106163)
@@ -29,8 +29,8 @@
             attributeFormDefault="unqualified"
             version="1.0">
 
-  <!-- Include the server groups definitions -->
-  <xs:include schemaLocation="jboss-domain-servers.xsd" />
+  <!-- Include the common definitions -->
+  <xs:include schemaLocation="jboss-domain-common.xsd" />
 
     <xs:element name="host-config" type="host-configType"/>
 

Deleted: projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-servers.xsd
===================================================================
--- projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-servers.xsd	2010-06-18 14:32:40 UTC (rev 106162)
+++ projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-servers.xsd	2010-06-18 14:38:44 UTC (rev 106163)
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns="urn:jboss:domain:1.0"
-    targetNamespace="urn:jboss:domain:1.0"
-    >
-
-    <!-- Include the common definitions -->
-    <xs:include schemaLocation="jboss-domain-common.xsd" />
-    <!-- Include the logging schema definitions for reuse -->
-    <xs:include schemaLocation="jboss-domain-logging.xsd"/>
-
-    <xs:complexType name="server-groupType">
-        <xs:sequence>
-            <xs:element name="java-config" type="java-configType" />
-
-            <xs:element name="subsystems" type="disabledSubsystemsType"/>
-            <xs:element name="deployments" type="disabledDeploymentsType"/>
-
-            <xs:element name="resources" minOccurs="0" maxOccurs="unbounded" type="resourcesType"/>
-            <xs:element name="system-properties" minOccurs="0" type="propertiesType"/>
-        </xs:sequence>
-        <xs:attribute name="group-name" type="xs:ID">
-            <xs:annotation>
-                <xs:documentation>
-                    The name of the server group
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-    </xs:complexType>
-
-    <xs:complexType name="clustersType">
-        <xs:complexContent>
-            <xs:extension base="server-groupType">
-                <xs:sequence>
-                    <xs:element name="subsystems" type="disabledSubsystemsType"/>
-                    <xs:element name="partition-name" type="xs:string"/>
-                    <xs:element name="state-transfer-timeout" type="xs:integer"/>
-                    <xs:element name="method-call-timeout" type="xs:integer"/>
-                </xs:sequence>
-                <xs:attribute name="category" type="xs:string" use="required"/>                    
-            </xs:extension>
-        </xs:complexContent>
-    </xs:complexType>
-
-    <xs:complexType name="serverType">
-        <xs:sequence>
-            <xs:element name="server-group-ref" minOccurs="1" maxOccurs="unbounded" type="server-group-refType" />
-            <xs:element name="java-config" minOccurs="0" type="java-configType" />
-
-            <!-- this element is present if the server is started at boot; otherwise, the server is configured but idle -->
-            <xs:element name="running" minOccurs="0"/>
-
-            <xs:element name="interfaces" type="interfacesType" minOccurs="0"/>
-            <xs:element name="port-group" type="attributeNameType" minOccurs="0"/>
-
-
-            <xs:element name="loggers" type="loggersType" />
-            <xs:element name="system-properties" type="propertiesType"/>
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:string" use="required"/>
-    </xs:complexType>
-
-    <xs:complexType name="server-group-refType">
-        <xs:attribute name="ref" type="xs:IDREF">
-            <xs:annotation>
-                <xs:documentation>
-                    The name of the server group or cluster the server is associated with.
-                </xs:documentation>
-            </xs:annotation>            
-        </xs:attribute>
-    </xs:complexType>
-
-    <xs:complexType name="interfacesType">
-        <xs:sequence>
-            <xs:element name="interface" type="interfaceType" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="interfaceType">
-        <xs:attribute name="name" type="xs:string" use="required"/>
-        <xs:attribute name="address" type="xs:string" use="required"/>
-    </xs:complexType>
-
-
-  <xs:complexType name="disabledSubsystemsType">
-    <xs:annotation>
-      <xs:documentation>Contains a list of disabled subsystems per server-group</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="disable" type="attributeNameType" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="disabledDeploymentsType">
-    <xs:annotation>
-      <xs:documentation>Contains a list of disabled deplyments per server-group</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="disable" type="attributeNameType" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-    <!-- resources related definitions -->
-    <xs:complexType name="resourcesType">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element name="external-jndi-resource" type="external-jndi-resourceType"/>
-            <xs:element name="jdbc-resource" type="external-jndi-resourceType"/>
-            <xs:element name="mail-resource" type="mail-resourceType"/>
-            <xs:element name="persistence-manager-factory-resource"
-                type="persistence-manager-factory-resourceType"/>
-            <!-- 
-            <xs:group ref="connector-resource"/>
-            <xs:group ref="resource-adapter-config"/>
-            <xs:group ref="connector-connection-pool"/>
-            -->
-        </xs:choice>
-        <xs:attribute name="name"/>
-        <xs:attribute name="jndi-name">
-            <xs:annotation>
-                <xs:documentation>The JNDI name under which to bind the resource</xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="factory-class">
-            <xs:annotation>
-                <xs:documentation>The class name of the ObjectFactory</xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-    </xs:complexType>
-
-    <xs:complexType name="external-jndi-resourceType">
-        <xs:complexContent>
-            <xs:extension base="resource-commonType">
-                <xs:attribute name="jndi-lookup-name" use="required"/>
-                <xs:attribute name="res-type" use="required"/>
-                <xs:attribute name="factory-class" use="required"/>
-                <xs:attribute name="enabled" default="true" type="xs:boolean"/>
-            </xs:extension>
-        </xs:complexContent>
-    </xs:complexType>
-
-    <xs:complexType name="jdbc-resourceType">
-        <xs:complexContent>
-            <xs:extension base="resource-commonType">
-                <xs:attribute name="pool-name" use="required"/>
-                <xs:attribute name="enabled" default="true" type="xs:boolean"/>
-            </xs:extension>
-        </xs:complexContent>
-    </xs:complexType>
-
-    <xs:attributeGroup name="jdbc-connection-pool">
-        <xs:attribute name="name" use="required"/>
-    </xs:attributeGroup>
-
-    <xs:complexType name="mail-resourceType">
-        <xs:complexContent>
-            <xs:extension base="resource-commonType">
-                <xs:sequence minOccurs="0" maxOccurs="1">
-                    <xs:annotation>
-                        <xs:documentation>The JavaMail connection properties</xs:documentation>
-                    </xs:annotation>
-                    <xs:element name="mail.store.protocol" type="xs:string"/>
-                    <xs:element name="mail.transport.protocol" type="xs:string"/>
-                    <xs:element name="mail.user" type="xs:string"/>
-                    <xs:element name="mail.pop3.host" type="xs:string"/>
-                    <xs:element name="mail.smtp.host" type="xs:string"/>
-                    <xs:element name="mail.smtp.port" type="xs:string"/>
-                    <xs:element name="mail.from" type="xs:string"/>
-                    <xs:element name="mail.debug" type="xs:string"/>
-                </xs:sequence>
-                <xs:attribute name="user" use="required"/>
-                <xs:attribute name="password" use="required"/>
-            </xs:extension>
-        </xs:complexContent>
-    </xs:complexType>
-
-    <xs:complexType name="persistence-manager-factory-resourceType">
-        <xs:complexContent>
-            <xs:extension base="resource-commonType">
-                <xs:attribute name="factory-class" use="required">
-                    <xs:annotation>
-                        <xs:documentation>The class name of the JPA factory</xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
-            </xs:extension>
-        </xs:complexContent>
-    </xs:complexType>
-
-    <xs:complexType name="resource-commonType">
-        <xs:sequence minOccurs="0" maxOccurs="1">
-            <xs:element name="properties" type="propertiesType"/>
-        </xs:sequence>
-    </xs:complexType>
-
-</xs:schema>

Modified: projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain.xsd
===================================================================
--- projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain.xsd	2010-06-18 14:32:40 UTC (rev 106162)
+++ projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain.xsd	2010-06-18 14:38:44 UTC (rev 106163)
@@ -4,8 +4,8 @@
   targetNamespace="urn:jboss:domain:1.0"
   xmlns:sec="urn:jboss:security-config:5.0">
 
-  <!-- Include the server groups definitions -->
-  <xs:include schemaLocation="jboss-domain-servers.xsd" />
+  <!-- Include the common definitions -->
+  <xs:include schemaLocation="jboss-domain-common.xsd" />
   <!-- Include the web schema definitions for reuse -->
   <xs:include schemaLocation="jboss-domain-web.xsd"/>
   <!-- Import the security schema definitions for reuse -->



More information about the jboss-cvs-commits mailing list