[overlord-commits] Overlord SVN: r143 - in sam/trunk: src/main/java/org/jboss/sam/simulation and 1 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Sun Jul 13 07:46:13 EDT 2008
Author: heiko.braun at jboss.com
Date: 2008-07-13 07:46:12 -0400 (Sun, 13 Jul 2008)
New Revision: 143
Modified:
sam/trunk/SAM.iws
sam/trunk/pom.xml
sam/trunk/src/main/java/org/jboss/sam/simulation/EventSimulation.java
sam/trunk/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java
sam/trunk/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java
Log:
Added waitForMainSuspend() hook in sim controller thread
Modified: sam/trunk/SAM.iws
===================================================================
--- sam/trunk/SAM.iws 2008-07-12 17:52:59 UTC (rev 142)
+++ sam/trunk/SAM.iws 2008-07-13 11:46:12 UTC (rev 143)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4" relativePaths="false">
<component name="BookmarkManager">
- <editor_bookmark url="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" line="584" />
+ <editor_bookmark url="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" line="589" />
</component>
<component name="ChangeBrowserSettings">
<option name="MAIN_SPLITTER_PROPORTION" value="0.3" />
@@ -21,15 +21,18 @@
<list default="true" name="Default" comment="">
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java" />
+ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Histogram.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Histogram.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.java" />
+ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/SimpleHistogram.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/SimpleHistogram.java" />
<change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml" />
<change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util/ThreadUtil.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAM.iws" afterPath="$PROJECT_DIR$/SAM.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sam-trunk.iml" afterPath="$PROJECT_DIR$/sam-trunk.iml" />
+ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Variance.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Variance.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Mean.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Mean.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" />
</list>
</component>
@@ -101,86 +104,6 @@
<disable_hints />
</component>
<component name="DebuggerManager">
- <line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java" line="129" class="org.jboss.test.sam.samples.pattern.PatternTestCase" package="org.jboss.test.sam.samples.pattern">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java" line="75" class="org.jboss.test.sam.samples.pattern.PatternTestCase" package="org.jboss.test.sam.samples.pattern">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" line="441" class="org.javasim.SimulationProcess" package="org.javasim">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" line="464" class="org.javasim.SimulationProcess" package="org.javasim">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" line="47" class="org.javasim.internal.SimulationProcessList" package="org.javasim.internal">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" line="217" class="org.javasim.internal.SimulationProcessList" package="org.javasim.internal">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- </line_breakpoints>
<breakpoint_any>
<breakpoint>
<option name="NOTIFY_CAUGHT" value="true" />
@@ -252,98 +175,60 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="PatternTestCase.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java">
+ <file leaf-file-name="EventSimulation.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="129" column="0" selection-start="3997" selection-end="3997" vertical-scroll-proportion="0.18742293">
+ <state line="108" column="16" selection-start="4352" selection-end="4352" vertical-scroll-proportion="0.1381346">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <file leaf-file-name="PrecisionHistogram.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/PrecisionHistogram.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="138" column="30" selection-start="4472" selection-end="4477" vertical-scroll-proportion="0.73119605">
+ <state line="243" column="12" selection-start="6168" selection-end="6168" vertical-scroll-proportion="0.1570248">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="EventSourceEntity.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java">
+ <file leaf-file-name="Quantile.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Quantile.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="115" column="16" selection-start="3580" selection-end="3580" vertical-scroll-proportion="0.13922518">
+ <state line="90" column="8" selection-start="2393" selection-end="2393" vertical-scroll-proportion="0.6635183">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="SimulationProcess.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java">
+ <file leaf-file-name="SimulationTestCase.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="480" column="0" selection-start="12140" selection-end="12140" vertical-scroll-proportion="0.19007264">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="SimulationEntity.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationEntity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="110" column="0" selection-start="3340" selection-end="3340" vertical-scroll-proportion="0.19007264">
+ <state line="64" column="23" selection-start="2340" selection-end="2340" vertical-scroll-proportion="0.25974026">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="MachineShop.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test/java/org/javasim/examples/interrupt/MachineShop.java">
+ <file leaf-file-name="SensorEventMessage.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SensorEventMessage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="76" column="13" selection-start="2237" selection-end="2237" vertical-scroll-proportion="0.44673124">
+ <state line="21" column="37" selection-start="1040" selection-end="1069" vertical-scroll-proportion="0.022432113">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="EventSimulation.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.java">
+ <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="163" column="13" selection-start="5679" selection-end="5679" vertical-scroll-proportion="0.76634383">
+ <state line="140" column="16" selection-start="4601" selection-end="4601" vertical-scroll-proportion="0.58774036">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Scheduler.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="77" column="22" selection-start="2495" selection-end="2495" vertical-scroll-proportion="0.3329298">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="SimulationProcessList.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="47" column="0" selection-start="1512" selection-end="1512" vertical-scroll-proportion="0.19007264">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="SimulationProcessIterator.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessIterator.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="57" column="35" selection-start="1652" selection-end="1652" vertical-scroll-proportion="0.42372882">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -357,6 +242,7 @@
<option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
</component>
<component name="HighlightingSettingsPerFile">
+ <setting file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" root0="SKIP_INSPECTION" />
<setting file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java" root0="SKIP_INSPECTION" />
</component>
<component name="InspectionManager">
@@ -680,6 +566,52 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="SAM.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="sam-trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -869,6 +801,10 @@
<option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test/java/org/javasim/examples" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test/java/org/javasim/examples/interrupt" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -892,6 +828,52 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test/java/org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test/java/org/javasim" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test/java/org/javasim/examples" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test/java/org/javasim/examples/basic" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="SAM.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="javasim" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="javasim-trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -963,7 +945,7 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" />
+ <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -978,17 +960,17 @@
<property name="MemberChooser.sorted" value="false" />
<property name="GenerateAntBuildDialog.enableUiFormCompile" value="true" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
- <property name="cvs_file_history_treeWidth0" value="398" />
- <property name="cvs_file_history_treeWidth1" value="397" />
- <property name="cvs_file_history_treeWidth2" value="398" />
- <property name="cvs_file_history_treeWidth3" value="397" />
- <property name="cvs_file_history_flatWidth2" value="398" />
+ <property name="cvs_file_history_treeWidth0" value="396" />
+ <property name="cvs_file_history_treeWidth1" value="396" />
+ <property name="cvs_file_history_treeWidth2" value="396" />
+ <property name="cvs_file_history_treeWidth3" value="396" />
+ <property name="cvs_file_history_flatWidth2" value="396" />
<property name="MemberChooser.showClasses" value="true" />
- <property name="cvs_file_history_flatWidth3" value="397" />
+ <property name="cvs_file_history_flatWidth3" value="396" />
<property name="cvs_file_history_treeOrder0" value="0" />
- <property name="cvs_file_history_flatWidth0" value="398" />
+ <property name="cvs_file_history_flatWidth0" value="396" />
<property name="GoToClass.includeLibraries" value="false" />
- <property name="cvs_file_history_flatWidth1" value="397" />
+ <property name="cvs_file_history_flatWidth1" value="396" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="RunManagerConfig.compileBeforeRunning" value="false" />
<property name="cvs_file_history_flatOrder2" value="2" />
@@ -1018,16 +1000,16 @@
</key>
</component>
<component name="RestoreUpdateTree" />
- <component name="RunManager" selected="JUnit.PatternTestCase">
- <tempConfiguration default="false" name="PatternTestCase" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
- <pattern value="org.jboss.test.sam.samples.pattern.*" />
+ <component name="RunManager" selected="JUnit.SimulationTestCase.testSimulationAPI">
+ <tempConfiguration default="false" name="SimulationTestCase.testSimulationAPI" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+ <pattern value="org.jboss.test.sam.simulation.*" />
<module name="sam-trunk" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" value="org.jboss.test.sam.samples.pattern" />
- <option name="MAIN_CLASS_NAME" value="org.jboss.test.sam.samples.pattern.PatternTestCase" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
+ <option name="PACKAGE_NAME" value="org.jboss.test.sam.simulation" />
+ <option name="MAIN_CLASS_NAME" value="org.jboss.test.sam.simulation.SimulationTestCase" />
+ <option name="METHOD_NAME" value="testSimulationAPI" />
+ <option name="TEST_OBJECT" value="method" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -1035,30 +1017,12 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="37729" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
<RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method>
<option name="Make" value="false" />
</method>
</tempConfiguration>
- <configuration default="true" type="Applet" factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- </configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -1091,6 +1055,18 @@
<option name="Make" value="false" />
</method>
</configuration>
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ </configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -1222,31 +1198,31 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="0" y="25" width="1680" height="1000" extended-state="2" />
+ <frame x="-3" y="25" width="1686" height="1003" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.54057145" order="1" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39657143" order="3" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5353075" order="1" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39635536" order="3" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32915717" order="8" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32914287" order="8" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32915717" order="8" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
<window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25046155" order="1" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25015327" order="1" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2763077" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27590436" order="0" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.15757205" order="2" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.69028574" order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.69020504" order="2" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
@@ -1267,7 +1243,7 @@
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
<option name="PUT_FOCUS_INTO_COMMENT" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="javadocs" />
+ <option name="LAST_COMMIT_MESSAGE" value="while(!terminate())" />
<option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
<option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
@@ -1283,6 +1259,7 @@
<MESSAGE value="fix ratio nonsense" />
<MESSAGE value="Added ratio constraint assertion" />
<MESSAGE value="javadocs" />
+ <MESSAGE value="while(!terminate())" />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@@ -1336,111 +1313,107 @@
<option name="myLastEditedConfigurable" value="IDE Profiles" />
</component>
<component name="editorHistoryManager">
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml">
+ <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test/java/org/javasim/examples/basic/Main.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="21" selection-start="386" selection-end="386" vertical-scroll-proportion="0.14004914">
+ <state line="42" column="15" selection-start="1513" selection-end="1513" vertical-scroll-proportion="0.55006033">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/SimulationContext.java">
+ <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test/java/org/javasim/examples/basic/MachineShop.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="84" column="36" selection-start="2692" selection-end="2692" vertical-scroll-proportion="0.8154403">
+ <state line="40" column="32" selection-start="1403" selection-end="1403" vertical-scroll-proportion="0.02291918">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SensorMessageFactory.java">
+ <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test/java/org/javasim/examples/basic/Arrivals.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="101" selection-start="1221" selection-end="1221" vertical-scroll-proportion="0.1145959">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="29" column="13" selection-start="1211" selection-end="1211" vertical-scroll-proportion="0.1363088">
+ <folding />
</state>
</provider>
</entry>
- <entry file="jar:///usr/lib/jdk/32/jdk1.5.0_13/src.zip!/java/lang/Thread.java">
+ <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test/java/org/javasim/examples/basic/Job.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1011" column="24" selection-start="40585" selection-end="40585" vertical-scroll-proportion="0.32585597">
+ <state line="56" column="16" selection-start="1749" selection-end="1749" vertical-scroll-proportion="0.64053077">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util/ThreadUtil.java">
+ <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test/java/org/javasim/examples/basic/Machine.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="31" selection-start="1261" selection-end="1261" vertical-scroll-proportion="0.23002422">
+ <state line="29" column="13" selection-start="1211" selection-end="1211" vertical-scroll-proportion="0.02291918">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/test/java/org/javasim/examples/interrupt/MachineShop.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="76" column="13" selection-start="2237" selection-end="2237" vertical-scroll-proportion="0.44673124">
+ <state line="58" column="58" selection-start="2128" selection-end="2128" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="138" column="30" selection-start="4472" selection-end="4477" vertical-scroll-proportion="0.73119605">
+ <state line="476" column="33" selection-start="12195" selection-end="12195" vertical-scroll-proportion="0.74788904">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessIterator.java">
+ <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util/ThreadUtil.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="57" column="35" selection-start="1652" selection-end="1652" vertical-scroll-proportion="0.42372882">
+ <state line="32" column="32" selection-start="1263" selection-end="1263" vertical-scroll-proportion="0.252111">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationEntity.java">
+ <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="110" column="0" selection-start="3340" selection-end="3340" vertical-scroll-proportion="0.19007264">
+ <state line="240" column="15" selection-start="6550" selection-end="6550" vertical-scroll-proportion="0.54829544">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="129" column="0" selection-start="3997" selection-end="3997" vertical-scroll-proportion="0.18742293">
+ <state line="108" column="16" selection-start="4352" selection-end="4352" vertical-scroll-proportion="0.1381346">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java">
+ <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/PrecisionHistogram.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="0" selection-start="1512" selection-end="1512" vertical-scroll-proportion="0.19007264">
+ <state line="243" column="12" selection-start="6168" selection-end="6168" vertical-scroll-proportion="0.1570248">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java">
+ <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Quantile.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="115" column="16" selection-start="3580" selection-end="3580" vertical-scroll-proportion="0.13922518">
+ <state line="90" column="8" selection-start="2393" selection-end="2393" vertical-scroll-proportion="0.6635183">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="77" column="22" selection-start="2495" selection-end="2495" vertical-scroll-proportion="0.3329298">
+ <state line="140" column="16" selection-start="4601" selection-end="4601" vertical-scroll-proportion="0.58774036">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SensorEventMessage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="480" column="0" selection-start="12140" selection-end="12140" vertical-scroll-proportion="0.19007264">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="21" column="37" selection-start="1040" selection-end="1069" vertical-scroll-proportion="0.022432113">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="163" column="13" selection-start="5679" selection-end="5679" vertical-scroll-proportion="0.76634383">
+ <state line="64" column="23" selection-start="2340" selection-end="2340" vertical-scroll-proportion="0.25974026">
<folding />
</state>
</provider>
Modified: sam/trunk/pom.xml
===================================================================
--- sam/trunk/pom.xml 2008-07-12 17:52:59 UTC (rev 142)
+++ sam/trunk/pom.xml 2008-07-13 11:46:12 UTC (rev 143)
@@ -136,8 +136,9 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <forkMode>never</forkMode>
- <argLine>${surefire.jvm.args} -Dcom.sun.management.jmxremote</argLine>
+ <!--forkMode>never</forkMode-->
+ <!--argLine>${surefire.jvm.args} -Dcom.sun.management.jmxremote</argLine-->
+ <argLine>${surefire.jvm.args}</argLine>
</configuration>
</plugin>
Modified: sam/trunk/src/main/java/org/jboss/sam/simulation/EventSimulation.java
===================================================================
--- sam/trunk/src/main/java/org/jboss/sam/simulation/EventSimulation.java 2008-07-12 17:52:59 UTC (rev 142)
+++ sam/trunk/src/main/java/org/jboss/sam/simulation/EventSimulation.java 2008-07-13 11:46:12 UTC (rev 143)
@@ -31,6 +31,7 @@
import org.jboss.sam.internal.stream.InVMStreamInput;
import org.jboss.sam.internal.stream.InVMDispatcher;
import org.javasim.Scheduler;
+import org.javasim.util.ThreadUtil;
import java.net.URL;
import java.util.ArrayList;
@@ -145,10 +146,12 @@
*/
public void singleRun()
{
- System.out.println("-----------");
- System.out.println("Start called: " + this);
+ // [HB] System.out.println("-----------");
+ // [HB] System.out.println("Start called: " + this);
this.resumeProcess();
+ // [HB] System.out.println("Trying mainSuspend on: " + this);
SimulationProcess.mainSuspend();
+ // [HB] System.out.println("Done with mainSuspend on: " + this);
}
public void done()
@@ -204,7 +207,10 @@
{
try
{
- System.out.println("Running " + this);
+ // wait for main thread
+ waitUntilMainSuspended();
+
+ // [HB] System.out.println("Running " + this);
// begin
begin();
@@ -213,8 +219,8 @@
Double totalSimTime = (Double) context.getConfig(EventSimulation.TOTAL_SIM_TIME);
hold(totalSimTime);
- System.out.println("End simulation:" + this );
- System.out.println("-----------");
+ // [HB] System.out.println("End simulation:" + this );
+ // [HB] System.out.println("-----------");
// cleanup
Scheduler.stopSimulation();
@@ -237,7 +243,7 @@
{
try
{
- System.out.println("Return control to main thread");
+ // [HB] System.out.println("Return control to main thread");
SimulationProcess.mainResume();
this.suspendProcess();
} catch (Exception e)
Modified: sam/trunk/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java
===================================================================
--- sam/trunk/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java 2008-07-12 17:52:59 UTC (rev 142)
+++ sam/trunk/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java 2008-07-13 11:46:12 UTC (rev 143)
@@ -133,7 +133,7 @@
}
- System.out.println("EventSource " + name + " was terminated");
+ // [HB] System.out.println("EventSource " + name + " was terminated");
}
public void begin()
Modified: sam/trunk/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java
===================================================================
--- sam/trunk/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java 2008-07-12 17:52:59 UTC (rev 142)
+++ sam/trunk/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java 2008-07-13 11:46:12 UTC (rev 143)
@@ -22,6 +22,7 @@
package org.jboss.test.sam.simulation;
import junit.framework.TestCase;
+import junit.framework.TestResult;
import org.jboss.sam.EventMessage;
import org.jboss.sam.simulation.*;
@@ -34,7 +35,6 @@
*/
public class SimulationTestCase extends TestCase
{
-
public void testSimulationAPI()
{
// config
@@ -78,7 +78,7 @@
simulation.addSink(sink);
// forward single event messages
- simulation.bindStatement("select * from SensorEventMessage", sink);
+ simulation.bindStatement("select * from org.jboss.test.sam.simulation.SensorEventMessage", sink);
// start simulation
simulation.singleRun();
More information about the overlord-commits
mailing list