You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/08/12 17:23:08 UTC

svn commit: r232310 [4/92] - in /beehive/trunk/controls/test: common/ infra/gtlf/ infra/gtlf/xsl/ infra/mantis/ infra/tch/ infra/tch/messages/ infra/tch/runtime/ infra/tch/schema/ perf/ perf/bin/ perf/cases/ perf/ctlsrc/org/apache/beehive/controls/perf...

Propchange: beehive/trunk/controls/test/infra/gtlf/xsl/TestReport.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: beehive/trunk/controls/test/infra/gtlf/xsl/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/infra/gtlf/xsl/junit.css
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/gtlf/xsl/junit.css?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/infra/gtlf/xsl/junit.css (original)
+++ beehive/trunk/controls/test/infra/gtlf/xsl/junit.css Fri Aug 12 08:12:28 2005
@@ -1,49 +1,49 @@
-<style type="text/css">
-      body {
-        font:normal 68% verdana,arial,helvetica;
-        color:#000000;
-      }
-      table tr td, table tr th {
-          font-size: 68%;
-      }
-      table.details tr th{
-        font-weight: bold;
-        text-align:left;
-        background:#a6caf0;
-      }
-      table.details tr td{
-        background:#eeeee0;
-      }
-      
-      p {
-        line-height:1.5em;
-        margin-top:0.5em; margin-bottom:1.0em;
-      }
-      h1 {
-        margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
-      }
-      h2 {
-        margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
-      }
-      h3 {
-        margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
-      }
-      h4 {
-        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-      }
-      h5 {
-        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-      }
-      h6 {
-        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-      }
-      .Error {
-        font-weight:bold; color:red;
-      }
-      .Failure {
-        font-weight:bold; color:purple;
-      }
-      .Properties {
-        text-align:right;
-      }
-      </style>
+<style type="text/css">
+      body {
+        font:normal 68% verdana,arial,helvetica;
+        color:#000000;
+      }
+      table tr td, table tr th {
+          font-size: 68%;
+      }
+      table.details tr th{
+        font-weight: bold;
+        text-align:left;
+        background:#a6caf0;
+      }
+      table.details tr td{
+        background:#eeeee0;
+      }
+      
+      p {
+        line-height:1.5em;
+        margin-top:0.5em; margin-bottom:1.0em;
+      }
+      h1 {
+        margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
+      }
+      h2 {
+        margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
+      }
+      h3 {
+        margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
+      }
+      h4 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+      }
+      h5 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+      }
+      h6 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+      }
+      .Error {
+        font-weight:bold; color:red;
+      }
+      .Failure {
+        font-weight:bold; color:purple;
+      }
+      .Properties {
+        text-align:right;
+      }
+      </style>

