diff --git a/viskit/Schemas/assembly.xsd b/viskit/Schemas/assembly.xsd
deleted file mode 100644
index 7f7c35038ebad2280bf07578af615e7534715995..0000000000000000000000000000000000000000
--- a/viskit/Schemas/assembly.xsd
+++ /dev/null
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- SVN ID: $Id$ -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:group name="DesignParameters">
-    <xs:sequence>
-      <xs:element ref="TerminalParameter"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="ValueRange" abstract="true">
-    <xs:complexType>
-      <xs:attribute name="lowValue"/>
-      <xs:attribute name="highValue"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:group name="Parameters">
-    <xs:choice>
-      <xs:element ref="MultiParameter"/>
-      <xs:element ref="FactoryParameter"/>
-      <xs:element ref="TerminalParameter"/>
-    </xs:choice>
-  </xs:group>
-  <xs:element name="Statistics" abstract="true"/>
-  <xs:element name="SimkitAssembly">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="head"/>
-        <xs:group minOccurs="0" maxOccurs="unbounded" ref="DesignParameters"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="SimEntity"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="EventGraph"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="PropertyChangeListener"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="SimEventListenerConnection"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="PropertyChangeListenerConnection"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Adapter"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Output"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Verbose"/>
-        <xs:element minOccurs="0" ref="Schedule"/>
-        <xs:element minOccurs="0" ref="Experiment"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="version" default="1.0"/>
-      <xs:attribute name="package" use="required"/>
-      <xs:attribute name="author"/>
-      <xs:attribute name="extend" default="viskit.assembly.ViskitAssembly"/>
-      <xs:attribute name="implement"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="head">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="meta"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="meta">
-    <xs:complexType>
-      <xs:attribute name="name" use="required"/>
-      <xs:attribute name="content"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="SimEntity">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:group minOccurs="0" maxOccurs="unbounded" ref="Parameters"/>
-        <xs:element minOccurs="0" ref="Coordinate"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="url"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="TerminalParameter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="ValueRange"/>
-      </xs:sequence>
-      <xs:attribute name="name"/>
-      <xs:attribute name="linkRef" type="xs:IDREF"/>
-      <xs:attribute name="link" type="xs:ID"/>
-      <xs:attribute name="value"/>
-      <xs:attribute name="type" use="required"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="DoubleRange" substitutionGroup="ValueRange"/>
-  <xs:element name="IntegerRange" substitutionGroup="ValueRange"/>
-  <xs:element name="MultiParameter">
-    <xs:complexType>
-      <xs:group minOccurs="0" maxOccurs="unbounded" ref="Parameters"/>
-      <xs:attribute name="name"/>
-      <xs:attribute name="type" use="required"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="FactoryParameter">
-    <xs:complexType>
-      <xs:group minOccurs="0" maxOccurs="unbounded" ref="Parameters"/>
-      <xs:attribute name="name"/>
-      <xs:attribute name="factory" use="required"/>
-      <xs:attribute name="method" default="getInstance"/>
-      <xs:attribute name="type" use="required"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Coordinate">
-    <xs:complexType>
-      <xs:attribute name="x" use="required"/>
-      <xs:attribute name="y" use="required"/>
-    </xs:complexType>
-  </xs:element>
-  <!--
-     The proper mode for a PropertyChangeListener is singular, however, for
-    backwards compatibility with older EventGraphs, we allow both singular and
-    plural modes (tdn 16 SEP 2008)
-  -->
-  <xs:element name="PropertyChangeListener">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:group minOccurs="0" maxOccurs="unbounded" ref="Parameters"/>
-        <xs:element minOccurs="0" ref="Coordinate"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="mode" default="listener">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="replicationStat"/>
-            <xs:enumeration value="replicationStats"/>
-            <xs:enumeration value="designPointStat"/>
-            <xs:enumeration value="designPointStats"/>
-            <xs:enumeration value="listener"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="meanStatistics" default="false">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="countStatistics" default="true">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="SimEventListenerConnection">
-    <xs:complexType>
-      <xs:attribute name="listener" use="required"/>
-      <xs:attribute name="source" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="PropertyChangeListenerConnection">
-    <xs:complexType>
-      <xs:attribute name="property"/>
-      <xs:attribute name="listener" use="required"/>
-      <xs:attribute name="source" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Output">
-    <xs:complexType>
-      <xs:attribute name="entity" use="required" type="xs:NMTOKEN"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Verbose">
-    <xs:complexType>
-      <!-- Bugfix 1425 (xs:NMTOKEN) -->
-      <xs:attribute name="entity" use="required" type="xs:NMTOKEN"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Schedule">
-    <xs:complexType>
-      <xs:attribute name="stopTime" default="0.0"/>
-      <xs:attribute name="verbose" default="true">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="numberReplications" default="1"/>
-      <xs:attribute name="printReplicationReports" default="true">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="printSummaryReport" default="true">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="saveReplicationData" default="false">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Adapter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="Coordinate"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required"/>
-      <xs:attribute name="eventHeard" use="required"/>
-      <xs:attribute name="eventSent" use="required"/>
-      <xs:attribute name="from" use="required" type="xs:NMTOKEN"/>
-      <xs:attribute name="to" use="required" type="xs:NMTOKEN"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Log" type="xs:string"/>
-  <xs:element name="Errors" type="xs:string"/>
-  <xs:element name="PropertyChange">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Statistics"/>
-      </xs:sequence>
-      <xs:attribute name="listenerName" use="required"/>
-      <xs:attribute name="property"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="SampleStatistics" substitutionGroup="Statistics">
-    <xs:complexType>
-      <xs:attribute name="name"/>
-      <xs:attribute name="mean" default="0.0"/>
-      <xs:attribute name="variance" default="0.0"/>
-      <xs:attribute name="standardDeviation" default="0.0"/>
-      <xs:attribute name="count" default="0"/>
-      <xs:attribute name="minObs" default="0.0"/>
-      <xs:attribute name="maxObs" default="0.0"/>
-      <xs:attribute name="samplingType" default="TALLY">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="TALLY"/>
-            <xs:enumeration value="TIME_VARYING"/>
-            <xs:enumeration value="LINEAR"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="IndexedSampleStatistics" substitutionGroup="Statistics">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="SampleStatistics"/>
-      </xs:sequence>
-      <xs:attribute name="name"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Results">
-    <xs:complexType>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="Log"/>
-        <xs:element ref="PropertyChange"/>
-        <xs:element ref="Errors"/>
-      </xs:choice>
-      <xs:attribute name="sample" use="required"/>
-      <xs:attribute name="designPoint" use="required"/>
-      <xs:attribute name="index"/>
-      <xs:attribute name="job"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="DesignPoint">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="TerminalParameter"/>
-        <xs:element minOccurs="0" ref="Script"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Replication"/>
-        <xs:element minOccurs="0" ref="Results"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Statistics"/>
-      </xs:sequence>
-      <xs:attribute name="index"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Replication">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Statistics"/>
-      </xs:sequence>
-      <xs:attribute name="index"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Script" type="xs:string"/>
-  <xs:element name="Sample">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="DesignPoint"/>
-      </xs:sequence>
-      <xs:attribute name="index"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Experiment">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="Script"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Sample"/>
-      </xs:sequence>
-      <xs:attribute name="jobID"/>
-      <xs:attribute name="type" default="latin-hypercube">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="latin-hypercube"/>
-            <xs:enumeration value="full-factorial"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="replicationsPerDesignPoint" default="1"/>
-      <xs:attribute name="totalSamples" default="1"/>
-      <xs:attribute name="jitter" default="true">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="timeout" default="0"/>
-      <xs:attribute name="debug" default="false">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="EventGraph">
-    <xs:complexType mixed="true">
-      <xs:attribute name="fileName"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="PasswordFile">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="User"/>
-      </xs:sequence>
-      <xs:attribute name="name" default="/tmp/passwd.xml"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="User">
-    <xs:complexType>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="password" use="required"/>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
diff --git a/viskit/Schemas/cli.xsd b/viskit/Schemas/cli.xsd
deleted file mode 100644
index 14a902bacd0a1e5a00d3c76cfbaa68447b744058..0000000000000000000000000000000000000000
--- a/viskit/Schemas/cli.xsd
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="Config">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="Assembly"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="EventGraph"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="ExtensionJar"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Assembly">
-    <xs:complexType>
-      <xs:attribute name="fileName" use="required"/>
-      <xs:attribute name="className" use="required"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="EventGraph">
-    <xs:complexType>
-      <xs:attribute name="fileName" use="required"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ExtensionJar">
-    <xs:complexType>
-      <xs:attribute name="fileName" use="required"/>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
diff --git a/viskit/Schemas/qstat.xsd b/viskit/Schemas/qstat.xsd
deleted file mode 100644
index a8b58d5aca2d908db95a92563828d4961d5f7291..0000000000000000000000000000000000000000
--- a/viskit/Schemas/qstat.xsd
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:ns="http://xml.netbeans.org/examples/targetNS"
-            targetNamespace="http://xml.netbeans.org/examples/targetNS"
-            xmlns="http://xml.netbeans.org/examples/targetNS"
-            elementFormDefault="qualified">
-
-  
-<!--
-    Document   : qstat.xsd
-    Created on : March 14, 2006, 4:39 PM
-    Author     : Rick Goldberg
-    Description: qstat -xml format 
-        Licensed from Sun Grid Engine.
--->
-
-
-
-<!--___INFO__MARK_BEGIN__
-/*************************************************************************
- * 
- *  The Contents of this file are made available subject to the terms of
- *  the Sun Industry Standards Source License Version 1.2
- * 
- *  Sun Microsystems Inc., March, 2001
- * 
- * 
- *  Sun Industry Standards Source License Version 1.2
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.2 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://gridengine.sunsource.net/Gridengine_SISSL_license.html
- * 
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- * 
- *   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- * 
- *   Copyright: 2001 by Sun Microsystems, Inc.
- * 
- *   All Rights Reserved.
- * 
- ************************************************************************/
-___INFO__MARK_END__-->
-
-
-   <xsd:element name="job_info">
-      <xsd:complexType>
-         <xsd:annotation>
-            <xsd:documentation> 
-               This schema describes most of the qstat outputs. There are extra
-               schema defintions for "qstat -j" and and "qstat -j job".
-            </xsd:documentation>
-         </xsd:annotation>
-         <xsd:sequence>
-            <xsd:element name="queue_info" type="queue_info_t" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="job_info" type="job_info_t" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="cluster_queue_summary" type="cqueue_summary_t" minOccurs="0" maxOccurs="unbounded"/>
-         </xsd:sequence>
-      </xsd:complexType>   
-   </xsd:element>
-
-<!-- ======================================= -->
-<!-- general qstat output                    -->
-
-   <xsd:element name="cqueue_summary_t">
-      <xsd:complexType>
-         <xsd:annotation>
-            <xsd:documentation></xsd:documentation>
-         </xsd:annotation>
-         <xsd:sequence>
-            <xsd:element name="name" type="xsd:String"/>
-            <xsd:element name="used" type="xsd:positiveInteger"/>
-            <xsd:element name="available" type="xsd:positiveInteger"/>
-            <xsd:element name="total" type="xsd:positiveInteger"/>
-            <xsd:element name="temp_disabled" type="xsd:positiveInteger"/>
-            <xsd:element name="manual_intervention" type="xsd:positiveInteger"/>
-         
-            <xsd:element name="suspend_manual" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="suspend_threshold" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="suspend_on_subordinate" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="suspend_calendar" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="unknown" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="load_alarm" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="disabled_manual" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="disabled_calendar" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="ambiguous" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="orphaned" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="error" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-         </xsd:sequence>
-      </xsd:complexType>
-   </xsd:element> 
-
-   <xsd:element name="queue_info_t">
-      <xsd:complexType>
-         <xsd:annotation>
-            <xsd:documentation></xsd:documentation>
-         </xsd:annotation>
-         <xsd:sequence>
-            <xsd:element name="name" type="xsd:String" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="qtype" type="xsd:String" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="slots_used" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="slots_total" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="load_avg" type="xsd:float" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="arch" type="xsd:String" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="state" type="xsd:String" minOccurs="0" maxOccurs="1"/>
-          
-            <xsd:element name="message" type="xsd:String" minOccurs="0" maxOccurs="unbounded"/>
-          
-            <xsd:element name="resource" type="resource_t" minOccurs="0" maxOccurs="unbounded"/>
-           
-            <xsd:element name="job_list" type="job_list_t" minOccurs="0" maxOccurs="unbounded"/>
-            
-         </xsd:sequence>
-      </xsd:complexType>
-   </xsd:element> 
-
-   <xsd:element name="job_info_t">
-      <xsd:complexType>
-         <xsd:annotation>
-            <xsd:documentation></xsd:documentation>
-         </xsd:annotation>
-         <xsd:sequence>
-            <xsd:element name="job_list" type="job_list_t" minOccurs="0" maxOccurs="unbounded"/>
-         </xsd:sequence>
-      </xsd:complexType>
-   </xsd:element> 
-
-   <xsd:element name="job_list_t">
-      <xsd:complexType>
-         <xsd:annotation>
-            <xsd:documentation></xsd:documentation>
-         </xsd:annotation>
-         <xsd:sequence>
-            <xsd:element name="JB_job_number" type="xsd:positiveInteger"/>  
-            <xsd:element name="JAT_prio" type="xsd:float"/>
-            <xsd:element name="JAT_ntix" type="xsd:float" minOccurs="0" maxOccurs="1"/>
-            
-            <xsd:element name="JB_nurg" type="xsd:float" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="JB_urg" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="JB_rrcontr" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="JB_wtcontr" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="JB_dlcontr" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="JB_priority" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            
-            <xsd:element name="JB_name" type="xsd:String"/>
-            <xsd:element name="JB_owner" type="xsd:String"/>
-            <xsd:element name="JB_project" type="xsd:String" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="JB_department" type="xsd:String" minOccurs="0" maxOccurs="1"/>
-
-            <xsd:element name="state" type="xsd:String"/>
-            
-            <xsd:element name="JB_submission_time" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="JAT_start_time" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="JB_deadline" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
-
-            <xsd:element name="cpu_usage" type="xsd:float" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="mem_usage" type="xsd:float" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="io_usage" type="xsd:float" minOccurs="0" maxOccurs="1"/>
-
-            <xsd:element name="tickets" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/> 
-            <xsd:element name="JB_override_tickets" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="JB_jobshare" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="otickets" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="ftickets" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="stickets" type="xsd:positiveInteger" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="JAT_share" type="xsd:float" minOccurs="0" maxOccurs="1"/>
-            
-            <xsd:element name="queue_name" type="xsd:String" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="master" type="xsd:String" minOccurs="0" maxOccurs="1"/>
-            
-            <xsd:element name="slots" type="xsd:positiveInteger"/> 
-            <xsd:element name="tasks" type="xsd:String" minOccurs="0" maxOccurs="1"/>
-
-            <xsd:element name="requested_PE" type="requested_PE_t" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="granted_PE" type="granted_PE_t" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="JB_checkpoint_name" type="xsd:String" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="hard_request" type="request_t" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="def_hard_request" type="request_t" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="soft_request" type="request_t" minOccurs="0" maxOccurs="unbounded"/>
-
-            <xsd:element name="hard_req_queue" type="xsd:String" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="soft_req_queue" type="xsd:String" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="master_hard_req_queue" type="xsd:String" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="predecessor_jobs_req" type="xsd:String" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="predecessor_jobs" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
-
-         </xsd:sequence>
-         <xsd:attribute name="state" type="xsd:string" use="required"/>
-      </xsd:complexType>
-   </xsd:element> 
-
-<!-- ======================================= -->
-
-   <xsd:element name="request_t" type="xsd:string">
-      <xsd:complexType>
-         <xsd:annotation>
-            <xsd:documentation></xsd:documentation>
-         </xsd:annotation>
-         <xsd:attribute name="name" type="xsd:string" use="required"/>
-          <xsd:attribute name="resource_contribution" type="xsd:float" use="implied"/>
-      </xsd:complexType>
-   </xsd:element>
-
-   <xsd:element name="granted_PE_t" type="xsd:positiveInteger">
-      <xsd:complexType>
-         <xsd:annotation>
-            <xsd:documentation></xsd:documentation>
-         </xsd:annotation>
-         <xsd:attribute name="name" type="xsd:string" use="required"/>
-      </xsd:complexType>
-   </xsd:element>
-
-   <xsd:element name="requested_PE_t" type="xsd:string">
-      <xsd:complexType>
-         <xsd:annotation>
-            <xsd:documentation></xsd:documentation>
-         </xsd:annotation>
-         <xsd:attribute name="name" type="xsd:string" use="required"/>
-      </xsd:complexType>
-   </xsd:element>
-
-   <xsd:element name="resource_t" type="xsd:string">
-      <xsd:complexType>
-         <xsd:annotation>
-            <xsd:documentation></xsd:documentation>
-         </xsd:annotation>
-         <xsd:attribute name="name" type="xsd:string" use="required"/>
-         <xsd:attribute name="type" type="xsd:string" use="required"/>
-      </xsd:complexType>
-   </xsd:element>
-
-</xsd:schema>
diff --git a/viskit/Schemas/simkit.xsd b/viskit/Schemas/simkit.xsd
deleted file mode 100644
index 5764da8d5a8823458fcde2751d39633f08df1399..0000000000000000000000000000000000000000
--- a/viskit/Schemas/simkit.xsd
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- SVN ID: $Id$ -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="SimEntity">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="head"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Parameter"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="StateVariable"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Event"/>
-        <xs:element minOccurs="0" ref="Code"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required"/>
-      <xs:attribute name="package" default="examples"/>
-      <xs:attribute name="version" default="1.0"/>
-      <xs:attribute name="author"/>
-      <xs:attribute name="extend" default="SimEntityBase"/>
-      <xs:attribute name="implement"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="head">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="meta"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="meta">
-    <xs:complexType>
-      <xs:attribute name="name" use="required"/>
-      <xs:attribute name="content"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Comment" type="xs:string"/>
-  <xs:element name="Parameter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="StateVariable">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Code"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Event">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Argument"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="LocalVariable"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="StateTransition"/>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="Schedule"/>
-          <xs:element ref="Cancel"/>
-        </xs:choice>
-
-        <!-- Regardless of this sequence, code blocks will appear in the correct
-             place in generated source code -->
-        <xs:element minOccurs="0" ref="Code"/>
-        <xs:element minOccurs="0" ref="Coordinate"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Code" type="xs:string"/>
-  <xs:element name="Argument">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:NMTOKEN"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="LocalVariable">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Code"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:NMTOKEN"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="value"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Coordinate">
-    <xs:complexType>
-      <xs:attribute name="x" use="required"/>
-      <xs:attribute name="y" use="required"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Operation">
-    <xs:complexType>
-      <xs:attribute name="method" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Assignment">
-    <xs:complexType>
-      <xs:attribute name="value" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="LocalVariableAssignment">
-      <xs:complexType>
-      <xs:attribute name="value"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="LocalVariableInvocation">
-      <xs:complexType>
-      <xs:attribute name="method"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <!-- bug fix 1183 -->
-  <xs:element name="StateTransition">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:choice>
-          <xs:element ref="Assignment"/>
-          <xs:element ref="Operation"/>
-        </xs:choice>
-        <xs:element minOccurs="0" maxOccurs="1" ref="LocalVariableAssignment"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="LocalVariableInvocation"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Code"/>
-      </xs:sequence>
-      <xs:attribute name="state" use="required" type="xs:IDREF"/>
-      <xs:attribute name="index"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="EdgeParameter">
-    <xs:complexType>
-      <xs:attribute name="value" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Schedule">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Code"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="EdgeParameter"/>
-      </xs:sequence>
-      <xs:attribute name="delay" default="0.0"/>
-      <xs:attribute name="event" use="required" type="xs:IDREF"/>
-      <xs:attribute name="condition"/>
-      <xs:attribute name="priority" default="DEFAULT">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="HIGHEST"/>
-            <xs:enumeration value="HIGHER"/>
-            <xs:enumeration value="HIGH"/>
-            <xs:enumeration value="DEFAULT"/>
-            <xs:enumeration value="LOW"/>
-            <xs:enumeration value="LOWER"/>
-            <xs:enumeration value="LOWEST"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Cancel">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Code"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="EdgeParameter"/>
-      </xs:sequence>
-      <xs:attribute name="event" use="required" type="xs:IDREF"/>
-      <xs:attribute name="condition"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
diff --git a/viskit/Schemas/statistics.xsd b/viskit/Schemas/statistics.xsd
deleted file mode 100644
index ec587670f213ea0535a1cb836ecdfcfa2578cedb..0000000000000000000000000000000000000000
--- a/viskit/Schemas/statistics.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="SampleStatistics">
-    <xs:complexType>
-      <xs:attribute name="mean" default="0.0" type="xs:decimal"/>
-      <xs:attribute name="variance" default="0.0" type="xs:decimal"/>
-      <xs:attribute name="standardDeviation" default="0.0" type="xs:decimal"/>
-      <xs:attribute name="count" default="0" type="xs:integer"/>
-      <xs:attribute name="minObs" default="0.0" type="xs:decimal"/>
-      <xs:attribute name="maxObs" default="0.0" type="xs:decimal"/>
-      <xs:attribute name="sampleType" default="TALLY">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="TALLY"/>
-            <xs:enumeration value="TIME_VARYING"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="name"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="IndexedSampleStatistics">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="SampleStatistics"/>
-      </xs:sequence>
-      <xs:attribute name="name"/>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
diff --git a/viskit/Schemas/viskit.xsd b/viskit/Schemas/viskit.xsd
deleted file mode 100644
index 867ea3c631a759219202fae16f71f03ab3cc6098..0000000000000000000000000000000000000000
--- a/viskit/Schemas/viskit.xsd
+++ /dev/null
@@ -1,541 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <!-- this is next-generation merged schema, work in progress, not yet used -->
-  <!-- change: renamed   simkit.xsd (dissimilar) Schedule as AssemblySchedule -->
-  <!-- change: renamed assembly.xsd (dissimilar) SimEntity as AssemblySimEntity -->
-  <!-- assembly.xsd ============================================= -->
-  <xs:group name="DesignParameters">
-    <xs:sequence>
-      <xs:element ref="TerminalParameter"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="ValueRange" abstract="true">
-    <xs:complexType>
-      <xs:attribute name="lowValue"/>
-      <xs:attribute name="highValue"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:group name="Parameters">
-    <xs:choice>
-      <xs:element ref="MultiParameter"/>
-      <xs:element ref="FactoryParameter"/>
-      <xs:element ref="TerminalParameter"/>
-    </xs:choice>
-  </xs:group>
-  <xs:element name="Statistics" abstract="true"/>
-  <xs:element name="SimkitAssembly">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="head"/>
-        <xs:group minOccurs="0" maxOccurs="unbounded" ref="DesignParameters"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="AssemblySimEntity"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="EventGraph"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="PropertyChangeListener"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="SimEventListenerConnection"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="PropertyChangeListenerConnection"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Adapter"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Output"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Verbose"/>
-        <xs:element minOccurs="0" ref="Schedule"/>
-        <xs:element minOccurs="0" ref="Experiment"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="version" default="1.0"/>
-      <xs:attribute name="package" use="required"/>
-      <xs:attribute name="author"/>
-      <xs:attribute name="extend" default="viskit.assembly.ViskitAssembly"/>
-      <xs:attribute name="implement"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="head">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="meta"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="meta">
-    <xs:complexType>
-      <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
-      <xs:attribute name="content"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="AssemblySimEntity">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:group minOccurs="0" maxOccurs="unbounded" ref="Parameters"/>
-        <xs:element minOccurs="0" ref="Coordinate"/>
-      </xs:sequence>
-      <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="url"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="TerminalParameter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="ValueRange"/>
-      </xs:sequence>
-      <xs:attribute name="name"/>
-      <xs:attribute name="linkRef" type="xs:IDREF"/>
-      <xs:attribute name="link" type="xs:ID"/>
-      <xs:attribute name="value"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="DoubleRange" substitutionGroup="ValueRange"/>
-  <xs:element name="IntegerRange" substitutionGroup="ValueRange"/>
-  <xs:element name="MultiParameter">
-    <xs:complexType>
-      <xs:group minOccurs="0" maxOccurs="unbounded" ref="Parameters"/>
-      <xs:attribute name="name"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="FactoryParameter">
-    <xs:complexType>
-      <xs:group minOccurs="0" maxOccurs="unbounded" ref="Parameters"/>
-      <xs:attribute name="name"/>
-      <xs:attribute name="factory" use="required"/>
-      <xs:attribute name="method" default="getInstance"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Coordinate">
-    <xs:complexType>
-      <xs:attribute name="x" use="required"/> <!-- TODO  type="xs:float" -->
-      <xs:attribute name="y" use="required"/> <!-- TODO  type="xs:float" -->
-    </xs:complexType>
-  </xs:element>
-  <!--
-     The proper mode for a PropertyChangeListener is singular, however, for
-    backwards compatibility with older EventGraphs, we allow both singular and
-    plural modes (tdn 16 SEP 2008)
-  -->
-  <xs:element name="PropertyChangeListener">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:group minOccurs="0" maxOccurs="unbounded" ref="Parameters"/>
-        <xs:element minOccurs="0" ref="Coordinate"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="mode" default="listener">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="replicationStat"/>
-            <xs:enumeration value="replicationStats"/>
-            <xs:enumeration value="designPointStat"/>
-            <xs:enumeration value="designPointStats"/>
-            <xs:enumeration value="listener"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="meanStatistics" default="false">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="countStatistics" default="true">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="SimEventListenerConnection">
-    <xs:complexType>
-      <xs:attribute name="listener" use="required"/>
-      <xs:attribute name="source" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="PropertyChangeListenerConnection">
-    <xs:complexType>
-      <xs:attribute name="property"/>
-      <xs:attribute name="listener" use="required"/>
-      <xs:attribute name="source" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Output">
-    <xs:complexType>
-      <xs:attribute name="entity" use="required" type="xs:NMTOKEN"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Verbose">
-    <xs:complexType>
-      <!-- Bugfix 1425 (xs:NMTOKEN) -->
-      <xs:attribute name="entity" use="required" type="xs:NMTOKEN"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Schedule">
-    <xs:complexType>
-      <xs:attribute name="stopTime" default="0.0"/>
-      <xs:attribute name="verbose" default="true">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="numberReplications" default="1"/>
-      <xs:attribute name="printReplicationReports" default="true">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="printSummaryReport" default="true">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="saveReplicationData" default="true">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="AssemblySchedule">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Code"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="EdgeParameter"/>
-      </xs:sequence>
-      <xs:attribute name="delay" default="0.0"/>
-      <xs:attribute name="event" use="required" type="xs:IDREF"/>
-      <xs:attribute name="condition"/>
-      <xs:attribute name="priority" default="DEFAULT">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="HIGHEST"/>
-            <xs:enumeration value="HIGHER"/>
-            <xs:enumeration value="HIGH"/>
-            <xs:enumeration value="DEFAULT"/>
-            <xs:enumeration value="LOW"/>
-            <xs:enumeration value="LOWER"/>
-            <xs:enumeration value="LOWEST"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Adapter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="Coordinate"/>
-      </xs:sequence>
-      <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
-      <xs:attribute name="eventHeard" use="required"/>
-      <xs:attribute name="eventSent" use="required"/>
-      <xs:attribute name="from" use="required" type="xs:NMTOKEN"/>
-      <xs:attribute name="to" use="required" type="xs:NMTOKEN"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Log" type="xs:string"/>
-  <xs:element name="Errors" type="xs:string"/>
-  <xs:element name="PropertyChange">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Statistics"/>
-      </xs:sequence>
-      <xs:attribute name="listenerName" use="required"/>
-      <xs:attribute name="property"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="SampleStatistics" substitutionGroup="Statistics">
-    <xs:complexType>
-      <xs:attribute name="name"/>
-      <xs:attribute name="mean" default="0.0"/>
-      <xs:attribute name="variance" default="0.0"/>
-      <xs:attribute name="standardDeviation" default="0.0"/>
-      <xs:attribute name="count" default="0"/>
-      <xs:attribute name="minObs" default="0.0"/>
-      <xs:attribute name="maxObs" default="0.0"/>
-      <xs:attribute name="samplingType" default="TALLY">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="TALLY"/>
-            <xs:enumeration value="TIME_VARYING"/>
-            <xs:enumeration value="LINEAR"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="IndexedSampleStatistics" substitutionGroup="Statistics">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="SampleStatistics"/>
-      </xs:sequence>
-      <xs:attribute name="name"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Results">
-    <xs:complexType>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="Log"/>
-        <xs:element ref="PropertyChange"/>
-        <xs:element ref="Errors"/>
-      </xs:choice>
-      <xs:attribute name="sample" use="required"/>
-      <xs:attribute name="designPoint" use="required"/>
-      <xs:attribute name="index"/>
-      <xs:attribute name="job"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="DesignPoint">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="TerminalParameter"/>
-        <xs:element minOccurs="0" ref="Script"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Replication"/>
-        <xs:element minOccurs="0" ref="Results"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Statistics"/>
-      </xs:sequence>
-      <xs:attribute name="index"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Replication">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Statistics"/>
-      </xs:sequence>
-      <xs:attribute name="index"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Script" type="xs:string"/>
-  <xs:element name="Sample">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="DesignPoint"/>
-      </xs:sequence>
-      <xs:attribute name="index"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Experiment">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="Script"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Sample"/>
-      </xs:sequence>
-      <xs:attribute name="jobID"/>
-      <xs:attribute name="type" default="latin-hypercube">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="latin-hypercube"/>
-            <xs:enumeration value="full-factorial"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="replicationsPerDesignPoint" default="1"/>
-      <xs:attribute name="totalSamples" default="1"/>
-      <xs:attribute name="jitter" default="true">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="timeout" default="0"/>
-      <xs:attribute name="debug" default="false">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="EventGraph">
-    <xs:complexType mixed="true">
-      <xs:attribute name="fileName"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="PasswordFile">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="User"/>
-      </xs:sequence>
-      <xs:attribute name="name" default="/tmp/passwd.xml"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="User">
-    <xs:complexType>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="password" use="required"/>
-    </xs:complexType>
-  </xs:element>
-  <!-- simkit.xsd ============================================ -->
-  <xs:element name="SimEntity">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="head"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Parameter"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="StateVariable"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Event"/>
-        <xs:element minOccurs="0" ref="Code"/>
-      </xs:sequence>
-      <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
-      <xs:attribute name="package" default="examples"/>
-      <xs:attribute name="version" default="1.0"/>
-      <xs:attribute name="author"/>
-      <xs:attribute name="extend" default="SimEntityBase"/>
-      <xs:attribute name="implement"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Comment" type="xs:string"/>
-  <xs:element name="Parameter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="StateVariable">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Code"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Event">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Argument"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="LocalVariable"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="StateTransition"/>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="AssemblySchedule"/>
-          <xs:element ref="Cancel"/>
-        </xs:choice>
-        <!-- Regardless of this sequence, code blocks will appear in the correct
-             place in generated source code -->
-        <xs:element minOccurs="0" ref="Code"/>
-        <xs:element minOccurs="0" ref="Coordinate"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Code" type="xs:string"/>
-  <xs:element name="Argument">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:NMTOKEN"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="LocalVariable">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Code"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:NMTOKEN"/>
-      <xs:attribute name="type" use="required"/>
-      <xs:attribute name="value"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Operation">
-    <xs:complexType>
-      <xs:attribute name="method" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Assignment">
-    <xs:complexType>
-      <xs:attribute name="value" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="LocalVariableAssignment">
-      <xs:complexType>
-      <xs:attribute name="value"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="LocalVariableInvocation">
-      <xs:complexType>
-      <xs:attribute name="method"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <!-- bug fix 1183 -->
-  <xs:element name="StateTransition">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:choice>
-          <xs:element ref="Assignment"/>
-          <xs:element ref="Operation"/>
-        </xs:choice>
-        <xs:element minOccurs="0" maxOccurs="1" ref="LocalVariableAssignment"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="LocalVariableInvocation"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Code"/>
-      </xs:sequence>
-      <xs:attribute name="state" use="required" type="xs:IDREF"/>
-      <xs:attribute name="index"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="EdgeParameter">
-    <xs:complexType>
-      <xs:attribute name="value" use="required"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="Cancel">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Code"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Comment"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="EdgeParameter"/>
-      </xs:sequence>
-      <xs:attribute name="event" use="required" type="xs:IDREF"/>
-      <xs:attribute name="condition"/>
-      <xs:attribute name="description"/>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
diff --git a/viskit/lib/viskit.jar b/viskit/lib/viskit.jar
index be597bd61e9c5189add9ec861e6b9c57ee6acff8..8be1d55814001efa8b875a96705a0bf821f65382 100644
Binary files a/viskit/lib/viskit.jar and b/viskit/lib/viskit.jar differ