Author: heiko.braun(a)jboss.com Date: 2009-07-29 05:37:37 -0400 (Wed, 29 Jul 2009) New Revision: 685 Modified: sam/trunk/SAMM.iws sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamInput.java sam/trunk/modules/core/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java sam/trunk/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java sam/trunk/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java sam/trunk/modules/sim/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java Log: Fxi compilation errors Modified: sam/trunk/SAMM.iws =================================================================== --- sam/trunk/SAMM.iws 2009-07-29 09:31:22 UTC (rev 684) +++ sam/trunk/SAMM.iws 2009-07-29 09:37:37 UTC (rev 685) @@ -18,20 +18,13 @@ <component name="ChangeListManager"> <list default="true" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAMM.iws" afterPath="$PROJECT_DIR$/SAMM.iws" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/twitter.iml" afterPath="$PROJECT_DIR$/modules/examples/twitter/twitter.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAMM.ipr" afterPath="$PROJECT_DIR$/SAMM.ipr" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/common/ComponentLifecycle.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamOutput.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamOutput.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/util" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/sim.iml" afterPath="$PROJECT_DIR$/modules/sim/sim.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamInput.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamInput.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/util" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/cvt" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/util/CurrentValueTable.java" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/common" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/toplevel.iml" afterPath="$PROJECT_DIR$/toplevel.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/core.iml" afterPath="$PROJECT_DIR$/modules/core/core.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java" afterPath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamInput.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamInput.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java" afterPath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -197,42 +190,87 @@ </provider> </entry> </file> - <file leaf-file-name="Main.java" pinned="false" current="true" current-in-tab="true"> + <file leaf-file-name="Main.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="102" column="19" selection-start="2861" selection-end="2861" vertical-scroll-proportion="0.21375921"> + <state line="119" column="51" selection-start="3180" selection-end="3180" vertical-scroll-proportion="0.5479115"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="StreamInput.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamInput.java"> + <file leaf-file-name="InVMStreamInput.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamInput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="55" selection-start="1465" selection-end="1465" vertical-scroll-proportion="0.23160434"> + <state line="62" column="55" selection-start="1821" selection-end="1821" vertical-scroll-proportion="0.6755127"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ComponentLifecycle.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/common/ComponentLifecycle.java"> + <file leaf-file-name="BufferedStreamOutput.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="22" selection-start="1211" selection-end="1211" vertical-scroll-proportion="0.23160434"> + <state line="36" column="13" selection-start="1359" selection-end="1359" vertical-scroll-proportion="0.19300362"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="StreamOutput.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamOutput.java"> + <file leaf-file-name="BufferedStreamOutput.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="56" selection-start="1382" selection-end="1408" vertical-scroll-proportion="0.23160434"> + <state line="70" column="53" selection-start="2050" selection-end="2050" vertical-scroll-proportion="0.65621233"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="SearchInput.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="161" column="25" selection-start="4106" selection-end="4106" vertical-scroll-proportion="0.82629675"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="CVTOutput.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="50" column="14" selection-start="1668" selection-end="1668" vertical-scroll-proportion="0.54041016"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SamTestSetup.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="66" column="53" selection-start="2567" selection-end="2567" vertical-scroll-proportion="0.57002455"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="EventSinkEntity.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="69" column="58" selection-start="2358" selection-end="2358" vertical-scroll-proportion="0.64742017"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ApiTestCase.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/drools/ApiTestCase.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="30" column="13" selection-start="1243" selection-end="1243" vertical-scroll-proportion="0.19656019"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -759,13 +797,13 @@ </component> <component name="ToolWindowManager"> <frame x="373" y="46" width="1293" height="976" extended-state="0" /> - <editor active="false" /> + <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.32922825" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="14" /> <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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.329582" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.329582" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32423207" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2454844" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32946634" order="9" /> @@ -777,7 +815,7 @@ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="11" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5812065" order="2" /> <window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="12" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24862313" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24839228" order="2" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39559165" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> @@ -869,109 +907,109 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/modules/sim/src/test/resources/simulation/sam-cfg.xml"> + <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="6" column="58" selection-start="315" selection-end="320" vertical-scroll-proportion="0.1182266"> - <folding /> + <state line="77" column="48" selection-start="2587" selection-end="2587" vertical-scroll-proportion="0.3927227"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/pom.xml"> + <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.20075282"> + <state line="71" column="63" selection-start="2288" selection-end="2288" vertical-scroll-proportion="0.78624076"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/cvt/CurrentValueTable.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/common/ComponentLifecycle.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="57" column="57" selection-start="1654" selection-end="1654" vertical-scroll-proportion="0.6699507"> + <state line="32" column="22" selection-start="1211" selection-end="1211" vertical-scroll-proportion="0.23160434"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/examples/twitter/pom.xml"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamOutput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="36" selection-start="1102" selection-end="1102" vertical-scroll-proportion="0.6624843"> + <state line="32" column="56" selection-start="1382" selection-end="1408" vertical-scroll-proportion="0.23160434"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamInput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="12" column="0" selection-start="367" selection-end="367" vertical-scroll-proportion="0.2364532"> + <state line="32" column="55" selection-start="1465" selection-end="1465" vertical-scroll-proportion="0.23160434"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="42" column="25" selection-start="967" selection-end="967" vertical-scroll-proportion="0.8431619"> + <state line="76" column="29" selection-start="2257" selection-end="2257" vertical-scroll-proportion="0.6486486"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java"> + <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="64" column="0" selection-start="1871" selection-end="1871" vertical-scroll-proportion="0.5073892"> + <state line="119" column="51" selection-start="3180" selection-end="3180" vertical-scroll-proportion="0.5479115"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamInput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="77" column="48" selection-start="2587" selection-end="2587" vertical-scroll-proportion="0.3927227"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="62" column="55" selection-start="1821" selection-end="1821" vertical-scroll-proportion="0.6755127"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/drools/ApiTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="78" column="42" selection-start="2313" selection-end="2313" vertical-scroll-proportion="0.3546798"> + <state line="30" column="13" selection-start="1243" selection-end="1243" vertical-scroll-proportion="0.19656019"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="71" column="63" selection-start="2288" selection-end="2288" vertical-scroll-proportion="0.78624076"> + <state line="66" column="53" selection-start="2567" selection-end="2567" vertical-scroll-proportion="0.57002455"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/common/ComponentLifecycle.java"> + <entry file="file://$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="22" selection-start="1211" selection-end="1211" vertical-scroll-proportion="0.23160434"> + <state line="69" column="58" selection-start="2358" selection-end="2358" vertical-scroll-proportion="0.64742017"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamOutput.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="56" selection-start="1382" selection-end="1408" vertical-scroll-proportion="0.23160434"> + <state line="36" column="13" selection-start="1359" selection-end="1359" vertical-scroll-proportion="0.19300362"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamInput.java"> + <entry file="file://$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="55" selection-start="1465" selection-end="1465" vertical-scroll-proportion="0.23160434"> + <state line="70" column="53" selection-start="2050" selection-end="2050" vertical-scroll-proportion="0.65621233"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java"> + <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="76" column="29" selection-start="2257" selection-end="2257" vertical-scroll-proportion="0.6486486"> + <state line="161" column="25" selection-start="4106" selection-end="4106" vertical-scroll-proportion="0.82629675"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java"> + <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="102" column="19" selection-start="2861" selection-end="2861" vertical-scroll-proportion="0.21375921"> + <state line="50" column="14" selection-start="1668" selection-end="1668" vertical-scroll-proportion="0.54041016"> <folding /> </state> </provider> Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamInput.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamInput.java 2009-07-29 09:31:22 UTC (rev 684) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamInput.java 2009-07-29 09:37:37 UTC (rev 685) @@ -46,23 +46,21 @@ this.channelRegistry = InVMStreamRegistry.getInstance(); } - public StreamInput start() + public void start() { - this.started = true; - return this; + this.started = true; } - public StreamInput stop() + public void stop() { this.started = false; - return this; } public boolean isStarted() { return this.started; } - + public String getStreamName() { return this.streamName; Modified: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java =================================================================== --- sam/trunk/modules/core/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java 2009-07-29 09:31:22 UTC (rev 684) +++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java 2009-07-29 09:37:37 UTC (rev 685) @@ -62,16 +62,14 @@ } - public BufferedStreamOutput start() + public void start() { this.started = true; - return this; } - public BufferedStreamOutput stop() + public void stop() { - this.started = false; - return this; + this.started = false; } public boolean isStarted() Modified: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java =================================================================== --- sam/trunk/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java 2009-07-29 09:31:22 UTC (rev 684) +++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java 2009-07-29 09:37:37 UTC (rev 685) @@ -34,77 +34,78 @@ /** * Basic SAM test skeleton. Test cases should derive from this class. - * + * * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ public abstract class SamTestSetup extends TestCase { - protected ActivityMonitor runtime; - protected EventProcessor eventProcessor; - protected StreamInput streamInput; - protected BufferedStreamOutput bufferedOutput; - private InVMDispatcher dispatcher; + protected ActivityMonitor runtime; + protected EventProcessor eventProcessor; + protected StreamInput streamInput; + protected BufferedStreamOutput bufferedOutput; + private InVMDispatcher dispatcher; - /** - * Constructs a {@link org.jboss.sam.EventProcessor} for a given name - * and assigns default adapter input's and output's. - * - * @see org.jboss.sam.internal.stream.InVMStreamInput - * @see org.jboss.test.sam.BufferedStreamOutput - * - * @param name the runtime name - * @param configFile name of the esper-config file relative to test execution - */ - public void createProcessor(String name, String configFile) - { - assert configFile!=null : "No configFile!"; - - // Main runtime - URL config = loadTestConfiguration(configFile); - Configuration configuration = new Configuration( ConfigFactory.newInstance().unmarshall(config) ); + /** + * Constructs a {@link org.jboss.sam.EventProcessor} for a given name + * and assigns default adapter input's and output's. + * + * @see org.jboss.sam.internal.stream.InVMStreamInput + * @see org.jboss.test.sam.BufferedStreamOutput + * + * @param name the runtime name + * @param configFile name of the esper-config file relative to test execution + */ + public void createProcessor(String name, String configFile) + { + assert configFile!=null : "No configFile!"; - runtime = ActivityMonitorFactory.newInstance().createMonitor(configuration); - eventProcessor = runtime.getEventProcessor(); + // Main runtime + URL config = loadTestConfiguration(configFile); + Configuration configuration = new Configuration( ConfigFactory.newInstance().unmarshall(config) ); - // Stream input and output - streamInput = new InVMStreamInput("in-channel").start(); - dispatcher = new InVMDispatcher(streamInput.getStreamName()); + runtime = ActivityMonitorFactory.newInstance().createMonitor(configuration); + eventProcessor = runtime.getEventProcessor(); - bufferedOutput = new BufferedStreamOutput("out-channel").start(); - eventProcessor.addInput(streamInput); - eventProcessor.addOutput(bufferedOutput); - } + // Stream input and output + streamInput = new InVMStreamInput("in-channel"); + dispatcher = new InVMDispatcher(streamInput.getStreamName()); - /** - * Creates an in memory database. Make sure to shutdown the database in {@link #tearDown()} - * @return pointer to an in memory database - */ - protected InMemoryDatabase createDatabase() - { - InMemoryDatabase inMemoryDB = new InMemoryDatabase(); - System.out.println("Database has been setup: " + inMemoryDB); - return inMemoryDB; - } + bufferedOutput = new BufferedStreamOutput("out-channel"); + eventProcessor.addInput(streamInput); + eventProcessor.addOutput(bufferedOutput); - protected InMemoryDatabase createDatabase(DataSource dataSource) - { - InMemoryDatabase inMemoryDB = new InMemoryDatabase(dataSource); - System.out.println("Database has been setup: " + inMemoryDB); - return inMemoryDB; - } + } - protected void generateInVMEvent(Object obj) - { - dispatcher.dispatch(obj); - } + /** + * Creates an in memory database. Make sure to shutdown the database in {@link #tearDown()} + * @return pointer to an in memory database + */ + protected InMemoryDatabase createDatabase() + { + InMemoryDatabase inMemoryDB = new InMemoryDatabase(); + System.out.println("Database has been setup: " + inMemoryDB); + return inMemoryDB; + } - public URL loadTestConfiguration(String name) - { - return Thread.currentThread().getContextClassLoader().getResource(name); - } + protected InMemoryDatabase createDatabase(DataSource dataSource) + { + InMemoryDatabase inMemoryDB = new InMemoryDatabase(dataSource); + System.out.println("Database has been setup: " + inMemoryDB); + return inMemoryDB; + } - protected InputStream loadDRL(String resource) - { - return Thread.currentThread().getContextClassLoader().getResourceAsStream(resource); - } + protected void generateInVMEvent(Object obj) + { + dispatcher.dispatch(obj); + } + + public URL loadTestConfiguration(String name) + { + return Thread.currentThread().getContextClassLoader().getResource(name); + } + + protected InputStream loadDRL(String resource) + { + return Thread.currentThread().getContextClassLoader().getResourceAsStream(resource); + } } Modified: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java =================================================================== --- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java 2009-07-29 09:31:22 UTC (rev 684) +++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java 2009-07-29 09:37:37 UTC (rev 685) @@ -42,17 +42,15 @@ ); } - public StreamOutput start() + public void start() { System.out.println("Started search tweet logger"); this.started = true; - return this; } - public StreamOutput stop() + public void stop() { this.started = false; - return this; } public boolean isStarted() Modified: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java =================================================================== --- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java 2009-07-29 09:31:22 UTC (rev 684) +++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java 2009-07-29 09:37:37 UTC (rev 685) @@ -150,17 +150,15 @@ this.interval = interval; } - public StreamInput start() + public void start() { watchdog.start(); this.started = true; - return this; } - public StreamInput stop() + public void stop() { keepRunning = false; - this.started = false; - return this; + this.started = false; } } Modified: sam/trunk/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java =================================================================== --- sam/trunk/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java 2009-07-29 09:31:22 UTC (rev 684) +++ sam/trunk/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java 2009-07-29 09:37:37 UTC (rev 685) @@ -51,7 +51,7 @@ * <br> * <b>EPL Statements and event forwarding</b><br> * In order to invoke an event sink, you need to register a statement - * through {@link org.jboss.sam.simulation.EventSimulation#bindStatement(String,EventSinkEntity)} + * through {@link org.jboss.sam.simulation.EventSimulation#bindStatement(java.io.InputStream)} * * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ @@ -62,6 +62,8 @@ private SimulationContext context; private EventSinkHandler handler = null; + private boolean started; + public EventSinkEntity(String streamName) { this.streamName = streamName; @@ -72,19 +74,19 @@ this.handler = handler; } - public StreamOutput start() + public void start() { - return this; + started = true; } - public StreamOutput stop() + public void stop() { - return this; + started = false; } public boolean isStarted() { - return true; + return started; } public String getStreamName() Modified: sam/trunk/modules/sim/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java =================================================================== --- sam/trunk/modules/sim/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java 2009-07-29 09:31:22 UTC (rev 684) +++ sam/trunk/modules/sim/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java 2009-07-29 09:37:37 UTC (rev 685) @@ -62,16 +62,14 @@ } - public BufferedStreamOutput start() + public void start() { this.started = true; - return this; } - public BufferedStreamOutput stop() + public void stop() { - this.started = false; - return this; + this.started = false; } public boolean isStarted() @@ -84,7 +82,6 @@ return this.streamName; } - public void setStreamName(String name) { this.streamName = name;