Propchange: beehive/trunk/controls/test/infra/gtlf/xsl/junit.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/infra/gtlf/xsl/windowFrameScript.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/gtlf/xsl/windowFrameScript.xml?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/infra/gtlf/xsl/windowFrameScript.xml (original)
+++ beehive/trunk/controls/test/infra/gtlf/xsl/windowFrameScript.xml Fri Aug 12 08:12:28 2005
@@ -1,207 +1,207 @@
-<xsl:template name="windowFrameScripts">
-
-  <!-- HTML structure that will hold vertical and horizontal split data -->
-
-  <!-- HORIZONTAL SPLIT STRUCTURE -->
-  <form id="horizontalForm" style="width:100%;height:96%">
-    <table id="horizontalSpilt" style="width:100%;height:96%"  
-           border="0" cellspacing="0" cellpadding="0">
-      <tr>
-          <td>
-            <iframe id="horizontalFirst" frameborder="1" 
-                    style="width:100%;height:100%" src="">
-            </iframe>
-          </td>
-          <td>
-            <iframe id="horizontalSecond" frameborder="1" 
-                    style="width:100%;height:100%" src="">
-            </iframe>
-          </td>
-      </tr>
-    </table>
-  </form>
-  
-  <!-- VERTICAL SPLIT STRUCTURE -->
-  <form id="verticalForm" style="width:100%;height:96%">
-    <table id="verticalSpilt" style="width:100%;height:100%"  
-           border="0" cellspacing="0" cellpadding="0">
-      <tr>
-        <td>
-           <iframe id="verticalFirst" frameborder="1" 
-                   style="width:100%;height:100%" src="">
-           </iframe>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <iframe id="verticalSecond" frameborder="1" 
-                  style="width:100%;height:100%" src="">
-          </iframe>
-       </td>
-      </tr>
-    </table>
-  </form>
-
-  <script type="text/javascript">
-
-<![CDATA[
-
-//Drop-down Document Viewer- Dynamic Drive (www.dynamicdrive.com)
-//For full source code, 100's more DHTML scripts, and TOS,
-//visit http://www.dynamicdrive.com
-
-
-
-
-//Specify display mode (0 or 1)
-//0 causes document to be displayed in an inline frame, while 1 in a new browser window
-//if displaymode=0, configure inline frame attributes (ie: dimensions, intial document shown
-
-var displaymode=0
-var verticalSplit = 0
-var horzontalSplit = 0
-
-      document.getElementById("horizontalFirst").style.display="none"
-      document.getElementById("horizontalSecond").style.display="none"
-      document.getElementById("horizontalForm").style.display="none"
-
-      document.getElementById("verticalFirst").style.display="none"
-      document.getElementById("verticalSecond").style.display="none"
-      document.getElementById("verticalForm").style.display="none"
-
-
-function unSplit(){
-  if ( verticalSplit == 1){
-    document.getElementById("verticalFirst").style.display="none"
-    document.getElementById("verticalSecond").style.display="none"
-    document.getElementById("verticalForm").style.display="none"
-  } else if (horizontalSplit == 1){
-    document.getElementById("horizontalFirst").style.display="none"
-    document.getElementById("horizontalSecond").style.display="none"
-    document.getElementById("horizontalForm").style.display="none"
-  }
-
-}
-
-
-function split(doVerticalSplit){
-  var splitUrl = window.location.href
-  verticalSplit = doVerticalSplit
-if (document.getElementById && displaymode==0){
-
-  if ( verticalSplit == 1){
-
-   verticalSplit = 1
-   document.getElementById("horizontalFirst").style.display="none"
-   document.getElementById("horizontalSecond").style.display="none"
-   document.getElementById("horizontalForm").style.display="none"
-
-   document.getElementById("verticalForm").style.display=""
-
-   document.getElementById("verticalSecond").src="http://www.google.com"
-   document.getElementById("verticalFirst").src="http://www.google.com"
-
-   document.getElementById("verticalSecond").style.display=""
-   document.getElementById("verticalSecond").style.display="none"
-   document.getElementById("verticalSecond").style.display=""
-
-   document.getElementById("verticalFirst").style.display=""
-   document.getElementById("verticalFirst").style.display="none"
-   document.getElementById("verticalFirst").style.display=""
-
-   document.getElementById("verticalSecond").src=splitUrl
-   document.getElementById("verticalFirst").src=splitUrl
-
-   document.getElementById("verticalSecond").style.display=""
-   document.getElementById("verticalSecond").style.display="none"
-   document.getElementById("verticalSecond").style.display=""
-
-   document.getElementById("verticalFirst").style.display=""
-   document.getElementById("verticalFirst").style.display="none"
-   document.getElementById("verticalFirst").style.display=""
-
-  } else {
-
-    horizontalSplit = 1
-    document.getElementById("verticalFirst").style.display="none"
-    document.getElementById("verticalSecond").style.display="none"
-    document.getElementById("verticalForm").style.display="none"
-
-    document.getElementById("horizontalForm").style.display=""
-
-    document.getElementById("horizontalSecond").src=splitUrl
-    document.getElementById("horizontalFirst").src=splitUrl
-
-    document.getElementById("horizontalSecond").style.display=""
-    document.getElementById("horizontalSecond").style.display="none"
-    document.getElementById("horizontalSecond").style.display=""
-
-    document.getElementById("horizontalFirst").style.display=""
-    document.getElementById("horizontalFirst").style.display="none"
-    document.getElementById("horizontalFirst").style.display=""
-
-
-  }
-
-
-} else if (document.all && displaymode==0) {
-
-  if ( verticalSplit == 1){
-
-    verticalSplit = 1
-    document.getElementById("horizontalFirst").style.display="none"
-    document.getElementById("horizontalSecond").style.display="none"
-    document.getElementById("horizontalForm").style.display="none"
-
-    document.getElementById("verticalForm").style.display=""
-
-    document.all.verticalSecond.src=splitUrl
-    document.all.verticalFirst.src=splitUrl
-
-    document.getElementById("verticalSecond").style.display="" 
-    document.getElementById("verticalSecond").style.display="none" 
-    document.getElementById("verticalSecond").style.display="" 
-
-    document.getElementById("verticalFirst").style.display=""
-    document.getElementById("verticalFirst").style.display="none"
-    document.getElementById("verticalFirst").style.display=""
-
-  } else {
-
-    horizontalSplit = 1
-    document.getElementById("verticalFirst").style.display="none"
-    document.getElementById("verticalSecond").style.display="none"
-    document.getElementById("verticalForm").style.display="none"
-
-    document.getElementById("horizontalForm").style.display=""
-
-    document.all.horizontalSecond.src=splitUrl
-    document.all.horizontalFirst.src=splitUrl
-
-    document.getElementById("horizontalSecond").style.display="" 
-    document.getElementById("horizontalSecond").style.display="none" 
-    document.getElementById("horizontalSecond").style.display="" 
-
-    document.getElementById("horizontalFirst").style.display=""
-    document.getElementById("horizontalFirst").style.display="none"
-    document.getElementById("horizontalFirst").style.display=""
-
-  }
-
-
-} else{
-  if (!window.win2||win2.closed)
-    win2=window.open(splitUrl)
-  //else if win2 already exists
-  else{
-    win2.location=splitUrl
-    win2.focus()
-  } // if.
- } // if..
-}  // M - split
-]]>
-
-  </script>
-
-
-</xsl:template>
+<xsl:template name="windowFrameScripts">
+
+  <!-- HTML structure that will hold vertical and horizontal split data -->
+
+  <!-- HORIZONTAL SPLIT STRUCTURE -->
+  <form id="horizontalForm" style="width:100%;height:96%">
+    <table id="horizontalSpilt" style="width:100%;height:96%"  
+           border="0" cellspacing="0" cellpadding="0">
+      <tr>
+          <td>
+            <iframe id="horizontalFirst" frameborder="1" 
+                    style="width:100%;height:100%" src="">
+            </iframe>
+          </td>
+          <td>
+            <iframe id="horizontalSecond" frameborder="1" 
+                    style="width:100%;height:100%" src="">
+            </iframe>
+          </td>
+      </tr>
+    </table>
+  </form>
+  
+  <!-- VERTICAL SPLIT STRUCTURE -->
+  <form id="verticalForm" style="width:100%;height:96%">
+    <table id="verticalSpilt" style="width:100%;height:100%"  
+           border="0" cellspacing="0" cellpadding="0">
+      <tr>
+        <td>
+           <iframe id="verticalFirst" frameborder="1" 
+                   style="width:100%;height:100%" src="">
+           </iframe>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <iframe id="verticalSecond" frameborder="1" 
+                  style="width:100%;height:100%" src="">
+          </iframe>
+       </td>
+      </tr>
+    </table>
+  </form>
+
+  <script type="text/javascript">
+
+<![CDATA[
+
+//Drop-down Document Viewer- Dynamic Drive (www.dynamicdrive.com)
+//For full source code, 100's more DHTML scripts, and TOS,
+//visit http://www.dynamicdrive.com
+
+
+
+
+//Specify display mode (0 or 1)
+//0 causes document to be displayed in an inline frame, while 1 in a new browser window
+//if displaymode=0, configure inline frame attributes (ie: dimensions, intial document shown
+
+var displaymode=0
+var verticalSplit = 0
+var horzontalSplit = 0
+
+      document.getElementById("horizontalFirst").style.display="none"
+      document.getElementById("horizontalSecond").style.display="none"
+      document.getElementById("horizontalForm").style.display="none"
+
+      document.getElementById("verticalFirst").style.display="none"
+      document.getElementById("verticalSecond").style.display="none"
+      document.getElementById("verticalForm").style.display="none"
+
+
+function unSplit(){
+  if ( verticalSplit == 1){
+    document.getElementById("verticalFirst").style.display="none"
+    document.getElementById("verticalSecond").style.display="none"
+    document.getElementById("verticalForm").style.display="none"
+  } else if (horizontalSplit == 1){
+    document.getElementById("horizontalFirst").style.display="none"
+    document.getElementById("horizontalSecond").style.display="none"
+    document.getElementById("horizontalForm").style.display="none"
+  }
+
+}
+
+
+function split(doVerticalSplit){
+  var splitUrl = window.location.href
+  verticalSplit = doVerticalSplit
+if (document.getElementById && displaymode==0){
+
+  if ( verticalSplit == 1){
+
+   verticalSplit = 1
+   document.getElementById("horizontalFirst").style.display="none"
+   document.getElementById("horizontalSecond").style.display="none"
+   document.getElementById("horizontalForm").style.display="none"
+
+   document.getElementById("verticalForm").style.display=""
+
+   document.getElementById("verticalSecond").src="http://www.google.com"
+   document.getElementById("verticalFirst").src="http://www.google.com"
+
+   document.getElementById("verticalSecond").style.display=""
+   document.getElementById("verticalSecond").style.display="none"
+   document.getElementById("verticalSecond").style.display=""
+
+   document.getElementById("verticalFirst").style.display=""
+   document.getElementById("verticalFirst").style.display="none"
+   document.getElementById("verticalFirst").style.display=""
+
+   document.getElementById("verticalSecond").src=splitUrl
+   document.getElementById("verticalFirst").src=splitUrl
+
+   document.getElementById("verticalSecond").style.display=""
+   document.getElementById("verticalSecond").style.display="none"
+   document.getElementById("verticalSecond").style.display=""
+
+   document.getElementById("verticalFirst").style.display=""
+   document.getElementById("verticalFirst").style.display="none"
+   document.getElementById("verticalFirst").style.display=""
+
+  } else {
+
+    horizontalSplit = 1
+    document.getElementById("verticalFirst").style.display="none"
+    document.getElementById("verticalSecond").style.display="none"
+    document.getElementById("verticalForm").style.display="none"
+
+    document.getElementById("horizontalForm").style.display=""
+
+    document.getElementById("horizontalSecond").src=splitUrl
+    document.getElementById("horizontalFirst").src=splitUrl
+
+    document.getElementById("horizontalSecond").style.display=""
+    document.getElementById("horizontalSecond").style.display="none"
+    document.getElementById("horizontalSecond").style.display=""
+
+    document.getElementById("horizontalFirst").style.display=""
+    document.getElementById("horizontalFirst").style.display="none"
+    document.getElementById("horizontalFirst").style.display=""
+
+
+  }
+
+
+} else if (document.all && displaymode==0) {
+
+  if ( verticalSplit == 1){
+
+    verticalSplit = 1
+    document.getElementById("horizontalFirst").style.display="none"
+    document.getElementById("horizontalSecond").style.display="none"
+    document.getElementById("horizontalForm").style.display="none"
+
+    document.getElementById("verticalForm").style.display=""
+
+    document.all.verticalSecond.src=splitUrl
+    document.all.verticalFirst.src=splitUrl
+
+    document.getElementById("verticalSecond").style.display="" 
+    document.getElementById("verticalSecond").style.display="none" 
+    document.getElementById("verticalSecond").style.display="" 
+
+    document.getElementById("verticalFirst").style.display=""
+    document.getElementById("verticalFirst").style.display="none"
+    document.getElementById("verticalFirst").style.display=""
+
+  } else {
+
+    horizontalSplit = 1
+    document.getElementById("verticalFirst").style.display="none"
+    document.getElementById("verticalSecond").style.display="none"
+    document.getElementById("verticalForm").style.display="none"
+
+    document.getElementById("horizontalForm").style.display=""
+
+    document.all.horizontalSecond.src=splitUrl
+    document.all.horizontalFirst.src=splitUrl
+
+    document.getElementById("horizontalSecond").style.display="" 
+    document.getElementById("horizontalSecond").style.display="none" 
+    document.getElementById("horizontalSecond").style.display="" 
+
+    document.getElementById("horizontalFirst").style.display=""
+    document.getElementById("horizontalFirst").style.display="none"
+    document.getElementById("horizontalFirst").style.display=""
+
+  }
+
+
+} else{
+  if (!window.win2||win2.closed)
+    win2=window.open(splitUrl)
+  //else if win2 already exists
+  else{
+    win2.location=splitUrl
+    win2.focus()
+  } // if.
+ } // if..
+}  // M - split
+]]>
+
+  </script>
+
+
+</xsl:template>

