[overlord-commits] Overlord SVN: r686 - in sam/trunk: modules/core/src/main/java/org/jboss/sam and 1 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-07-29 05:48:25 -0400 (Wed, 29 Jul 2009) New Revision: 686 Removed: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DefaultCallback.java Modified: sam/trunk/SAMM.iws sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java sam/trunk/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsProcessingStatement.java Log: Further API changes Modified: sam/trunk/SAMM.iws =================================================================== --- sam/trunk/SAMM.iws 2009-07-29 09:37:37 UTC (rev 685) +++ sam/trunk/SAMM.iws 2009-07-29 09:48:25 UTC (rev 686) @@ -18,13 +18,11 @@ <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/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" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java" /> + <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="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DefaultCallback.java" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsProcessingStatement.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsProcessingStatement.java" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -181,91 +179,91 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="EventProcessor.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java"> + <file leaf-file-name="EventMessage.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventMessage.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="32" column="17" selection-start="1318" selection-end="1318" vertical-scroll-proportion="0.23160434"> <folding /> </state> </provider> </entry> </file> - <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"> + <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"> <provider selected="true" editor-type-id="text-editor"> - <state line="119" column="51" selection-start="3180" selection-end="3180" vertical-scroll-proportion="0.5479115"> + <state line="39" column="31" selection-start="1602" selection-end="1602" vertical-scroll-proportion="0.36670688"> <folding /> </state> </provider> </entry> </file> - <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"> + <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"> <provider selected="true" editor-type-id="text-editor"> - <state line="62" column="55" selection-start="1821" selection-end="1821" vertical-scroll-proportion="0.6755127"> + <state line="32" column="17" selection-start="1369" selection-end="1369" vertical-scroll-proportion="0.23160434"> <folding /> </state> </provider> </entry> </file> - <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"> + <file leaf-file-name="SAMAdapter.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="1359" selection-end="1359" vertical-scroll-proportion="0.19300362"> + <state line="48" column="13" selection-start="1828" selection-end="1828" vertical-scroll-proportion="0.25552824"> <folding /> </state> </provider> </entry> </file> - <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"> + <file leaf-file-name="StreamOutputAdapter.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="70" column="53" selection-start="2050" selection-end="2050" vertical-scroll-proportion="0.65621233"> + <state line="68" column="32" selection-start="2158" selection-end="2158" vertical-scroll-proportion="0.8492159"> <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"> + <file leaf-file-name="MapMessageAdapter.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/MapMessageAdapter.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"> + <state line="36" column="9" selection-start="1305" selection-end="1305" vertical-scroll-proportion="0.2509047"> <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"> + <file leaf-file-name="StreamInputCallback.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamInputCallback.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"> + <state line="28" column="17" selection-start="1217" selection-end="1217" vertical-scroll-proportion="0.1544029"> <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"> + <file leaf-file-name="DroolsEventProcessorImpl.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.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"> + <state line="265" column="49" selection-start="7746" selection-end="7746" vertical-scroll-proportion="0.70638824"> <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"> + <file leaf-file-name="ActivityMonitor.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ActivityMonitor.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"> + <state line="34" column="12" selection-start="1313" selection-end="1313" vertical-scroll-proportion="0.27020508"> <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"> + <file leaf-file-name="DataSourceManager.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/datasource/DataSourceManager.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"> + <state line="30" column="13" selection-start="1234" selection-end="1234" vertical-scroll-proportion="0.15724815"> <folding /> </state> </provider> @@ -566,6 +564,94 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/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$/modules/core/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$/modules/core/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$/modules/core/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$/modules/core/src/main/java/org/jboss/sam/internal" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/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$/modules/core/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$/modules/core/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$/modules/core/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$/modules/core/src/main/java/org/jboss/sam/common" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -907,109 +993,107 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <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/drools/DroolsProcessingStatement.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="34" column="0" selection-start="1352" selection-end="1352" vertical-scroll-proportion="0.27518427"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/Configuration.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="86" column="18" selection-start="2917" selection-end="2917" vertical-scroll-proportion="0.07616708"> <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/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.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="102" column="19" selection-start="2861" selection-end="2861" vertical-scroll-proportion="0.21375921"> <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/main/java/org/jboss/sam/ProcessingStatement.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="51" column="28" selection-start="1731" selection-end="1731" vertical-scroll-proportion="0.59831125"> <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/core/src/main/java/org/jboss/sam/EventProcessor.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="76" column="18" selection-start="2246" selection-end="2246" vertical-scroll-proportion="0.6486486"> <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/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.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="265" column="49" selection-start="7746" selection-end="7746" vertical-scroll-proportion="0.70638824"> <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/core/src/main/java/org/jboss/sam/datasource/DataSourceManager.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="119" column="51" selection-start="3180" selection-end="3180" vertical-scroll-proportion="0.5479115"> + <state line="30" column="13" selection-start="1234" selection-end="1234" vertical-scroll-proportion="0.15724815"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamInput.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ActivityMonitor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="62" column="55" selection-start="1821" selection-end="1821" vertical-scroll-proportion="0.6755127"> + <state line="34" column="12" selection-start="1313" selection-end="1313" vertical-scroll-proportion="0.27020508"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/drools/ApiTestCase.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventMessage.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"> + <state line="32" column="17" selection-start="1318" selection-end="1318" vertical-scroll-proportion="0.23160434"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamInputCallback.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"> + <state line="28" column="17" selection-start="1217" selection-end="1217" vertical-scroll-proportion="0.1544029"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java"> + <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="69" column="58" selection-start="2358" selection-end="2358" vertical-scroll-proportion="0.64742017"> + <state line="39" column="31" selection-start="1602" selection-end="1602" vertical-scroll-proportion="0.36670688"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java"> + <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="36" column="13" selection-start="1359" selection-end="1359" vertical-scroll-proportion="0.19300362"> + <state line="32" column="17" selection-start="1369" selection-end="1369" vertical-scroll-proportion="0.23160434"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="70" column="53" selection-start="2050" selection-end="2050" vertical-scroll-proportion="0.65621233"> + <state line="48" column="13" selection-start="1828" selection-end="1828" vertical-scroll-proportion="0.25552824"> <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/main/java/org/jboss/sam/internal/drools/MapMessageAdapter.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"> + <state line="36" column="9" selection-start="1305" selection-end="1305" vertical-scroll-proportion="0.2509047"> <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/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.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"> + <state line="68" column="32" selection-start="2158" selection-end="2158" vertical-scroll-proportion="0.8492159"> <folding /> </state> </provider> Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java 2009-07-29 09:37:37 UTC (rev 685) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java 2009-07-29 09:48:25 UTC (rev 686) @@ -74,9 +74,8 @@ * @param in * @return */ - ProcessingStatement registerStatement(String statementName, InputStream in); + void registerStatement(String statementName, InputStream in); - /** * Iterate over statement names * Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java 2009-07-29 09:37:37 UTC (rev 685) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java 2009-07-29 09:48:25 UTC (rev 686) @@ -46,13 +46,6 @@ String getExpression(); /** - * Check wether the statement is bound to a {@link org.jboss.sam.StreamOutput} - * - * @return - */ - boolean isBound(); - - /** * Access the underlying implementation * * @return Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DefaultCallback.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DefaultCallback.java 2009-07-29 09:37:37 UTC (rev 685) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DefaultCallback.java 2009-07-29 09:48:25 UTC (rev 686) @@ -1,56 +0,0 @@ -/* - * 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.sam.internal.drools; - -import org.drools.runtime.StatefulKnowledgeSession; -import org.drools.runtime.rule.WorkingMemoryEntryPoint; -import org.jboss.sam.StreamInputCallback; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class DefaultCallback implements StreamInputCallback -{ - - StatefulKnowledgeSession sessionHandle; - - public DefaultCallback(StatefulKnowledgeSession sessionHandle) - { - this.sessionHandle = sessionHandle; - } - - public void onEvent(Object args) - { - - System.out.println("Handle " + args + " on " + sessionHandle); - - WorkingMemoryEntryPoint entryPoint = - sessionHandle.getWorkingMemoryEntryPoint("in-channel"); - - if(null==entryPoint) - throw new IllegalArgumentException("Unable to resolve entry point 'in-channel'"); - - entryPoint.insert(args); - sessionHandle.fireAllRules(); - } - -} Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java 2009-07-29 09:37:37 UTC (rev 685) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java 2009-07-29 09:48:25 UTC (rev 686) @@ -240,19 +240,10 @@ // -------------------------------------------------- /** - * Creates a drools package and registers it with the current rulebase - * @deprecated - */ - public ProcessingStatement registerStatement(String statementName, String epl) - { - throw new RuntimeException("Obsolete"); - } - - /** * Create a drools package, register it with the rulebase and make * sure that the adapter output adapter is available as a drools global variable */ - public ProcessingStatement registerStatement(String statementName, InputStream epl) + public void registerStatement(String statementName, InputStream epl) { if(isStarted()) throw new IllegalStateException("EventProcessor already started"); @@ -287,7 +278,6 @@ new DroolsProcessingStatement(statementName, null, null); this.statements.put(statementName, stmt); - return stmt; } // -------------------------------------------------- Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsProcessingStatement.java =================================================================== --- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsProcessingStatement.java 2009-07-29 09:37:37 UTC (rev 685) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsProcessingStatement.java 2009-07-29 09:48:25 UTC (rev 686) @@ -31,20 +31,13 @@ private String name; private String epl; - private boolean bound = false; private org.drools.rule.Package pkg; public DroolsProcessingStatement(String name, String epl, org.drools.rule.Package pkg) { - this(name, epl, pkg, false); - } - - public DroolsProcessingStatement(String name, String epl, org.drools.rule.Package pkg, boolean isBound) - { this.name = name; this.epl = epl; this.pkg = pkg; - this.bound = isBound; } public String getName() @@ -57,11 +50,6 @@ return this.epl; } - public boolean isBound() - { - return this.bound; - } - public org.drools.rule.Package getUnderlying() { return pkg;