[overlord-commits] Overlord SVN: r138 - 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
Fri Jul 11 15:14:42 EDT 2008
Author: heiko.braun at jboss.com
Date: 2008-07-11 15:14:42 -0400 (Fri, 11 Jul 2008)
New Revision: 138
Modified:
sam/trunk/SAM.iws
sam/trunk/pom.xml
sam/trunk/sam-trunk.iml
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/samples/pattern/PatternTestCase.java
Log:
Stuck with the javasim lockups
Modified: sam/trunk/SAM.iws
===================================================================
--- sam/trunk/SAM.iws 2008-07-10 19:34:32 UTC (rev 137)
+++ sam/trunk/SAM.iws 2008-07-11 19:14:42 UTC (rev 138)
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4" relativePaths="false">
- <component name="BookmarkManager" />
+ <component name="BookmarkManager">
+ <editor_bookmark url="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" line="584" />
+ </component>
<component name="ChangeBrowserSettings">
<option name="MAIN_SPLITTER_PROPORTION" value="0.3" />
<option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" />
@@ -17,22 +19,18 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/samples" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/samples/pattern" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/Measurement.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/Measurement.java" />
+ <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="$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="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/samples/pattern/esper-cfg.xml" />
+ <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="/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$/SAM.iws" afterPath="$PROJECT_DIR$/SAM.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/SimulationContext.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/SimulationContext.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SensorMessageFactory.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SensorMessageFactory.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAM.ipr" afterPath="$PROJECT_DIR$/SAM.ipr" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/sam-trunk.iml" afterPath="$PROJECT_DIR$/sam-trunk.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/LightSwitch.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples" />
+ <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>
<component name="ChangeListSynchronizer" />
@@ -104,7 +102,7 @@
</component>
<component name="DebuggerManager">
<line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java" line="127" class="org.jboss.test.sam.samples.pattern.PatternTestCase" package="org.jboss.test.sam.samples.pattern">
+ <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" />
@@ -117,7 +115,7 @@
<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="73" class="org.jboss.test.sam.samples.pattern.PatternTestCase" package="org.jboss.test.sam.samples.pattern">
+ <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" />
@@ -130,7 +128,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java" line="146" class="org.jboss.sam.simulation.EventSourceEntity" package="org.jboss.sam.simulation">
+ <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" />
@@ -143,7 +141,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.java" line="198" class="org.jboss.sam.simulation.EventSimulation" package="org.jboss.sam.simulation">
+ <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" />
@@ -156,7 +154,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java" line="101" class="org.jboss.sam.simulation.EventSourceEntity" package="org.jboss.sam.simulation">
+ <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" />
@@ -169,7 +167,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.java" line="205" class="org.jboss.sam.simulation.EventSimulation" package="org.jboss.sam.simulation">
+ <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" />
@@ -230,8 +228,8 @@
<property name="field_breakpoints_groupByClasses" value="true" />
<property name="method_breakpoints_groupByClasses" value="true" />
<property name="exception_breakpoints_viewId" value="TABLE" />
+ <property name="field_breakpoints_viewId" value="TABLE" />
<property name="exception_breakpoints_groupByClasses" value="true" />
- <property name="field_breakpoints_viewId" value="TABLE" />
<property name="method_breakpoints_groupByMethods" value="false" />
</ui_properties>
</component>
@@ -257,7 +255,7 @@
<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">
<provider selected="true" editor-type-id="text-editor">
- <state line="127" column="0" selection-start="3924" selection-end="3924" vertical-scroll-proportion="1.7125307">
+ <state line="129" column="0" selection-start="3997" selection-end="3997" vertical-scroll-proportion="0.18742293">
<folding />
</state>
</provider>
@@ -266,7 +264,7 @@
<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="138" column="32" selection-start="4479" selection-end="4479" vertical-scroll-proportion="0.7039312">
+ <state line="138" column="30" selection-start="4472" selection-end="4477" vertical-scroll-proportion="0.73119605">
<folding />
</state>
</provider>
@@ -275,25 +273,36 @@
<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">
<provider selected="true" editor-type-id="text-editor">
- <state line="146" column="18" selection-start="4214" selection-end="4214" vertical-scroll-proportion="0.76960194">
+ <state line="115" column="16" selection-start="3580" selection-end="3580" vertical-scroll-proportion="0.13922518">
<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">
+ <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="82" column="34" selection-start="2755" selection-end="2755" vertical-scroll-proportion="0.048250906">
+ <state line="110" column="0" selection-start="3340" selection-end="3340" vertical-scroll-proportion="0.19007264">
<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="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">
<provider selected="true" editor-type-id="text-editor">
- <state line="484" column="70" selection-start="12623" selection-end="12623" vertical-scroll-proportion="0.2110977">
+ <state line="76" column="13" selection-start="2237" selection-end="2237" vertical-scroll-proportion="0.44673124">
<folding />
</state>
</provider>
@@ -302,11 +311,8 @@
<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">
<provider selected="true" editor-type-id="text-editor">
- <state line="207" column="49" selection-start="6311" selection-end="6311" vertical-scroll-proportion="0.0060313633">
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="method#begin#0;class#EventSimulation#0" expanded="false" />
- </folding>
+ <state line="163" column="13" selection-start="5679" selection-end="5679" vertical-scroll-proportion="0.76634383">
+ <folding />
</state>
</provider>
</entry>
@@ -314,7 +320,7 @@
<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="278" column="40" selection-start="7427" selection-end="7427" vertical-scroll-proportion="5.59228">
+ <state line="77" column="22" selection-start="2495" selection-end="2495" vertical-scroll-proportion="0.3329298">
<folding />
</state>
</provider>
@@ -323,12 +329,21 @@
<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="28" column="26" selection-start="1197" selection-end="1197" vertical-scroll-proportion="0.13751508">
+ <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">
@@ -487,20 +502,10 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleGroupNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="javasim-samples" />
+ <option name="myItemId" value="javasim-trunk" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="SAM.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="javasim" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleGroupNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</component>
<component name="PerforceChangeBrowserSettings">
@@ -823,6 +828,128 @@
<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/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>
+ <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>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/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/main/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/main/java/org/javasim" />
+ <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>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/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/main/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/main/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/main/java/org/javasim/util" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -836,7 +963,7 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" />
+ <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -867,8 +994,8 @@
<property name="cvs_file_history_flatOrder2" value="2" />
<property name="cvs_file_history_flatOrder3" value="3" />
<property name="cvs_file_history_flatOrder0" value="0" />
+ <property name="GenerateAntBuildDialog.forceTargetJdk" value="true" />
<property name="cvs_file_history_flatOrder1" value="1" />
- <property name="GenerateAntBuildDialog.forceTargetJdk" value="true" />
<property name="MemberChooser.copyJavadoc" value="false" />
<property name="GenerateAntBuildDialog.backupFiles" value="true" />
</component>
@@ -908,7 +1035,13 @@
<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" />
@@ -926,13 +1059,6 @@
<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" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -965,6 +1091,13 @@
<option name="Make" value="false" />
</method>
</configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
<configuration default="false" name="client" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -1089,31 +1222,31 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="0" y="25" width="1680" height="1000" extended-state="6" />
+ <frame x="0" y="25" width="1680" height="1000" extended-state="2" />
<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.55125284" order="1" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39749432" order="3" />
+ <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="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="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.24954017" order="1" />
+ <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="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.27651748" order="0" />
+ <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="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.46810934" order="2" />
+ <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="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" />
@@ -1203,86 +1336,6 @@
<option name="myLastEditedConfigurable" value="IDE Profiles" />
</component>
<component name="editorHistoryManager">
- <entry file="file:///home/hbraun/dev/env/JavaSim/core/src/java/arjuna/JavaSim/Simulation/SimulationProcess.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="337" column="0" selection-start="8768" selection-end="8768" vertical-scroll-proportion="0.1893848">
- <folding>
- <marker date="1214414865000" expanded="false" signature="0:201" placeholder="/.../" />
- <marker date="1214414865000" expanded="true" signature="424:943" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="948:1000" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="1035:1087" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="1092:1159" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="1266:1435" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="1440:1515" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="1552:1583" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="1588:1713" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="1814:2068" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="2073:2197" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="2297:2549" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="2554:2913" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="3019:3287" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="3292:3510" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="3601:3640" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="3645:3995" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="4103:4378" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="4383:4592" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="4685:4726" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="4731:4868" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="4944:5099" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="5104:5164" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="5267:5420" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="5425:5484" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="5586:5738" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="5743:5982" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="6090:6268" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="6273:6377" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="6470:6511" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="6516:6737" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="6847:7010" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="7015:7095" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="7190:7233" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="7238:7310" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="7388:7534" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="7539:7609" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="7662:8239" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="8244:8299" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="8331:8772" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="8777:8814" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="8857:8976" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="8981:9030" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="9066:9097" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="9102:9151" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="9187:9218" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="9223:9287" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="9364:9516" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="9521:9573" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="9616:9660" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="9665:9706" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="9747:9860" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="9865:9905" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="9972:10130" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="10168:10344" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="10418:10710" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="10715:10801" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="10884:11174" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="11233:11320" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="11325:11430" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="11487:12034" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="12039:12269" placeholder="/**...*/" />
- <marker date="1214414865000" expanded="true" signature="12301:12878" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="12925:13008" placeholder="{...}" />
- <marker date="1214414865000" expanded="true" signature="13033:13108" placeholder="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="jar:///usr/lib/jdk/32/jdk1.5.0_13/src.zip!/java/lang/Thread.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="685" column="22" selection-start="27497" selection-end="27497" vertical-scroll-proportion="0.33293125">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="6" column="21" selection-start="386" selection-end="386" vertical-scroll-proportion="0.14004914">
@@ -1306,65 +1359,92 @@
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java">
+ <entry file="jar:///usr/lib/jdk/32/jdk1.5.0_13/src.zip!/java/lang/Thread.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="26" selection-start="1197" selection-end="1197" vertical-scroll-proportion="0.13751508">
+ <state line="1011" column="24" selection-start="40585" selection-end="40585" vertical-scroll-proportion="0.32585597">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.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="278" column="40" selection-start="7427" selection-end="7427" vertical-scroll-proportion="5.59228">
+ <state line="31" column="31" selection-start="1261" selection-end="1261" vertical-scroll-proportion="0.23002422">
<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/test/java/org/javasim/examples/interrupt/MachineShop.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="146" column="18" selection-start="4214" selection-end="4214" vertical-scroll-proportion="0.76960194">
+ <state line="76" column="13" selection-start="2237" selection-end="2237" vertical-scroll-proportion="0.44673124">
<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$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="484" column="70" selection-start="12623" selection-end="12623" vertical-scroll-proportion="0.2110977">
+ <state line="138" column="30" selection-start="4472" selection-end="4477" vertical-scroll-proportion="0.73119605">
<folding />
</state>
</provider>
</entry>
+ <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>
<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="82" column="34" selection-start="2755" selection-end="2755" vertical-scroll-proportion="0.048250906">
+ <state line="110" column="0" selection-start="3340" selection-end="3340" vertical-scroll-proportion="0.19007264">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="127" column="0" selection-start="3924" selection-end="3924" vertical-scroll-proportion="1.7125307">
+ <state line="129" column="0" selection-start="3997" selection-end="3997" vertical-scroll-proportion="0.18742293">
<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/internal/SimulationProcessList.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="138" column="32" selection-start="4479" selection-end="4479" vertical-scroll-proportion="0.7039312">
+ <state line="47" column="0" selection-start="1512" selection-end="1512" vertical-scroll-proportion="0.19007264">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.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="207" column="49" selection-start="6311" selection-end="6311" vertical-scroll-proportion="0.0060313633">
+ <state line="115" column="16" selection-start="3580" selection-end="3580" vertical-scroll-proportion="0.13922518">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <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>
+ <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="480" column="0" selection-start="12140" selection-end="12140" vertical-scroll-proportion="0.19007264">
<folding>
<element signature="imports" expanded="true" />
- <element signature="method#begin#0;class#EventSimulation#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.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">
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
Modified: sam/trunk/pom.xml
===================================================================
--- sam/trunk/pom.xml 2008-07-10 19:34:32 UTC (rev 137)
+++ sam/trunk/pom.xml 2008-07-11 19:14:42 UTC (rev 138)
@@ -136,8 +136,8 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <forkMode>pertest</forkMode>
- <argLine>${surefire.jvm.args}</argLine>
+ <forkMode>never</forkMode>
+ <argLine>${surefire.jvm.args} -Dcom.sun.management.jmxremote</argLine>
</configuration>
</plugin>
Modified: sam/trunk/sam-trunk.iml
===================================================================
--- sam/trunk/sam-trunk.iml 2008-07-10 19:34:32 UTC (rev 137)
+++ sam/trunk/sam-trunk.iml 2008-07-11 19:14:42 UTC (rev 138)
@@ -93,6 +93,42 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: cglib:cglib-nodep:jar:2.1_3:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: mysql:mysql-connector-java:jar:3.1.14:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/mysql/mysql-connector-java/3.1.14/mysql-connector-java-3.1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
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-10 19:34:32 UTC (rev 137)
+++ sam/trunk/src/main/java/org/jboss/sam/simulation/EventSimulation.java 2008-07-11 19:14:42 UTC (rev 138)
@@ -80,6 +80,10 @@
private EventSimulation(Properties config, URL bootstrap)
{
+ // thread setup
+ setName("EventSimulation {" + getName()+"}");
+ setPriority(1);
+
this.context = new SimulationContext(config);
// setup SAM processor
@@ -136,23 +140,28 @@
}
/**
- * Execute a single run of this simulation
+ * Execute a single run of this simulation.
+ * Suspends the main thread until the simulation is done.
*/
public void singleRun()
{
- takeControl();
+ System.out.println("-----------");
+ System.out.println("Start called: " + this);
+ this.resumeProcess();
+ SimulationProcess.mainSuspend();
}
public void done()
{
- this.terminate();
try
{
+ this.terminate();
Scheduler.reset();
- } catch (SimulationException e)
+ }
+ catch(SimulationException e)
{
- e.printStackTrace();
- }
+ e.printStackTrace();
+ }
}
private void begin()
@@ -163,7 +172,7 @@
}
for(EventSourceEntity source : eventSources)
- {
+ {
source.begin();
}
}
@@ -190,39 +199,35 @@
{
return context.getMeasurement(key);
}
-
+
public void run()
{
try
{
+ System.out.println("Running " + this);
+
// begin
begin();
Scheduler.startSimulation();
-
+
Double totalSimTime = (Double) context.getConfig(EventSimulation.TOTAL_SIM_TIME);
hold(totalSimTime);
+ System.out.println("End simulation:" + this );
+ System.out.println("-----------");
+
// cleanup
Scheduler.stopSimulation();
end();
-
+
returnControl();
}
catch (Exception e)
{
e.printStackTrace();
System.exit(-1);
- }
- }
+ }
- /**
- * Suspends the test class thread and gives
- * control to the simulation
- */
- private void takeControl()
- {
- this.resumeProcess();
- SimulationProcess.mainSuspend();
}
/**
@@ -232,6 +237,7 @@
{
try
{
+ 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-10 19:34:32 UTC (rev 137)
+++ sam/trunk/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java 2008-07-11 19:14:42 UTC (rev 138)
@@ -61,6 +61,7 @@
private InVMDispatcher dispatcher = null;
private SimulationContext context = null;
private EventMessageFactory factory = null;
+ private boolean keepRunning = true;
/**
*
@@ -69,6 +70,11 @@
*/
public EventSourceEntity(String name, double eventRatio)
{
+ // thread setup
+ setPriority(5);
+ setName("EventSourceEntity {" + getName()+"}");
+
+
this.name = name;
if(eventRatio<=0 || eventRatio>1)
@@ -95,7 +101,7 @@
public void run()
{
- for (; ;)
+ while (keepRunning)
{
try
{
@@ -105,9 +111,11 @@
}
catch (SimulationException e)
{
+ e.printStackTrace();
}
catch (RestartException e)
{
+ e.printStackTrace();
}
@@ -125,6 +133,8 @@
this.dispatcher.dispatch(event);
}
+
+ System.out.println("EventSource " + name + " was terminated");
}
public void begin()
@@ -144,7 +154,9 @@
public void end()
{
+ this.resumeProcess();
this.terminate();
+ keepRunning = false;
}
Modified: sam/trunk/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java
===================================================================
--- sam/trunk/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java 2008-07-10 19:34:32 UTC (rev 137)
+++ sam/trunk/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java 2008-07-11 19:14:42 UTC (rev 138)
@@ -42,7 +42,9 @@
EventSinkEntity sink;
protected void setUp() throws Exception
- {
+ {
+ System.out.println("UnitTest thread: " + Thread.currentThread());
+
// config
Properties config = new Properties();
config.put(EventSimulation.TOTAL_SIM_TIME, 60.00);
More information about the overlord-commits
mailing list