Propchange: beehive/trunk/controls/test/infra/gtlf/xsl/windowFrameScript.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: beehive/trunk/controls/test/infra/mantis/mantis.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: beehive/trunk/controls/test/infra/tch/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/infra/tch/messages/end.txt
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/tch/messages/end.txt?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/infra/tch/messages/end.txt (original)
+++ beehive/trunk/controls/test/infra/tch/messages/end.txt Fri Aug 12 08:12:28 2005
@@ -1,21 +1,21 @@
-
-
-
-
-*****************************************************************
-*****************************************************************
-**                                                             **
-**                                                             **
-**                                                             **
-**                TCH TEST RUN HAS COMPLETED.                  **
-**                                                             **
-**        (please see log files to view results in detail,     **
-**               e.g. tch.debug, tch.log)                      **
-**                                                             **
-**                                                             **
-**                                                             **
-*****************************************************************
-*****************************************************************
-
-
-
+
+
+
+
+*****************************************************************
+*****************************************************************
+**                                                             **
+**                                                             **
+**                                                             **
+**                TCH TEST RUN HAS COMPLETED.                  **
+**                                                             **
+**        (please see log files to view results in detail,     **
+**               e.g. tch.debug, tch.log)                      **
+**                                                             **
+**                                                             **
+**                                                             **
+*****************************************************************
+*****************************************************************
+
+
+

