RubyGems - torquebox-server - Versions diffs - 2.0.3-java → 2.1.0-java - Mend

torquebox-server 2.0.3-java → 2.1.0-java

Files changed (851) hide show

data/jboss/docs/licenses/the werken company license - license.html CHANGED Viewed

@@ -1,8 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html><head><title>jaxen: universal Java XPath engine - Project License</title><style type="text/css" media="all">
           @import url("./style/maven-base.css");
-          @import url("./style/maven-theme.css");</style><link rel="stylesheet" href="./style/print.css" type="text/css" media="print"></link><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></meta></head><body class="composite"><div id="banner"><a href="http://codehaus.org" id="organizationLogo"><img alt="Codehaus" src="http://codehaus.org/codehaus-small.gif"></img></a><a href="http://jaxen.codehaus.org/" id="projectLogo"><img alt="jaxen" src="././jaxen.gif"></img></a><div class="clear"><hr></hr></div></div><div id="breadcrumbs"><div class="xleft">Last published: 17 June 2010
-                <span class="separator">|</span> Doc for  1.1.3
+          @import url("./style/maven-theme.css");</style><link rel="stylesheet" href="./style/print.css" type="text/css" media="print"></link><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></meta></head><body class="composite"><div id="banner"><a href="http://codehaus.org" id="organizationLogo"><img alt="Codehaus" src="http://codehaus.org/codehaus-small.gif"></img></a><a href="http://jaxen.codehaus.org/" id="projectLogo"><img alt="jaxen" src="././jaxen.gif"></img></a><div class="clear"><hr></hr></div></div><div id="breadcrumbs"><div class="xleft">Last published: 12 May 2012
+                <span class="separator">|</span> Doc for  1.1.4
                 </div><div class="xright"></div><div class="clear"><hr></hr></div></div><div id="leftColumn"><div id="navcolumn"><div id="menujaxen"><h5>jaxen</h5><ul><li class="none"><a href="index.html">Overview</a></li><li class="none"><a href="releases.html">Download Jaxen</a></li><li class="none"><a href="apidocs/index.html">API Documentation</a></li><li class="none"><a href="faq.html">FAQ</a></li><li class="none"><a href="extensions.html">Writing Extension Functions</a></li><li class="none"><a href="building.html">Build Instructions</a></li><li class="none"><a href="releases.html">Releases</a></li><li class="none"><a href="status.html">Status</a></li></ul></div><div id="menuProject_Documentation"><h5>Project Documentation</h5><ul><li class="none"><a href="index.html">About</a></li><li class="collapsed"><a href="project-info.html">Project Info</a></li><li class="expanded"><a href="maven-reports.html">Project Reports</a><ul><li class="none"><a href="jdepend-report.html">Metrics</a></li><li class="none"><a href="checkstyle/index.html">Checkstyle</a></li><li class="none"><a href="cobertura/index.html" class="newWindow" title="New Window" target="_blank">Cobertura</a></li><li class="none"><a href="changelog-report.html">Change Log</a></li><li class="none"><a href="developer-activity-report.html">Developer Activity</a></li><li class="none"><strong><a href="license.html">Project License</a></strong></li><li class="none"><a href="apidocs/index.html" class="newWindow" title="New Window" target="_blank">JavaDocs</a></li><li class="none"><a href="javadoc.html">JavaDoc Report</a></li><li class="none"><a href="javadoc-warnings-report.html">JavaDoc Warnings Report</a></li><li class="none"><a href="xref/index.html" class="newWindow" title="New Window" target="_blank">Source Xref</a></li><li class="none"><a href="xref-test/index.html" class="newWindow" title="New Window" target="_blank">Test Xref</a></li><li class="none"><a href="junit-report.html">Unit Tests</a></li><li class="none"><a href="linkcheck.html">Link Check Report</a></li><li class="none"><a href="pmd-report.html">PMD Report</a></li><li class="none"><a href="findbugs-report.html">FindBugs Report</a></li></ul></li><li class="none"><a href="development-process.html">Development Process</a></li></ul></div><div id="legend"><h5>Legend</h5><ul><li class="externalLink">External Link</li><li class="newWindow">Opens in a new window</li></ul></div><a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy"><img alt="Built by Maven" src="./images/logos/mavenlogo_builtby_w.png"></img></a></div></div><div id="bodyColumn"><div class="contentBox"><div class="section"><a name="Project_License"></a><h2>Project License</h2><p></p>
     <div class="source"><pre>/*
  $Id: LICENSE.txt 1128 2006-02-05 21:49:04Z elharo $
@@ -38,4 +38,4 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 </pre></div>
-  </div></div></div><div class="clear"><hr></hr></div><div id="footer"><div class="xright">© 2001-2010, Codehaus</div><div class="clear"><hr></hr></div></div></body></html>
+  </div></div></div><div class="clear"><hr></hr></div><div id="footer"><div class="xright">© 2001-2012, Codehaus</div><div class="clear"><hr></hr></div></div></body></html>

data/jboss/docs/schema/jboss-as-cli_1_1.xsd ADDED Viewed

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2012, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns="urn:jboss:cli:1.1"
+           targetNamespace="urn:jboss:cli:1.1"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified"
+        >
+    <xs:element name="jboss-cli">
+        <xs:annotation>
+            <xs:documentation>
+                Root element for the JBoss Command Line Interface configuration.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="default-controller" minOccurs="0"/>
+                <xs:element ref="validate-operation-requests" minOccurs="0"/>
+                <xs:element ref="history" minOccurs="0"/>
+                <xs:element ref="ssl" minOccurs="0" maxOccurs="1"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="default-controller">
+        <xs:annotation>
+            <xs:documentation>
+                This element contains the configuration of the default controller to connect to
+                when the connect command is executed w/o arguments.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="host" type="xs:string" minOccurs="0" default="localhost"/>
+                <xs:element name="port" type="xs:int" minOccurs="0" default="9999"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="validate-operation-requests" type="xs:boolean" default="true">
+        <xs:annotation>
+            <xs:documentation>
+                Indicates whether the parameter list of the operation reuqests
+                should be validated before the requests are sent to the controller
+                for the execution.
+            </xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    <xs:element name="history">
+        <xs:annotation>
+            <xs:documentation>
+                This element contains the configuration for the commands and operations history log.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="enabled" type="xs:boolean" minOccurs="0" default="true"/>
+                <xs:element name="file-name" type="xs:string" minOccurs="0" default=".jboss-cli-history"/>
+                <xs:element name="file-dir" type="xs:string" minOccurs="0" default="${user.home}"/>
+                <xs:element name="max-size" type="xs:int" minOccurs="0" default="500"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ssl">
+        <xs:annotation>
+            <xs:documentation>
+                This element contains the configuration for the Key and Trust stores
+                used for SSL.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="key-store" type="xs:string" minOccurs="0" />
+                <xs:element name="key-store-password" type="xs:string" minOccurs="0" />
+                <xs:element name="alias" type="xs:string" minOccurs="0" />
+                <xs:element name="key-password" type="xs:string" minOccurs="0" />
+                <xs:element name="trust-store" type="xs:string" minOccurs="0" />
+                <xs:element name="trust-store-password" type="xs:string" minOccurs="0" />
+                <xs:element name="modify-trust-store" type="xs:boolean" default="true" minOccurs="0">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Setting to true will cause the CLI to prompt when unrecognised certificates are received
+                            and allow them to be stored in the truststore.
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+</xs:schema>

data/jboss/docs/schema/jboss-as-cmp_1_0.xsd CHANGED Viewed

@@ -68,16 +68,16 @@
     <xs:complexType name="hiloType">
         <xs:sequence>
-            <xs:element name="block-size" type="xs:long"/>
-            <xs:element name="create-table" type="xs:boolean"/>
-            <xs:element name="create-table-ddl" type="xs:string"/>
-            <xs:element name="data-source" type="xs:token"/>
-            <xs:element name="drop-table" type="xs:boolean"/>
-            <xs:element name="id-column" type="xs:token"/>
-            <xs:element name="select-hi-ddl" type="xs:string"/>
-            <xs:element name="sequence-column" type="xs:token"/>
-            <xs:element name="sequence-name" type="xs:token"/>
-            <xs:element name="table-name" type="xs:token"/>
+            <xs:element name="block-size" type="xs:long" maxOccurs="1"/>
+            <xs:element name="create-table" type="xs:boolean" maxOccurs="1"/>
+            <xs:element name="create-table-ddl" type="xs:string" maxOccurs="1"/>
+            <xs:element name="data-source" type="xs:token"  minOccurs="1" maxOccurs="1"/>
+            <xs:element name="drop-table" type="xs:boolean" maxOccurs="1"/>
+            <xs:element name="id-column" type="xs:token"  minOccurs="1" maxOccurs="1"/>
+            <xs:element name="select-hi-ddl" type="xs:string" maxOccurs="1"/>
+            <xs:element name="sequence-column" type="xs:token"  minOccurs="1" maxOccurs="1"/>
+            <xs:element name="sequence-name" type="xs:token"  minOccurs="1" maxOccurs="1"/>
+            <xs:element name="table-name" type="xs:token" minOccurs="1" maxOccurs="1"/>
         </xs:sequence>
         <xs:attribute name="name" type="xs:string"/>
     </xs:complexType>

data/jboss/docs/schema/jboss-as-config_1_0.xsd CHANGED Viewed

@@ -108,7 +108,7 @@
                 <xs:element name="profile" type="standalone-profileType" minOccurs="0"/>
                 <xs:element name="interfaces" type="specified-interfacesType" minOccurs="0" maxOccurs="1"/>
                 <xs:element name="socket-binding-group" type="standalone-socket-binding-groupType" minOccurs="0" maxOccurs="1"/>
-                <xs:element name="deployments" type="mapped-deploymentsType" minOccurs="0" maxOccurs="1"/>
+                <xs:element name="deployments" type="server-deploymentsType" minOccurs="0" maxOccurs="1"/>
             </xs:sequence>
             <xs:attribute name="name" type="xs:string" use="optional">
                 <xs:annotation>
@@ -546,7 +546,7 @@
             <xs:element name="jvm" type="namedJvmType" minOccurs="0"/>
             <xs:element name="socket-binding-group" type="socket-binding-group-refType" minOccurs="1"/>
-            <xs:element name="deployments" type="mapped-deploymentsType" minOccurs="0"/>
+            <xs:element name="deployments" type="server-groupDeploymentsType" minOccurs="0"/>
             <xs:element name="system-properties" minOccurs="0" type="properties-with-boottime"/>
         </xs:sequence>
@@ -566,27 +566,16 @@
         </xs:attribute>
     </xs:complexType>
-    <xs:complexType name="mapped-deploymentsType">
+    <xs:complexType name="server-groupDeploymentsType">
         <xs:annotation>
             <xs:documentation>Contains a list of deployments that have been mapped to a server-group.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-            <xs:element name="deployment" type="mapped-deploymentType" maxOccurs="unbounded"/>
+            <xs:element name="deployment" type="base-deploymentType" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    <xs:complexType name="mapped-deploymentType">
-        <xs:annotation>
-            <xs:documentation>A deployment that has been mapped to a server group.</xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-            <!-- TODO: maxOccurs should be unbounded once overlays are in place -->
-            <xs:choice maxOccurs="1">
-                <xs:element name="content" type="contentType"/>
-                <xs:element name="fs-archive" type="fs-archiveType"/>
-                <xs:element name="fs-exploded" type="fs-explodedType"/>
-            </xs:choice>
-        </xs:sequence>
+    <xs:complexType name="base-deploymentType">
         <xs:attribute name="name" use="required">
             <xs:annotation>
                 <xs:documentation>Unique identifier of the deployment. Must be unique across all deployments.
@@ -603,13 +592,38 @@
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>
-        <!--  TODO clarify what a value of 'false' means -->
-        <xs:attribute name="enabled" use="optional" type="xs:boolean" default="true">
-            <xs:annotation>
-                <xs:documentation>Whether the deployment deploy automatically when the server starts up.
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
+    </xs:complexType><xs:complexType name="server-deploymentsType">
+    <xs:annotation>
+        <xs:documentation>Contains a list of deployments that have been mapped to a server.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+        <xs:element name="deployment" type="server-deploymentType" maxOccurs="unbounded"/>
+    </xs:sequence>
+</xs:complexType>
+    <xs:complexType name="server-deploymentType">
+        <xs:annotation>
+            <xs:documentation>A deployment that has been mapped to a server.</xs:documentation>
+        </xs:annotation>
+        <xs:complexContent>
+            <xs:extension base="base-deploymentType">
+                <xs:sequence>
+                    <!-- TODO: maxOccurs should be unbounded once overlays are in place -->
+                    <xs:choice maxOccurs="1">
+                        <xs:element name="content" type="contentType"/>
+                        <xs:element name="fs-archive" type="fs-archiveType"/>
+                        <xs:element name="fs-exploded" type="fs-explodedType"/>
+                    </xs:choice>
+                </xs:sequence>
+                <!--  TODO clarify what a value of 'false' means -->
+                <xs:attribute name="enabled" use="optional" type="xs:boolean" default="true">
+                    <xs:annotation>
+                        <xs:documentation>Whether the deployment deploy automatically when the server starts up.
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:attribute>
+            </xs:extension>
+        </xs:complexContent>
     </xs:complexType>
     <xs:complexType name="contentType">
@@ -656,11 +670,11 @@
             <xs:documentation>Contains a list of domain-level deployments</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-            <xs:element name="deployment" type="deploymentType" maxOccurs="unbounded"/>
+            <xs:element name="deployment" type="domain-deploymentType" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    <xs:complexType name="deploymentType">
+    <xs:complexType name="domain-deploymentType">
         <xs:annotation>
             <xs:documentation>Deployment represents anything that can be deployed (e.g. an application such as EJB-JAR,
                 WAR, EAR,
@@ -669,7 +683,16 @@
             </xs:documentation>
         </xs:annotation>
         <xs:complexContent>
-            <xs:extension base="mapped-deploymentType" />
+            <xs:extension base="base-deploymentType">
+                <xs:sequence>
+                    <!-- TODO: maxOccurs should be unbounded once overlays are in place -->
+                    <xs:choice maxOccurs="1">
+                        <xs:element name="content" type="contentType"/>
+                        <xs:element name="fs-archive" type="fs-archiveType"/>
+                        <xs:element name="fs-exploded" type="fs-explodedType"/>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
         </xs:complexContent>
     </xs:complexType>
@@ -1315,6 +1338,8 @@
                 java.home - java installation directory
                 jboss.server.base.dir - root directory for an individual server
                                         instance
+                jboss.server.config.dir - directory in which server configuration
+                                          files are stored.
                 jboss.server.data.dir - directory the server will use for persistent
                                         data file storage
                 jboss.server.log.dir - directory the server will use for
@@ -1409,6 +1434,8 @@
                 java.home - java installation directory
                 jboss.server.base.dir - root directory for an individual server
                                         instance
+                jboss.server.config.dir - directory in which server configuration
+                                          files are stored.
                 jboss.server.data.dir - directory the server will use for persistent
                                         data file storage
                 jboss.server.log.dir - directory the server will use for
@@ -1439,7 +1466,7 @@
             <xs:element name="stack" type="memory-sizeType" minOccurs="0"/>
             <xs:element name="agent-lib" type="jvm-agentLibType" minOccurs="0"/>
             <xs:element name="agent-path" type="jvm-agentPathType" minOccurs="0"/>
-            <xs:element name="javaagent" type="jvm-javaagentType" minOccurs="0"/>
+            <xs:element name="java-agent" type="jvm-javaagentType" minOccurs="0"/>
             <xs:element name="jvm-options" type="jvm-optionsType" minOccurs="0"/>
             <xs:element name="environment-variables" type="environmentVariablesType" minOccurs="0"/>
         </xs:all>

data/jboss/docs/schema/jboss-as-config_1_1.xsd CHANGED Viewed

@@ -114,7 +114,7 @@
                 <xs:element name="profile" type="standalone-profileType" minOccurs="0"/>
                 <xs:element name="interfaces" type="specified-interfacesType" minOccurs="0" maxOccurs="1"/>
                 <xs:element name="socket-binding-group" type="standalone-socket-binding-groupType" minOccurs="0" maxOccurs="1"/>
-                <xs:element name="deployments" type="mapped-deploymentsType" minOccurs="0" maxOccurs="1"/>
+                <xs:element name="deployments" type="server-deploymentsType" minOccurs="0" maxOccurs="1"/>
             </xs:sequence>
             <xs:attribute name="name" type="xs:string" use="optional">
                 <xs:annotation>
@@ -907,7 +907,7 @@
             <xs:element name="jvm" type="namedJvmType" minOccurs="0"/>
             <xs:element name="socket-binding-group" type="socket-binding-group-refType" minOccurs="1"/>
-            <xs:element name="deployments" type="mapped-deploymentsType" minOccurs="0"/>
+            <xs:element name="deployments" type="server-groupDeploymentsType" minOccurs="0"/>
             <xs:element name="system-properties" minOccurs="0" type="properties-with-boottime"/>
         </xs:sequence>
@@ -936,27 +936,33 @@
         </xs:attribute>
     </xs:complexType>
-    <xs:complexType name="mapped-deploymentsType">
+    <xs:complexType name="server-groupDeploymentsType">
         <xs:annotation>
             <xs:documentation>Contains a list of deployments that have been mapped to a server-group.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-            <xs:element name="deployment" type="mapped-deploymentType" maxOccurs="unbounded"/>
+            <xs:element name="deployment" type="base-deploymentType" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    <xs:complexType name="mapped-deploymentType">
+    <xs:complexType name="server-groupDeploymentType">
         <xs:annotation>
             <xs:documentation>A deployment that has been mapped to a server group.</xs:documentation>
         </xs:annotation>
-        <xs:sequence>
-            <!-- TODO: maxOccurs should be unbounded once overlays are in place -->
-            <xs:choice maxOccurs="1">
-                <xs:element name="content" type="contentType"/>
-                <xs:element name="fs-archive" type="fs-archiveType"/>
-                <xs:element name="fs-exploded" type="fs-explodedType"/>
-            </xs:choice>
-        </xs:sequence>
+        <xs:complexContent>
+            <xs:extension base="base-deploymentType">
+                <!--  TODO clarify what a value of 'false' means -->
+                <xs:attribute name="enabled" use="optional" type="xs:boolean" default="true">
+                    <xs:annotation>
+                        <xs:documentation>Whether the deployment deploy automatically when the server starts up.
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:attribute>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="base-deploymentType">
         <xs:attribute name="name" use="required">
             <xs:annotation>
                 <xs:documentation>Unique identifier of the deployment. Must be unique across all deployments.
@@ -973,13 +979,40 @@
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>
-        <!--  TODO clarify what a value of 'false' means -->
-        <xs:attribute name="enabled" use="optional" type="xs:boolean" default="true">
-            <xs:annotation>
-                <xs:documentation>Whether the deployment deploy automatically when the server starts up.
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="server-deploymentsType">
+        <xs:annotation>
+            <xs:documentation>Contains a list of deployments that have been mapped to a server.</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="deployment" type="server-deploymentType" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="server-deploymentType">
+        <xs:annotation>
+            <xs:documentation>A deployment that has been mapped to a server.</xs:documentation>
+        </xs:annotation>
+        <xs:complexContent>
+            <xs:extension base="base-deploymentType">
+                <xs:sequence>
+                    <!-- TODO: maxOccurs should be unbounded once overlays are in place -->
+                    <xs:choice maxOccurs="1">
+                        <xs:element name="content" type="contentType"/>
+                        <xs:element name="fs-archive" type="fs-archiveType"/>
+                        <xs:element name="fs-exploded" type="fs-explodedType"/>
+                    </xs:choice>
+                </xs:sequence>
+                <!--  TODO clarify what a value of 'false' means -->
+                <xs:attribute name="enabled" use="optional" type="xs:boolean" default="true">
+                    <xs:annotation>
+                        <xs:documentation>Whether the deployment deploy automatically when the server starts up.
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:attribute>
+            </xs:extension>
+        </xs:complexContent>
     </xs:complexType>
     <xs:complexType name="contentType">
@@ -1026,11 +1059,11 @@
             <xs:documentation>Contains a list of domain-level deployments</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-            <xs:element name="deployment" type="deploymentType" maxOccurs="unbounded"/>
+            <xs:element name="deployment" type="domain-deploymentType" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    <xs:complexType name="deploymentType">
+    <xs:complexType name="domain-deploymentType">
         <xs:annotation>
             <xs:documentation>Deployment represents anything that can be deployed (e.g. an application such as EJB-JAR,
                 WAR, EAR,
@@ -1039,7 +1072,16 @@
             </xs:documentation>
         </xs:annotation>
         <xs:complexContent>
-            <xs:extension base="mapped-deploymentType" />
+            <xs:extension base="base-deploymentType">
+                <xs:sequence>
+                    <!-- TODO: maxOccurs should be unbounded once overlays are in place -->
+                    <xs:choice maxOccurs="1">
+                        <xs:element name="content" type="contentType"/>
+                        <xs:element name="fs-archive" type="fs-archiveType"/>
+                        <xs:element name="fs-exploded" type="fs-explodedType"/>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
         </xs:complexContent>
     </xs:complexType>
@@ -1794,6 +1836,8 @@
                 java.home - java installation directory
                 jboss.server.base.dir - root directory for an individual server
                                         instance
+                jboss.server.config.dir - directory in which server configuration
+                                          files are stored.
                 jboss.server.data.dir - directory the server will use for persistent
                                         data file storage
                 jboss.server.log.dir - directory the server will use for
@@ -1888,6 +1932,8 @@
                 java.home - java installation directory
                 jboss.server.base.dir - root directory for an individual server
                                         instance
+                jboss.server.config.dir - directory in which server configuration
+                                          files are stored.
                 jboss.server.data.dir - directory the server will use for persistent
                                         data file storage
                 jboss.server.log.dir - directory the server will use for
@@ -1918,7 +1964,7 @@
             <xs:element name="stack" type="memory-sizeType" minOccurs="0"/>
             <xs:element name="agent-lib" type="jvm-agentLibType" minOccurs="0"/>
             <xs:element name="agent-path" type="jvm-agentPathType" minOccurs="0"/>
-            <xs:element name="javaagent" type="jvm-javaagentType" minOccurs="0"/>
+            <xs:element name="java-agent" type="jvm-javaagentType" minOccurs="0"/>
             <xs:element name="jvm-options" type="jvm-optionsType" minOccurs="0"/>
             <xs:element name="environment-variables" type="environmentVariablesType" minOccurs="0"/>
         </xs:all>