[jboss-cvs] JBossAS SVN: r106091 - projects/profileservice/trunk/domain/src/test/resources/schemas.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 16 13:03:39 EDT 2010
Author: alex.loubyansky at jboss.com
Date: 2010-06-16 13:03:38 -0400 (Wed, 16 Jun 2010)
New Revision: 106091
Modified:
projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-common.xsd
projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-example.xml
projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-logging.xsd
projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-resources.xsd
projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-security.xsd
projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-servers.xsd
projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-web.xsd
projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain.xsd
projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-logging_6_0.xsd
Log:
namespace urn:jboss:domain:1.0; threads and remoting removed; changed jvm-option element to <jvm-option value=-Xmx512m/>; added <heap size=128m max-size=512m/>; added domain-level subsystems and server-group subsystems that should be disabled; added domain-level deployments and server-group deployments that should be disabled
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-16 15:41:31 UTC (rev 106090)
+++ projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-common.xsd 2010-06-16 17:03:38 UTC (rev 106091)
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:jboss:domain:common:1.0"
- xmlns="urn:jboss:domain:common:1.0"
+ targetNamespace="urn:jboss:domain:1.0"
+ xmlns="urn:jboss:domain:1.0"
>
<!-- Common definitions -->
<xs:complexType name="java-configType">
<xs:all minOccurs="0" maxOccurs="1">
- <xs:element name="jvm-options" type="xs:string" />
+ <xs:element name="heap" type="heapType"/>
+ <xs:element name="jvm-option" type="jvm-optionType" />
<xs:element name="jvm-properties" type="propertiesType" />
<xs:element name="system-properties" type="propertiesType" />
<xs:element name="classpath-prefix"/>
@@ -25,6 +26,27 @@
<xs:attribute name="env-classpath-ignored" default="true" type="boolean"/>
</xs:complexType>
+ <xs:complexType name="heapType">
+ <xs:attribute name="size" use="optional">
+ <xs:annotation>
+ <xs:documentation>Initial JVM heap size</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="max-size" use="optional">
+ <xs:annotation>
+ <xs:documentation>Maximum JVM heap size</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="jvm-optionType">
+ <xs:attribute name="value" use="required">
+ <xs:annotation>
+ <xs:documentation>JVM option value</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
<xs:complexType name="resource-refType">
<xs:attribute name="name" use="required">
<xs:annotation>
@@ -63,4 +85,16 @@
<xs:enumeration value="false"/>
</xs:restriction>
</xs:simpleType>
+
+ <xs:complexType name="attributeNameType">
+ <xs:annotation>
+ <xs:documentation>A complex type that declares only attribute 'name'.</xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="name" use="required">
+ <xs:annotation>
+ <xs:documentation>The meaning depends on the context the type is used in.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
</xs:schema>
Modified: projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-example.xml
===================================================================
--- projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-example.xml 2010-06-16 15:41:31 UTC (rev 106090)
+++ projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-example.xml 2010-06-16 17:03:38 UTC (rev 106091)
@@ -1,13 +1,7 @@
<domain xmlns="urn:jboss:domain:1.0"
targetNamespace="urn:jboss:domain:1.0"
- xmlns:com="urn:jboss:domain:common:1.0"
- xmlns:prof="urn:jboss:domain:profiles:1.0"
- xmlns:res="urn:jboss:domain:resources:1.0"
- xmlns:serv="urn:jboss:domain:servers:1.0"
- xmlns:thr="urn:jboss:threads:2.0"
xmlns:sec="urn:jboss:security-config:5.0"
- xmlns:rem="urn:jboss:remoting:3.1"
- xmlns:web="urn:jboss:domain:web:1.0">
+>
<!-- The domain manager/server bootstrap configuration -->
<domain-configuration>
@@ -15,17 +9,33 @@
<bootstrapURI>http://bootstrap.uri</bootstrapURI>
</domain-configuration>
+ <subsystems>
+ <subsystem name="ejb"/>
+ <subsystem name="war"/>
+ <subsystem name="jms" allowed="false"/>
+ </subsystems>
+
+ <deployments>
+ <deployment name="my-app.ear" sha1="xxx"/>
+ <deployment name="my-ejb.jar" sha1="xxx"/>
+ <deployment name="my-war.ear" sha1="xxx" allowed="false"/>
+ </deployments>
+
<server-groups>
<server-group group-name="group1">
<java-config java-home=${java.home}
debug-enabled="true" debug-options="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n"
javac-options="-g" env-classpath-ignored="true">
- <jvm-options>-server</jvm-options>
- <jvm-options>-Xmx512m</jvm-options>
+
+ <heap size="512m" max-size="1024m"/>
+ <jvm-option value="-server"/>
+ <jvm-option value="-XX:-DisableExplicitGC"/>
+
<jvm-properties>
<property name="prop1" value="value1"/>
<property name="prop2" value="value2"/>
</jvm-properties>
+
<system-properties>
<property name="prop1" value="value1"/>
<property name="prop2" value="value2"/>
@@ -39,10 +49,13 @@
<bytecode-preprocessors>org.xxx.BytecodePreprocessorImpl,com.xxx.BytecodePreprocessorImpl</bytecode-preprocessors>
</java-config>
-<!-- profiles section will change
- <profiles>
- </profiles>
--->
+ <subsystems>
+ <disable name="http"/>
+ <disable name="ejb"/>
+ </subsystems>
+ <deployments>
+ <disable name="my-ejb.jar"/>
+ </deployments>
<resources>
<external-jndi-resource jndi-lookup-name="external/JNDIResource1"
@@ -141,45 +154,6 @@
</server>
</servers>
- <threads>
- <!-- A thread that is automatically started up. -->
- <thread name="thread1" daemon="false" priority="4">
- <task name="task1">
- <thread-factory name="ThreadFactory1">
- <exception-handler name="DefaultExceptionHandler">
- <!-- optional <task-filter> -->
- </thread>
-
- <!-- A thread group that can be referenced by a bean name. -->
- <thread-group name="ThreadGroupBean1" group-name="ThreadGroup1" daemon="true" max-priority="7">
- <parent-thread-group name="MainThreadGroup"/>
- </thread-group>
-
- <!-- A thread factory (implementing java.util.concurrent.ThreadFactory). -->
- <thread-factory name="ThreadFactory1" daemon="true" thread-name-pattern="${pattern}" priority="10">
- <thread-group name="ThreadGroupBean1"/>
- <exception-handler name="DefaultExceptionHandler"/>
- <!-- optional <task-filter> -->
- </thread-factory>
-<!--
- <thread-factory-executor>
-
- <unbounded-queue-thread-pool-executor>
-
- <bounded-queue-thread-pool-executor>
-
- <queueless-thread-pool-executor>
-
- <scheduled-thread-pool-executor>
-
- <unbounded-ordered-executor>
-
- <bounded-ordered-executor>
-
- <direct-executor>
--->
- </threads>
-
<security-policy>
<authentication>
<login-module code="org.xxx.LoginModule1" flag="sufficient">
@@ -215,11 +189,6 @@
</acl>
</security-policy>
-<!-- remoting config
- <remoting>
- </remoting>
--->
-
<containers>
<web-container>
<thread-group name="ThreadGroupBean1"/>
Modified: projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-logging.xsd
===================================================================
--- projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-logging.xsd 2010-06-16 15:41:31 UTC (rev 106090)
+++ projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-logging.xsd 2010-06-16 17:03:38 UTC (rev 106091)
@@ -23,15 +23,14 @@
-->
<!-- Modified from the urn:jboss:logging:6.0 (jboss-logging_6_0.xsd) -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:com="urn:jboss:domain:common:1.0"
- targetNamespace="urn:jboss:domain:logging:1.0"
- xmlns="urn:jboss:domain:logging:1.0"
+ targetNamespace="urn:jboss:domain:1.0"
+ xmlns="urn:jboss:domain:1.0"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
<!-- Allow access to common domain schema elements -->
- <xs:import namespace="urn:jboss:domain:common:1.0" schemaLocation="jboss-domain-common.xsd"/>
+ <xs:include schemaLocation="jboss-domain-common.xsd"/>
<xs:element name="logging" type="loggingType"/>
Modified: projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-resources.xsd
===================================================================
--- projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-resources.xsd 2010-06-16 15:41:31 UTC (rev 106090)
+++ projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-resources.xsd 2010-06-16 17:03:38 UTC (rev 106091)
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:jboss:domain:resources:1.0" xmlns="urn:jboss:domain:resources:1.0"
- xmlns:dc="urn:jboss:domain:common:1.0">
+ targetNamespace="urn:jboss:domain:1.0" xmlns="urn:jboss:domain:1.0">
- <!-- Import the common definitions -->
- <xs:import namespace="urn:jboss:domain:common:1.0" schemaLocation="jboss-domain-common.xsd"/>
+ <!-- Include the common definitions -->
+ <xs:include schemaLocation="jboss-domain-common.xsd"/>
<!-- resources related definitions -->
<xs:complexType name="resourcesType">
@@ -48,7 +47,7 @@
<xs:complexContent>
<xs:extension base="resource-commonType">
<xs:attribute name="pool-name" use="required"/>
- <xs:attribute name="enabled" default="true" type="dc:boolean"/>
+ <xs:attribute name="enabled" default="true" type="boolean"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -93,7 +92,7 @@
<xs:complexType name="resource-commonType">
<xs:sequence minOccurs="0" maxOccurs="1">
- <xs:element name="properties" type="dc:propertiesType"/>
+ <xs:element name="properties" type="propertiesType"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
Modified: projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-security.xsd
===================================================================
--- projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-security.xsd 2010-06-16 15:41:31 UTC (rev 106090)
+++ projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-security.xsd 2010-06-16 17:03:38 UTC (rev 106091)
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns="urn:jboss:domain:security:1.0"
- targetNamespace="urn:jboss:domain:security:1.0"
- xmlns:dc="urn:jboss:domain:common:1.0"
+ xmlns="urn:jboss:domain:1.0"
+ targetNamespace="urn:jboss:domain:1.0"
>
- <!-- Import the common definitions -->
- <xs:import namespace="urn:jboss:domain:common:1.0" schemaLocation="jboss-domain-common.xsd" />
+ <!-- Include the common definitions -->
+ <xs:include schemaLocation="jboss-domain-common.xsd" />
<xs:complexType name="security-domainType">
<xs:sequence>
Modified: 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-16 15:41:31 UTC (rev 106090)
+++ projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-servers.xsd 2010-06-16 17:03:38 UTC (rev 106091)
@@ -1,28 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns="urn:jboss:domain:servers:1.0"
- targetNamespace="urn:jboss:domain:servers:1.0"
- xmlns:dc="urn:jboss:domain:common:1.0"
- xmlns:p="urn:jboss:domain:profiles:1.0"
- xmlns:res="urn:jboss:domain:resources:1.0"
- xmlns:log="urn:jboss:domain:logging:1.0"
+ xmlns="urn:jboss:domain:1.0"
+ targetNamespace="urn:jboss:domain:1.0"
>
- <!-- Import the common definitions -->
- <xs:import namespace="urn:jboss:domain:common:1.0" schemaLocation="jboss-domain-common.xsd" />
- <!-- Import the profiles -->
- <xs:import namespace="urn:jboss:domain:profiles:1.0" schemaLocation="jboss-domain-profiles.xsd" />
- <!-- Import the resources definitions -->
- <xs:import namespace="urn:jboss:domain:resources:1.0" schemaLocation="jboss-domain-resources.xsd" />
- <!-- Import the logging schema definitions for reuse -->
- <xs:import namespace="urn:jboss:domain:logging:1.0" schemaLocation="jboss-domain-logging.xsd"/>
+ <!-- Include the common definitions -->
+ <xs:include schemaLocation="jboss-domain-common.xsd" />
+ <!-- Include the profiles -->
+ <xs:include schemaLocation="jboss-domain-profiles.xsd" />
+ <!-- Include the resources definitions -->
+ <xs:include schemaLocation="jboss-domain-resources.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="dc:java-configType" />
- <xs:element name="profiles" type="p:profilesType"/>
- <xs:element name="resources" minOccurs="0" maxOccurs="unbounded" type="res:resourcesType"/>
- <xs:element name="system-properties" minOccurs="0" type="dc:propertiesType"/>
+ <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>
@@ -37,6 +36,7 @@
<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"/>
@@ -49,9 +49,9 @@
<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="dc:java-configType" />
- <xs:element name="loggers" type="log:loggersType" />
- <xs:element name="system-properties" type="dc:propertiesType"/>
+ <xs:element name="java-config" minOccurs="0" type="java-configType" />
+ <xs:element name="loggers" type="loggersType" />
+ <xs:element name="system-properties" type="propertiesType"/>
</xs:sequence>
</xs:complexType>
@@ -64,4 +64,24 @@
</xs:annotation>
</xs:attribute>
</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>
+
+
</xs:schema>
Modified: projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-web.xsd
===================================================================
--- projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-web.xsd 2010-06-16 15:41:31 UTC (rev 106090)
+++ projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain-web.xsd 2010-06-16 17:03:38 UTC (rev 106091)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:jboss:domain:web:1.0" xmlns="urn:jboss:domain:web:1.0"
- xmlns:dc="urn:jboss:domain:common:1.0">
+ targetNamespace="urn:jboss:domain:1.0" xmlns="urn:jboss:domain:1.0">
<!-- Import the common definitions -->
<xs:import namespace="urn:jboss:domain:common:1.0" schemaLocation="jboss-domain-common.xsd"/>
@@ -30,7 +29,7 @@
<xs:element name="access-log" minOccurs="0" type="http-access-logType" />
<xs:element maxOccurs="unbounded" ref="http-connector"/>
<xs:element maxOccurs="unbounded" ref="virtual-server"/>
- <xs:element name="properties" minOccurs="0" maxOccurs="unbounded" type="dc:propertiesType" />
+ <xs:element name="properties" minOccurs="0" maxOccurs="unbounded" type="propertiesType" />
</xs:sequence>
</xs:complexType>
@@ -38,7 +37,7 @@
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" ref="ssl"/>
- <xs:element name="properties" type="dc:propertiesType" />
+ <xs:element name="properties" type="propertiesType" />
</xs:sequence>
<xs:attributeGroup ref="http-connector-attlist"/>
</xs:complexType>
@@ -50,12 +49,12 @@
<xs:attribute name="protocol"/>
<xs:attribute name="scheme"/>
<xs:attribute name="redirect-port"/>
- <xs:attribute name="blocking-enabled" default="false" type="dc:boolean"/>
- <xs:attribute name="secure" default="false" type="dc:boolean"/>
- <xs:attribute name="client-auth" default="false" type="dc:boolean"/>
+ <xs:attribute name="blocking-enabled" default="false" type="boolean"/>
+ <xs:attribute name="secure" default="false" type="boolean"/>
+ <xs:attribute name="client-auth" default="false" type="boolean"/>
<xs:attribute name="default-virtual-server"/>
<xs:attribute name="xpowered-by"/>
- <xs:attribute name="enabled" default="true" type="dc:boolean"/>
+ <xs:attribute name="enabled" default="true" type="boolean"/>
<xs:attribute name="acceptor-executor" type="xs:IDREF" />
<xs:attribute name="request-executor" type="xs:IDREF" />
</xs:attributeGroup>
@@ -67,20 +66,20 @@
</xs:element>
<xs:attributeGroup name="ssl-attlist">
<xs:attribute name="cert-nickname" use="required"/>
- <xs:attribute name="ssl2-enabled" default="false" type="dc:boolean"/>
+ <xs:attribute name="ssl2-enabled" default="false" type="boolean"/>
<xs:attribute name="ssl2-ciphers"/>
- <xs:attribute name="ssl3-enabled" default="true" type="dc:boolean"/>
+ <xs:attribute name="ssl3-enabled" default="true" type="boolean"/>
<xs:attribute name="ssl3-tls-ciphers"/>
- <xs:attribute name="tls-enabled" default="true" type="dc:boolean"/>
- <xs:attribute name="tls-rollback-enabled" default="true" type="dc:boolean"/>
- <xs:attribute name="client-auth-enabled" default="false" type="dc:boolean"/>
+ <xs:attribute name="tls-enabled" default="true" type="boolean"/>
+ <xs:attribute name="tls-rollback-enabled" default="true" type="boolean"/>
+ <xs:attribute name="client-auth-enabled" default="false" type="boolean"/>
</xs:attributeGroup>
<xs:element name="virtual-server">
<xs:complexType>
<xs:sequence>
<xs:element name="access-log" minOccurs="0" type="http-access-logType"/>
- <xs:element name="properties" type="dc:propertiesType" />
+ <xs:element name="properties" type="propertiesType" />
</xs:sequence>
<xs:attributeGroup ref="virtual-server-attlist"/>
</xs:complexType>
@@ -96,7 +95,7 @@
<xs:complexType name="http-access-logType">
<xs:attribute name="log-directory" default="${com.sun.aas.instanceRoot}/logs/access"/>
- <xs:attribute name="iponly" default="true" type="dc:boolean"/>
+ <xs:attribute name="iponly" default="true" type="boolean"/>
</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-16 15:41:31 UTC (rev 106090)
+++ projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-domain.xsd 2010-06-16 17:03:38 UTC (rev 106091)
@@ -2,58 +2,43 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
xmlns="urn:jboss:domain:1.0"
targetNamespace="urn:jboss:domain:1.0"
- xmlns:com="urn:jboss:domain:common:1.0"
- xmlns:prof="urn:jboss:domain:profiles:1.0"
- xmlns:res="urn:jboss:domain:resources:1.0"
- xmlns:serv="urn:jboss:domain:servers:1.0"
- xmlns:thr="urn:jboss:threads:2.0"
- xmlns:sec="urn:jboss:security-config:5.0"
- xmlns:rem="urn:jboss:remoting:3.1"
- xmlns:web="urn:jboss:domain:web:1.0"
- >
+ xmlns:sec="urn:jboss:security-config:5.0">
- <!-- Import the common definitions -->
- <xs:import namespace="urn:jboss:domain:common:1.0" schemaLocation="jboss-domain-common.xsd" />
- <!-- Import the profiles -->
- <xs:import namespace="urn:jboss:domain:profiles:1.0" schemaLocation="jboss-domain-profiles.xsd" />
- <!-- Import the resources definitions -->
- <xs:import namespace="urn:jboss:domain:resources:1.0" schemaLocation="jboss-domain-resources.xsd" />
- <!-- Import the server groups definitions -->
- <xs:import namespace="urn:jboss:domain:servers:1.0" schemaLocation="jboss-domain-servers.xsd" />
- <!-- Import the jboss-threads schema definitions for reuse -->
- <xs:import namespace="urn:jboss:threads:2.0" schemaLocation="jboss-threads_2_0.xsd"/>
+ <!-- Include the common definitions -->
+ <xs:include schemaLocation="jboss-domain-common.xsd" />
+ <!-- Include the resources definitions -->
+ <xs:include schemaLocation="jboss-domain-resources.xsd" />
+ <!-- Include the server groups definitions -->
+ <xs:include schemaLocation="jboss-domain-servers.xsd" />
+ <!-- Include the web schema definitions for reuse -->
+ <xs:include schemaLocation="jboss-domain-web.xsd"/>
<!-- Import the security schema definitions for reuse -->
<xs:import namespace="urn:jboss:security-config:5.0" schemaLocation="security-config_5_0.xsd"/>
- <!-- Import the remoting schema definitions for reuse -->
- <xs:import namespace="urn:jboss:remoting:3.1" schemaLocation="jboss-remoting_3_1.xsd"/>
- <!-- Import the web schema definitions for reuse -->
- <xs:import namespace="urn:jboss:domain:web:1.0" schemaLocation="jboss-domain-web.xsd"/>
<xs:element name="domain">
<xs:complexType>
<xs:all minOccurs="0" maxOccurs="1">
<xs:element name="domain-configuration" type="domain-configurationType"/>
- <xs:element name="server-groups" type="serv:server-groupType"/>
- <xs:element name="clusters" type="serv:clustersType"/>
+ <xs:element name="subsystems" type="domainSubsystemsType"/>
+ <xs:element name="server-groups" type="server-groupType"/>
+ <xs:element name="clusters" type="clustersType"/>
<xs:element name="servers">
<xs:complexType>
<xs:sequence>
- <xs:element name="server" type="serv:serverType" />
+ <xs:element name="server" type="serverType" />
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="threads" type="thr:threads"/>
<xs:element name="security-policy" type="sec:PolicyConfig" />
- <xs:element name="remoting" type="rem:remotingType"/>
<xs:element name="containers">
<xs:complexType>
<xs:all>
- <xs:element name="web-containers" type="web:web-containersType" />
+ <xs:element name="web-containers" type="web-containersType" />
</xs:all>
</xs:complexType>
</xs:element>
- <xs:element name="system-properties" type="com:propertiesType"/>
+ <xs:element name="system-properties" type="propertiesType"/>
</xs:all>
</xs:complexType>
</xs:element>
@@ -73,4 +58,68 @@
</xs:annotation>
</xs:element>
+ <xs:complexType name="domainSubsystemsType">
+ <xs:annotation>
+ <xs:documentation>Contains a list of domain-level subsystems</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="subsystem" type="subsystemType" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="subsystemType">
+ <xs:annotation>
+ <xs:documentation>Subsystem is a specific technology, service or a set of or a functionality
+ which can be enabled or disabled on a domain level.
+
+ If a certain subsystem (or a set of) is not relevant for a specific server-group
+ this subsystem (or a set of) can be disabled for this server-group in the server-group configuration.</xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="name" use="required">
+ <xs:annotation>
+ <xs:documentation>Name of the subsystem</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="allowed" use="optional" type="xs:boolean" default="true">
+ <xs:annotation>
+ <xs:documentation>Whether the subsystem is allowed.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="domainDeploymentsType">
+ <xs:annotation>
+ <xs:documentation>Contains a list of domain-level deployments</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="deployment" type="deploymentType" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="deploymentType">
+ <xs:annotation>
+ <xs:documentation>Deployment represents anything that can be deployed (i.g. an application such as EJB-JAR, WAR, EAR,
+ any kind of standard archive such as RAR or JBoss-specific deployment descriptor such as -aop.xml, -jboss-beans.xml, etc),
+ which can be enabled or disabled on a domain level.
+
+ If a certain deployment (or a set of) is not relevant for a specific server-group
+ this deployment (or a set of) can be disabled for this server-group in the server-group configuration.</xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="name" use="required">
+ <xs:annotation>
+ <xs:documentation>Name of the deployment</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="sha1" use="required">
+ <xs:annotation>
+ <xs:documentation>The checksum of the deployment</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="allowed" use="optional" type="xs:boolean" default="true">
+ <xs:annotation>
+ <xs:documentation>Whether the deployment is allowed.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
</xs:schema>
Modified: projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-logging_6_0.xsd
===================================================================
--- projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-logging_6_0.xsd 2010-06-16 15:41:31 UTC (rev 106090)
+++ projects/profileservice/trunk/domain/src/test/resources/schemas/jboss-logging_6_0.xsd 2010-06-16 17:03:38 UTC (rev 106091)
@@ -23,15 +23,14 @@
-->
<!-- Modified from the urn:jboss:logging:6.0 (jboss-logging_6_0.xsd) -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:com="urn:jboss:domain:common:1.0"
- targetNamespace="urn:jboss:domain:logging:1.0"
- xmlns="urn:jboss:domain:logging:1.0"
+ targetNamespace="urn:jboss:domain:1.0"
+ xmlns="urn:jboss:domain:1.0"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
<!-- Allow access to common domain schema elements -->
- <xs:import namespace="urn:jboss:domain:common:1.0" schemaLocation="jboss-domain-common.xsd"/>
+ <xs:include schemaLocation="jboss-domain-common.xsd"/>
<xs:element name="logging" type="loggingType"/>
More information about the jboss-cvs-commits
mailing list