diff --git a/build.properties b/build.properties
index 680cd113d635177a6ea63c12081d81c0b88e406b..7fa66e1304637100336eda62cc41712e92502d05 100644
--- a/build.properties
+++ b/build.properties
@@ -1,8 +1,12 @@
# Created 23 AUG 2024
product.shortname=viskit
viskit.dir=${basedir}/${product.shortname}
+viskit.editor.jar=${viskit.dir}/viskit-editor.jar
-#assy.file=${basedir}/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
+opendis.jar=lib/opendis7-full.jar
+runtime.classpath=${opendis.jar}
+
+assy.file=${basedir}/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
#assy.file=${basedir}/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml
# Viskit run arguments
diff --git a/build.xml b/build.xml
index 6e994c3925be34622ce5585be2d7f41263604c7d..0986877f971ed2e779a25a442260635766fea32f 100644
--- a/build.xml
+++ b/build.xml
@@ -240,37 +240,41 @@ POSSIBILITY OF SUCH DAMAGE.
</target>
<!-- Viskit properties -->
- <condition property="isWin">
- <os family="windows"/>
- </condition>
- <condition property="isMac">
- <os family="mac"/>
- </condition>
- <condition property="isUnix">
- <and>
- <os family="unix"/>
- <not>
- <equals arg1="${os.name}" arg2="Mac OS X"/>
- </not>
- </and>
- </condition>
-
- <target name="run.viskit" depends="run.viskit.win,run.viskit.mac,run.viskit.unix" description="Start the Visual Simikit (viskit) DES Authoring Tool on any O/S"/>
- <target name="run.viskit.win" if="isWin">
- <java dir="${viskit.dir}" jar="viskit/viskit-editor.jar" fork="true">
- <jvmarg line="${win.run.args}"/>
- <arg value="${assy.file}"/>
- </java>
+ <target name="platformInitialize" depends="platformType"/>
+ <target name="platformType">
+ <condition property="isWin" >
+ <os family="windows"/>
+ </condition>
+ <condition property="isMac" >
+ <os family="mac"/>
+ </condition>
+ <!-- Based on Apache Ant user-manual example -->
+ <condition property="isUnix">
+ <and>
+ <os family="unix"/>
+
+ <not>
+ <equals arg1="${os.name}" arg2="Mac OS X"/>
+ </not>
+
+ </and>
+ </condition>
</target>
- <target name="run.viskit.mac" if="isMac">
- <java dir="${viskit.dir}" jar="viskit/viskit-editor.jar" fork="true">
- <jvmarg line="${mac.run.args}"/>
- <arg value="${assy.file}"/>
- </java>
+ <target name="initWin" if="isWin">
+ <property name="run.args" value="${win.run.args}"/>
</target>
- <target name="run.viskit.unix" if="isUnix">
- <java dir="${viskit.dir}" jar="viskit/viskit-editor.jar" fork="true">
- <jvmarg line="${unix.run.args}"/>
+ <target name="initUnix" if="isUnix">
+ <property name="run.args" value="${unix.run.args}"/>
+ </target>
+ <target name="initMac" if="isMac">
+ <property name="run.args" value="${mac.run.args}"/>
+ </target>
+ <target name="initializeAll" depends="platformInitialize,initWin,initUnix,initMac"/>
+
+ <target name="run.viskit" depends="initializeAll" description="Start the Visual Simikit (viskit) DES Authoring Tool on any O/S">
+ <java dir="${viskit.dir}" jar="${viskit.editor.jar}" fork="true">
+ <classpath path="${runtime.classpath}"/>
+ <jvmarg line="${run.args}"/>
<arg value="${assy.file}"/>
</java>
</target>
@@ -280,7 +284,7 @@ POSSIBILITY OF SUCH DAMAGE.
<delete dir="${viskit.dir}/pduLog"/>
</target>
- <target name="nuke.dot.viskit" description="Abolish an out of synch configuration and metadata directory">
+ <target name="nuke.dot.viskit" description="Abolish an out of synch configuration and metadata directory - only when necessary">
<delete includeemptydirs="yes" dir="${dot.viskit.dir}"/>
</target>
diff --git a/examples/build.xml b/examples/build.xml
index b3940cf05b7f38a85a7b99961c53b5c525c3503a..31bdfd58879a38df1f4fb6905c378b780595ce27 100644
--- a/examples/build.xml
+++ b/examples/build.xml
@@ -209,17 +209,16 @@ POSSIBILITY OF SUCH DAMAGE.
</target>
<target name="run.opendis.helper" depends="jar" description="Test run our OpenDisHelper">
- <java classpath="${viskit.proj.lib.dir}/${dist.name}.jar" classname="${opendis.helper}" fork="true"/>
+ <java classpath="${viskit.proj.lib.dir}/${dist.name}.jar" classname="${opendis.helper}" fork="true">
+ <classpath path="${file.reference.simkit.jar}"/>
+ <classpath path="${file.reference.opendis7-full.jar}"/>
+ </java>
</target>
<target name="-post-jar">
<copy todir="${viskit.proj.lib.dir}">
<fileset dir="${dist.dir}">
- <exclude name="README.TXT"/>
- <exclude name="lib/simkit-src.zip"/>
- <exclude name="lib/simkit-doc.zip"/>
- <exclude name="lib/dis-enums-1.3.jar"/>
- <exclude name="lib/open-dis_4.16.jar"/>
+ <include name="${dist.name}.jar"/>
</fileset>
</copy>
</target>
diff --git a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml b/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
index 87787fc2afa70f4122f89029fae5350ab3793b37..69b90e1164cfce895901f27ba1d581403319dd5c 100644
--- a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
+++ b/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<SimkitAssembly name="ArrivalProcessOpenDis7Assembly" version="1.0" package="dis7" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/assembly.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SimEntity name="aPOpenDis7" type="dis7.ArrivalProcessOpenDis7" description="">
- <TerminalParameter name="address" value="" type="java.lang.String"/>
- <TerminalParameter name="port" value="-1" type="int"/>
+ <TerminalParameter name="" value="" type="java.lang.String"/>
+ <TerminalParameter name="" value="-1" type="int"/>
<FactoryParameter factory="simkit.random.RandomVariateFactory" type="simkit.random.RandomVariate">
<TerminalParameter name="" value="Exponential" type="String"/>
<TerminalParameter name="" value="1.7" type="Object..."/>
@@ -10,15 +10,15 @@
<Coordinate x="220.0" y="210.0"/>
</SimEntity>
<PropertyChangeListener name="numArrivalsStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
- <TerminalParameter name="p[0] : " value="N" type="java.lang.String"/>
+ <TerminalParameter name="" value="N" type="java.lang.String"/>
<Coordinate x="220.0" y="330.0"/>
</PropertyChangeListener>
<PropertyChangeListener name="numEntityCreationsStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
- <TerminalParameter name="p[0] : " value="C" type="java.lang.String"/>
+ <TerminalParameter name="" value="C" type="java.lang.String"/>
<Coordinate x="220.0" y="80.0"/>
</PropertyChangeListener>
<PropertyChangeListener name="numEntityRemovalsStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
- <TerminalParameter name="p[0] : " value="R" type="java.lang.String"/>
+ <TerminalParameter name="" value="R" type="java.lang.String"/>
<Coordinate x="380.0" y="210.0"/>
</PropertyChangeListener>
<PropertyChangeListenerConnection property="N" listener="numArrivalsStat" source="aPOpenDis7" description=""/>
diff --git a/examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar b/examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar
index 4207d922c5f17c1da5089407e7f4fba4e3fe19f9..0cbde38647fb6d883325247599f799954c0e9245 100644
Binary files a/examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar and b/examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar differ
diff --git a/examples/src/ViskitOpenDis7Examples/lib/lib/opendis7-full.jar b/examples/src/ViskitOpenDis7Examples/lib/lib/opendis7-full.jar
deleted file mode 100644
index 0d5629a38595219b3345bea05b37cee2a2d8a11c..0000000000000000000000000000000000000000
Binary files a/examples/src/ViskitOpenDis7Examples/lib/lib/opendis7-full.jar and /dev/null differ
diff --git a/examples/src/ViskitOpenDis7Examples/lib/lib/simkit.jar b/examples/src/ViskitOpenDis7Examples/lib/lib/simkit.jar
deleted file mode 100644
index ce53b684b70217098f6f012e53d95d8d5199619c..0000000000000000000000000000000000000000
Binary files a/examples/src/ViskitOpenDis7Examples/lib/lib/simkit.jar and /dev/null differ
diff --git a/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/ArrayTesterAssembly.xml b/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/ArrayTesterAssembly.xml
index fee1f6a97e0903f48d1a20878422d262c4a0a256..707a13a58727fff5f82f1bbb98725b9b015f8acf 100644
--- a/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/ArrayTesterAssembly.xml
+++ b/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/ArrayTesterAssembly.xml
@@ -12,6 +12,6 @@
</PropertyChangeListener>
<PropertyChangeListenerConnection listener="SimplePropertyDumper_4" source="ArrayTester_3"/>
<Output entity="ArrayTester_3"/>
- <Schedule stopTime="100." verbose="false"/>
+ <Schedule stopTime="100." verbose="false" saveReplicationData="false"/>
<Experiment replicationsPerDesignPoint="1" totalSamples="1" timeout="5000"/>
</SimkitAssembly>
diff --git a/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/ServerAssembly3.xml b/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/ServerAssembly3.xml
index 884e95456cfcadc36be677b62b560665601cd620..680a77807ab5ccf4c5877bf593b119a68ed3e9e0 100644
--- a/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/ServerAssembly3.xml
+++ b/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/ServerAssembly3.xml
@@ -33,6 +33,6 @@
<Adapter name="adptr_3" eventHeard="Arrival" eventSent="Arrival" from="arrival" to="server"/>
<Output entity="arrival"/>
<Output entity="server"/>
- <Schedule stopTime="1000.0" verbose="false"/>
+ <Schedule stopTime="1000.0" verbose="false" saveReplicationData="false"/>
<Experiment replicationsPerDesignPoint="2" totalSamples="5" timeout="5000"/>
</SimkitAssembly>
diff --git a/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/ServerWithRenegesAssembly.xml b/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/ServerWithRenegesAssembly.xml
index 86c3d313ed90b5f9b80452f42aff7283c0d93369..5757a51dc1c6bf3b7b1c1b19aa9631f14252303f 100644
--- a/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/ServerWithRenegesAssembly.xml
+++ b/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/ServerWithRenegesAssembly.xml
@@ -54,6 +54,6 @@
<Output entity="creator"/>
<Output entity="arrivalProcess"/>
<Output entity="serverWithReneges"/>
- <Schedule stopTime="100.0" verbose="false"/>
+ <Schedule stopTime="100.0" verbose="false" saveReplicationData="false"/>
<Experiment replicationsPerDesignPoint="1" totalSamples="1" timeout="5000"/>
</SimkitAssembly>
diff --git a/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/TestServerGenericAssembly.xml b/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/TestServerGenericAssembly.xml
index d5963727fcd03a464c3303e9fd23d81e0cdbccbe..2dab889dd56ba36113250c3b7aa79c37a661822e 100644
--- a/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/TestServerGenericAssembly.xml
+++ b/viskit/MyViskitProjects/DefaultProject/Assemblies/examples/TestServerGenericAssembly.xml
@@ -20,6 +20,6 @@
</SimEntity>
<SimEventListenerConnection listener="EntityCreator_2" source="ArrivalProcess_1"/>
<Adapter name="adptr_3" eventHeard="EntityArrival" eventSent="Arrival" from="EntityCreator_2" to="ServerGeneric_0" description=""/>
- <Schedule stopTime="100." verbose="false"/>
+ <Schedule stopTime="100." verbose="false" saveReplicationData="false"/>
<Experiment replicationsPerDesignPoint="1" totalSamples="1" timeout="5000"/>
</SimkitAssembly>
diff --git a/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/SimpleServer.xml b/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/SimpleServer.xml
old mode 100644
new mode 100755
diff --git a/viskit/configuration/c_gui.xml b/viskit/configuration/c_gui.xml
index 4766e3a3514a7ca9644b229129fb48b83a6cac9f..618bfc878571494378ba98c23c47ab2ace615463 100644
--- a/viskit/configuration/c_gui.xml
+++ b/viskit/configuration/c_gui.xml
@@ -29,6 +29,6 @@
<projecttitle>
<name value="DefaultProject"/>
</projecttitle>
- <lookandfeel>default</lookandfeel>
+ <lookandfeel>platform</lookandfeel>
</gui>
</ViskitConfig>
diff --git a/viskit/configuration/c_gui_mac.xml b/viskit/configuration/c_gui_mac.xml
deleted file mode 100644
index 618bfc878571494378ba98c23c47ab2ace615463..0000000000000000000000000000000000000000
--- a/viskit/configuration/c_gui_mac.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- values in this file are retrieved by keys such as 'gui.beanshellerrordialog.title' -->
-<!-- the root element name is ignored when assembling keys -->
-<ViskitConfig>
- <gui>
- <beanshellerrordialog>
- <title>Warning</title>
- <label>Java language error:</label>
- <question>Ignore and continue?</question>
- <sessioncheckbox>Hide warnings for current session</sessioncheckbox>
- <preferencescheckbox>Hide warnings permanently</preferencescheckbox>
- <preferencestooltip>A very primitive Java compile warning indicator</preferencestooltip>
- </beanshellerrordialog>
- <title>
- <projecthome>
- <generation>Viskit Project Generation Dialog</generation>
- </projecthome>
- </title>
- <tooltip>
- <projecthome>Select a location for a Viskit project home</projecthome>
- </tooltip>
- <button>
- <projectgeneration>
- <text>Generate Project</text>
- <image>PlayGreen16.gif</image>
- <tt>Generate your Viskit project</tt>
- </projectgeneration>
- </button>
- <projecttitle>
- <name value="DefaultProject"/>
- </projecttitle>
- <lookandfeel>platform</lookandfeel>
- </gui>
-</ViskitConfig>
diff --git a/viskit/configuration/vconfig.xml b/viskit/configuration/vconfig.xml
deleted file mode 100644
index 8c7430008a5cc8b83eac65a6bc8c489df82fe058..0000000000000000000000000000000000000000
--- a/viskit/configuration/vconfig.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This is the master file used by the Apache Commons Configuration code. -->
-<configuration>
- <header>
- <!-- Meta data about the resulting combined configuration -->
- </header>
- <override>
- <!-- Configuration declarations with override semantics -->
- <!-- stack up your config files here -->
- <xml fileName="c_app.xml" config-name="app" />
- <xml fileName="c_gui.xml" config-name="gui" />
- </override>
- <additional>
- <!-- Configuration declarations that form a union configuration -->
- </additional>
-</configuration>
\ No newline at end of file
diff --git a/viskit/viskit-editor.jar b/viskit/viskit-editor.jar
index 3523c59be17d6a448ea9c55dd6ed1b3a53497962..d6f96aaad792517f9f5c4d11c731af79dfb41da6 100644
Binary files a/viskit/viskit-editor.jar and b/viskit/viskit-editor.jar differ