Propchange: beehive/trunk/controls/test/infra/tch/messages/end.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/infra/tch/messages/start.txt
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/tch/messages/start.txt?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/infra/tch/messages/start.txt (original)
+++ beehive/trunk/controls/test/infra/tch/messages/start.txt Fri Aug 12 08:12:28 2005
@@ -1,20 +1,20 @@
-
-
-
-
-*****************************************************************
-*****************************************************************
-**                                                             **
-**                                                             **
-**                                                             **
-**                 TCH TEST RUN HAS BEGUN.                     **
-**                                                             **
-**          INITIALIZATION AND VALIDATION COMMENCING ...       **
-**                                                             **
-**                                                             **
-**                                                             **
-*****************************************************************
-*****************************************************************
-
-
-
+
+
+
+
+*****************************************************************
+*****************************************************************
+**                                                             **
+**                                                             **
+**                                                             **
+**                 TCH TEST RUN HAS BEGUN.                     **
+**                                                             **
+**          INITIALIZATION AND VALIDATION COMMENCING ...       **
+**                                                             **
+**                                                             **
+**                                                             **
+*****************************************************************
+*****************************************************************
+
+
+

Propchange: beehive/trunk/controls/test/infra/tch/messages/start.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: beehive/trunk/controls/test/infra/tch/runtime/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/infra/tch/schema/config.xsd
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/tch/schema/config.xsd?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/infra/tch/schema/config.xsd (original)
+++ beehive/trunk/controls/test/infra/tch/schema/config.xsd Fri Aug 12 08:12:28 2005
@@ -1,336 +1,336 @@
-<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:element name="config-root">
-    <xs:complexType>
-      <xs:all>
-        <xs:element
-          maxOccurs="1"
-          minOccurs="0"
-          name="environment-config"
-          type="environment-configType"
-        />
-        <xs:element
-          maxOccurs="1"
-          minOccurs="0"
-          name="machine-config"
-          type="machine-configType"
-        />
-        <xs:element
-          maxOccurs="1"
-          minOccurs="0"
-          name="process-config"
-          type="process-configType"
-        />
-      </xs:all>
-    </xs:complexType>
-  </xs:element>
-
-  <!-- FIXME: the attribute values here should be checked as existant. Easier to do this programatically -->
-  <xs:complexType name="configured-process-typeType">
-    <xs:attribute
-      name="name"
-      type="xs:string"
-      use="required"
-    />
-    <xs:attribute
-      name="process-type"
-      type="xs:string"
-      use="required"
-    />
-    <xs:attribute
-      name="env"
-      type="xs:string"
-      use="required"
-    />
-    <xs:attribute
-      name="configuration"
-      type="xs:string"
-      use="required"
-    />
-  </xs:complexType>
-  <xs:complexType name="envType">
-    <xs:sequence>
-      <xs:element
-        maxOccurs="unbounded"
-        minOccurs="0"
-        name="var"
-        type="varType"
-      />
-    </xs:sequence>
-    <xs:attribute
-      name="name"
-      type="xs:string"
-      use="required"
-    />
-  </xs:complexType>
-  <xs:complexType name="environment-configType">
-    <xs:sequence>
-      <xs:element
-        maxOccurs="unbounded"
-        name="env"
-        type="envType"
-      />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="exec-process-configType">
-    <xs:sequence>
-      <xs:element name="cmd" type="xs:string"/>
-    </xs:sequence>
-    <xs:attribute
-      name="name"
-      type="xs:string"
-      use="required"
-    />
-  </xs:complexType>
-  <xs:complexType name="tch-agent-process-configType">
-    <xs:sequence>
-      <xs:element
-        maxOccurs="unbounded"
-        minOccurs="0"
-        name="property"
-        type="propertyType"
-    />
-    </xs:sequence>
-    <xs:attribute
-      name="name"
-      type="xs:string"
-      use="required"
-    />
-    <xs:attribute
-      name="port"
-      type="xs:string"
-      use="optional"
-    />
-    <xs:attribute
-      name="bindname"
-      type="xs:string"
-      use="optional"
-    />
-    <xs:attribute
-      name="javaopts"
-      type="xs:string"
-      use="optional"
-    />
-    <xs:attribute
-      name="startup-timeout"
-      type="xs:string"
-      use="optional"
-    />
-  </xs:complexType>
-  <xs:complexType name="machineType">
-    <xs:attribute
-      name="name"
-      type="xs:string"
-      use="required"
-    />
-    <xs:attribute
-      name="host"
-      type="xs:string"
-      use="optional"
-    />
-    <xs:attribute
-      name="externalhost"
-      type="xs:string"
-      use="optional"
-    />
-    <xs:attribute name="ip" use="optional"/>
-    <xs:attribute
-      name="login"
-      type="xs:string"
-      use="optional"
-    />
-  </xs:complexType>
-  <xs:complexType name="machine-configType">
-    <xs:sequence>
-      <xs:element
-        maxOccurs="unbounded"
-        name="machine"
-        type="machineType"
-      />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="processType">
-    <xs:choice maxOccurs="unbounded">
-      <xs:element
-        maxOccurs="unbounded"
-        minOccurs="0"
-        name="nested-process"
-        type="nested-processType"
-      />
-    </xs:choice>
-    <xs:attribute
-      name="name"
-      type="xs:string"
-      use="required"
-    />
-    <xs:attribute
-      name="machine"
-      type="xs:string"
-      use="optional"
-    />
-    <xs:attribute
-      name="requires-started"
-      type="xs:string"
-      use="optional"
-    />    
-    <xs:attribute
-      name="implicit"
-      type="xs:boolean"
-      use="optional"
-    />
-    <xs:attribute
-      name="auto-start"
-      type="xs:string"
-      use="optional"
-    />
-    <xs:attribute
-      name="sleep-seconds-after-started"
-      type="xs:string"
-      use="optional"
-    />
-    <xs:attribute
-      name="window"
-      type="xs:boolean"
-      use="optional"
-    />
-    <xs:attribute
-      name="home"
-      type="xs:string"
-      use="optional"
-    />
-    <xs:attribute
-      name="java-home"
-      type="xs:string"
-      use="optional"
-    />
-    <xs:attribute
-      name="configured-process-type"
-      type="xs:string"
-      use="optional"
-    />
-    <xs:attribute
-      name="configuration"
-      type="xs:string"
-      use="optional"
-    />
-    <xs:attribute
-      name="abstract"
-      type="xs:string"
-      use="optional"
-    />
-    <xs:attribute
-      name="inherit"
-      type="xs:string"
-      use="optional"
-    />
-    <xs:attribute
-      name="process-type"
-      type="xs:string"
-      use="optional"
-    />
-  </xs:complexType>
-  <xs:complexType name="nested-processType">
-    <xs:attribute
-      name="name"
-      type="xs:string"
-      use="required"
-    />
-  </xs:complexType>
-  <xs:complexType name="process-configType">
-    <xs:choice maxOccurs="unbounded">
-      <xs:element
-        maxOccurs="unbounded"
-        minOccurs="0"
-        name="process-type"
-        type="process-typeType"
-      />
-      <xs:element
-        maxOccurs="unbounded"
-        minOccurs="0"
-        name="configured-process-type"
-        type="configured-process-typeType"
-      />
-      <xs:element
-        maxOccurs="unbounded"
-        minOccurs="0"
-        name="exec-process-config"
-        type="exec-process-configType"
-      />
-      <xs:element
-        maxOccurs="unbounded"
-        minOccurs="0"
-        name="listener-process-config"
-        type="tch-agent-process-configType"
-      />
-      <xs:element
-        maxOccurs="unbounded"
-        minOccurs="0"
-        name="tch-agent"
-        type="tch-agent-process-configType"
-      />
-      <xs:element
-        maxOccurs="unbounded"
-        minOccurs="0"
-        name="tch-agent-process-config"
-        type="tch-agent-process-configType"
-      />
-      <xs:element
-        maxOccurs="unbounded"
-        minOccurs="0"
-        name="process"
-        type="processType"
-      />
-    </xs:choice>
-  </xs:complexType>
-  <xs:complexType name="process-typeType">
-    <xs:attribute
-      name="name"
-      type="xs:string"
-      use="required"
-    />
-    <xs:attribute
-      name="default-process-manager"
-      type="xs:string"
-      use="required"
-    />
-    <xs:attribute name="process-handler" use="required"/>
-    <xs:attribute
-      name="configuration-manager"
-      type="xs:string"
-      use="required"
-    />
-    <xs:attribute
-      name="xml-handler"
-      type="xs:string"
-      use="required"
-    />
-    <xs:attribute
-      name="root-config-tagname"
-      type="xs:string"
-      use="required"
-    />
-  </xs:complexType>
-  <xs:complexType name="varType">
-    <xs:attribute
-      name="name"
-      type="xs:string"
-      use="required"
-    />
-    <xs:attribute
-      name="value"
-      type="xs:string"
-      use="required"
-    />
-  </xs:complexType>
-  <xs:complexType name="propertyType">
-    <xs:attribute
-      name="name"
-      type="xs:string"
-      use="required"
-    />
-    <xs:attribute
-      name="value"
-      type="xs:string"
-      use="required"
-    />
-  </xs:complexType>
-</xs:schema>
+<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="config-root">
+    <xs:complexType>
+      <xs:all>
+        <xs:element
+          maxOccurs="1"
+          minOccurs="0"
+          name="environment-config"
+          type="environment-configType"
+        />
+        <xs:element
+          maxOccurs="1"
+          minOccurs="0"
+          name="machine-config"
+          type="machine-configType"
+        />
+        <xs:element
+          maxOccurs="1"
+          minOccurs="0"
+          name="process-config"
+          type="process-configType"
+        />
+      </xs:all>
+    </xs:complexType>
+  </xs:element>
+
+  <!-- FIXME: the attribute values here should be checked as existant. Easier to do this programatically -->
+  <xs:complexType name="configured-process-typeType">
+    <xs:attribute
+      name="name"
+      type="xs:string"
+      use="required"
+    />
+    <xs:attribute
+      name="process-type"
+      type="xs:string"
+      use="required"
+    />
+    <xs:attribute
+      name="env"
+      type="xs:string"
+      use="required"
+    />
+    <xs:attribute
+      name="configuration"
+      type="xs:string"
+      use="required"
+    />
+  </xs:complexType>
+  <xs:complexType name="envType">
+    <xs:sequence>
+      <xs:element
+        maxOccurs="unbounded"
+        minOccurs="0"
+        name="var"
+        type="varType"
+      />
+    </xs:sequence>
+    <xs:attribute
+      name="name"
+      type="xs:string"
+      use="required"
+    />
+  </xs:complexType>
+  <xs:complexType name="environment-configType">
+    <xs:sequence>
+      <xs:element
+        maxOccurs="unbounded"
+        name="env"
+        type="envType"
+      />
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="exec-process-configType">
+    <xs:sequence>
+      <xs:element name="cmd" type="xs:string"/>
+    </xs:sequence>
+    <xs:attribute
+      name="name"
+      type="xs:string"
+      use="required"
+    />
+  </xs:complexType>
+  <xs:complexType name="tch-agent-process-configType">
+    <xs:sequence>
+      <xs:element
+        maxOccurs="unbounded"
+        minOccurs="0"
+        name="property"
+        type="propertyType"
+    />
+    </xs:sequence>
+    <xs:attribute
+      name="name"
+      type="xs:string"
+      use="required"
+    />
+    <xs:attribute
+      name="port"
+      type="xs:string"
+      use="optional"
+    />
+    <xs:attribute
+      name="bindname"
+      type="xs:string"
+      use="optional"
+    />
+    <xs:attribute
+      name="javaopts"
+      type="xs:string"
+      use="optional"
+    />
+    <xs:attribute
+      name="startup-timeout"
+      type="xs:string"
+      use="optional"
+    />
+  </xs:complexType>
+  <xs:complexType name="machineType">
+    <xs:attribute
+      name="name"
+      type="xs:string"
+      use="required"
+    />
+    <xs:attribute
+      name="host"
+      type="xs:string"
+      use="optional"
+    />
+    <xs:attribute
+      name="externalhost"
+      type="xs:string"
+      use="optional"
+    />
+    <xs:attribute name="ip" use="optional"/>
+    <xs:attribute
+      name="login"
+      type="xs:string"
+      use="optional"
+    />
+  </xs:complexType>
+  <xs:complexType name="machine-configType">
+    <xs:sequence>
+      <xs:element
+        maxOccurs="unbounded"
+        name="machine"
+        type="machineType"
+      />
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="processType">
+    <xs:choice maxOccurs="unbounded">
+      <xs:element
+        maxOccurs="unbounded"
+        minOccurs="0"
+        name="nested-process"
+        type="nested-processType"
+      />
+    </xs:choice>
+    <xs:attribute
+      name="name"
+      type="xs:string"
+      use="required"
+    />
+    <xs:attribute
+      name="machine"
+      type="xs:string"
+      use="optional"
+    />
+    <xs:attribute
+      name="requires-started"
+      type="xs:string"
+      use="optional"
+    />    
+    <xs:attribute
+      name="implicit"
+      type="xs:boolean"
+      use="optional"
+    />
+    <xs:attribute
+      name="auto-start"
+      type="xs:string"
+      use="optional"
+    />
+    <xs:attribute
+      name="sleep-seconds-after-started"
+      type="xs:string"
+      use="optional"
+    />
+    <xs:attribute
+      name="window"
+      type="xs:boolean"
+      use="optional"
+    />
+    <xs:attribute
+      name="home"
+      type="xs:string"
+      use="optional"
+    />
+    <xs:attribute
+      name="java-home"
+      type="xs:string"
+      use="optional"
+    />
+    <xs:attribute
+      name="configured-process-type"
+      type="xs:string"
+      use="optional"
+    />
+    <xs:attribute
+      name="configuration"
+      type="xs:string"
+      use="optional"
+    />
+    <xs:attribute
+      name="abstract"
+      type="xs:string"
+      use="optional"
+    />
+    <xs:attribute
+      name="inherit"
+      type="xs:string"
+      use="optional"
+    />
+    <xs:attribute
+      name="process-type"
+      type="xs:string"
+      use="optional"
+    />
+  </xs:complexType>
+  <xs:complexType name="nested-processType">
+    <xs:attribute
+      name="name"
+      type="xs:string"
+      use="required"
+    />
+  </xs:complexType>
+  <xs:complexType name="process-configType">
+    <xs:choice maxOccurs="unbounded">
+      <xs:element
+        maxOccurs="unbounded"
+        minOccurs="0"
+        name="process-type"
+        type="process-typeType"
+      />
+      <xs:element
+        maxOccurs="unbounded"
+        minOccurs="0"
+        name="configured-process-type"
+        type="configured-process-typeType"
+      />
+      <xs:element
+        maxOccurs="unbounded"
+        minOccurs="0"
+        name="exec-process-config"
+        type="exec-process-configType"
+      />
+      <xs:element
+        maxOccurs="unbounded"
+        minOccurs="0"
+        name="listener-process-config"
+        type="tch-agent-process-configType"
+      />
+      <xs:element
+        maxOccurs="unbounded"
+        minOccurs="0"
+        name="tch-agent"
+        type="tch-agent-process-configType"
+      />
+      <xs:element
+        maxOccurs="unbounded"
+        minOccurs="0"
+        name="tch-agent-process-config"
+        type="tch-agent-process-configType"
+      />
+      <xs:element
+        maxOccurs="unbounded"
+        minOccurs="0"
+        name="process"
+        type="processType"
+      />
+    </xs:choice>
+  </xs:complexType>
+  <xs:complexType name="process-typeType">
+    <xs:attribute
+      name="name"
+      type="xs:string"
+      use="required"
+    />
+    <xs:attribute
+      name="default-process-manager"
+      type="xs:string"
+      use="required"
+    />
+    <xs:attribute name="process-handler" use="required"/>
+    <xs:attribute
+      name="configuration-manager"
+      type="xs:string"
+      use="required"
+    />
+    <xs:attribute
+      name="xml-handler"
+      type="xs:string"
+      use="required"
+    />
+    <xs:attribute
+      name="root-config-tagname"
+      type="xs:string"
+      use="required"
+    />
+  </xs:complexType>
+  <xs:complexType name="varType">
+    <xs:attribute
+      name="name"
+      type="xs:string"
+      use="required"
+    />
+    <xs:attribute
+      name="value"
+      type="xs:string"
+      use="required"
+    />
+  </xs:complexType>
+  <xs:complexType name="propertyType">
+    <xs:attribute
+      name="name"
+      type="xs:string"
+      use="required"
+    />
+    <xs:attribute
+      name="value"
+      type="xs:string"
+      use="required"
+    />
+  </xs:complexType>
+</xs:schema>

Propchange: beehive/trunk/controls/test/infra/tch/schema/config.xsd
------------------------------------------------------------------------------
    svn:eol-style = native