Overlord SVN: r145 - sam/trunk/src/test/resources/samples.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-07-13 08:34:02 -0400 (Sun, 13 Jul 2008)
New Revision: 145
Added:
sam/trunk/src/test/resources/samples/esper-default-cfg.xml
Log:
Added samples default config and added new factory method that relies on this
Added: sam/trunk/src/test/resources/samples/esper-default-cfg.xml
===================================================================
--- sam/trunk/src/test/resources/samples/esper-default-cfg.xml (rev 0)
+++ sam/trunk/src/test/resources/samples/esper-default-cfg.xml 2008-07-13 12:34:02 UTC (rev 145)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Sample configuration file.
+-->
+<esper-configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://www.espertech.com/schema/esper"
+ xsi:noNamespaceSchemaLocation="esper-configuration-2-0.xsd">
+
+ <!--
+ Sample engine settings
+ -->
+ <engine-settings>
+ <defaults>
+ <threading>
+ <!--
+ In multithreaded environments, this setting controls whether dispatches to listeners
+ preserve the ordering in which the statement processes events
+ -->
+ <listener-dispatch preserve-order="true" timeout-msec="1000" locking="spin"/>
+ <!--
+ In multithreaded environments, this setting controls whether insert-into streams
+ preserve the order of events inserted into them by one or more statements,
+ allowing statements that consume other statement's events to behave deterministic.
+ -->
+ <insert-into-dispatch preserve-order="true" timeout-msec="100" locking="spin"/>
+ <!-- These settings define the resolution of the internal timer thread,
+ and can disable the timer to indicate that the application supplies the timer events
+ -->
+ <internal-timer enabled="true" msec-resolution="100"/>
+ </threading>
+ <event-meta>
+ <!--
+ Lets configure the engine to use case-insensitive resolution for event properties
+ -->
+ <class-property-resolution style="distinct_case_insensitive"/>
+ </event-meta>
+ <view-resources>
+ <!--
+ Lets configure the engine to reuse views, which is the default but can introduce additional locking
+ -->
+ <share-views enabled="true"/>
+ </view-resources>
+ <logging>
+ <!--
+ By default the engine does not generate logging through Log4j of the event processing execution path.
+ To get debug output, set this flag to true. This setting translates into a static boolean flag
+ and thus may apply to multiple engine instances within a given VM.
+ -->
+ <execution-path enabled="false" />
+ </logging>
+ <stream-selection>
+ <!--
+ By default the engine generates output for the insert stream only, and not for the remove stream.
+ To obtain output for remove stream only, or for insert stream and remove stream,
+ there are keywords "rstream" and "irstream" for use in the select clause.
+ This setting controls the default behavior, if no keyword is specified in the select-clause by statements.
+ -->
+ <stream-selector value="irstream" />
+ </stream-selection>
+ <time-source>
+ <!--
+ By default the time source is System.currentTimeMillis.
+ This sample configures the nano-second time call System.nanoTime() as the time source,
+ which Esper adjusts for wall clock time.
+ -->
+ <time-source-type value="nano" />
+ </time-source>
+ </defaults>
+ </engine-settings>
+
+</esper-configuration>
Property changes on: sam/trunk/src/test/resources/samples/esper-default-cfg.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 11 months
- 1
- 0
Overlord SVN: r144 - sam/trunk/src/main/java/org/jboss/sam/simulation.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-07-13 08:33:18 -0400 (Sun, 13 Jul 2008)
New Revision: 144
Modified:
sam/trunk/src/main/java/org/jboss/sam/simulation/EventSimulation.java
Log:
Allow creation of unbound statements in EventSimulation
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-13 11:46:12 UTC (rev 143)
+++ sam/trunk/src/main/java/org/jboss/sam/simulation/EventSimulation.java 2008-07-13 12:33:18 UTC (rev 144)
@@ -78,7 +78,7 @@
// Constants
public final static String TOTAL_SIM_TIME = "sam.total-sim-time";
public final static String NUM_UNMATCHED_EVENTS = "sam.unmatched-events";
-
+
private EventSimulation(Properties config, URL bootstrap)
{
// thread setup
@@ -132,9 +132,24 @@
return source;
}
+ /**
+ * Create a aggregation/filtering statement
+ * @param stmt
+ */
+ public void createStatement(String stmt)
+ {
+ this.eventProcessor.registerStatement(
+ UUID.randomUUID().toString(), stmt
+ );
+ }
+
+ /**
+ * Bind a statment that forwards to an EventSink
+ * @param stmt
+ * @param sink
+ */
public void bindStatement(String stmt, EventSinkEntity sink)
{
- // bind the results to a stream output (EventSink)
this.eventProcessor.registerBoundStatement(
sink.getStreamName(), UUID.randomUUID().toString(), stmt
);
@@ -253,6 +268,13 @@
}
}
+ public static EventSimulation bootstrap(Properties config)
+ {
+ return new EventSimulation(config,
+ Thread.currentThread().getContextClassLoader().getResource("samples/esper-default-cfg.xml")
+ );
+ }
+
public static EventSimulation bootstrap(Properties config, URL bootstrap)
{
return new EventSimulation(config, bootstrap);
15 years, 11 months
- 1
- 0
Overlord SVN: r143 - in sam/trunk: src/main/java/org/jboss/sam/simulation and 1 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)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();
15 years, 11 months
- 1
- 0
Overlord SVN: r142 - in cdl/trunk/samples/jbossesb/purchasing: src/main/resources and 1 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2008-07-12 13:52:59 -0400 (Sat, 12 Jul 2008)
New Revision: 142
Modified:
cdl/trunk/samples/jbossesb/purchasing/pom.xml
cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/purchasing/src/main/resources/hibernate.cfg.xml
cdl/trunk/samples/jbossesb/purchasing/src/main/resources/log4j.xml
Log:
* update purchasing example.
Modified: cdl/trunk/samples/jbossesb/purchasing/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/pom.xml 2008-07-12 17:45:12 UTC (rev 141)
+++ cdl/trunk/samples/jbossesb/purchasing/pom.xml 2008-07-12 17:52:59 UTC (rev 142)
@@ -51,6 +51,12 @@
<artifactId>hsqldb</artifactId>
<version>${hsqldb-version}</version>
</dependency>
+
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.0.5</version>
+ </dependency>
</dependencies>
@@ -95,7 +101,7 @@
<phase>install</phase>
<configuration>
<tasks>
- <property name="deploy.dir" value="/var/local/jboss-4.2.2.GA/server/default/deploy" />
+ <property name="deploy.dir" value="/var/local/jboss/server/default/deploy" />
<copy file="target/purchasing.esb" todir="${deploy.dir}" overwrite="true" />
</tasks>
</configuration>
Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml 2008-07-12 17:45:12 UTC (rev 141)
+++ cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml 2008-07-12 17:52:59 UTC (rev 142)
@@ -183,7 +183,6 @@
<actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.actions.ScheduleStateAction"
process="process" name="b7">
- <property name="session" value="com.acme.services.broker.PurchaseGoods" />
<property name="serviceName" value="ReturnBuyerResponse" />
<property name="serviceCategory" value="PurchaseGoods.Broker" />
<property name="immediate" value="false" />
@@ -200,7 +199,6 @@
<actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.actions.ScheduleStateAction"
process="process" name="b9">
- <property name="session" value="com.acme.services.broker.PurchaseGoods" />
<property name="serviceName" value="ReturnBuyerResponse" />
<property name="serviceCategory" value="PurchaseGoods.Broker" />
<property name="immediate" value="false" />
Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/resources/hibernate.cfg.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/src/main/resources/hibernate.cfg.xml 2008-07-12 17:45:12 UTC (rev 141)
+++ cdl/trunk/samples/jbossesb/purchasing/src/main/resources/hibernate.cfg.xml 2008-07-12 17:52:59 UTC (rev 142)
@@ -22,6 +22,22 @@
-->
<hibernate-configuration>
<session-factory>
+ <!--property name="hibernate.connection.driver_class">
+ org.gjt.mm.mysql.Driver
+ </property>
+ <property name="hibernate.connection.url">
+ jdbc:mysql://localhost:3306/cdl
+ </property>
+ <property name="hibernate.connection.username">
+ root
+ </property>
+ <property name="hibernate.connection.password">
+ jeff
+ </property>
+ <property name="hibernate.dialect">
+ org.hibernate.dialect.MySQL5Dialect
+ </property-->
+
<property name="hibernate.connection.driver_class">
org.hsqldb.jdbcDriver
</property>
@@ -42,6 +58,9 @@
<property name="hibernate.c3p0.max_statements">50</property>
<property name="hibernate.c3p0.idle_test_period">3000</property>
+ <property name="current_session_context_class">thread</property>
+ <property name="hibernate.connection.isolation">4</property>
+
<!-- Show and print nice SQL on stdout -->
<property name="show_sql">false</property>
<property name="format_sql">true</property>
Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/resources/log4j.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/src/main/resources/log4j.xml 2008-07-12 17:45:12 UTC (rev 141)
+++ cdl/trunk/samples/jbossesb/purchasing/src/main/resources/log4j.xml 2008-07-12 17:52:59 UTC (rev 142)
@@ -7,8 +7,6 @@
<!-- -->
<!-- ===================================================================== -->
-<!-- $Id: log4j.xml,v 1.26.2.10 2006/04/21 17:29:20 csuconic Exp $ -->
-
<!--
| For more configuration infromation and examples see the Jakarta Log4j
| owebsite: http://jakarta.apache.org/log4j
@@ -43,20 +41,7 @@
</layout>
</appender>
- <!-- A size based file rolling appender
- <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/server.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
- -->
-
<!-- ============================== -->
<!-- Append messages to the console -->
<!-- ============================== -->
@@ -71,88 +56,6 @@
</layout>
</appender>
- <!-- ====================== -->
- <!-- More Appender examples -->
- <!-- ====================== -->
-
- <!-- Buffer events and log them asynchronously
- <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <appender-ref ref="FILE"/>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="SMTP"/>
- </appender>
- -->
-
- <!-- EMail events to an administrator
- <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Threshold" value="ERROR"/>
- <param name="To" value="admin(a)myhost.domain.com"/>
- <param name="From" value="nobody(a)myhost.domain.com"/>
- <param name="Subject" value="JBoss Sever Errors"/>
- <param name="SMTPHost" value="localhost"/>
- <param name="BufferSize" value="10"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- Syslog events
- <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Facility" value="LOCAL7"/>
- <param name="FacilityPrinting" value="true"/>
- <param name="SyslogHost" value="localhost"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- Log events to JMS (requires a topic to be created)
- <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Threshold" value="ERROR"/>
- <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
- <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
- </appender>
- -->
-
- <!-- Log events through SNMP
- <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
- <param name="ManagementHost" value="127.0.0.1"/>
- <param name="ManagementHostTrapListenPort" value="162"/>
- <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
- <param name="LocalIPAddress" value="127.0.0.1"/>
- <param name="LocalTrapSendPort" value="161"/>
- <param name="GenericTrapType" value="6"/>
- <param name="SpecificTrapType" value="12345678"/>
- <param name="CommunityString" value="public"/>
- <param name="ForwardStackTraceWithTrap" value="true"/>
- <param name="Threshold" value="DEBUG"/>
- <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- Emit events as JMX notifications
- <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-
- <param name="Threshold" value="WARN"/>
- <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
- </layout>
- </appender>
- -->
<!-- ================ -->
<!-- Limit categories -->
@@ -204,8 +107,11 @@
<category name="org.milyn.cdr.XMLConfigDigester">
<priority value="INFO"/>
</category>
+
+ <category name="org.jboss.soa.overlord">
+ <priority value="DEBUG" />
+ </category>
-
<!-- ======================= -->
<!-- Setup the Root category -->
<!-- ======================= -->
@@ -216,29 +122,5 @@
<appender-ref ref="FILE"/>
</root>
- <!-- Clustering logging -->
- <!-- Uncomment the following to redirect the org.jgroups and
- org.jboss.ha categories to a cluster.log file.
- <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
- <category name="org.jgroups">
- <priority value="DEBUG" />
- <appender-ref ref="CLUSTER"/>
- </category>
- <category name="org.jboss.ha">
- <priority value="DEBUG" />
- <appender-ref ref="CLUSTER"/>
- </category>
- -->
-
</log4j:configuration>
15 years, 11 months
- 1
- 0
Overlord SVN: r141 - in cdl/trunk/runtime/jbossesb: src/main/java/org/jboss/soa/overlord/conversation and 1 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2008-07-12 13:45:12 -0400 (Sat, 12 Jul 2008)
New Revision: 141
Removed:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/PersistentTest.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationActionException.java
Modified:
cdl/trunk/runtime/jbossesb/pom.xml
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/HibernateUtil.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Identity.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/JoinState.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/ScheduleItem.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetVariableAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java
Log:
* Updating the jbossesb-rosetta 4.3GA release.
* Make the hibernate transacation demarcation is 'Action' based unit.
* Remove ConversationActionException, throw Exception directly. otherwise, the standalone client also need to have this dependency.
Modified: cdl/trunk/runtime/jbossesb/pom.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/pom.xml 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/pom.xml 2008-07-12 17:45:12 UTC (rev 141)
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.jboss.jbossesb</groupId>
<artifactId>rosetta</artifactId>
- <version>4.2.1</version>
+ <version>4.3</version>
</dependency>
<dependency>
<groupId>org.jboss.jbossesb</groupId>
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/HibernateUtil.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/HibernateUtil.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/HibernateUtil.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -19,6 +19,8 @@
*/
package org.jboss.soa.overlord.conversation;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.AnnotationConfiguration;
@@ -27,11 +29,12 @@
private static SessionFactory sessionFactory;
+ private static final ThreadLocal<Session> session = new ThreadLocal<Session>();
+
static {
try {
sessionFactory = new AnnotationConfiguration().configure().buildSessionFactory();
} catch (Throwable t) {
- t.printStackTrace();
throw new ExceptionInInitializerError(t);
}
}
@@ -45,5 +48,22 @@
getSessionFactory().close();
}
}
+
+ public static synchronized Session currentSession() throws HibernateException {
+ Session s = session.get();
+ if (s == null) {
+ s = sessionFactory.openSession();
+ session.set(s);
+ }
+ return s;
+ }
+
+ public static void closeSession() throws HibernateException {
+ Session s = session.get();
+ if (s!= null) {
+ s.close();
+ }
+ session.set(null);
+ }
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Identity.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Identity.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Identity.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -19,7 +19,6 @@
*/
package org.jboss.soa.overlord.conversation;
-import java.io.Serializable;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -43,7 +42,7 @@
@Entity
@Table(name="T_IDENTITY")
-public class Identity implements Serializable {
+public class Identity implements HibernateObject {
private static final long serialVersionUID = 1112L;
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/JoinState.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/JoinState.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/JoinState.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -19,8 +19,6 @@
*/
package org.jboss.soa.overlord.conversation;
-import java.io.Serializable;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -35,7 +33,7 @@
*/
@Entity
@Table(name="T_JOIN_STATES")
-public class JoinState implements Serializable {
+public class JoinState implements HibernateObject {
private static final long serialVersionUID = 1113L;
Deleted: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/PersistentTest.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/PersistentTest.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/PersistentTest.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2008,
- */
-package org.jboss.soa.overlord.conversation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.hibernate.HibernateException;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-
-/**
- * @author jeffyu
- *
- */
-public class PersistentTest {
-
-
- public static void main(String[] args) throws Exception{
- Session s = SessionManager.createSession("com.acme.services.broker.PurchaseGoods");
- Identity id = new Identity();
- id.setSession(s);
- id.setServiceName(s.getServiceName());
- id.setType(IdentityType.Primary);
-
- Map<String, String> properties = new HashMap<String, String>();
- properties.put("id", "8");
-
- id.setProperties(properties);
-
- SessionManager.saveObject(id);
-
- Session newSession = SessionManager.getSession(id);
- System.out.println("================================");
- System.out.println(newSession.getServiceName());
- System.out.println(newSession.getPojoClass());
- }
-
- public static void testScheduleItem() {
- try {
- SessionFactory sf = HibernateUtil.getSessionFactory();
- org.hibernate.Session session = sf.openSession();
- Transaction transaction= session.getTransaction();
- transaction.begin();
-
- ScheduleItem si = new ScheduleItem("PurchasingBroker", "creditagency");
- session.save(si);
- transaction.commit();
- session.close();
- sf.close();
-
- } catch (HibernateException e) {
- System.out.println("=========ERROR==============");
- e.printStackTrace();
- }
- }
-
-}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/ScheduleItem.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/ScheduleItem.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/ScheduleItem.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -19,8 +19,6 @@
*/
package org.jboss.soa.overlord.conversation;
-import java.io.Serializable;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -32,7 +30,7 @@
@Entity
@Table(name="T_SCHEDULE_ITEM")
-public class ScheduleItem implements Serializable {
+public class ScheduleItem implements HibernateObject {
private static final long serialVersionUID = 1114L;
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -19,7 +19,6 @@
*/
package org.jboss.soa.overlord.conversation;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -44,7 +43,7 @@
@Entity
@Table(name="T_SESSION")
-public class Session implements Serializable {
+public class Session implements HibernateObject {
private static final long serialVersionUID = 1115L;
@@ -108,7 +107,7 @@
return this.status;
}
- public void setEPR(String name, EPR epr) {
+ public void setEPR(String name, EPR epr) throws Exception{
try {
EPRWrapper theEPRWrapper = null;
for(EPRWrapper eprWrapper : eprWrappers) {
@@ -129,8 +128,7 @@
eprWrappers.add(eprWrapper);
SessionManager.saveObject(eprWrapper);
} catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException("Error in storing EPR!!");
+ throw new Exception("Error in storing EPR!!" + e, e);
}
}
@@ -146,28 +144,27 @@
return null;
}
- public void schedule(String category, String name, boolean immediate,
- Message message) throws Exception {
+ public void schedule(String category, String name, Message message) throws Exception {
- logger.info("Schedule '"+category+"/"+name+"' immediate="+immediate);
-
ScheduleItem si=new ScheduleItem(category, name);
si.setSession(this);
+ logger.info("Scheduling: " + si + " by thread of " + Thread.currentThread().getName());
+
synchronized(joinStates) {
JoinState joinState = getJoinStateByScheduleItem(si);
if (joinState != null) {
joinState.join();
SessionManager.updateObject(joinState);
- System.out.println("---<><><>----" + getJoinStateByScheduleItem(si).getSpawnPath());
+ logger.debug("Join State is: " + joinState);
if (joinState.getSpawnPath() <= 0) {
joinStates.remove(joinState);
SessionManager.removeObject(joinState);
- logger.info("About to schedule joined state: "+joinState);
+
ServiceInvoker invoker= new ServiceInvoker(category, name);
invoker.deliverAsync(message);
} else {
- logger.info("Don't join yet: "+si);
+ logger.info("Don't join yet: "+ joinState);
return;
}
}
@@ -176,24 +173,20 @@
synchronized(scheduleItems) {
// Check if already exists
if (scheduleItems.contains(si)) {
- logger.error("Schedule already contains item for " + si);
+ throw new Exception("Schedule already contains item for " + si);
}
scheduleItems.add(si);
SessionManager.saveObject(si);
- logger.info("Scheduled: "+si);
-
- if (immediate) {
- ServiceInvoker invoker= new ServiceInvoker(category, name);
- invoker.deliverAsync(message);
- }
+
+ logger.info("Finished scheduling "+si);
}
}
public void unschedule(String category, String name) throws Exception {
- logger.info("Unschedule '"+category+"/"+name+"'");
+ logger.info("Unscheduling: '"+category+"/"+name+"' by thread of " + Thread.currentThread().getName() );
synchronized(joinStates) {
if (isScheduleItemInJoinState(category, name)) {
@@ -203,13 +196,13 @@
synchronized(scheduleItems) {
ScheduleItem si = getScheduleItem(category, name);
- if (scheduleItems.remove(si) == false) {
- logger.error("Unable to unschedule: "+si);
- throw new Exception("Unable to unschedule item : "+si);
- } else {
- SessionManager.removeObject(si);
- logger.info("Successfully Unscheduled: "+si);
+ if (si.getId() == 0) {
+ throw new Exception("The scheduleItem of " + si + " is not existed !");
}
+
+ scheduleItems.remove(si);
+ SessionManager.removeObject(si);
+ logger.info("Finished unscheduling: " + si);
}
}
@@ -223,7 +216,7 @@
}
- protected JoinState getJoinStateByScheduleItem(ScheduleItem si) {
+ protected synchronized JoinState getJoinStateByScheduleItem(ScheduleItem si) {
for(JoinState joinState : joinStates) {
if (si.getName().equals(joinState.getName()) && si.getCategory().equals(joinState.getCategory())) {
return joinState;
@@ -239,18 +232,20 @@
return si;
}
}
- return new ScheduleItem(category, name);
+ ScheduleItem item = new ScheduleItem(category, name);
+ item.setSession(this);
+ return item;
}
public void join(String category, String name, int count) throws Exception {
JoinState joinState=new JoinState(category, name, count);
joinState.setSession(this);
if (joinStates.contains(joinState)) {
- logger.error("Join already exists for '"+category+ "/"+name+"'");
+ throw new Exception("The '"+category+ "/"+name+"' of JoinState is already existed.");
}
joinStates.add(joinState);
SessionManager.saveObject(joinState);
- logger.info("Added Join State: " + joinState);
+ logger.debug("Added Join State: " + joinState);
}
public void assimulateIdentities(java.util.List<Identity> ids) throws Exception {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -25,9 +25,7 @@
import java.util.Map;
import org.apache.log4j.Logger;
-import org.hibernate.Transaction;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.overlord.jbossesb.actions.ConversationActionException;
import org.jboss.soa.overlord.jbossesb.actions.MessageProperties;
import org.jboss.soa.overlord.jbossesb.actions.Service;
import org.mvel.MVEL;
@@ -42,93 +40,64 @@
public static Session createSession(String sessionName) throws Exception {
- org.hibernate.Session hibernateSession = HibernateUtil.getSessionFactory().openSession();
- Transaction transaction = null;
- try {
-
- Class<?> pojoclass= ClassLoaderUtil.loadClass(sessionName);
- Object businessState = pojoclass.newInstance();
-
- transaction = hibernateSession.beginTransaction();
- hibernateSession.save(businessState);
-
- Session conversationSession = new Session();
- conversationSession.setPojoClass(sessionName);
- conversationSession.setStatus(SessionStatus.Active);
- if (businessState instanceof HibernateObject) {
- HibernateObject ho = (HibernateObject) businessState;
- conversationSession.setPojoID(ho.getId());
- logger.debug("Set Business State Object ID : " + ho.getId());
- }
- conversationSession.setBusinessObject(businessState);
-
- Service service = pojoclass.getAnnotation(Service.class);
- if (service != null) {
- conversationSession.setServiceName(service.name());
- conversationSession.setConversationType(service.conversationType());
- }
-
- hibernateSession.save(conversationSession);
-
- transaction.commit();
-
- return conversationSession;
-
- }catch (Exception e) {
- if (transaction != null) {
- transaction.rollback();
- }
- throw new Exception (e);
- } finally {
- hibernateSession.close();
+ org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
+ Class<?> pojoclass= ClassLoaderUtil.loadClass(sessionName);
+ Object businessState = pojoclass.newInstance();
+ hibernateSession.save(businessState);
+
+ Session conversationSession = new Session();
+ conversationSession.setPojoClass(sessionName);
+ conversationSession.setStatus(SessionStatus.Active);
+ if (businessState instanceof HibernateObject) {
+ HibernateObject ho = (HibernateObject) businessState;
+ conversationSession.setPojoID(ho.getId());
+ logger.debug("Set Business State Object ID : " + ho.getId());
}
+ conversationSession.setBusinessObject(businessState);
+
+ Service service = pojoclass.getAnnotation(Service.class);
+ if (service != null) {
+ conversationSession.setServiceName(service.name());
+ conversationSession.setConversationType(service.conversationType());
+ }
+
+ hibernateSession.save(conversationSession);
+
+ return conversationSession;
}
@SuppressWarnings("unchecked")
public static Session createSubSession(String sessionName, String sessionKey, Message message) throws Exception {
- org.hibernate.Session hibernateSession = HibernateUtil.getSessionFactory().openSession();
- Transaction transaction = null;
- try {
- Session parentSession = (Session)hibernateSession.load(Session.class, Long.valueOf(sessionKey));
- Class<?> pojoclass= ClassLoaderUtil.loadClass(sessionName);
- Object businessState = pojoclass.newInstance();
-
- transaction = hibernateSession.beginTransaction();
-
- Map<String, Object> boundVariables = (Map<String, Object>)message.getProperties().
- getProperty(MessageProperties.BOUND_VARIABLE_KEY);
- for(String key : boundVariables.keySet()) {
- MVEL.setProperty(businessState, key, boundVariables.get(key));
- logger.info("bound to " + key);
- }
-
- hibernateSession.save(businessState);
-
- Session conversationSession = new Session();
- conversationSession.setPojoClass(sessionName);
- conversationSession.setStatus(SessionStatus.Active);
- if (businessState instanceof HibernateObject) {
- HibernateObject ho = (HibernateObject) businessState;
- conversationSession.setPojoID(ho.getId());
- logger.debug("Set Business State Object ID : " + ho.getId());
- }
- conversationSession.setBusinessObject(businessState);
- conversationSession.setParent(parentSession);
- conversationSession.setServiceName(parentSession.getServiceName());
-
- hibernateSession.save(conversationSession);
- transaction.commit();
-
- return conversationSession;
- } catch (Exception e) {
- if (transaction != null) {
- transaction.rollback();
- }
- throw new ConversationActionException (e);
- } finally {
- hibernateSession.close();
+ org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
+ Session parentSession = (Session)hibernateSession.load(Session.class, Long.valueOf(sessionKey));
+ Class<?> pojoclass= ClassLoaderUtil.loadClass(sessionName);
+ Object businessState = pojoclass.newInstance();
+
+ Map<String, Object> boundVariables = (Map<String, Object>)message.getProperties().
+ getProperty(MessageProperties.BOUND_VARIABLE_KEY);
+ for(String key : boundVariables.keySet()) {
+ MVEL.setProperty(businessState, key, boundVariables.get(key));
+ logger.info("bound to " + key);
}
+
+ hibernateSession.save(businessState);
+
+ Session conversationSession = new Session();
+ conversationSession.setPojoClass(sessionName);
+ conversationSession.setStatus(SessionStatus.Active);
+ if (businessState instanceof HibernateObject) {
+ HibernateObject ho = (HibernateObject) businessState;
+ conversationSession.setPojoID(ho.getId());
+ logger.debug("Set Business State Object ID : " + ho.getId());
+ }
+ conversationSession.setBusinessObject(businessState);
+ conversationSession.setParent(parentSession);
+ conversationSession.setServiceName(parentSession.getServiceName());
+
+ hibernateSession.save(conversationSession);
+
+ return conversationSession;
}
public static Session retrieveSession(String sessionKey, java.util.List<Identity> ids) throws Exception {
@@ -138,26 +107,18 @@
}
if (sessionKey != null) {
- org.hibernate.Session hibernateSession = HibernateUtil.getSessionFactory().openSession();
- Session session = null;
- try {
- session = (Session) hibernateSession.load(Session.class, Long.valueOf(sessionKey));
- Class<?> pojoClass = ClassLoaderUtil.loadClass(session.getPojoClass());
- Object pojo = hibernateSession.load(pojoClass, Long.valueOf(session.getPojoID()));
- session.setBusinessObject(pojo);
- session.getScheduleItems().size();
- session.getIdentities().size();
- session.getJoinStates().size();
- session.getEprWrappers().size();
- } finally {
- hibernateSession.close();
- }
+ org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
+ Session session = (Session) hibernateSession.load(Session.class, Long.valueOf(sessionKey));
+ Class<?> pojoClass = ClassLoaderUtil.loadClass(session.getPojoClass());
+ Object pojo = hibernateSession.load(pojoClass, Long.valueOf(session.getPojoID()));
+ session.setBusinessObject(pojo);
+
return session;
}
for (Identity id : ids) {
if (IdentityType.Primary.equals(id.getType())) {
- return getSession(id);
+ return getSessionByIdentity(id);
}
}
@@ -165,108 +126,58 @@
}
public static Object saveObject(Object obj) throws Exception {
- org.hibernate.Session hibernateSession = HibernateUtil.getSessionFactory().openSession();
- Transaction transaction = null;
- try {
- transaction = hibernateSession.beginTransaction();
- hibernateSession.save(obj);
- transaction.commit();
- } catch (Exception e) {
- if (transaction != null) {
- transaction.rollback();
- }
- throw new ConversationActionException("Error in saveObject", e);
- } finally {
- hibernateSession.close();
- }
-
+ org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
+ hibernateSession.save(obj);
return obj;
}
+
+ public static Object getObject(long id, Class<?> cls) throws Exception {
+ org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
+ return hibernateSession.load(cls, id);
+ }
+
@SuppressWarnings("unchecked")
public static Collection saveCollection(Collection col) throws Exception {
- org.hibernate.Session hibernateSession = HibernateUtil.getSessionFactory().openSession();
- Transaction transaction = null;
- try {
- transaction = hibernateSession.beginTransaction();
+ org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
- for(Iterator it = col.iterator(); it.hasNext();) {
- Object o = it.next();
- hibernateSession.save(o);
- }
-
- transaction.commit();
- } catch (Exception e) {
- if (transaction != null) {
- transaction.rollback();
- }
- throw new ConversationActionException("Error in saveCollection", e);
- } finally {
- hibernateSession.close();
+ for(Iterator it = col.iterator(); it.hasNext();) {
+ Object o = it.next();
+ hibernateSession.save(o);
}
return col;
}
public static void updateObject(Object obj) {
- org.hibernate.Session hibernateSession = HibernateUtil.getSessionFactory().openSession();
- Transaction transaction = null;
- try {
- transaction = hibernateSession.beginTransaction();
- hibernateSession.update(obj);
- transaction.commit();
- } catch (Exception e) {
- if (transaction != null) {
- transaction.rollback();
- }
- throw new ConversationActionException("Error in updateObject", e);
- } finally {
- hibernateSession.close();
- }
+ org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
+ hibernateSession.update(obj);
}
public static void removeObject(Object obj) {
- org.hibernate.Session hibernateSession = HibernateUtil.getSessionFactory().openSession();
- Transaction transaction = null;
- try {
- transaction = hibernateSession.beginTransaction();
- hibernateSession.delete(obj);
- transaction.commit();
- } catch (Exception e) {
- if (transaction != null) {
- transaction.rollback();
- }
- throw new ConversationActionException("Error in removeObject : " + obj, e);
- } finally {
- hibernateSession.close();
- }
-
+ org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
+ hibernateSession.delete(obj);
}
- public static Session getSession(Identity id) {
- org.hibernate.Session hibernateSession = HibernateUtil.getSessionFactory().openSession();
- Session session = null;
- try {
- String query = "select b from Identity b where b.type =:type and b.propertyValues =:propertyValues and b.serviceName =:serviceName";
- List<?> results = hibernateSession.createQuery(query)
- .setParameter("type", id.getType())
- .setParameter("propertyValues", id.getPropertyValues())
- .setParameter("serviceName", id.getServiceName())
- .list();
- if (results.size() < 1) {
- return null;
- }
-
- Identity theID = (Identity)results.get(0);
- session = theID.getSession();
- session.getScheduleItems().size();
- session.getIdentities().size();
- session.getJoinStates().size();
- session.getEprWrappers().size();
- } finally {
- hibernateSession.close();
+ public static Session getSessionByIdentity(Identity id) throws Exception{
+ org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
+ String query = "select b from Identity b where b.type =:type and b.propertyValues =:propertyValues and b.serviceName =:serviceName";
+ List<?> results = hibernateSession.createQuery(query)
+ .setParameter("type", id.getType())
+ .setParameter("propertyValues", id.getPropertyValues())
+ .setParameter("serviceName", id.getServiceName())
+ .list();
+ if (results.size() < 1) {
+ return null;
}
+
+ Identity theID = (Identity)results.get(0);
+ Session session = (Session)hibernateSession.load(Session.class, theID.getSession().getId());
+ Class<?> pojoClass = ClassLoaderUtil.loadClass(session.getPojoClass());
+ Object pojo = hibernateSession.load(pojoClass, Long.valueOf(session.getPojoID()));
+ session.setBusinessObject(pojo);
+
return session;
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -20,16 +20,22 @@
package org.jboss.soa.overlord.jbossesb.actions;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.log4j.Logger;
+import org.hibernate.Transaction;
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.client.ServiceInvoker;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.ClassLoaderUtil;
+import org.jboss.soa.overlord.conversation.HibernateUtil;
import org.jboss.soa.overlord.conversation.Identity;
import org.jboss.soa.overlord.conversation.IdentityType;
+import org.jboss.soa.overlord.conversation.ScheduleItem;
import org.jboss.soa.overlord.conversation.Session;
import org.jboss.soa.overlord.conversation.SessionManager;
import org.jboss.soa.overlord.jbossesb.util.MessageUtil;
@@ -40,10 +46,12 @@
*/
public abstract class ConversationAction extends AbstractActionLifecycle {
- protected static Logger logger = Logger.getLogger(ConversationAction.class);
+ private static Logger logger = Logger.getLogger(ConversationAction.class);
- private ConfigTree config;
+ private ConfigTree config;
+ private Set<ScheduleItem> scheduleItems = new HashSet<ScheduleItem>();
+
public ConversationAction(ConfigTree config) {
this.config = config;
}
@@ -62,7 +70,7 @@
return(ret);
}
- public List<Identity> getIdentities(Message message, String serviceDescriptionName, ConfigTree ct) throws Exception {
+ protected List<Identity> getIdentities(Message message, String serviceDescriptionName, ConfigTree ct) throws Exception {
ConfigTree[] children=ct.getAllChildren();
java.util.List<Identity> ids=new java.util.Vector<Identity>();
@@ -164,16 +172,37 @@
public Message process(Message message) throws Exception {
String sessionKey=(String)message.getProperties().getProperty(MessageProperties.SESSION_KEY);
logger.info("Session Key is [" + sessionKey + "] Body is: [" + message.getBody() + "]");
- Session session = getSession(message);
- if (session != null && isFirstConversationAction(message)) {
- unschedule(message);
- logger.info("This is first conversation action to unschedule the item!");
+
+ org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
+ Transaction transaction = hibernateSession.beginTransaction();
+ try {
+ Session session = getSession(message);
+ if (session != null && isFirstConversationAction(message)) {
+ logger.info("This is first conversation action to unschedule the item!");
+ unschedule(message);
+ }
+
+ handle(message);
+ transaction.commit();
+ } catch (Exception e) {
+ transaction.rollback();
+ throw new Exception("Error in process message: " + e, e);
+ } finally {
+ HibernateUtil.closeSession();
}
- return handle(message);
+ sendAsyncMessage(message);
+
+ return message;
}
-
+ protected void sendAsyncMessage(Message message) throws Exception {
+ for(ScheduleItem si : scheduleItems) {
+ ServiceInvoker invoker = new ServiceInvoker(si.getCategory(), si.getName());
+ invoker.deliverAsync(message);
+ }
+ }
+
private boolean isFirstConversationAction(Message message) throws ClassNotFoundException{
String sessionKey=(String)message.getProperties().getProperty(MessageProperties.SESSION_KEY);
if (sessionKey != null) {
@@ -212,6 +241,13 @@
return method + "()";
}
+
+ protected void addScheduleItemToDeliver(String category, String name) {
+ ScheduleItem si = new ScheduleItem(category, name);
+ scheduleItems.add(si);
+ }
+
+
/**
* This is the method that deals with business logic for derived conversation actions.
* @param message
@@ -219,5 +255,6 @@
* @throws Exception
*/
public abstract Message handle(Message message) throws Exception;
+
}
Deleted: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationActionException.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationActionException.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationActionException.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2008,
- */
-package org.jboss.soa.overlord.jbossesb.actions;
-
-/**
- * @author jeffyu
- *
- */
-public class ConversationActionException extends RuntimeException {
-
- private static final long serialVersionUID = -8332666951736901905L;
-
- public ConversationActionException() {
- super();
- }
-
- public ConversationActionException(String message) {
- super(message);
- }
-
- public ConversationActionException(Throwable t) {
- super(t);
- }
-
- public ConversationActionException(String message, Throwable t) {
- super(message, t);
- }
-
-}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -19,6 +19,7 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.Session;
@@ -31,6 +32,8 @@
*/
public class CreateSessionAction extends ConversationAction {
+ private Logger logger = Logger.getLogger(CreateSessionAction.class);
+
public CreateSessionAction(ConfigTree config) {
super(config);
}
@@ -58,9 +61,8 @@
message.getProperties().setProperty(MessageProperties.SESSION, session);
message.getProperties().setProperty(MessageProperties.SESSION_KEY, String.valueOf(session.getId()));
- } else {
- logger.error("No session has been defined");
- throw new ConversationActionException("Session is not defined");
+ } else {
+ throw new Exception("No session has been defined");
}
return(message);
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -19,6 +19,7 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.Session;
@@ -30,6 +31,8 @@
*/
public class IfAction extends ConversationAction {
+ private static Logger logger = Logger.getLogger(IfAction.class);
+
public IfAction(ConfigTree config) {
super(config);
}
@@ -72,10 +75,11 @@
}
if (f_register) {
- // Schedule the service category/name
- session.schedule(category, name,
- immediate.equalsIgnoreCase("true"),
- message);
+ session.schedule(category, name, message);
+
+ if ("true".equals(immediate)) {
+ addScheduleItemToDeliver(category, name);
+ }
}
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -21,6 +21,7 @@
import java.util.List;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.client.ServiceInvoker;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.listeners.message.MessageDeliverException;
@@ -35,6 +36,8 @@
*/
public class MessageRouterAction extends ConversationAction {
+ private static Logger logger = Logger.getLogger(MessageRouterAction.class);
+
private boolean routerFlag = false;
public MessageRouterAction(ConfigTree config) {
@@ -70,7 +73,7 @@
}
}
if (routerFlag == false) {
- throw new ConversationActionException ("Could not find any appropriate services to proceed!");
+ throw new Exception ("Could not find any appropriate services to proceed!");
}
return null;
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -19,6 +19,7 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.Session;
@@ -28,6 +29,8 @@
*/
public class ParallelAction extends ConversationAction {
+ private static Logger logger = Logger.getLogger(ParallelAction.class);
+
public ParallelAction(ConfigTree config) {
super(config);
}
@@ -40,22 +43,8 @@
ConfigTree[] children=getConfig().getAllChildren();
- // NOTE: May be issue, sending message?
- // A parallel construct should not occur prior
- // to a receive activity within a pipeline -
- // this might indicate incorrect projection
- // so should check that message has been cleared?
- if (message.getBody().get() != null) {
- logger.error("Message has not been received prior to parallel construct");
- }
-
for (int i=0; i < children.length; i++) {
-
- if (children[i].getName().equals("path")) {
-
- // Increment the path count, but don't schedule
- // until after the optional join has been scheduled
-
+ if (children[i].getName().equals("path")) {
pathCount++;
} else if (children[i].getName().equals("join")) {
@@ -76,7 +65,7 @@
logger.error("Join cannot be performed without concurrent paths");
} else {
session.join(joinCategory, joinName, pathCount);
-
+ logger.info("Scheduling a join state of " + joinCategory + "/" + joinName);
}
}
@@ -89,15 +78,16 @@
String immediate=children[i].getAttribute("immediate","false");
// Schedule service
- session.schedule(category, name,
- immediate.equalsIgnoreCase("true"),
- message);
-
+ session.schedule(category, name, message);
+ if ("true".equalsIgnoreCase(immediate)){
+ addScheduleItemToDeliver(category, name);
+ }
}
}
return(message);
}
+
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -23,7 +23,6 @@
import java.util.Map;
import org.apache.log4j.Logger;
-import org.jboss.soa.esb.client.ServiceInvoker;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.Session;
@@ -64,10 +63,17 @@
}
message.getProperties().setProperty(MessageProperties.BOUND_VARIABLE_KEY, bindingVal);
- //ServiceInvoker serviceInvoker = new ServiceInvoker(serviceCategory, serviceName);
- //serviceInvoker.deliverSync(message, 2000);
- session.schedule(serviceCategory, serviceName, true, message);
+ session.schedule(serviceCategory, serviceName, message);
+ addScheduleItemToDeliver(serviceCategory, serviceName);
+
+ String responseCategory = getConfig().getAttribute(ActionProperties.RESPONSE_SERVICE_CATEGORY);
+ String responseName = getConfig().getAttribute(ActionProperties.RESPONSE_SERVICE_NAME);
+
+ if (responseCategory != null && responseName != null) {
+ session.schedule(responseCategory, responseName, message);
+ }
+
return message;
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -19,6 +19,7 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
@@ -30,6 +31,8 @@
*/
public class ReceiveMessageAction extends ConversationAction {
+ private static Logger logger = Logger.getLogger(ReceiveMessageAction.class);
+
public ReceiveMessageAction(ConfigTree config) {
super(config);
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -21,6 +21,7 @@
import java.util.List;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.Identity;
@@ -31,6 +32,8 @@
*/
public class RetrieveSessionAction extends ConversationAction {
+ private static Logger logger = Logger.getLogger(RetrieveSessionAction.class);
+
public RetrieveSessionAction(ConfigTree config) {
super(config);
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -19,6 +19,7 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.Session;
@@ -28,6 +29,8 @@
*/
public class ScheduleStateAction extends ConversationAction {
+ private static Logger logger = Logger.getLogger(ScheduleStateAction.class);
+
public ScheduleStateAction(ConfigTree config) {
super(config);
}
@@ -37,11 +40,13 @@
String serviceCategory=getConfig().getAttribute(ActionProperties.SERVICE_CATEGORY_PROPERTY);
String immediate=getConfig().getAttribute(ActionProperties.IMMEDIATE);
- // Schedule action pipeline
- Session session=getSession(message);
-
- session.schedule(serviceCategory, serviceName,immediate.equalsIgnoreCase("true"), message);
+ Session session=getSession(message);
+ session.schedule(serviceCategory, serviceName, message);
+ if ("true".equalsIgnoreCase(immediate)) {
+ addScheduleItemToDeliver(serviceCategory, serviceName);
+ }
+
logger.info("Scheduled '"+serviceCategory+"/"+serviceName+"'");
return(message);
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -52,7 +52,7 @@
String requiredMType=getConfig().getAttribute(ActionProperties.MESSAGE_TYPE);
if (requiredMType == null) {
- throw new ConversationActionException("Message type is not defined");
+ throw new Exception("Message type is not defined");
}
String mesgMType=getMessageType(message);
@@ -87,32 +87,25 @@
mesg.getHeader().getCall().setReplyTo(lepr);
// Schedule response action pipeline
- session.schedule(respServiceCategory, respServiceName, false,
- message);
+ session.schedule(respServiceCategory, respServiceName, message);
}
- ServiceInvoker invoker = null;
- if (serviceCategory != null && serviceName != null) {
- invoker = new ServiceInvoker(serviceCategory, serviceName);
- } else {
+ if (serviceCategory == null && serviceName == null) {
serviceCategory = (String) MVEL.eval(categoryExpression, session.getBusinessObject());
serviceName = (String) MVEL.eval(nameExpression, session.getBusinessObject());
- invoker = new ServiceInvoker(serviceCategory, serviceName);
}
+
+ ServiceInvoker invoker = new ServiceInvoker(serviceCategory, serviceName);
invoker.deliverAsync(mesg);
- logger.info("Sending message to '"+serviceCategory+"/"+serviceName+"'");
+ logger.info("Sent message to '"+serviceCategory+"/"+serviceName+"'");
} else if (clientEPR != null) {
- EPR epr=null;
+ EPR epr = session.getEPR(clientEPR);
- epr = session.getEPR(clientEPR);
-
- if (epr == null) {
- logger.error("Client EPR '"+clientEPR+"' does not exist in session");
-
- throw new ConversationActionException("Client EPR '"+clientEPR+"' does not exist in session");
+ if (epr == null) {
+ throw new Exception("Client EPR '"+clientEPR+"' does not exist in session");
}
Courier courier=null;
@@ -131,14 +124,14 @@
courier.cleanup();
} else {
- throw new ConversationActionException("Failed to send message");
+ throw new Exception("Failed to send message");
}
logger.info("MESSAGE TYPE '"+mesgMType+"' SENT.");
} else {
- throw new ConversationActionException("Unexpected message type="+mesgMType+
- ", but expecting type="+requiredMType);
+ throw new Exception("Unexpected message type="+mesgMType+
+ ", but expecting type="+requiredMType);
}
return(message);
@@ -146,4 +139,3 @@
}
-
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetVariableAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetVariableAction.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetVariableAction.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -22,6 +22,7 @@
import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.overlord.conversation.ClassLoaderUtil;
import org.jboss.soa.overlord.conversation.Session;
import org.jboss.soa.overlord.conversation.SessionManager;
import org.jboss.soa.overlord.jbossesb.util.XMLUtils;
@@ -49,23 +50,27 @@
Session session = getSession(message);
Object bstate = session.getBusinessObject();
-
logger.info("Set value to the variable of " + variable);
while (variable.startsWith("parent.")) {
variable = variable.substring(7);
session = session.getParent();
+ if (session.getPojoID() != 0) {
+ Class<?> pojoClass = ClassLoaderUtil.loadClass(session.getPojoClass());
+ //Object pojo = SessionManager.getObject(session.getPojoID(), pojoClass);
+ //session.setBusinessObject(pojo);
+ }
}
if (stateExpression != null) {
Object result = MVEL.eval(stateExpression, bstate);
- MVEL.setProperty(bstate, variable, result);
+ MVEL.setProperty(session.getBusinessObject(), variable, result);
logger.info("The Variable is: " + variable + "; stateExpression is: " + stateExpression);
} else if (messageExpression != null) {
String xmlBody = (String) message.getBody().get();
Element element = (Element) XMLUtils.getNode(xmlBody);
String result = XMLUtils.executeXpath(element, messageExpression);
- MVEL.setProperty(bstate, variable, result);
+ MVEL.setProperty(session.getBusinessObject(), variable, result);
logger.info("The Variable is: " + variable + "; messageExpression is: " + messageExpression);
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -19,6 +19,7 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.Session;
@@ -29,6 +30,8 @@
*/
public class SwitchAction extends ConversationAction {
+ private static Logger logger = Logger.getLogger(SwitchAction.class);
+
public SwitchAction(ConfigTree config) {
super(config);
}
@@ -62,16 +65,15 @@
}
if (selected) {
- session.schedule(category, name, true, message);
- logger.info("Schedule service of [" + category + "/" + name + "] immediately");
+ session.schedule(category, name, message);
+ addScheduleItemToDeliver(category, name);
+ logger.info("Scheduled service of [" + category + "/" + name + "] immediately");
}
}
}
}
if (selected == false) {
- logger.error("Switch case statement was not selected");
-
throw new Exception("Switch case statement was not selected");
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -19,6 +19,7 @@
*/
package org.jboss.soa.overlord.jbossesb.actions;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.conversation.Session;
@@ -30,6 +31,8 @@
*/
public class WhenAction extends ConversationAction {
+ private static Logger logger = Logger.getLogger(WhenAction.class);
+
public WhenAction(ConfigTree config) {
super(config);
}
@@ -37,50 +40,28 @@
@Override
public Message handle(Message message) throws Exception {
+
Session session = getSession(message);
- int pathCount = 0;
- String joinCategory = null;
- String joinName = null;
for(ConfigTree ct : getConfig().getAllChildren()) {
if ("when".equals(ct.getName())) {
- pathCount ++;
- } else if ("join".equals(ct.getName())) {
-
- if (joinName != null) {
- logger.error("Join details already defined");
- }
-
- joinCategory = ct.getAttribute(ActionProperties.SERVICE_CATEGORY);
- joinName = ct.getAttribute(ActionProperties.SERVICE_NAME);
- }
- }
-
- if (joinCategory != null && joinName != null && pathCount > 0) {
- session.join(joinCategory, joinName, pathCount);
- }
-
- for(ConfigTree ct : getConfig().getAllChildren()) {
- if ("when".equals(ct.getName())) {
//TODO: make the expression as an method name temporarily
String decision = ct.getAttribute("expression");
String category = ct.getAttribute(ActionProperties.SERVICE_CATEGORY);
String name = ct.getAttribute(ActionProperties.SERVICE_NAME);
- try {
- if (decision != null) {
- Object res = MVEL.eval(getMvelMethodName(decision), session.getBusinessObject());
- if (res instanceof Boolean) {
- Boolean ret = (Boolean)res;
- if (ret.booleanValue()) {
- session.schedule(category, name, true, message);
- }
- } else {
- logger.error("currently doesn't support the return value other than Boolean");
+ if (decision != null) {
+ Object res = MVEL.eval(getMvelMethodName(decision), session.getBusinessObject());
+ if (res instanceof Boolean) {
+ Boolean ret = (Boolean)res;
+ if (ret.booleanValue()) {
+ session.schedule(category, name, message);
+ addScheduleItemToDeliver(category, name);
+ logger.info("Scheduled: " + category + '/' + name);
+ break;
}
+ } else {
+ logger.error("currently doesn't support the return value other than Boolean");
}
- } catch (Exception e) {
- logger.error("Failed to invoke decision method: " + decision);
- throw new ConversationActionException("Failed to invoke decision method of - " + decision);
}
}
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java 2008-07-12 17:38:10 UTC (rev 140)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java 2008-07-12 17:45:12 UTC (rev 141)
@@ -51,7 +51,7 @@
} else if ("exit".equals(ct.getName())){
exitConfig = ct;
} else {
- throw new ConversationActionException("Unrecognized configuration Node in WhileAction");
+ throw new Exception("Unrecognized configuration Node in WhileAction");
}
}
@@ -66,21 +66,22 @@
if (flag) {
String category = whileConfig.getAttribute(ActionProperties.SERVICE_CATEGORY);
String name = whileConfig.getAttribute(ActionProperties.SERVICE_NAME);
- session.schedule(category, name, false, message);
+ session.schedule(category, name, message);
ServiceInvoker serviceInvoker = new ServiceInvoker(category, name);
serviceInvoker.deliverSync(message, 2000);
logger.info("Schedule items of " + category + "/" + name + "in WhileAction");
} else {
String category = exitConfig.getAttribute(ActionProperties.SERVICE_CATEGORY);
String name = exitConfig.getAttribute(ActionProperties.SERVICE_NAME);
- session.schedule(category, name, true, message);
- logger.info("Schedule items of " + category + "/" + name + "in WhileAction of exit branch");
+ session.schedule(category, name, message);
+ addScheduleItemToDeliver(category, name);
+ logger.info("Scheduled items of " + category + "/" + name + "in WhileAction of exit branch");
}
} else {
- throw new ConversationActionException("method return value is not an Integer.");
+ throw new Exception("method return value is not Boolean.");
}
} else {
- throw new ConversationActionException("Haven't found the decision method in the configuration.");
+ throw new Exception("Haven't found the decision method in the configuration.");
}
return message;
15 years, 11 months
- 1
- 0
Overlord SVN: r140 - in cdl/trunk/samples/jbossesb/client: src/com/acme/services/buyer and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2008-07-12 13:38:10 -0400 (Sat, 12 Jul 2008)
New Revision: 140
Added:
cdl/trunk/samples/jbossesb/client/lib/commons-codec-1.3.jar
cdl/trunk/samples/jbossesb/client/lib/juddi-2.0rc5.jar
cdl/trunk/samples/jbossesb/client/lib/juddi-client-2.0rc5.jar
cdl/trunk/samples/jbossesb/client/lib/wstx-lgpl-3.2.1.jar
Removed:
cdl/trunk/samples/jbossesb/client/lib/juddi-client-20071022.191630-6.jar
Modified:
cdl/trunk/samples/jbossesb/client/lib/jbossall-client.jar
cdl/trunk/samples/jbossesb/client/lib/jbossesb-rosetta.jar
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java
Log:
* Updating the jbossesb to 4.3GA version.
* Set property to make sure it won't retry for the deliverSync way.
Added: cdl/trunk/samples/jbossesb/client/lib/commons-codec-1.3.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/samples/jbossesb/client/lib/commons-codec-1.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: cdl/trunk/samples/jbossesb/client/lib/jbossall-client.jar
===================================================================
(Binary files differ)
Modified: cdl/trunk/samples/jbossesb/client/lib/jbossesb-rosetta.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/samples/jbossesb/client/lib/juddi-2.0rc5.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/samples/jbossesb/client/lib/juddi-2.0rc5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: cdl/trunk/samples/jbossesb/client/lib/juddi-client-2.0rc5.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/samples/jbossesb/client/lib/juddi-client-2.0rc5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/samples/jbossesb/client/lib/juddi-client-20071022.191630-6.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/samples/jbossesb/client/lib/wstx-lgpl-3.2.1.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/samples/jbossesb/client/lib/wstx-lgpl-3.2.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java 2008-07-11 19:39:08 UTC (rev 139)
+++ cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java 2008-07-12 17:38:10 UTC (rev 140)
@@ -54,9 +54,10 @@
Message mesg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
mesg.getBody().add(buyReq);
-
+ mesg.getProperties().setProperty("org.jboss.soa.esb.exceptionOnDeliverFailure", "true");
+
try {
- Message reply=brokerInvoker.deliverSync(mesg, 20000);
+ Message reply=brokerInvoker.deliverSync(mesg, 500000);
if (reply != null) {
System.out.println("Reply: "+reply.getBody().get());
@@ -66,6 +67,7 @@
} catch (Exception e) {
logger.error(e);
+ e.printStackTrace();
}
}
Modified: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java 2008-07-11 19:39:08 UTC (rev 139)
+++ cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java 2008-07-12 17:38:10 UTC (rev 140)
@@ -43,6 +43,7 @@
try {
brokerInvoker = new ServiceInvoker("PurchaseGoods.Broker", "Broker.main");
} catch (Exception e) {
+ e.printStackTrace();
throw new RuntimeException("Failed to create ServiceInvoker", e);
}
}
@@ -53,6 +54,7 @@
Message mesg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
mesg.getBody().add(buyReq);
+ mesg.getProperties().setProperty("org.jboss.soa.esb.exceptionOnDeliverFailure", "true");
try {
Message reply=brokerInvoker.deliverSync(mesg, 20000);
@@ -65,6 +67,7 @@
} catch (Exception e) {
logger.error(e);
+ e.printStackTrace();
}
}
15 years, 11 months
- 1
- 0
Overlord SVN: r139 - sam/trunk/src/main/java/org/jboss/sam/simulation.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-07-11 15:39:08 -0400 (Fri, 11 Jul 2008)
New Revision: 139
Modified:
sam/trunk/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java
Log:
while(!terminate())
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-11 19:14:42 UTC (rev 138)
+++ sam/trunk/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java 2008-07-11 19:39:08 UTC (rev 139)
@@ -60,8 +60,7 @@
private double eventRatio;
private InVMDispatcher dispatcher = null;
private SimulationContext context = null;
- private EventMessageFactory factory = null;
- private boolean keepRunning = true;
+ private EventMessageFactory factory = null;
/**
*
@@ -101,7 +100,7 @@
public void run()
{
- while (keepRunning)
+ while (!terminated())
{
try
{
@@ -154,9 +153,7 @@
public void end()
{
- this.resumeProcess();
this.terminate();
- keepRunning = false;
}
15 years, 11 months
- 1
- 0
Overlord SVN: r138 - in sam/trunk: src/main/java/org/jboss/sam/simulation and 1 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)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);
15 years, 11 months
- 1
- 0
Overlord SVN: r137 - in sam/trunk: src/main/java/org/jboss/sam/simulation and 7 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-07-10 15:34:32 -0400 (Thu, 10 Jul 2008)
New Revision: 137
Added:
sam/trunk/src/test/java/org/jboss/test/sam/samples/
sam/trunk/src/test/java/org/jboss/test/sam/samples/pattern/
sam/trunk/src/test/java/org/jboss/test/sam/samples/pattern/LightSwitch.java
sam/trunk/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java
sam/trunk/src/test/resources/samples/
sam/trunk/src/test/resources/samples/pattern/
sam/trunk/src/test/resources/samples/pattern/esper-cfg.xml
Modified:
sam/trunk/SAM.ipr
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/main/java/org/jboss/sam/simulation/Measurement.java
sam/trunk/src/main/java/org/jboss/sam/simulation/SimulationContext.java
sam/trunk/src/test/java/org/jboss/test/sam/simulation/SensorMessageFactory.java
Log:
Move to org.javasim
Modified: sam/trunk/SAM.ipr
===================================================================
--- sam/trunk/SAM.ipr 2008-07-10 14:10:35 UTC (rev 136)
+++ sam/trunk/SAM.ipr 2008-07-10 19:34:32 UTC (rev 137)
@@ -292,8 +292,7 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file:///home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/esper-2.1.0-src.iml" filepath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/esper-2.1.0-src.iml" />
- <module fileurl="file:///home/hbraun/dev/env/JavaSim/core/javasim-core.iml" filepath="/home/hbraun/dev/env/JavaSim/core/javasim-core.iml" group="javasim" />
- <module fileurl="file:///home/hbraun/dev/env/JavaSim/samples/javasim-samples.iml" filepath="/home/hbraun/dev/env/JavaSim/samples/javasim-samples.iml" group="javasim" />
+ <module fileurl="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/javasim-trunk.iml" filepath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/javasim-trunk.iml" group="javasim" />
<module fileurl="file://$PROJECT_DIR$/sam-trunk.iml" filepath="$PROJECT_DIR$/sam-trunk.iml" />
</modules>
</component>
Modified: sam/trunk/SAM.iws
===================================================================
--- sam/trunk/SAM.iws 2008-07-10 14:10:35 UTC (rev 136)
+++ sam/trunk/SAM.iws 2008-07-10 19:34:32 UTC (rev 137)
@@ -17,10 +17,22 @@
</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="$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="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$/src/test/java/org/jboss/test/sam/simulation/SimulationMain.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SimulationMain.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SensorEventMessage.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SensorEventMessage.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java" />
+ <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" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -91,6 +103,86 @@
<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="127" 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="73" 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/main/java/org/jboss/sam/simulation/EventSourceEntity.java" line="146" class="org.jboss.sam.simulation.EventSourceEntity" package="org.jboss.sam.simulation">
+ <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/main/java/org/jboss/sam/simulation/EventSimulation.java" line="198" class="org.jboss.sam.simulation.EventSimulation" package="org.jboss.sam.simulation">
+ <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/main/java/org/jboss/sam/simulation/EventSourceEntity.java" line="101" class="org.jboss.sam.simulation.EventSourceEntity" package="org.jboss.sam.simulation">
+ <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/main/java/org/jboss/sam/simulation/EventSimulation.java" line="205" class="org.jboss.sam.simulation.EventSimulation" package="org.jboss.sam.simulation">
+ <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" />
@@ -162,35 +254,81 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="SimulationMain.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SimulationMain.java">
+ <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="87" column="40" selection-start="1389" selection-end="3318" vertical-scroll-proportion="0.86540735">
+ <state line="127" column="0" selection-start="3924" selection-end="3924" vertical-scroll-proportion="1.7125307">
<folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <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="91" column="30" selection-start="3145" selection-end="3145" vertical-scroll-proportion="0.95513576">
+ <state line="138" column="32" selection-start="4479" selection-end="4479" vertical-scroll-proportion="0.7039312">
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="146" column="18" selection-start="4214" selection-end="4214" vertical-scroll-proportion="0.76960194">
+ <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">
+ <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="484" column="70" selection-start="12623" selection-end="12623" vertical-scroll-proportion="0.2110977">
+ <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">
+ <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>
</provider>
</entry>
</file>
- <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">
+ <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="32" column="62" selection-start="1308" selection-end="1308" vertical-scroll-proportion="0.26918536">
+ <state line="278" column="40" selection-start="7427" selection-end="7427" vertical-scroll-proportion="5.59228">
<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="28" column="26" selection-start="1197" selection-end="1197" vertical-scroll-proportion="0.13751508">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -232,7 +370,137 @@
<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="sam-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="sam-trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="samples.pattern" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </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="sam-trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss.test.sam" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </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="sam-trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss.test.sam" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="simulation" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </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="sam-trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss.test.sam" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="samples.pattern" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </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="sam-trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss.sam" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </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="sam-trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org.jboss.sam" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="simulation" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </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>
+ <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_ELEMENT>
+ <option name="myItemId" value="javasim-samples" />
+ <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">
@@ -322,10 +590,6 @@
<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/resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -349,13 +613,25 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources" />
+ <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/resources/simulation" />
+ <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>
<PATH>
<PATH_ELEMENT>
@@ -383,43 +659,29 @@
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" />
<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="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" />
+ <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" />
+ <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" />
+ <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>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern" />
<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>
@@ -439,7 +701,7 @@
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -464,6 +726,22 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/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/main/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/main/java/org/jboss/sam" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -491,9 +769,21 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/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/main/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/main/java/org/jboss/sam" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -501,6 +791,38 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</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>
+ <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>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -512,27 +834,43 @@
<showMembers />
<showModules />
<showLibraryContents />
- <hideEmptyPackages />
+ <hideEmptyPackages ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure ProjectPane="false" PackagesPane="false" Scope="false" Favorites="false" />
+ <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
</navigator>
</component>
<component name="PropertiesComponent">
- <property name="GenerateAntBuildDialog.enableUiFormCompile" value="true" />
- <property name="GoToFile.includeJavaFiles" value="false" />
- <property name="GoToClass.toSaveIncludeLibraries" value="false" />
- <property name="RunManagerConfig.compileBeforeRunning" value="false" />
+ <property name="cvs_file_history_treeOrder2" value="2" />
+ <property name="cvs_file_history_treeOrder1" value="1" />
<property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
+ <property name="cvs_file_history_treeOrder3" value="3" />
<property name="GenerateAntBuildDialog.generateSingleFile" value="false" />
<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="MemberChooser.showClasses" value="true" />
- <property name="GenerateAntBuildDialog.backupFiles" value="true" />
+ <property name="cvs_file_history_flatWidth3" value="397" />
+ <property name="cvs_file_history_treeOrder0" value="0" />
+ <property name="cvs_file_history_flatWidth0" value="398" />
+ <property name="GoToClass.includeLibraries" value="false" />
+ <property name="cvs_file_history_flatWidth1" value="397" />
+ <property name="GoToFile.includeJavaFiles" value="false" />
+ <property name="RunManagerConfig.compileBeforeRunning" value="false" />
+ <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="cvs_file_history_flatOrder1" value="1" />
<property name="GenerateAntBuildDialog.forceTargetJdk" value="true" />
- <property name="GoToClass.includeLibraries" value="false" />
<property name="MemberChooser.copyJavadoc" value="false" />
+ <property name="GenerateAntBuildDialog.backupFiles" value="true" />
</component>
<component name="ReadonlyStatusHandler">
<option name="SHOW_DIALOG" value="true" />
@@ -553,26 +891,27 @@
</key>
</component>
<component name="RestoreUpdateTree" />
- <component name="RunManager" selected="Application.SimulationMain">
- <tempConfiguration default="false" name="SimulationMain" type="Application" factoryName="Application" enabled="false" merge="false">
- <option name="MAIN_CLASS_NAME" value="org.jboss.test.sam.simulation.SimulationMain" />
+ <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.*" />
+ <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="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
+ <option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <module name="sam-trunk" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="32888" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
<RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method>
- <option name="Make" value="true" />
+ <option name="Make" value="false" />
</method>
</tempConfiguration>
<configuration default="true" type="Applet" factoryName="Applet">
@@ -587,6 +926,13 @@
<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" />
@@ -600,13 +946,6 @@
<option name="Make" value="true" />
</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="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -623,7 +962,7 @@
<value defaultName="wholeProject" />
</option>
<method>
- <option name="Make" value="true" />
+ <option name="Make" value="false" />
</method>
</configuration>
<configuration default="false" name="client" type="Remote" factoryName="Remote">
@@ -642,6 +981,34 @@
<option name="Make" value="true" />
</method>
</configuration>
+ <configuration default="false" name="PatternTestCase.testDetectLightSwitchFailure" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+ <pattern value="org.jboss.test.sam.samples.pattern.*" />
+ <module name="sam-trunk" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" value="" />
+ <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" value="testDetectLightSwitchFailure" />
+ <option name="TEST_OBJECT" value="method" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="33254" />
+ <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>
+ </configuration>
<configuration name="<template>" type="WebApp" default="true" selected="false">
<Host>localhost</Host>
<Port>5050</Port>
@@ -722,18 +1089,18 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-3" y="25" width="1686" height="1003" extended-state="6" />
+ <frame x="0" y="25" width="1680" height="1000" 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.55580866" 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="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.33" order="8" />
+ <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" />
@@ -743,10 +1110,10 @@
<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.27774373" order="0" />
+ <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="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.4692483" order="2" />
+ <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="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" />
@@ -767,7 +1134,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" />
+ <option name="LAST_COMMIT_MESSAGE" value="javadocs" />
<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" />
@@ -780,6 +1147,9 @@
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+ <MESSAGE value="fix ratio nonsense" />
+ <MESSAGE value="Added ratio constraint assertion" />
+ <MESSAGE value="javadocs" />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@@ -825,123 +1195,172 @@
<component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
- <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667" version="1">
+ <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667,0.5" version="1">
<option name="myPlainMode" value="false" />
- <option name="myLastEditedConfigurable" value="Modules" />
+ <option name="myLastEditedConfigurable" value="sam-trunk" />
</component>
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="0.16666667" version="1">
<option name="myLastEditedConfigurable" value="IDE Profiles" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java">
+ <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="59" column="13" selection-start="2120" selection-end="2120" vertical-scroll-proportion="0.33293125">
- <folding />
+ <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="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/ChartGenerationHandler.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="50" column="6" selection-start="1949" selection-end="1949" vertical-scroll-proportion="0.4571773">
+ <state line="685" column="22" selection-start="27497" selection-end="27497" vertical-scroll-proportion="0.33293125">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/ContextAwareEntity.java">
+ <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="17" selection-start="1180" selection-end="1180" vertical-scroll-proportion="0.1794569">
+ <state line="6" column="21" selection-start="386" selection-end="386" vertical-scroll-proportion="0.14004914">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSinkHandler.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/SimulationContext.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="0" selection-start="1360" selection-end="1360" vertical-scroll-proportion="0.32086852">
+ <state line="84" column="36" selection-start="2692" selection-end="2692" vertical-scroll-proportion="0.8154403">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventMessageFactory.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SensorMessageFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="0" selection-start="1309" selection-end="1309" vertical-scroll-proportion="0.27503017">
- <folding />
+ <state line="25" column="101" selection-start="1221" selection-end="1221" vertical-scroll-proportion="0.1145959">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/stream/InVMDispatcher.java">
+ <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="31" column="3" selection-start="1272" selection-end="1272" vertical-scroll-proportion="0.252111">
+ <state line="28" column="26" selection-start="1197" selection-end="1197" vertical-scroll-proportion="0.13751508">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/Measurement.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="27" column="37" selection-start="1160" selection-end="1160" vertical-scroll-proportion="0.16043426">
+ <state line="278" column="40" selection-start="7427" selection-end="7427" vertical-scroll-proportion="5.59228">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/SimulationContext.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="53" column="19" selection-start="1941" selection-end="1941" vertical-scroll-proportion="0.13027744">
+ <state line="146" column="18" selection-start="4214" selection-end="4214" vertical-scroll-proportion="0.76960194">
<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/SimulationProcess.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="119" column="45" selection-start="3754" selection-end="3754" vertical-scroll-proportion="0.15199035">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="484" column="70" selection-start="12623" selection-end="12623" vertical-scroll-proportion="0.2110977">
+ <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/main/java/org/javasim/SimulationEntity.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="13" selection-start="1329" selection-end="1329" vertical-scroll-proportion="0.27503017">
- <folding>
- <element signature="imports" expanded="true" />
- </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="57" column="28" selection-start="2531" selection-end="2531" vertical-scroll-proportion="0.5041322">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SimulationMain.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="87" column="40" selection-start="1389" selection-end="3318" vertical-scroll-proportion="0.86540735">
+ <state line="82" column="34" selection-start="2755" selection-end="2755" vertical-scroll-proportion="0.048250906">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SensorEventMessage.java">
+ <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="32" column="62" selection-start="1308" selection-end="1308" vertical-scroll-proportion="0.26918536">
+ <state line="127" column="0" selection-start="3924" selection-end="3924" vertical-scroll-proportion="1.7125307">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="37" column="73" selection-start="1380" selection-end="1380" vertical-scroll-proportion="0.52884614">
+ <state line="138" column="32" selection-start="4479" selection-end="4479" vertical-scroll-proportion="0.7039312">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.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="91" column="30" selection-start="3145" selection-end="3145" vertical-scroll-proportion="0.95513576">
+ <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>
</provider>
Modified: sam/trunk/pom.xml
===================================================================
--- sam/trunk/pom.xml 2008-07-10 14:10:35 UTC (rev 136)
+++ sam/trunk/pom.xml 2008-07-10 19:34:32 UTC (rev 137)
@@ -21,7 +21,7 @@
<antlr.version>3.0.1</antlr.version>
<jfree.version>1.0.0</jfree.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
- <javasim.version>1.0</javasim.version>
+ <javasim.version>2.0-hbraun</javasim.version>
</properties>
<!-- Dependencies -->
@@ -65,7 +65,7 @@
<dependency>
<groupId>javasim</groupId>
- <artifactId>javasim-core</artifactId>
+ <artifactId>javasim</artifactId>
<version>${javasim.version}</version>
</dependency>
@@ -136,6 +136,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <forkMode>pertest</forkMode>
<argLine>${surefire.jvm.args}</argLine>
</configuration>
</plugin>
Modified: sam/trunk/sam-trunk.iml
===================================================================
--- sam/trunk/sam-trunk.iml 2008-07-10 14:10:35 UTC (rev 136)
+++ sam/trunk/sam-trunk.iml 2008-07-10 19:34:32 UTC (rev 137)
@@ -11,6 +11,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="javasim-trunk" />
<orderEntry type="module-library">
<library name="M2 Dep: jfree:jfreechart:jar:1.0.0:compile">
<CLASSES>
@@ -84,9 +85,9 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: javasim:javasim-core:jar:1.0:compile">
+ <library name="M2 Dep: javasim:javasim:jar:2.0-hbraun:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/javasim/javasim-core/1.0/javasim-core-1.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/javasim/javasim/2.0-hbraun/javasim-2.0-hbraun.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
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 14:10:35 UTC (rev 136)
+++ sam/trunk/src/main/java/org/jboss/sam/simulation/EventSimulation.java 2008-07-10 19:34:32 UTC (rev 137)
@@ -21,8 +21,7 @@
*/
package org.jboss.sam.simulation;
-import arjuna.JavaSim.Simulation.Scheduler;
-import arjuna.JavaSim.Simulation.SimulationProcess;
+import org.javasim.*;
import com.espertech.esper.client.UnmatchedListener;
import com.espertech.esper.event.EventBean;
import org.jboss.sam.EventProcessor;
@@ -31,6 +30,7 @@
import org.jboss.sam.internal.esper.EsperRuntimeImpl;
import org.jboss.sam.internal.stream.InVMStreamInput;
import org.jboss.sam.internal.stream.InVMDispatcher;
+import org.javasim.Scheduler;
import java.net.URL;
import java.util.ArrayList;
@@ -142,8 +142,20 @@
{
takeControl();
}
+
+ public void done()
+ {
+ this.terminate();
+ try
+ {
+ Scheduler.reset();
+ } catch (SimulationException e)
+ {
+ e.printStackTrace();
+ }
+ }
- public void begin()
+ private void begin()
{
for(EventSinkEntity sink : eventSinks)
{
@@ -151,12 +163,12 @@
}
for(EventSourceEntity source : eventSources)
- {
+ {
source.begin();
}
}
- public void end()
+ private void end()
{
for(EventSinkEntity sink : eventSinks)
{
@@ -186,11 +198,9 @@
// begin
begin();
Scheduler.startSimulation();
-
+
Double totalSimTime = (Double) context.getConfig(EventSimulation.TOTAL_SIM_TIME);
- double end = Scheduler.CurrentTime()+ totalSimTime;
- while(Scheduler.CurrentTime()<end)
- Hold(totalSimTime+1);
+ hold(totalSimTime);
// cleanup
Scheduler.stopSimulation();
@@ -211,7 +221,7 @@
*/
private void takeControl()
{
- this.Resume();
+ this.resumeProcess();
SimulationProcess.mainSuspend();
}
@@ -223,7 +233,7 @@
try
{
SimulationProcess.mainResume();
- Suspend();
+ this.suspendProcess();
} catch (Exception e)
{
e.printStackTrace();
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 14:10:35 UTC (rev 136)
+++ sam/trunk/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java 2008-07-10 19:34:32 UTC (rev 137)
@@ -21,9 +21,9 @@
*/
package org.jboss.sam.simulation;
-import arjuna.JavaSim.Simulation.RestartException;
-import arjuna.JavaSim.Simulation.SimulationException;
-import arjuna.JavaSim.Simulation.SimulationEntity;
+import org.javasim.RestartException;
+import org.javasim.SimulationException;
+import org.javasim.SimulationEntity;
import org.jboss.sam.internal.stream.InVMDispatcher;
/**
@@ -101,7 +101,7 @@
{
double totalSim = (Double) context.getConfig(EventSimulation.TOTAL_SIM_TIME);
double holdTime = (totalSim*eventRatio);
- Wait(holdTime);
+ hold(holdTime);
}
catch (SimulationException e)
{
@@ -109,8 +109,6 @@
catch (RestartException e)
{
}
- catch(InterruptedException e)
- {}
if(null==context)
@@ -128,12 +126,12 @@
}
}
-
+
public void begin()
{
try
{
- super.Activate();
+ this.activate();
} catch (SimulationException e)
{
e.printStackTrace();
@@ -146,7 +144,7 @@
public void end()
{
- super.terminate();
+ this.terminate();
}
Modified: sam/trunk/src/main/java/org/jboss/sam/simulation/Measurement.java
===================================================================
--- sam/trunk/src/main/java/org/jboss/sam/simulation/Measurement.java 2008-07-10 14:10:35 UTC (rev 136)
+++ sam/trunk/src/main/java/org/jboss/sam/simulation/Measurement.java 2008-07-10 19:34:32 UTC (rev 137)
@@ -64,4 +64,10 @@
this.current -= 1;
return this.current;
}
+
+
+ public String toString()
+ {
+ return String.valueOf(getCurrent());
+ }
}
Modified: sam/trunk/src/main/java/org/jboss/sam/simulation/SimulationContext.java
===================================================================
--- sam/trunk/src/main/java/org/jboss/sam/simulation/SimulationContext.java 2008-07-10 14:10:35 UTC (rev 136)
+++ sam/trunk/src/main/java/org/jboss/sam/simulation/SimulationContext.java 2008-07-10 19:34:32 UTC (rev 137)
@@ -21,7 +21,7 @@
*/
package org.jboss.sam.simulation;
-import arjuna.JavaSim.Simulation.Scheduler;
+import org.javasim.Scheduler;
import java.util.HashMap;
import java.util.Map;
@@ -82,6 +82,6 @@
public double getCurrentSimulationTime()
{
- return Scheduler.CurrentTime();
+ return Scheduler.currentTime();
}
}
Added: sam/trunk/src/test/java/org/jboss/test/sam/samples/pattern/LightSwitch.java
===================================================================
--- sam/trunk/src/test/java/org/jboss/test/sam/samples/pattern/LightSwitch.java (rev 0)
+++ sam/trunk/src/test/java/org/jboss/test/sam/samples/pattern/LightSwitch.java 2008-07-10 19:34:32 UTC (rev 137)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.sam.samples.pattern;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public final class LightSwitch
+{
+ boolean enabled;
+
+ public LightSwitch(boolean enabled)
+ {
+ this.enabled = enabled;
+ }
+
+ public boolean getEnabled()
+ {
+ return enabled;
+ }
+
+
+ public String toString()
+ {
+ return "LightSwitch{enabled="+this.enabled+"}";
+ }
+}
Property changes on: sam/trunk/src/test/java/org/jboss/test/sam/samples/pattern/LightSwitch.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: 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 (rev 0)
+++ sam/trunk/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java 2008-07-10 19:34:32 UTC (rev 137)
@@ -0,0 +1,188 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.sam.samples.pattern;
+
+import junit.framework.TestCase;
+import org.jboss.sam.EventMessage;
+import org.jboss.sam.simulation.*;
+
+import java.util.Properties;
+
+/**
+ * Use the simulation API to test pattern detection
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class PatternTestCase extends TestCase
+{
+
+ EventSimulation simulation;
+ SimulationContext context;
+
+ EventSourceEntity source;
+ EventSinkEntity sink;
+
+ protected void setUp() throws Exception
+ {
+ // config
+ Properties config = new Properties();
+ config.put(EventSimulation.TOTAL_SIM_TIME, 60.00);
+
+ // init
+ simulation = EventSimulation.bootstrap(
+ config,
+ Thread.currentThread().getContextClassLoader().getResource("samples/pattern/esper-cfg.xml")
+ );
+
+ // shared between all entities
+ context = simulation.getContext();
+
+ // create an event source and sink
+ source = new EventSourceEntity("LightSwitch", 0.10);
+ sink = new EventSinkEntity("LightMonitor");
+
+ }
+
+ protected void tearDown() throws Exception
+ {
+ simulation.done();
+ System.out.println("Done");
+ }
+
+ public void testRegularLightSwitch()
+ {
+ // associate a source factory
+ source.setEventMessageFactory(
+ new EventMessageFactory()
+ {
+ private boolean lastState;
+
+ public Object createEventMessage(SimulationContext context)
+ {
+ context.getMeasurement("dispatched").increment();
+ LightSwitch message = new LightSwitch(lastState);
+ lastState = !lastState;
+ return message;
+ }
+ }
+ );
+
+ // associate a sink handler
+ sink.setEventHandler(
+ new EventSinkHandler()
+ {
+ public void handle(EventMessage[] events, SimulationContext context)
+ {
+ context.getMeasurement("processed").increment();
+ context.addAttachment(EventMessage.class, events[0]);
+ }
+ }
+ );
+
+ simulation.addSource(source);
+ simulation.addSink(sink);
+
+ // forward single event messages
+ simulation.bindStatement("select B.* from pattern [every (A=LightSwitch(enabled=true) -> B=LightSwitch(enabled=false))]", sink);
+
+ // start simulation
+ simulation.singleRun();
+
+ // display status
+ printStatus();
+
+ // evaluate results
+ EventMessage lastEventMessage = context.getAttachment(EventMessage.class);
+ assertNotNull(lastEventMessage);
+ assertEquals(false, lastEventMessage.getProperty("enabled"));
+ }
+
+ private void printStatus()
+ {
+ System.out.println("Dispatched: "+context.getMeasurement("dispatched"));
+ System.out.println("Processed: "+context.getMeasurement("processed"));
+ }
+
+ public void testDetectLightSwitchFailure()
+ {
+ // associate a source factory
+ source.setEventMessageFactory(
+ new EventMessageFactory()
+ {
+ private boolean lastState;
+
+ public Object createEventMessage(SimulationContext context)
+ {
+ LightSwitch message = null;
+
+ double d = context.getMeasurement("dispatched").getCurrent();
+ if(d!=3)
+ {
+ // create a regular light switch condition
+ message = new LightSwitch(lastState);
+ }
+ else
+ {
+ // create an error condition: two times same enabled value
+ message = new LightSwitch(!lastState);
+ }
+
+ lastState = !lastState;
+ context.getMeasurement("dispatched").increment();
+ return message;
+ }
+ }
+ );
+
+ // associate a sink handler
+ sink.setEventHandler(
+ new EventSinkHandler()
+ {
+ public void handle(EventMessage[] events, SimulationContext context)
+ {
+ context.getMeasurement("processed").increment();
+ context.addAttachment(EventMessage.class, events[0]);
+ }
+ }
+ );
+
+ simulation.addSource(source);
+ simulation.addSink(sink);
+
+ // forward single event messages
+ simulation.bindStatement("select A.enabled as firstEnabled, B.enabled as secondEnabled "+
+ "from pattern [every (A=LightSwitch(enabled=false) -> B=LightSwitch(enabled=false))]", sink);
+
+ // start simulation
+ simulation.singleRun();
+
+ // display status
+ printStatus();
+
+ // evaluate results
+ EventMessage lastEventMessage = context.getAttachment(EventMessage.class);
+ assertNotNull(lastEventMessage);
+ assertEquals(false, lastEventMessage.getProperty("firstEnabled"));
+ assertEquals(false, lastEventMessage.getProperty("secondEnabled"));
+
+ }
+}
Property changes on: sam/trunk/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: sam/trunk/src/test/java/org/jboss/test/sam/simulation/SensorMessageFactory.java
===================================================================
--- sam/trunk/src/test/java/org/jboss/test/sam/simulation/SensorMessageFactory.java 2008-07-10 14:10:35 UTC (rev 136)
+++ sam/trunk/src/test/java/org/jboss/test/sam/simulation/SensorMessageFactory.java 2008-07-10 19:34:32 UTC (rev 137)
@@ -21,9 +21,9 @@
*/
package org.jboss.test.sam.simulation;
-import arjuna.JavaSim.Distributions.ExponentialStream;
import org.jboss.sam.simulation.EventMessageFactory;
import org.jboss.sam.simulation.SimulationContext;
+import org.javasim.streams.ExponentialStream;
import java.io.IOException;
Added: sam/trunk/src/test/resources/samples/pattern/esper-cfg.xml
===================================================================
--- sam/trunk/src/test/resources/samples/pattern/esper-cfg.xml (rev 0)
+++ sam/trunk/src/test/resources/samples/pattern/esper-cfg.xml 2008-07-10 19:34:32 UTC (rev 137)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Sample configuration file.
+-->
+<esper-configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://www.espertech.com/schema/esper"
+ xsi:noNamespaceSchemaLocation="esper-configuration-2-0.xsd">
+
+ <!--
+ Adds a Java package name of a package that Java event classes reside in.
+ This setting allows an application to place all it's events into one or more Java packages
+ and then declare these packages.
+ The engine attempts to resolve an event type alias to a Java class residing in each declared package.
+ -->
+ <event-type-auto-alias package-name="org.jboss.test.sam.samples.pattern"/>
+
+ <!--
+ Sample engine settings
+ -->
+ <engine-settings>
+ <defaults>
+ <threading>
+ <!--
+ In multithreaded environments, this setting controls whether dispatches to listeners
+ preserve the ordering in which the statement processes events
+ -->
+ <listener-dispatch preserve-order="true" timeout-msec="1000" locking="spin"/>
+ <!--
+ In multithreaded environments, this setting controls whether insert-into streams
+ preserve the order of events inserted into them by one or more statements,
+ allowing statements that consume other statement's events to behave deterministic.
+ -->
+ <insert-into-dispatch preserve-order="true" timeout-msec="100" locking="spin"/>
+ <!-- These settings define the resolution of the internal timer thread,
+ and can disable the timer to indicate that the application supplies the timer events
+ -->
+ <internal-timer enabled="true" msec-resolution="100"/>
+ </threading>
+ <event-meta>
+ <!--
+ Lets configure the engine to use case-insensitive resolution for event properties
+ -->
+ <class-property-resolution style="distinct_case_insensitive"/>
+ </event-meta>
+ <view-resources>
+ <!--
+ Lets configure the engine to reuse views, which is the default but can introduce additional locking
+ -->
+ <share-views enabled="true"/>
+ </view-resources>
+ <logging>
+ <!--
+ By default the engine does not generate logging through Log4j of the event processing execution path.
+ To get debug output, set this flag to true. This setting translates into a static boolean flag
+ and thus may apply to multiple engine instances within a given VM.
+ -->
+ <execution-path enabled="false" />
+ </logging>
+ <stream-selection>
+ <!--
+ By default the engine generates output for the insert stream only, and not for the remove stream.
+ To obtain output for remove stream only, or for insert stream and remove stream,
+ there are keywords "rstream" and "irstream" for use in the select clause.
+ This setting controls the default behavior, if no keyword is specified in the select-clause by statements.
+ -->
+ <stream-selector value="irstream" />
+ </stream-selection>
+ <time-source>
+ <!--
+ By default the time source is System.currentTimeMillis.
+ This sample configures the nano-second time call System.nanoTime() as the time source,
+ which Esper adjusts for wall clock time.
+ -->
+ <time-source-type value="nano" />
+ </time-source>
+ </defaults>
+ </engine-settings>
+
+</esper-configuration>
Property changes on: sam/trunk/src/test/resources/samples/pattern/esper-cfg.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 11 months
- 1
- 0
Overlord SVN: r136 - sam/trunk/src/main/java/org/jboss/sam/simulation.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-07-10 10:10:35 -0400 (Thu, 10 Jul 2008)
New Revision: 136
Modified:
sam/trunk/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java
Log:
javadocs
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 14:01:32 UTC (rev 135)
+++ sam/trunk/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java 2008-07-10 14:10:35 UTC (rev 136)
@@ -49,11 +49,7 @@
*
* <br>
* <b>Event ratio</b><br>
- * Specifies the ratio with regard to the total simulation time:
- * <ul>
- * <li>1.00: A single event per simulation
- * <li>0.01: An event per each simulation time sample
- * </ul>
+ * Specifies the ratio with regard to the total simulation time (between 0.01-1)
*
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
@@ -105,7 +101,7 @@
{
double totalSim = (Double) context.getConfig(EventSimulation.TOTAL_SIM_TIME);
double holdTime = (totalSim*eventRatio);
- Hold(holdTime);
+ Wait(holdTime);
}
catch (SimulationException e)
{
@@ -113,6 +109,9 @@
catch (RestartException e)
{
}
+ catch(InterruptedException e)
+ {}
+
if(null==context)
throw new IllegalStateException("Simulation context not set");
15 years, 11 months
- 1
- 0