Overlord SVN: r686 - in sam/trunk: modules/core/src/main/java/org/jboss/sam and 1 other directories.
by overlord-commits@lists.jboss.org
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>
- */
-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;
16 years, 12 months
Overlord SVN: r685 - in sam/trunk: modules/core/src/main/java/org/jboss/sam/internal/stream and 4 other directories.
by overlord-commits@lists.jboss.org
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>
*/
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>
*/
@@ -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;
16 years, 12 months
Overlord SVN: r684 - in sam/trunk: modules/core and 7 other directories.
by overlord-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-07-29 05:31:22 -0400 (Wed, 29 Jul 2009)
New Revision: 684
Added:
sam/trunk/modules/core/src/main/java/org/jboss/sam/common/
sam/trunk/modules/core/src/main/java/org/jboss/sam/common/ComponentLifecycle.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/cvt/
sam/trunk/modules/core/src/main/java/org/jboss/sam/cvt/CurrentValueTable.java
Removed:
sam/trunk/modules/core/src/main/java/org/jboss/sam/util/
sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/util/
Modified:
sam/trunk/SAMM.ipr
sam/trunk/SAMM.iws
sam/trunk/modules/core/core.iml
sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamInput.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamOutput.java
sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java
sam/trunk/modules/examples/twitter/twitter.iml
sam/trunk/modules/sim/sim.iml
sam/trunk/toplevel.iml
Log:
Begin API refactoring
Modified: sam/trunk/SAMM.ipr
===================================================================
--- sam/trunk/SAMM.ipr 2009-07-27 14:49:12 UTC (rev 683)
+++ sam/trunk/SAMM.ipr 2009-07-29 09:31:22 UTC (rev 684)
@@ -175,6 +175,14 @@
<entry type="java.lang.String" value="core" />
</collection>
</value>
+ <key type="java.lang.String" value="toplevel" />
+ </entry>
+ <entry>
+ <value>
+ <collection type="java.util.TreeSet">
+ <entry type="java.lang.String" value="core" />
+ </collection>
+ </value>
<key type="java.lang.String" value="twitter" />
</entry>
</map>
@@ -310,6 +318,7 @@
<module fileurl="file://$PROJECT_DIR$/modules/core/core.iml" filepath="$PROJECT_DIR$/modules/core/core.iml" />
<module fileurl="file:///Users/hbraun/dev/env/drools-5.0-examples/drools-examples/drools-examples-fusion/drools-examples-fusion.iml" filepath="/Users/hbraun/dev/env/drools-5.0-examples/drools-examples/drools-examples-fusion/drools-examples-fusion.iml" />
<module fileurl="file://$PROJECT_DIR$/modules/sim/sim.iml" filepath="$PROJECT_DIR$/modules/sim/sim.iml" />
+ <module fileurl="file://$PROJECT_DIR$/toplevel.iml" filepath="$PROJECT_DIR$/toplevel.iml" />
<module fileurl="file://$PROJECT_DIR$/modules/examples/twitter/twitter.iml" filepath="$PROJECT_DIR$/modules/examples/twitter/twitter.iml" />
</modules>
</component>
Modified: sam/trunk/SAMM.iws
===================================================================
--- sam/trunk/SAMM.iws 2009-07-27 14:49:12 UTC (rev 683)
+++ sam/trunk/SAMM.iws 2009-07-29 09:31:22 UTC (rev 684)
@@ -18,13 +18,20 @@
<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="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.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/examples/twitter/src/main/resources/iran-tweets.drl" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java" />
+ <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/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/core.iml" afterPath="$PROJECT_DIR$/modules/core/core.iml" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -181,50 +188,46 @@
</component>
<component name="FileEditorManager">
<leaf>
- <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="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">
<provider selected="true" editor-type-id="text-editor">
- <state line="92" column="44" selection-start="2634" selection-end="2634" vertical-scroll-proportion="0.78293604">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="76" column="29" selection-start="2257" selection-end="2257" vertical-scroll-proportion="0.6486486">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="BarChart.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/BarChart.java">
+ <file leaf-file-name="Main.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/Main.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="102" column="19" selection-start="2861" selection-end="2861" vertical-scroll-proportion="0.21375921">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="SearchInput.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/SearchInput.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="78" column="42" selection-start="2313" selection-end="2313" vertical-scroll-proportion="0.3546798">
+ <state line="32" column="55" selection-start="1465" selection-end="1465" vertical-scroll-proportion="0.23160434">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="CVTOutput.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/CVTOutput.java">
+ <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">
<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="32" column="22" selection-start="1211" selection-end="1211" vertical-scroll-proportion="0.23160434">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="iran-tweets.drl" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl">
+ <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="42" column="25" selection-start="967" selection-end="967" vertical-scroll-proportion="0.8431619">
+ <state line="32" column="56" selection-start="1382" selection-end="1408" vertical-scroll-proportion="0.23160434">
<folding />
</state>
</provider>
@@ -360,10 +363,6 @@
<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="twitter" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -371,13 +370,9 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="twitter" />
+ <option name="myItemId" value="toplevel" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/examples/twitter" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -385,25 +380,23 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="twitter" />
+ <option name="myItemId" value="toplevel" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/examples/twitter" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/examples/twitter/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <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="PsiDirectory:$PROJECT_DIR$/modules/examples/twitter/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <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/examples/twitter/src/main/resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -411,25 +404,13 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="twitter" />
+ <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/examples/twitter" />
+ <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/examples/twitter/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/examples/twitter/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/examples/twitter/src/main/java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -437,35 +418,37 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="twitter" />
+ <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/examples/twitter" />
+ <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/examples/twitter/src" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/examples/twitter/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <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="PsiDirectory:$PROJECT_DIR$/modules/examples/twitter/src/main/java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <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/examples/twitter/src/main/java/org" />
+ <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/examples/twitter/src/main/java/org/jboss" />
+ <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/examples/twitter/src/main/java/org/jboss/sam" />
+ <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>
@@ -475,120 +458,84 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="twitter" />
+ <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/examples/twitter" />
+ <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/examples/twitter/src" />
+ <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/examples/twitter/src/main" />
+ <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/examples/twitter/src/main/java" />
+ <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/examples/twitter/src/main/java/org" />
+ <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/examples/twitter/src/main/java/org/jboss" />
+ <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/examples/twitter/src/main/java/org/jboss/sam" />
+ <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/examples/twitter/src/main/java/org/jboss/sam/examples" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter" />
- <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>
- <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>
- <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>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="SAMM.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <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="core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <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" />
+ <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" />
+ <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>
- <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="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" />
+ <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" />
+ <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>
</PATH>
</subPane>
</component>
<component name="ProjectReloadState">
- <option name="STATE" value="0" />
+ <option name="STATE" value="2" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="0.11111111" version="1" splitterProportion="0.5">
@@ -598,7 +545,7 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" />
+ <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -627,7 +574,7 @@
</key>
</component>
<component name="RestoreUpdateTree" />
- <component name="RunManager" selected="Application.Main">
+ <component name="RunManager">
<tempConfiguration default="false" name="Main" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" value="org.jboss.sam.examples.twitter.Main" />
<option name="VM_PARAMETERS" />
@@ -649,19 +596,6 @@
<option name="Make" value="false" />
</method>
</tempConfiguration>
- <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_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="" />
- <method>
- <option name="Make" value="false" />
- </method>
- </configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -693,6 +627,19 @@
<option name="Make" value="true" />
</method>
</configuration>
+ <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_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="" />
+ <method>
+ <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" />
@@ -811,15 +758,15 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="393" y="43" width="1258" height="959" extended-state="0" />
- <editor active="true" />
+ <frame x="373" y="46" width="1293" height="976" extended-state="0" />
+ <editor active="false" />
<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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3209264" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32482597" order="1" />
+ <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="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" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
@@ -916,117 +863,115 @@
</component>
<component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.52098763,0.5" version="1">
<option name="myPlainMode" value="false" />
- <option name="myLastEditedConfigurable" value="core" />
+ <option name="myLastEditedConfigurable" value="toplevel" />
</component>
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/sql-join.drl">
+ <entry file="file://$PROJECT_DIR$/modules/sim/src/test/resources/simulation/sam-cfg.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="23" selection-start="295" selection-end="308" vertical-scroll-proportion="0.2208281">
+ <state line="6" column="58" selection-start="315" selection-end="320" vertical-scroll-proportion="0.1182266">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="48" column="13" selection-start="1949" selection-end="1949" vertical-scroll-proportion="0.16060226">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.20075282">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/test/resources/simulation/test.drl">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/cvt/CurrentValueTable.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="17" column="0" selection-start="385" selection-end="385" vertical-scroll-proportion="0.33497536">
+ <state line="57" column="57" selection-start="1654" selection-end="1654" vertical-scroll-proportion="0.6699507">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/test/resources/simulation/sam-cfg.xml">
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="58" selection-start="315" selection-end="320" vertical-scroll-proportion="0.1182266">
+ <state line="33" column="36" selection-start="1102" selection-end="1102" vertical-scroll-proportion="0.6624843">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///Users/hbraun/.m2/repository/org/drools/drools-core/5.0.1/drools-core-5.0.1.jar!/org/drools/base/accumulators/MVELAccumulatorFunctionExecutor.class">
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="46" column="0" selection-start="3176" selection-end="3176" vertical-scroll-proportion="0.6678201">
+ <state line="12" column="0" selection-start="367" selection-end="367" vertical-scroll-proportion="0.2364532">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/pom.xml">
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl">
<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="42" column="25" selection-start="967" selection-end="967" vertical-scroll-proportion="0.8431619">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <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="14" column="53" selection-start="539" selection-end="539" vertical-scroll-proportion="0.28105396">
+ <state line="64" column="0" selection-start="1871" selection-end="1871" vertical-scroll-proportion="0.5073892">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/util/CurrentValueTable.java">
+ <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="57" column="57" selection-start="1654" selection-end="1654" vertical-scroll-proportion="0.6699507">
- <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/examples/twitter/pom.xml">
+ <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="33" column="36" selection-start="1102" selection-end="1102" vertical-scroll-proportion="0.6624843">
+ <state line="78" column="42" selection-start="2313" selection-end="2313" vertical-scroll-proportion="0.3546798">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<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="71" column="63" selection-start="2288" selection-end="2288" vertical-scroll-proportion="0.78624076">
<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/common/ComponentLifecycle.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="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/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.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="64" column="0" selection-start="1871" selection-end="1871" vertical-scroll-proportion="0.5073892">
+ <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/java/org/jboss/sam/examples/twitter/Main.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="92" column="44" selection-start="2634" selection-end="2634" vertical-scroll-proportion="0.78293604">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <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/java/org/jboss/sam/examples/twitter/BarChart.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="77" column="48" selection-start="2587" selection-end="2587" vertical-scroll-proportion="0.3927227">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <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/SearchInput.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="78" column="42" selection-start="2313" selection-end="2313" vertical-scroll-proportion="0.3546798">
+ <state line="102" column="19" selection-start="2861" selection-end="2861" vertical-scroll-proportion="0.21375921">
<folding />
</state>
</provider>
Modified: sam/trunk/modules/core/core.iml
===================================================================
--- sam/trunk/modules/core/core.iml 2009-07-27 14:49:12 UTC (rev 683)
+++ sam/trunk/modules/core/core.iml 2009-07-29 09:31:22 UTC (rev 684)
@@ -143,18 +143,16 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.drools:drools-core:jar:5.1.0.SNAPSHOT:compile">
+ <library name="M2 Dep: org.mvel:mvel2:jar:2.0.12:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT-sources.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.drools:drools-api:jar:5.1.0.SNAPSHOT:compile">
+ <library name="M2 Dep: org.drools:drools-api:jar:5.1.0.20090729.083633-48:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
@@ -165,23 +163,25 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.drools:drools-compiler:jar:5.1.0.SNAPSHOT:compile">
+ <library name="M2 Dep: org.drools:drools-core:jar:5.1.0.20090729.083633-48:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.mvel:mvel2:jar:2.0.12:compile">
+ <library name="M2 Dep: org.drools:drools-compiler:jar:5.1.0.20090729.083633-48:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntryProperties />
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-27 14:49:12 UTC (rev 683)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java 2009-07-29 09:31:22 UTC (rev 684)
@@ -21,6 +21,8 @@
*/
package org.jboss.sam;
+import org.jboss.sam.common.ComponentLifecycle;
+
import java.util.Iterator;
import java.util.Properties;
import java.io.InputStream;
@@ -34,14 +36,8 @@
*
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
-public interface EventProcessor<T>
+public interface EventProcessor<T> extends ComponentLifecycle
{
- void start();
-
- void stop();
-
- boolean isStarted();
-
/**
* Add input to the runtime
*
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamInput.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamInput.java 2009-07-27 14:49:12 UTC (rev 683)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamInput.java 2009-07-29 09:31:22 UTC (rev 684)
@@ -21,6 +21,8 @@
*/
package org.jboss.sam;
+import org.jboss.sam.common.ComponentLifecycle;
+
/**
* Stream inputs are registered with {@link org.jboss.sam.EventProcessor}'s
* and invoke {@link org.jboss.sam.StreamInputCallback}'s when new events arrive.
@@ -28,14 +30,8 @@
*
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
-public interface StreamInput<T>
+public interface StreamInput extends ComponentLifecycle
{
- <T extends StreamInput> T start();
-
- <T extends StreamInput> T stop();
-
- boolean isStarted();
-
/**
* Register a callback
*
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamOutput.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamOutput.java 2009-07-27 14:49:12 UTC (rev 683)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamOutput.java 2009-07-29 09:31:22 UTC (rev 684)
@@ -21,6 +21,8 @@
*/
package org.jboss.sam;
+import org.jboss.sam.common.ComponentLifecycle;
+
/**
* Stream outputs are used to forward events. Typically the last step
* of an event processing chain leads to an action which receive events through
@@ -28,14 +30,8 @@
*
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
-public interface StreamOutput<T>
-{
- <T extends StreamOutput> T start();
-
- <T extends StreamOutput> T stop();
-
- boolean isStarted();
-
+public interface StreamOutput extends ComponentLifecycle
+{
/**
* Receive forwarded events
*
Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/common/ComponentLifecycle.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/common/ComponentLifecycle.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/common/ComponentLifecycle.java 2009-07-29 09:31:22 UTC (rev 684)
@@ -0,0 +1,34 @@
+/*
+ * 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.common;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface ComponentLifecycle
+{
+ void start();
+
+ void stop();
+
+ boolean isStarted();
+}
Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/cvt/CurrentValueTable.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/cvt/CurrentValueTable.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/cvt/CurrentValueTable.java 2009-07-29 09:31:22 UTC (rev 684)
@@ -0,0 +1,104 @@
+/*
+ * 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.cvt;
+
+import org.jboss.sam.EventMessage;
+
+import java.util.*;
+import java.io.PrintStream;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class CurrentValueTable
+{
+ private List<Map> table = new ArrayList<Map>();
+
+ private String[] columns;
+ private String name;
+ public CurrentValueTable(String name, String[] columns)
+ {
+ this.name = name;
+ this.columns = columns;
+ }
+
+ public void clear()
+ {
+ this.table.clear();
+ }
+
+ public int size()
+ {
+ return table.size();
+ }
+
+ public void update(EventMessage[] events)
+ {
+ synchronized(table)
+ {
+ clear();
+
+ for(EventMessage event : events)
+ {
+ Map<String,Object> row = new HashMap<String, Object>();
+ for(String s : columns)
+ {
+ row.put(s, event.getProperty(s));
+ }
+ table.add(row);
+ }
+ }
+ }
+
+ public List<Map> snapshot()
+ {
+ return Collections.unmodifiableList(table);
+ }
+
+ public void dump(PrintStream out)
+ {
+ synchronized(table)
+ {
+ int i=1;
+ Iterator<Map> iterator = table.iterator();
+ StringBuffer sb = new StringBuffer();
+ sb.append("[").append(name).append("]\n");
+ sb.append("-----------\n");
+ while(iterator.hasNext())
+ {
+ Map row = iterator.next();
+
+ sb.append(i).append("\t\t");
+ for(String s : columns)
+ {
+ sb.append(row.get(s)).append("\t\t\t");
+ }
+
+ sb.append("\n");
+ i++;
+ }
+ sb.append("-----------\n");
+
+ System.out.println(sb.toString());
+ }
+ }
+}
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-27 14:49:12 UTC (rev 683)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java 2009-07-29 09:31:22 UTC (rev 684)
@@ -23,7 +23,7 @@
import org.jboss.sam.EventMessage;
import org.jboss.sam.StreamOutput;
-import org.jboss.sam.util.CurrentValueTable;
+import org.jboss.sam.cvt.CurrentValueTable;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
Modified: sam/trunk/modules/examples/twitter/twitter.iml
===================================================================
--- sam/trunk/modules/examples/twitter/twitter.iml 2009-07-27 14:49:12 UTC (rev 683)
+++ sam/trunk/modules/examples/twitter/twitter.iml 2009-07-29 09:31:22 UTC (rev 684)
@@ -22,17 +22,6 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.drools:drools-core:jar:5.1.0.SNAPSHOT:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
<library name="M2 Dep: commons-dbcp:commons-dbcp:jar:1.2.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar!/" />
@@ -62,17 +51,6 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.drools:drools-api:jar:5.1.0.SNAPSHOT:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
<library name="M2 Dep: org.slf4j:nlog4j:jar:1.2.25:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/nlog4j/1.2.25/nlog4j-1.2.25.jar!/" />
@@ -118,17 +96,6 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.drools:drools-compiler:jar:5.1.0.SNAPSHOT:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
<library name="M2 Dep: janino:janino:jar:2.5.15:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/janino/janino/2.5.15/janino-2.5.15.jar!/" />
@@ -222,6 +189,39 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.drools:drools-api:jar:5.1.0.20090729.083633-48:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.drools:drools-core:jar:5.1.0.20090729.083633-48:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.drools:drools-compiler:jar:5.1.0.20090729.083633-48:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: sam/trunk/modules/sim/sim.iml
===================================================================
--- sam/trunk/modules/sim/sim.iml 2009-07-27 14:49:12 UTC (rev 683)
+++ sam/trunk/modules/sim/sim.iml 2009-07-29 09:31:22 UTC (rev 684)
@@ -142,18 +142,16 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.drools:drools-core:jar:5.1.0.SNAPSHOT:compile">
+ <library name="M2 Dep: org.mvel:mvel2:jar:2.0.12:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT-sources.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.drools:drools-api:jar:5.1.0.SNAPSHOT:compile">
+ <library name="M2 Dep: org.drools:drools-api:jar:5.1.0.20090729.083633-48:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
@@ -164,23 +162,25 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.drools:drools-compiler:jar:5.1.0.SNAPSHOT:compile">
+ <library name="M2 Dep: org.drools:drools-core:jar:5.1.0.20090729.083633-48:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.mvel:mvel2:jar:2.0.12:compile">
+ <library name="M2 Dep: org.drools:drools-compiler:jar:5.1.0.20090729.083633-48:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntryProperties />
Modified: sam/trunk/toplevel.iml
===================================================================
--- sam/trunk/toplevel.iml 2009-07-27 14:49:12 UTC (rev 683)
+++ sam/trunk/toplevel.iml 2009-07-29 09:31:22 UTC (rev 684)
@@ -15,6 +15,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="core" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
<CLASSES>
@@ -184,18 +185,16 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.drools:drools-core:jar:5.1.0.SNAPSHOT:compile">
+ <library name="M2 Dep: org.mvel:mvel2:jar:2.0.12:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT-sources.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.drools:drools-api:jar:5.1.0.SNAPSHOT:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.drools:drools-api:jar:5.1.0.20090729.083633-48:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
@@ -205,24 +204,26 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.drools:drools-compiler:jar:5.1.0.SNAPSHOT:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.drools:drools-core:jar:5.1.0.20090729.083633-48:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.mvel:mvel2:jar:2.0.12:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.drools:drools-compiler:jar:5.1.0.20090729.083633-48:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntryProperties />
16 years, 12 months
Overlord SVN: r683 - sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter.
by overlord-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-07-27 10:49:12 -0400 (Mon, 27 Jul 2009)
New Revision: 683
Removed:
sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/IO.java
Modified:
sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java
Log:
Cleanup example classes
Deleted: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/IO.java
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/IO.java 2009-07-27 14:44:27 UTC (rev 682)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/IO.java 2009-07-27 14:49:12 UTC (rev 683)
@@ -1,64 +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.examples.twitter;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.BufferedReader;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class IO
-{
- public static String convertStreamToString(InputStream is) {
-
- if(null==is)
- throw new IllegalArgumentException("Input stream cannot be null");
-
- BufferedReader reader = new BufferedReader(new InputStreamReader(is));
- StringBuilder sb = new StringBuilder();
-
- String line = null;
- try {
- while ((line = reader.readLine()) != null) {
- sb.append(line + "\n");
- }
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- try {
- is.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- return sb.toString();
- }
-
- public static InputStream loadDRL(String s)
- {
- return Thread.currentThread().getContextClassLoader().getResourceAsStream(s);
- }
-}
Modified: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java 2009-07-27 14:44:27 UTC (rev 682)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java 2009-07-27 14:49:12 UTC (rev 683)
@@ -21,16 +21,16 @@
*/
package org.jboss.sam.examples.twitter;
-import org.jboss.sam.config.Configuration;
-import org.jboss.sam.config.ConfigFactory;
+import org.jboss.sam.ActivityMonitor;
import org.jboss.sam.ActivityMonitorFactory;
-import org.jboss.sam.ActivityMonitor;
import org.jboss.sam.EventProcessor;
+import org.jboss.sam.config.ConfigFactory;
+import org.jboss.sam.config.Configuration;
import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
import java.util.UUID;
-import java.util.List;
-import java.util.ArrayList;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -99,7 +99,7 @@
private void loadDRL(String resource)
{
- InputStream in = IO.loadDRL(resource);
+ InputStream in = resourceStream(resource);
eventProcessor.registerStatement(UUID.randomUUID().toString(), in);
}
@@ -154,4 +154,9 @@
eventProcessor = monitor.getEventProcessor();
}
+
+ public static InputStream resourceStream(String s)
+ {
+ return Thread.currentThread().getContextClassLoader().getResourceAsStream(s);
+ }
}
16 years, 12 months
Overlord SVN: r682 - in sam/trunk: modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter and 1 other directories.
by overlord-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-07-27 10:44:27 -0400 (Mon, 27 Jul 2009)
New Revision: 682
Modified:
sam/trunk/SAMM.iws
sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.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/Main.java
sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java
sam/trunk/modules/examples/twitter/src/main/resources/iran-tweets.drl
Log:
Complete twitter example
Modified: sam/trunk/SAMM.iws
===================================================================
--- sam/trunk/SAMM.iws 2009-07-27 13:33:12 UTC (rev 681)
+++ sam/trunk/SAMM.iws 2009-07-27 14:44:27 UTC (rev 682)
@@ -18,15 +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/src/main/resources/sam-cfg.xml" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml" />
- <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="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/search-jboss.json" afterPath="" />
+ <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/examples/twitter/src/main/resources/iran-tweets.drl" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/toplevel.iml" afterPath="$PROJECT_DIR$/toplevel.iml" />
- <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/core.iml" afterPath="$PROJECT_DIR$/modules/core/core.iml" />
+ <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" />
@@ -98,7 +96,7 @@
</component>
<component name="DebuggerManager">
<line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java" line="64" class="org.jboss.sam.examples.twitter.CVTOutput" package="org.jboss.sam.examples.twitter">
+ <breakpoint url="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java" line="99" class="org.jboss.sam.examples.twitter.BarChart" package="org.jboss.sam.examples.twitter">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -186,7 +184,7 @@
<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="101" column="19" selection-start="2770" selection-end="2770" vertical-scroll-proportion="0.642409">
+ <state line="92" column="44" selection-start="2634" selection-end="2634" vertical-scroll-proportion="0.78293604">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -194,28 +192,39 @@
</provider>
</entry>
</file>
- <file leaf-file-name="CVTOutput.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/CVTOutput.java">
+ <file leaf-file-name="BarChart.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/BarChart.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="39" column="0" selection-start="1435" selection-end="1435" vertical-scroll-proportion="0.12438424">
+ <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>
+ </file>
+ <file leaf-file-name="SearchInput.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/SearchInput.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">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="iran-tweets.drl" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl">
+ <file leaf-file-name="CVTOutput.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/CVTOutput.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="0" selection-start="516" selection-end="516" vertical-scroll-proportion="0.49261084">
+ <state line="64" column="0" selection-start="1871" selection-end="1871" vertical-scroll-proportion="0.5073892">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="sam-cfg.xml" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml">
+ <file leaf-file-name="iran-tweets.drl" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl">
<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="42" column="25" selection-start="967" selection-end="967" vertical-scroll-proportion="0.8431619">
<folding />
</state>
</provider>
@@ -628,7 +637,13 @@
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<module name="twitter" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="50528" />
+ <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" />
@@ -956,53 +971,62 @@
</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/util/CurrentValueTable.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="78" column="26" selection-start="2301" selection-end="2301" vertical-scroll-proportion="0.66871923">
+ <state line="57" column="57" selection-start="1654" selection-end="1654" vertical-scroll-proportion="0.6699507">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/util/CurrentValueTable.java">
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/pom.xml">
<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="33" column="36" selection-start="1102" selection-end="1102" vertical-scroll-proportion="0.6624843">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/pom.xml">
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml">
<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="12" column="0" selection-start="367" selection-end="367" vertical-scroll-proportion="0.2364532">
<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/resources/iran-tweets.drl">
<provider selected="true" editor-type-id="text-editor">
- <state line="101" column="19" selection-start="2770" selection-end="2770" vertical-scroll-proportion="0.642409">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="42" column="25" selection-start="967" selection-end="967" vertical-scroll-proportion="0.8431619">
+ <folding />
</state>
</provider>
</entry>
<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="39" column="0" selection-start="1435" selection-end="1435" vertical-scroll-proportion="0.12438424">
+ <state line="64" column="0" selection-start="1871" selection-end="1871" vertical-scroll-proportion="0.5073892">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl">
+ <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="25" column="0" selection-start="516" selection-end="516" vertical-scroll-proportion="0.49261084">
- <folding />
+ <state line="92" column="44" selection-start="2634" selection-end="2634" vertical-scroll-proportion="0.78293604">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/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="12" column="0" selection-start="367" selection-end="367" vertical-scroll-proportion="0.2364532">
+ <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/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.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">
<folding />
</state>
</provider>
Modified: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java 2009-07-27 13:33:12 UTC (rev 681)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java 2009-07-27 14:44:27 UTC (rev 682)
@@ -21,41 +21,17 @@
*/
package org.jboss.sam.examples.twitter;
-/*
- OpenChart2 Java Charting Library and Toolkit
- Copyright (C) 2005-2007 Approximatrix, LLC
- Copyright (C) 2001 Sebastian Müller
- http://www.approximatrix.com
-
- This library 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 library 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 library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- BarChart.java
-
- */
-
import com.approximatrix.charting.DefaultChart;
import com.approximatrix.charting.event.ChartDataModelEvent;
import com.approximatrix.charting.event.ChartDataModelListener;
import com.approximatrix.charting.model.EditableChartDataModel;
import com.approximatrix.charting.render.LineChartRenderer;
import com.approximatrix.charting.swing.ChartPanel;
-import org.jboss.sam.EventMessage;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionListener;
+import java.util.ArrayList;
/** This class implements a simple dialog that displays a bar chart along
* side a menu. The chart is rescaled to show 0 to 100 rather than simply
@@ -70,20 +46,38 @@
ChartPanel panel;
EditableChartDataModel data;
- double numSamples = 2;
+ double offset = 2;
+ private java.util.List<CVTOutput> cvts;
+
+ private String[] rows;
+ private double[][] model;
+ private double[] columns;
+
/** Initializes the dialog and its chart in a ChartPanel dialog */
- public BarChart(String query)
+ public BarChart(java.util.List<CVTOutput> cvts)
{
+
+ this.cvts = cvts;
+
// Init some starting data
- double[][] model = {{1.0, 1.0, 1.0}};
+ model = new double[][] {
+ {1.0, 1.0, 1.0},
+ {1.0, 1.0, 1.0},
+ {1.0, 1.0, 1.0}
+ };
- double[] columns = {0.0, 1.0, 2.0};
+ columns = new double[] {0.0, 1.0, 2.0};
+
+ rows = new String[cvts.size()];
+ for(int i=0; i<cvts.size();i++)
+ {
+ CVTOutput cvt = cvts.get(i);
+ rows[i] = cvt.getStreamName();
+ }
- String[] rows = {query};
+ String title = "SAM: Twitter example feeds";
- String title = "Tweets per minute";
-
// Create an editable chart data model
data = new EditableChartDataModel(model, columns, rows);
@@ -92,6 +86,7 @@
// Adding ChartRenderer as usual
LineChartRenderer renderer = new LineChartRenderer(panel.getCoordSystem(), data);
panel.addChartRenderer(renderer, 1);
+ panel.addChartRenderer(renderer, 2);
// Register EventListener
data.addChartDataModelListener(this);
@@ -100,19 +95,19 @@
}
- public void updateFrom(EventMessage[] tweets)
+ public void refresh()
{
- try
+ for(int i=0; i<rows.length; i++)
{
- data.insertValue(0, Double.valueOf(tweets.length), Double.valueOf(numSamples));
- numSamples++;
+
+ CVTOutput cvtout = cvts.get(i);
+ int size = cvtout.getTable().size();
+ data.insertValue(i, Double.valueOf(size), Double.valueOf(offset));
}
- catch (Throwable e)
- {
- e.printStackTrace();
- }
- }
+ offset++;
+ }
+
/** Listener for our single menu item. When clicked, dispose of this
* dialog
*/
@@ -144,7 +139,7 @@
}
// Construct our bar chart dialog
- BarChart temp = new BarChart("Micheal Jackson");
+ BarChart temp = new BarChart(new ArrayList());
// Make the dialog visible
temp.setVisible(true);
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-27 13:33:12 UTC (rev 681)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java 2009-07-27 14:44:27 UTC (rev 682)
@@ -75,4 +75,9 @@
{
//
}
+
+ public CurrentValueTable getTable()
+ {
+ return cvt;
+ }
}
Modified: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java 2009-07-27 13:33:12 UTC (rev 681)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java 2009-07-27 14:44:27 UTC (rev 682)
@@ -29,6 +29,8 @@
import java.io.InputStream;
import java.util.UUID;
+import java.util.List;
+import java.util.ArrayList;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -41,6 +43,10 @@
private Thread mainThread;
private boolean running = true;
+
+ private BarChart ui;
+
+ private List<CVTOutput> cvts = new ArrayList<CVTOutput>();
public static void main(String[] args)
{
@@ -67,19 +73,30 @@
*/
private void bootstrap()
{
+ // input
SearchInput twitterSearchInput = new SearchInput("iran");
- CVTOutput output1 = new CVTOutput("iran results");
- CVTOutput output2 = new CVTOutput("us results");
-
- // input and output
eventProcessor.addInput(twitterSearchInput);
- eventProcessor.addOutput(output1);
- //eventProcessor.addOutput(output2);
- // rules
+ // output
+ CVTOutput output1 = createAndRegisterCVT("iran results");
+ CVTOutput output2 = createAndRegisterCVT("us involved");
+ CVTOutput output3 = createAndRegisterCVT("israel involved");
+
+ // processing rules
loadDRL("iran-tweets.drl");
+
+ // user interface
+ ui = new BarChart(cvts);
}
+ private CVTOutput createAndRegisterCVT(String name)
+ {
+ CVTOutput cvt = new CVTOutput(name);
+ eventProcessor.addOutput(cvt);
+ cvts.add(cvt);
+ return cvt;
+ }
+
private void loadDRL(String resource)
{
InputStream in = IO.loadDRL(resource);
@@ -89,7 +106,8 @@
public void start()
{
eventProcessor.start();
-
+ ui.setVisible(true);
+
mainThread = new Thread(
new Runnable()
{
@@ -106,6 +124,8 @@
{
e.printStackTrace();
}
+
+ ui.refresh();
}
System.out.println("Stopped event processor");
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-27 13:33:12 UTC (rev 681)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java 2009-07-27 14:44:27 UTC (rev 682)
@@ -56,7 +56,7 @@
{
this.twitter = new Twitter();
this.queryString = queryString;
-
+
watchdog = new Thread(
new Runnable(){
@@ -76,7 +76,7 @@
if(lastUpdate >0)
query.setSinceId(lastUpdate);
- QueryResult result = new Twitter().search(query);
+ QueryResult result = twitter.search(query);
System.out.println("Search results: " + result.getTweets().size());
@@ -98,7 +98,7 @@
if(!tweets.isEmpty())
{
Tweet last = tweets.get(0);
- lastUpdate = last.getId();
+ lastUpdate = last.getId();
}
try
Modified: sam/trunk/modules/examples/twitter/src/main/resources/iran-tweets.drl
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/resources/iran-tweets.drl 2009-07-27 13:33:12 UTC (rev 681)
+++ sam/trunk/modules/examples/twitter/src/main/resources/iran-tweets.drl 2009-07-27 14:44:27 UTC (rev 682)
@@ -5,7 +5,6 @@
global org.jboss.sam.internal.drools.SAMAdapter SAM;
-# default dialect for the semantic code will be MVEL
dialect "mvel"
# flag as event
@@ -23,3 +22,23 @@
then
SAM.getListener("iran results").update($tweets);
end
+
+rule "U.S. involvement tweets"
+when
+ $tweets: List() from accumulate(
+ $t : Tweet(text matches "(.*)(U.S.)(.*)") over window:time(15s) from entry-point "iran tweets",
+ collectList( $t )
+ )
+then
+ SAM.getListener("us involved").update($tweets);
+end
+
+rule "Isreal involvement tweets"
+when
+ $tweets: List() from accumulate(
+ $t : Tweet(text matches "(.*)(Israel)(.*)") over window:time(15s) from entry-point "iran tweets",
+ collectList( $t )
+ )
+then
+ SAM.getListener("israel involved").update($tweets);
+end
16 years, 12 months
Overlord SVN: r681 - in sam/trunk: modules/core and 4 other directories.
by overlord-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-07-27 09:33:12 -0400 (Mon, 27 Jul 2009)
New Revision: 681
Removed:
sam/trunk/modules/examples/twitter/src/main/resources/search-jboss.json
Modified:
sam/trunk/SAMM.ipr
sam/trunk/SAMM.iws
sam/trunk/modules/core/core.iml
sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java
sam/trunk/modules/examples/twitter/src/main/resources/iran-tweets.drl
sam/trunk/modules/examples/twitter/src/main/resources/sam-cfg.xml
sam/trunk/modules/examples/twitter/twitter.iml
sam/trunk/modules/sim/sim.iml
sam/trunk/toplevel.iml
Log:
Fix twitter DRL
Modified: sam/trunk/SAMM.ipr
===================================================================
--- sam/trunk/SAMM.ipr 2009-07-27 13:07:55 UTC (rev 680)
+++ sam/trunk/SAMM.ipr 2009-07-27 13:33:12 UTC (rev 681)
@@ -164,7 +164,7 @@
<entry>
<value>
<collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="toplevel" />
+ <entry type="java.lang.String" value="core" />
</collection>
</value>
<key type="java.lang.String" value="sim" />
@@ -172,7 +172,7 @@
<entry>
<value>
<collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="toplevel" />
+ <entry type="java.lang.String" value="core" />
</collection>
</value>
<key type="java.lang.String" value="twitter" />
@@ -310,7 +310,6 @@
<module fileurl="file://$PROJECT_DIR$/modules/core/core.iml" filepath="$PROJECT_DIR$/modules/core/core.iml" />
<module fileurl="file:///Users/hbraun/dev/env/drools-5.0-examples/drools-examples/drools-examples-fusion/drools-examples-fusion.iml" filepath="/Users/hbraun/dev/env/drools-5.0-examples/drools-examples/drools-examples-fusion/drools-examples-fusion.iml" />
<module fileurl="file://$PROJECT_DIR$/modules/sim/sim.iml" filepath="$PROJECT_DIR$/modules/sim/sim.iml" />
- <module fileurl="file://$PROJECT_DIR$/toplevel.iml" filepath="$PROJECT_DIR$/toplevel.iml" />
<module fileurl="file://$PROJECT_DIR$/modules/examples/twitter/twitter.iml" filepath="$PROJECT_DIR$/modules/examples/twitter/twitter.iml" />
</modules>
</component>
Modified: sam/trunk/SAMM.iws
===================================================================
--- sam/trunk/SAMM.iws 2009-07-27 13:07:55 UTC (rev 680)
+++ sam/trunk/SAMM.iws 2009-07-27 13:33:12 UTC (rev 681)
@@ -18,25 +18,15 @@
<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/src/main/resources/sam-cfg.xml" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml" />
<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="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/resources/simulation/test.drl" afterPath="$PROJECT_DIR$/modules/sim/src/test/resources/simulation/test.drl" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/util/CurrentValueTable.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/util/CurrentValueTable.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/util/CurrentValueTable.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/sim.iml" afterPath="$PROJECT_DIR$/modules/sim/sim.iml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/log-tweets.drl" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/util" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/util" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CurrentValueTable.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CurrentValueTable.java" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/search-jboss.json" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/toplevel.iml" afterPath="$PROJECT_DIR$/toplevel.iml" />
+ <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/core.iml" afterPath="$PROJECT_DIR$/modules/core/core.iml" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -196,7 +186,7 @@
<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="42" column="62" selection-start="1547" selection-end="1547" vertical-scroll-proportion="0.4416562">
+ <state line="101" column="19" selection-start="2770" selection-end="2770" vertical-scroll-proportion="0.642409">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -204,15 +194,33 @@
</provider>
</entry>
</file>
- <file leaf-file-name="CurrentValueTable.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/util/CurrentValueTable.java">
+ <file leaf-file-name="CVTOutput.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/CVTOutput.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="13" selection-start="1214" selection-end="1214" vertical-scroll-proportion="0.15763547">
+ <state line="39" column="0" selection-start="1435" selection-end="1435" vertical-scroll-proportion="0.12438424">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="iran-tweets.drl" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="25" column="0" selection-start="516" selection-end="516" vertical-scroll-proportion="0.49261084">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="sam-cfg.xml" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="12" column="0" selection-start="367" selection-end="367" vertical-scroll-proportion="0.2364532">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -503,10 +511,6 @@
<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="toplevel" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -514,26 +518,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="toplevel" />
- <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>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="SAMM.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </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>
@@ -569,18 +553,6 @@
<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/test" />
- <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/test/resources" />
- <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/test/resources/drools" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -600,54 +572,10 @@
<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/test" />
+ <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/test/resources" />
- <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/test" />
- <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>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -869,13 +797,13 @@
</component>
<component name="ToolWindowManager">
<frame x="393" y="43" width="1258" height="959" 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.3209264" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3209264" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32482597" 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" />
@@ -971,28 +899,14 @@
<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.52098763" version="1">
+ <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.52098763,0.5" version="1">
<option name="myPlainMode" value="false" />
- <option name="myLastEditedConfigurable" value="twitter" />
+ <option name="myLastEditedConfigurable" value="core" />
</component>
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/drools/standalone.drl">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/test/resources/samples/aggregation/aggregation-sample.drl">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/sql-join.drl">
<provider selected="true" editor-type-id="text-editor">
<state line="11" column="23" selection-start="295" selection-end="308" vertical-scroll-proportion="0.2208281">
@@ -1028,13 +942,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl">
- <provider selected="true" editor-type-id="text-editor">
- <state line="18" column="13" selection-start="319" selection-end="319" vertical-scroll-proportion="0.3546798">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/modules/core/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">
@@ -1056,36 +963,50 @@
</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/util/CurrentValueTable.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="57" selection-start="317" selection-end="317" vertical-scroll-proportion="0.13793103">
+ <state line="57" column="57" selection-start="1654" selection-end="1654" vertical-scroll-proportion="0.6699507">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/examples/twitter/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="27" column="80" selection-start="963" selection-end="963" vertical-scroll-proportion="0.5420326">
+ <state line="33" column="36" selection-start="1102" selection-end="1102" vertical-scroll-proportion="0.6624843">
<folding />
</state>
</provider>
</entry>
<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="42" column="62" selection-start="1547" selection-end="1547" vertical-scroll-proportion="0.4416562">
+ <state line="101" column="19" selection-start="2770" selection-end="2770" vertical-scroll-proportion="0.642409">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/util/CurrentValueTable.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="31" column="13" selection-start="1214" selection-end="1214" vertical-scroll-proportion="0.15763547">
+ <state line="39" column="0" selection-start="1435" selection-end="1435" vertical-scroll-proportion="0.12438424">
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="25" column="0" selection-start="516" selection-end="516" vertical-scroll-proportion="0.49261084">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="12" column="0" selection-start="367" selection-end="367" vertical-scroll-proportion="0.2364532">
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
Modified: sam/trunk/modules/core/core.iml
===================================================================
--- sam/trunk/modules/core/core.iml 2009-07-27 13:07:55 UTC (rev 680)
+++ sam/trunk/modules/core/core.iml 2009-07-27 13:33:12 UTC (rev 681)
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4" relativePaths="true" type="JAVA_MODULE">
<component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
<exclude-output />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
@@ -123,54 +125,60 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.mvel:mvel2:jar:2.0.10:compile">
+ <library name="M2 Dep: org.antlr:antlr-runtime:jar:3.1.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/mvel/mvel2/2.0.10/mvel2-2.0.10.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.antlr:antlr-runtime:jar:3.1.1:compile">
+ <library name="M2 Dep: janino:janino:jar:2.5.15:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/janino/janino/2.5.15/janino-2.5.15.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: janino:janino:jar:2.5.15:compile">
+ <library name="M2 Dep: org.drools:drools-core:jar:5.1.0.SNAPSHOT:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/janino/janino/2.5.15/janino-2.5.15.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.drools:drools-core:jar:5.0.1:compile">
+ <library name="M2 Dep: org.drools:drools-api:jar:5.1.0.SNAPSHOT:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-core/5.0.1/drools-core-5.0.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.drools:drools-api:jar:5.0.1:compile">
+ <library name="M2 Dep: org.drools:drools-compiler:jar:5.1.0.SNAPSHOT:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-api/5.0.1/drools-api-5.0.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.drools:drools-compiler:jar:5.0.1:compile">
+ <library name="M2 Dep: org.mvel:mvel2:jar:2.0.12:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-compiler/5.0.1/drools-compiler-5.0.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java 2009-07-27 13:07:55 UTC (rev 680)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java 2009-07-27 13:33:12 UTC (rev 681)
@@ -60,7 +60,6 @@
)
);
-
}
/**
Modified: sam/trunk/modules/examples/twitter/src/main/resources/iran-tweets.drl
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/resources/iran-tweets.drl 2009-07-27 13:07:55 UTC (rev 680)
+++ sam/trunk/modules/examples/twitter/src/main/resources/iran-tweets.drl 2009-07-27 13:33:12 UTC (rev 681)
@@ -18,9 +18,8 @@
when
$tweets: List() from accumulate(
$t : Tweet(id>0) over window:time(15s) from entry-point "iran tweets",
- accumulateList( $t )
+ collectList( $t )
)
-then
- System.out.println("RHS => Size "+$tweets.size() + " @ "+new java.util.Date());
- //SAM.getListener("iran results").update($tweets);
+then
+ SAM.getListener("iran results").update($tweets);
end
Modified: sam/trunk/modules/examples/twitter/src/main/resources/sam-cfg.xml
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/resources/sam-cfg.xml 2009-07-27 13:07:55 UTC (rev 680)
+++ sam/trunk/modules/examples/twitter/src/main/resources/sam-cfg.xml 2009-07-27 13:33:12 UTC (rev 681)
@@ -5,7 +5,7 @@
xmlns:ns2="http://org.jboss.sam/08/2008/">
<runtime-configuration>
- <property name="drools.runtimelog.enable" value="true"/>
+ <property name="drools.runtimelog.enable" value="false"/>
</runtime-configuration>
<statements/>
Deleted: sam/trunk/modules/examples/twitter/src/main/resources/search-jboss.json
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/resources/search-jboss.json 2009-07-27 13:07:55 UTC (rev 680)
+++ sam/trunk/modules/examples/twitter/src/main/resources/search-jboss.json 2009-07-27 13:33:12 UTC (rev 681)
@@ -1 +0,0 @@
-{"results":[{"text":"Richfaces is awesome, combine it with JBoss Studio the Eclipse ide from jboss ; that Rapid JSF app development","to_user_id":null,"from_user":"Ashok_Nanda","id":2795825173,"from_user_id":17081595,"iso_language_code":"en","source":"<a href="http:\/\/twitter.com\/">web<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/211976066\/ruby_normal.png","created_at":"Thu, 23 Jul 2009 09:58:34 +0000"},{"text":"Gonna work with the Big Boss today ... JBoss that is.","to_user_id":null,"from_user":"kmf","id":2795789895,"from_user_id":187295,"iso_language_code":"en","source":"<a href="http:\/\/floss.pro">floss.pro<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/323316425\/KarlFischer-OpenSuse_normal.jpg","created_at":"Thu, 23 Jul 2009 09:53:54 +0000"},{"text":"RT @sawan_ahluwalia weblogic to jboss migration","to_user_id":null,"from_user":"tamed_!
public_tl","id":2795431416,"from_user_id":27846565,"iso_language_code":"en","source":"<a href="http:\/\/software.complete.org\/twidge">Twidge<\/a>","profile_image_url":"http:\/\/static.twitter.com\/images\/default_profile_normal.png","created_at":"Thu, 23 Jul 2009 09:09:03 +0000"},{"text":"weblogic to jboss migration","to_user_id":null,"from_user":"sawan_ahluwalia","id":2795429838,"from_user_id":21204328,"iso_language_code":"en","source":"<a href="http:\/\/twitter.com\/">web<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/257273508\/Dragon_normal.bmp","created_at":"Thu, 23 Jul 2009 09:08:51 +0000"},{"text":"Setting up CI for JBoss Cloud","to_user_id":null,"from_user":"marekgoldmann","id":2795272079,"from_user_id":3296905,"iso_language_code":"en","source":"<a href="http:\/\/www.atebits.com\/">Tweetie<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_product!
ion\/profile_images\/94131308\/av_normal.jpg","created_at":"Th!
u, 23 Ju
l 2009 08:49:28 +0000"},{"text":"\u041d\u0430\u0434\u043e \u0431\u0443\u0434\u0435\u0442 \u043f\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0447\u0442\u043e \u0437\u0430 \u0437\u0432\u0435\u0440\u044c http:\/\/www.jboss.org\/infinispan","to_user_id":null,"from_user":"alekseiKO","id":2794666043,"from_user_id":3105964,"iso_language_code":"ru","source":"<a href="http:\/\/Jabber2Twitter.com">Jabber2Twitter<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/68114853\/NLO_normal.jpg","created_at":"Thu, 23 Jul 2009 07:39:55 +0000"},{"text":"Very productive night. Java, Apache, JBoss, MySql and FTP server installed on my Ubuntu machine on Amazon EC2. I'm going to bed now.","to_user_id":null,"from_user":"sandromancuso","id":2793803356,"from_user_id":26900362,"iso_language_code":"en","source":"<a href="http:\/\/twitter.com\/">web<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_!
production\/profile_images\/299814771\/27795085_N00_normal.jpg","created_at":"Thu, 23 Jul 2009 06:13:02 +0000"},{"text":"@GODJJBOSS drinks on jboss for 5 min lol","to_user_id":15813517,"to_user":"GODJJBOSS","from_user":"godjjque","id":2793055368,"from_user_id":12604917,"iso_language_code":"en","source":"<a href="http:\/\/twitterfon.net\/">TwitterFon<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/303678198\/bvxHex_large_normal.jpg","created_at":"Thu, 23 Jul 2009 05:10:05 +0000"},{"text":"Have received the requests for JBOSS and iPhone 3 Dev, they will be on the new site asap http:\/\/markiemark.me :)","to_user_id":null,"from_user":"CodingBooks","id":2792394400,"from_user_id":28444238,"iso_language_code":"en","source":"<a href="http:\/\/twitter.com\/">web<\/a>","profile_image_url":"http:\/\/static.twitter.com\/images\/default_profile_normal.png","created_at":"Thu, 23 Jul 2009 04:22:42 +0000!
"},{"text":"@GODJJBOSS u member....youu member...."Jboss !
be putti
ng it down wooooooo slimjim and tha freestyle child woooooo"..CLASSIC!!!...yep yep yep","to_user_id":15813517,"to_user":"GODJJBOSS","from_user":"SlimJimBaba","id":2791788724,"from_user_id":23225504,"iso_language_code":"en","source":"<a href="http:\/\/orangatame.com\/products\/twitterberry\/">TwitterBerry<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/279033778\/DSC02420_normal.JPG","created_at":"Thu, 23 Jul 2009 03:44:04 +0000"},{"text":"Been testing JBoss for a big project we're working on. Jazzed about deploying it for our production servers.","to_user_id":null,"from_user":"Rick_Proctor","id":2791771481,"from_user_id":1204960,"iso_language_code":"en","source":"<a href="http:\/\/twitter.com\/">web<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/276999643\/rizzo1jpg_normal.jpg","created_at":"Thu, 23 Jul 2009 03:42:56 +0000"},{"text":"RT: @jbos!
scn: JBoss Identity \u548c OpenID \u96c6\u6210 http:\/\/jboss.org\/jbossidentity\/downloads\/","to_user_id":null,"from_user":"night_gardener","id":2791514318,"from_user_id":29659697,"iso_language_code":"en","source":"<a href="http:\/\/www.mustacheinc.com\/summizer">Summizer<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/319908678\/murmur_normal.jpg","created_at":"Thu, 23 Jul 2009 03:26:53 +0000"},{"text":"On to Qualifying JBoss Operations Network (JBoss-ON) with Monitoring","to_user_id":null,"from_user":"carlosparientes","id":2791465300,"from_user_id":14949606,"iso_language_code":"en","source":"<a href="http:\/\/twitter.com\/">web<\/a>","profile_image_url":"http:\/\/static.twitter.com\/images\/default_profile_normal.png","created_at":"Thu, 23 Jul 2009 03:23:53 +0000"},{"text":"@burningdeck i was having the same problem yesterday on JBOSS, was caused by a FileNotFoundException :)","to_user!
_id":8649029,"to_user":"burningdeck","from_user":"mrxd","id":2!
79051060
4,"from_user_id":2830554,"iso_language_code":"en","source":"<a href="http:\/\/www.twittergadget.com">TwitterGadget<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/192639089\/Untitled3_normal.jpg","created_at":"Thu, 23 Jul 2009 02:26:50 +0000"},{"text":"JBoss Identity \u548c OpenID \u96c6\u6210 http:\/\/jboss.org\/jbossidentity\/downloads\/","to_user_id":null,"from_user":"jbosscn","id":2789556884,"from_user_id":18621456,"iso_language_code":"en","source":"<a href="http:\/\/twitter.com\/">web<\/a>","profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/289509427\/jbosscn_normal.jpg","created_at":"Thu, 23 Jul 2009 01:29:29 +0000"}],"since_id":0,"max_id":2795825173,"refresh_url":"?since_id=2795825173&q=jboss","results_per_page":15,"next_page":"?page=2&max_id=2795825173&q=jboss","completed_in":0.016466,"page":1,"query":"jboss"}
\ No newline at end of file
Modified: sam/trunk/modules/examples/twitter/twitter.iml
===================================================================
--- sam/trunk/modules/examples/twitter/twitter.iml 2009-07-27 13:07:55 UTC (rev 680)
+++ sam/trunk/modules/examples/twitter/twitter.iml 2009-07-27 13:33:12 UTC (rev 681)
@@ -12,7 +12,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="core" />
- <orderEntry type="module" module-name="toplevel" />
<orderEntry type="module-library">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
<CLASSES>
@@ -23,6 +22,17 @@
</library>
</orderEntry>
<orderEntry type="module-library">
+ <library name="M2 Dep: org.drools:drools-core:jar:5.1.0.SNAPSHOT:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
<library name="M2 Dep: commons-dbcp:commons-dbcp:jar:1.2.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar!/" />
@@ -43,15 +53,26 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.mvel:mvel2:jar:2.0.10:compile">
+ <library name="M2 Dep: openchart:openchart:jar:1.4.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/mvel/mvel2/2.0.10/mvel2-2.0.10.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/openchart/openchart/1.4.2/openchart-1.4.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
+ <library name="M2 Dep: org.drools:drools-api:jar:5.1.0.SNAPSHOT:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
<library name="M2 Dep: org.slf4j:nlog4j:jar:1.2.25:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/nlog4j/1.2.25/nlog4j-1.2.25.jar!/" />
@@ -97,6 +118,17 @@
</library>
</orderEntry>
<orderEntry type="module-library">
+ <library name="M2 Dep: org.drools:drools-compiler:jar:5.1.0.SNAPSHOT:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
<library name="M2 Dep: janino:janino:jar:2.5.15:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/janino/janino/2.5.15/janino-2.5.15.jar!/" />
@@ -126,24 +158,6 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.drools:drools-core:jar:5.0.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-core/5.0.1/drools-core-5.0.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.drools:drools-api:jar:5.0.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-api/5.0.1/drools-api-5.0.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
<library name="M2 Dep: commons-logging:commons-logging-api:jar:1.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar!/" />
@@ -171,9 +185,9 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.drools:drools-compiler:jar:5.0.1:compile">
+ <library name="M2 Dep: org.mvel:mvel2:jar:2.0.12:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/drools/drools-compiler/5.0.1/drools-compiler-5.0.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -208,15 +222,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: openchart:openchart:jar:1.4.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/openchart/openchart/1.4.2/openchart-1.4.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: sam/trunk/modules/sim/sim.iml
===================================================================
--- sam/trunk/modules/sim/sim.iml 2009-07-27 13:07:55 UTC (rev 680)
+++ sam/trunk/modules/sim/sim.iml 2009-07-27 13:33:12 UTC (rev 681)
@@ -10,7 +10,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="toplevel" />
+ <orderEntry type="module" module-name="core" />
<orderEntry type="module-library">
<library name="M2 Dep: junit:junit:jar:3.8.2:compile">
<CLASSES>
@@ -124,54 +124,60 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.mvel:mvel2:jar:2.0.10:compile">
+ <library name="M2 Dep: org.antlr:antlr-runtime:jar:3.1.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/mvel/mvel2/2.0.10/mvel2-2.0.10.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.antlr:antlr-runtime:jar:3.1.1:compile">
+ <library name="M2 Dep: janino:janino:jar:2.5.15:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/janino/janino/2.5.15/janino-2.5.15.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: janino:janino:jar:2.5.15:compile">
+ <library name="M2 Dep: org.drools:drools-core:jar:5.1.0.SNAPSHOT:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/janino/janino/2.5.15/janino-2.5.15.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.drools:drools-core:jar:5.0.1:compile">
+ <library name="M2 Dep: org.drools:drools-api:jar:5.1.0.SNAPSHOT:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-core/5.0.1/drools-core-5.0.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.drools:drools-api:jar:5.0.1:compile">
+ <library name="M2 Dep: org.drools:drools-compiler:jar:5.1.0.SNAPSHOT:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-api/5.0.1/drools-api-5.0.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.drools:drools-compiler:jar:5.0.1:compile">
+ <library name="M2 Dep: org.mvel:mvel2:jar:2.0.12:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/drools/drools-compiler/5.0.1/drools-compiler-5.0.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: sam/trunk/toplevel.iml
===================================================================
--- sam/trunk/toplevel.iml 2009-07-27 13:07:55 UTC (rev 680)
+++ sam/trunk/toplevel.iml 2009-07-27 13:33:12 UTC (rev 681)
@@ -128,92 +128,98 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.mvel:mvel2:jar:2.0.10:compile">
+ <library name="M2 Dep: org.antlr:antlr-runtime:jar:3.1.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/mvel/mvel2/2.0.10/mvel2-2.0.10.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.antlr:antlr-runtime:jar:3.1.1:compile">
+ <library name="M2 Dep: janino:janino:jar:2.5.15:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/janino/janino/2.5.15/janino-2.5.15.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: janino:janino:jar:2.5.15:compile">
+ <library name="M2 Dep: net.homeip.yusuke:twitter4j:jar:2.0.8:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/janino/janino/2.5.15/janino-2.5.15.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/net/homeip/yusuke/twitter4j/2.0.8/twitter4j-2.0.8.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/net/homeip/yusuke/twitter4j/2.0.8/twitter4j-2.0.8-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.drools:drools-core:jar:5.0.1:compile">
+ <library name="M2 Dep: rome:rome:jar:0.9:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-core/5.0.1/drools-core-5.0.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/rome/rome/0.9/rome-0.9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.drools:drools-api:jar:5.0.1:compile">
+ <library name="M2 Dep: org.slf4j:nlog4j:jar:1.2.25:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-api/5.0.1/drools-api-5.0.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/slf4j/nlog4j/1.2.25/nlog4j-1.2.25.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.drools:drools-compiler:jar:5.0.1:compile">
+ <library name="M2 Dep: openchart:openchart:jar:1.4.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-compiler/5.0.1/drools-compiler-5.0.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/openchart/openchart/1.4.2/openchart-1.4.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: net.homeip.yusuke:twitter4j:jar:2.0.8:compile">
+ <library name="M2 Dep: org.drools:drools-core:jar:5.1.0.SNAPSHOT:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/net/homeip/yusuke/twitter4j/2.0.8/twitter4j-2.0.8.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/net/homeip/yusuke/twitter4j/2.0.8/twitter4j-2.0.8-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: rome:rome:jar:0.9:compile">
+ <library name="M2 Dep: org.drools:drools-api:jar:5.1.0.SNAPSHOT:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/rome/rome/0.9/rome-0.9.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.slf4j:nlog4j:jar:1.2.25:compile">
+ <library name="M2 Dep: org.drools:drools-compiler:jar:5.1.0.SNAPSHOT:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/slf4j/nlog4j/1.2.25/nlog4j-1.2.25.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: openchart:openchart:jar:1.4.2:compile">
+ <library name="M2 Dep: org.mvel:mvel2:jar:2.0.12:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../.m2/repository/openchart/openchart/1.4.2/openchart-1.4.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
16 years, 12 months
Overlord SVN: r680 - in sam/trunk: modules/core/src/main/java/org/jboss/sam and 7 other directories.
by overlord-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-07-27 09:07:55 -0400 (Mon, 27 Jul 2009)
New Revision: 680
Added:
sam/trunk/modules/core/src/main/java/org/jboss/sam/util/
sam/trunk/modules/core/src/main/java/org/jboss/sam/util/CurrentValueTable.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/examples/twitter/src/main/java/org/jboss/sam/util/
sam/trunk/modules/examples/twitter/src/main/resources/iran-tweets.drl
Removed:
sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java
sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java
sam/trunk/modules/examples/twitter/src/main/resources/log-tweets.drl
Modified:
sam/trunk/SAMM.ipr
sam/trunk/SAMM.iws
sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java
sam/trunk/modules/examples/twitter/src/main/resources/sam-cfg.xml
sam/trunk/modules/examples/twitter/twitter.iml
sam/trunk/modules/sim/sim.iml
sam/trunk/modules/sim/src/test/resources/simulation/test.drl
sam/trunk/pom.xml
sam/trunk/toplevel.iml
Log:
More work on the twitter example. Update to drools 5.1.0.SNAPSHOT
Modified: sam/trunk/SAMM.ipr
===================================================================
--- sam/trunk/SAMM.ipr 2009-07-24 08:38:45 UTC (rev 679)
+++ sam/trunk/SAMM.ipr 2009-07-27 13:07:55 UTC (rev 680)
@@ -164,7 +164,7 @@
<entry>
<value>
<collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="core" />
+ <entry type="java.lang.String" value="toplevel" />
</collection>
</value>
<key type="java.lang.String" value="sim" />
@@ -172,17 +172,9 @@
<entry>
<value>
<collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="core" />
+ <entry type="java.lang.String" value="toplevel" />
</collection>
</value>
- <key type="java.lang.String" value="toplevel" />
- </entry>
- <entry>
- <value>
- <collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="core" />
- </collection>
- </value>
<key type="java.lang.String" value="twitter" />
</entry>
</map>
Modified: sam/trunk/SAMM.iws
===================================================================
--- sam/trunk/SAMM.iws 2009-07-24 08:38:45 UTC (rev 679)
+++ sam/trunk/SAMM.iws 2009-07-27 13:07:55 UTC (rev 680)
@@ -20,13 +20,23 @@
<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="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/resources/simulation/test.drl" afterPath="$PROJECT_DIR$/modules/sim/src/test/resources/simulation/test.drl" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/util/CurrentValueTable.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/util/CurrentValueTable.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/util/CurrentValueTable.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/sim.iml" afterPath="$PROJECT_DIR$/modules/sim/sim.iml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/log-tweets.drl" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/util" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/util" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/pom.xml" afterPath="$PROJECT_DIR$/modules/examples/twitter/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CurrentValueTable.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CurrentValueTable.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/toplevel.iml" afterPath="$PROJECT_DIR$/toplevel.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/log-tweets.drl" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/log-tweets.drl" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -98,7 +108,7 @@
</component>
<component name="DebuggerManager">
<line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java" line="78" class="org.jboss.sam.internal.drools.StreamOutputAdapter" package="org.jboss.sam.internal.drools">
+ <breakpoint url="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java" line="64" class="org.jboss.sam.examples.twitter.CVTOutput" package="org.jboss.sam.examples.twitter">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -111,45 +121,6 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java" line="61" class="org.jboss.sam.examples.twitter.TweetLogger" package="org.jboss.sam.examples.twitter">
- <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$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java" line="76" class="org.jboss.sam.examples.twitter.TweetLogger" package="org.jboss.sam.examples.twitter">
- <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$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java" line="51" class="org.jboss.sam.internal.drools.StreamOutputAdapter" package="org.jboss.sam.internal.drools">
- <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>
@@ -222,19 +193,10 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="StreamOutputAdapter.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java">
+ <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="78" column="0" selection-start="2357" selection-end="2357" vertical-scroll-proportion="0.7448166">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="TweetLogger.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/TweetLogger.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="76" column="0" selection-start="2150" selection-end="2150" vertical-scroll-proportion="0.48963317">
+ <state line="42" column="62" selection-start="1547" selection-end="1547" vertical-scroll-proportion="0.4416562">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -242,28 +204,15 @@
</provider>
</entry>
</file>
- <file leaf-file-name="BarChart.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/BarChart.java">
+ <file leaf-file-name="CurrentValueTable.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/util/CurrentValueTable.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="116" column="23" selection-start="4101" selection-end="4101" vertical-scroll-proportion="1.7400318">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="31" column="13" selection-start="1214" selection-end="1214" vertical-scroll-proportion="0.15763547">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="TitterSearch.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/TitterSearch.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="39" column="27" selection-start="1477" selection-end="1477" vertical-scroll-proportion="0.307815">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -502,7 +451,45 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam" />
<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="twitter" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/examples/twitter" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/examples/twitter/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/examples/twitter/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/examples/twitter/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/examples/twitter/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/examples/twitter/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/examples/twitter/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/examples/twitter/src/main/java/org/jboss/sam/examples" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -516,6 +503,10 @@
<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="toplevel" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -523,6 +514,26 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="toplevel" />
+ <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>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="SAMM.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </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>
@@ -558,7 +569,85 @@
<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/test" />
+ <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/test/resources" />
+ <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/test/resources/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/test" />
+ <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/test/resources" />
+ <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/test" />
+ <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>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -572,7 +661,7 @@
<showLibraryContents />
<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 />
@@ -593,6 +682,8 @@
</component>
<component name="RecentsManager">
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.jboss.sam.util" />
+ <recent name="org.jboss.sam.examples.twitter" />
<recent name="twitter4j.http" />
<recent name="twitter" />
<recent name="org.jboss.sam.config.internal" />
@@ -609,16 +700,10 @@
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<module name="twitter" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="57898" />
- <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="true" />
+ <option name="Make" value="false" />
</method>
</tempConfiguration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
@@ -631,15 +716,20 @@
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<module name="" />
<method>
- <option name="Make" value="true" />
+ <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 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="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
@@ -660,17 +750,12 @@
<option name="Make" value="true" />
</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 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" />
@@ -688,6 +773,21 @@
<option name="Make" value="true" />
</method>
</configuration>
+ <configuration default="false" name="run" type="Application" factoryName="Application" enabled="false" merge="false">
+ <option name="MAIN_CLASS_NAME" value="org.jboss.sam.examples.twitter.run" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" value="" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <module name="twitter" />
+ <RunnerSettings RunnerId="Run" />
+ <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>
@@ -768,28 +868,28 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="0" y="22" width="1280" height="774" extended-state="6" />
- <editor active="true" />
+ <frame x="393" y="43" width="1258" height="959" extended-state="0" />
+ <editor active="false" />
<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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31600326" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32496306" order="1" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3209264" order="0" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32482597" 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.32951945" order="9" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32946634" order="9" />
<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="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="6" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="10" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.18719211" order="4" />
<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="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.58197933" order="2" />
+ <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="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.3958641" order="4" />
+ <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" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="13" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
@@ -871,7 +971,7 @@
<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.52098763,0.5" version="1">
+ <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.52098763" version="1">
<option name="myPlainMode" value="false" />
<option name="myLastEditedConfigurable" value="twitter" />
</component>
@@ -879,114 +979,110 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/drools/standalone.drl">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="58" selection-start="318" selection-end="318" vertical-scroll-proportion="0.3181818">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/log-tweets.drl">
+ <entry file="file://$PROJECT_DIR$/modules/sim/src/test/resources/samples/aggregation/aggregation-sample.drl">
<provider selected="true" editor-type-id="text-editor">
- <state line="19" column="49" selection-start="398" selection-end="398" vertical-scroll-proportion="0.8636364">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/sql-join.drl">
<provider selected="true" editor-type-id="text-editor">
- <state line="75" column="0" selection-start="2751" selection-end="2751" vertical-scroll-proportion="0.3323442">
+ <state line="11" column="23" selection-start="295" selection-end="308" vertical-scroll-proportion="0.2208281">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/sql-join.drl">
+ <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="10" column="30" selection-start="275" selection-end="275" vertical-scroll-proportion="0.47477746">
+ <state line="48" column="13" selection-start="1949" selection-end="1949" vertical-scroll-proportion="0.16060226">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home/src.jar!/src/java/lang/Integer.java">
+ <entry file="file://$PROJECT_DIR$/modules/sim/src/test/resources/simulation/test.drl">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="0" selection-start="1105" selection-end="1105" vertical-scroll-proportion="0.3323442">
+ <state line="17" column="0" selection-start="385" selection-end="385" vertical-scroll-proportion="0.33497536">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///Users/hbraun/.m2/repository/org/mvel/mvel2/2.0.10/mvel2-2.0.10.jar!/org/mvel2/optimizers/impl/refl/ReflectiveAccessorOptimizer.class">
+ <entry file="file://$PROJECT_DIR$/modules/sim/src/test/resources/simulation/sam-cfg.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="0" selection-start="2152" selection-end="2152" vertical-scroll-proportion="0.3323442">
+ <state line="6" column="58" selection-start="315" selection-end="320" vertical-scroll-proportion="0.1182266">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///Users/hbraun/.m2/repository/org/drools/drools-core/5.0.1/drools-core-5.0.1.jar!/org/drools/base/mvel/MVELConsequence.class">
+ <entry file="jar:///Users/hbraun/.m2/repository/org/drools/drools-core/5.0.1/drools-core-5.0.1.jar!/org/drools/base/accumulators/MVELAccumulatorFunctionExecutor.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="22" column="0" selection-start="1058" selection-end="1058" vertical-scroll-proportion="0.5727003">
+ <state line="46" column="0" selection-start="3176" selection-end="3176" vertical-scroll-proportion="0.6678201">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///Users/hbraun/.m2/repository/org/drools/drools-core/5.0.1/drools-core-5.0.1.jar!/org/drools/runtime/rule/impl/DefaultConsequenceExceptionHandler.class">
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/iran-tweets.drl">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="0" selection-start="631" selection-end="631" vertical-scroll-proportion="0.3137255">
+ <state line="18" column="13" selection-start="319" selection-end="319" vertical-scroll-proportion="0.3546798">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///Users/hbraun/.m2/repository/org/drools/drools-core/5.0.1/drools-core-5.0.1.jar!/org/drools/common/AbstractWorkingMemory.class">
+ <entry file="file://$PROJECT_DIR$/modules/core/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="144" column="0" selection-start="7826" selection-end="7826" vertical-scroll-proportion="0.18300654">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.20075282">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home/src.jar!/src/java/net/URLClassLoader.java">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="204" column="0" selection-start="7752" selection-end="7752" vertical-scroll-proportion="0.18660288">
+ <state line="14" column="53" selection-start="539" selection-end="539" vertical-scroll-proportion="0.28105396">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home/src.jar!/src/java/lang/ClassLoader.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="979" column="0" selection-start="36286" selection-end="36286" vertical-scroll-proportion="0.3323442">
+ <state line="78" column="26" selection-start="2301" selection-end="2301" vertical-scroll-proportion="0.66871923">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java">
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="78" column="0" selection-start="2357" selection-end="2357" vertical-scroll-proportion="0.7448166">
+ <state line="7" column="57" selection-start="317" selection-end="317" vertical-scroll-proportion="0.13793103">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java">
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="76" column="0" selection-start="2150" selection-end="2150" vertical-scroll-proportion="0.48963317">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="27" column="80" selection-start="963" selection-end="963" vertical-scroll-proportion="0.5420326">
+ <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/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="116" column="23" selection-start="4101" selection-end="4101" vertical-scroll-proportion="1.7400318">
+ <state line="42" column="62" selection-start="1547" selection-end="1547" vertical-scroll-proportion="0.4416562">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/util/CurrentValueTable.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="39" column="27" selection-start="1477" selection-end="1477" vertical-scroll-proportion="0.307815">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="31" column="13" selection-start="1214" selection-end="1214" vertical-scroll-proportion="0.15763547">
+ <folding />
</state>
</provider>
</entry>
Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/util/CurrentValueTable.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/util/CurrentValueTable.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/util/CurrentValueTable.java 2009-07-27 13:07:55 UTC (rev 680)
@@ -0,0 +1,104 @@
+/*
+ * 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.util;
+
+import org.jboss.sam.EventMessage;
+
+import java.util.*;
+import java.io.PrintStream;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class CurrentValueTable
+{
+ private List<Map> table = new ArrayList<Map>();
+
+ private String[] columns;
+ private String name;
+ public CurrentValueTable(String name, String[] columns)
+ {
+ this.name = name;
+ this.columns = columns;
+ }
+
+ public void clear()
+ {
+ this.table.clear();
+ }
+
+ public int size()
+ {
+ return table.size();
+ }
+
+ public void update(EventMessage[] events)
+ {
+ synchronized(table)
+ {
+ clear();
+
+ for(EventMessage event : events)
+ {
+ Map<String,Object> row = new HashMap<String, Object>();
+ for(String s : columns)
+ {
+ row.put(s, event.getProperty(s));
+ }
+ table.add(row);
+ }
+ }
+ }
+
+ public List<Map> snapshot()
+ {
+ return Collections.unmodifiableList(table);
+ }
+
+ public void dump(PrintStream out)
+ {
+ synchronized(table)
+ {
+ int i=1;
+ Iterator<Map> iterator = table.iterator();
+ StringBuffer sb = new StringBuffer();
+ sb.append("[").append(name).append("]\n");
+ sb.append("-----------\n");
+ while(iterator.hasNext())
+ {
+ Map row = iterator.next();
+
+ sb.append(i).append("\t\t");
+ for(String s : columns)
+ {
+ sb.append(row.get(s)).append("\t\t\t");
+ }
+
+ sb.append("\n");
+ i++;
+ }
+ sb.append("-----------\n");
+
+ System.out.println(sb.toString());
+ }
+ }
+}
Copied: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java (from rev 679, sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java)
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java (rev 0)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/CVTOutput.java 2009-07-27 13:07:55 UTC (rev 680)
@@ -0,0 +1,78 @@
+/*
+ * 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.examples.twitter;
+
+import org.jboss.sam.EventMessage;
+import org.jboss.sam.StreamOutput;
+import org.jboss.sam.util.CurrentValueTable;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class CVTOutput implements StreamOutput
+{
+ private boolean started;
+ private String name;
+ private CurrentValueTable cvt;
+
+ public CVTOutput(String name)
+ {
+ this.name = name;
+ this.cvt = new CurrentValueTable(
+ name, new String[] {"id", "fromUser", "createdAt"}
+ );
+ }
+
+ public StreamOutput start()
+ {
+ System.out.println("Started search tweet logger");
+ this.started = true;
+ return this;
+ }
+
+ public StreamOutput stop()
+ {
+ this.started = false;
+ return this;
+ }
+
+ public boolean isStarted()
+ {
+ return this.started;
+ }
+
+ public void write(EventMessage[] events)
+ {
+ cvt.update(events);
+ cvt.dump(System.out);
+ }
+
+ public String getStreamName()
+ {
+ return name;
+ }
+
+ public void setStreamName(String name)
+ {
+ //
+ }
+}
Modified: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java 2009-07-24 08:38:45 UTC (rev 679)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java 2009-07-27 13:07:55 UTC (rev 680)
@@ -28,6 +28,7 @@
import org.jboss.sam.EventProcessor;
import java.io.InputStream;
+import java.util.UUID;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -50,7 +51,7 @@
Runtime.getRuntime().addShutdownHook(
new Thread(
new Runnable()
- {
+ {
public void run()
{
app.stop();
@@ -67,18 +68,25 @@
*/
private void bootstrap()
{
- TitterSearch twitterSearch = new TitterSearch("Micheal Jackson");
- TweetLogger logger = new TweetLogger();
+ SearchInput twitterSearchInput = new SearchInput("iran");
+ CVTOutput output1 = new CVTOutput("iran results");
+ CVTOutput output2 = new CVTOutput("us results");
// input and output
- eventProcessor.addInput(twitterSearch);
- eventProcessor.addOutput(logger);
+ eventProcessor.addInput(twitterSearchInput);
+ eventProcessor.addOutput(output1);
+ //eventProcessor.addOutput(output2);
// rules
- InputStream in = IO.loadDRL("log-tweets.drl");
- eventProcessor.registerStatement("log any tweet", in);
+ loadDRL("iran-tweets.drl");
}
+ private void loadDRL(String resource)
+ {
+ InputStream in = IO.loadDRL(resource);
+ eventProcessor.registerStatement(UUID.randomUUID().toString(), in);
+ }
+
public void start()
{
eventProcessor.start();
Copied: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java (from rev 679, sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java)
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java (rev 0)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java 2009-07-27 13:07:55 UTC (rev 680)
@@ -0,0 +1,166 @@
+/*
+ * 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.examples.twitter;
+
+import org.jboss.sam.StreamInput;
+import org.jboss.sam.StreamInputCallback;
+import twitter4j.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class SearchInput implements StreamInput
+{
+
+ // pull interval in seconds
+ // (remeber there is a 150 hits per hour limit on twitter search)
+ private int interval = 30;
+
+ private boolean started;
+
+ private Thread watchdog;
+
+ private List<StreamInputCallback> callbacks = new ArrayList<StreamInputCallback>();
+
+ private boolean keepRunning = true;
+
+ private final Twitter twitter;
+
+ public static long lastUpdate = -1;
+
+ private String queryString;
+
+ public SearchInput(final String queryString)
+ {
+ this.twitter = new Twitter();
+ this.queryString = queryString;
+
+ watchdog = new Thread(
+ new Runnable(){
+
+ public void run()
+ {
+ try
+ {
+ System.out.println("Started search watchdog");
+
+ while(keepRunning)
+ {
+
+ Query query = new Query(queryString);
+
+
+ // fetch new only
+ if(lastUpdate >0)
+ query.setSinceId(lastUpdate);
+
+ QueryResult result = new Twitter().search(query);
+
+ System.out.println("Search results: " + result.getTweets().size());
+
+ for(StreamInputCallback callback : callbacks)
+ {
+ try
+ {
+ for(Tweet t : result.getTweets())
+ callback.onEvent(t);
+ }
+ catch (Throwable e)
+ {
+ System.out.println("Failed to notify listener: "+e.getMessage());
+ }
+ }
+
+ // set last update
+ List<Tweet> tweets = result.getTweets();
+ if(!tweets.isEmpty())
+ {
+ Tweet last = tweets.get(0);
+ lastUpdate = last.getId();
+ }
+
+ try
+ {
+ Thread.sleep(interval*1000);
+ }
+ catch (InterruptedException e)
+ {
+ e.printStackTrace();
+ }
+ }
+ }
+ catch (TwitterException e)
+ {
+ e.printStackTrace();
+ }
+ }
+ }
+ );
+ }
+
+ public boolean isStarted()
+ {
+ return started;
+ }
+
+ public void registerCallback(StreamInputCallback streamInputCallback)
+ {
+ this.callbacks.add(streamInputCallback);
+ }
+
+ public void clearCallbacks()
+ {
+ this.callbacks.clear();
+ }
+
+ public String getStreamName()
+ {
+ return queryString + " tweets";
+ }
+
+ public void setStreamName(String name)
+ {
+ //
+ }
+
+ public void setInterval(int interval)
+ {
+ this.interval = interval;
+ }
+
+ public StreamInput start()
+ {
+ watchdog.start();
+ this.started = true;
+ return this;
+ }
+
+ public StreamInput stop()
+ {
+ keepRunning = false;
+ this.started = false;
+ return this;
+ }
+}
Deleted: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java 2009-07-24 08:38:45 UTC (rev 679)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java 2009-07-27 13:07:55 UTC (rev 680)
@@ -1,163 +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.examples.twitter;
-
-import twitter4j.*;
-import org.jboss.sam.StreamInput;
-import org.jboss.sam.StreamInputCallback;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Date;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class TitterSearch implements StreamInput
-{
-
- // pull interval in seconds
- // (remeber there is a 150 hits per hour limit on twitter search)
- private int interval = 40;
-
- private boolean started;
-
- private Thread watchdog;
-
- private List<StreamInputCallback> callbacks = new ArrayList<StreamInputCallback>();
-
- private boolean keepRunning = true;
-
- private final Twitter twitter;
-
- public static long lastUpdate = -1;
-
- public TitterSearch(final String queryString)
- {
- this.twitter = new Twitter();
-
- watchdog = new Thread(
- new Runnable(){
-
- public void run()
- {
- try
- {
- System.out.println("Started search watchdog");
-
- while(keepRunning)
- {
-
- Query query = new Query(queryString);
-
-
- // fetch new only
- if(TitterSearch.lastUpdate>0)
- query.setSinceId(lastUpdate);
-
- QueryResult result = twitter.search(query);
-
- System.out.println("Search results: " + result.getTweets().size());
-
- for(StreamInputCallback callback : callbacks)
- {
- try
- {
- callback.onEvent(result.getTweets());
- }
- catch (Throwable e)
- {
- System.out.println("Failed to notify listener: "+e.getMessage());
- }
- }
-
- // set last update
- List<Tweet> tweets = result.getTweets();
- if(!tweets.isEmpty())
- {
- Tweet last = tweets.get(0);
- TitterSearch.lastUpdate = last.getId();
- }
-
- try
- {
- Thread.sleep(interval*1000);
- }
- catch (InterruptedException e)
- {
- e.printStackTrace();
- }
- }
- }
- catch (TwitterException e)
- {
- e.printStackTrace();
- }
- }
- }
- );
- }
-
- public boolean isStarted()
- {
- return started;
- }
-
- public void registerCallback(StreamInputCallback streamInputCallback)
- {
- this.callbacks.add(streamInputCallback);
- }
-
- public void clearCallbacks()
- {
- this.callbacks.clear();
- }
-
- public String getStreamName()
- {
- return "twitter-search";
- }
-
- public void setStreamName(String name)
- {
- //
- }
-
- public void setInterval(int interval)
- {
- this.interval = interval;
- }
-
- public StreamInput start()
- {
- watchdog.start();
- this.started = true;
- return this;
- }
-
- public StreamInput stop()
- {
- keepRunning = false;
- this.started = false;
- return this;
- }
-}
Deleted: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java 2009-07-24 08:38:45 UTC (rev 679)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java 2009-07-27 13:07:55 UTC (rev 680)
@@ -1,90 +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.examples.twitter;
-
-import org.jboss.sam.StreamOutput;
-import org.jboss.sam.EventMessage;
-import twitter4j.Tweet;
-
-import java.util.List;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class TweetLogger implements StreamOutput
-{
- private boolean started;
-
- private BarChart barChart;
-
- public StreamOutput start()
- {
- this.barChart = new BarChart("num results");
- this.barChart.setVisible(true);
-
- System.out.println("Started search tweet logger");
- this.started = true;
- return this;
- }
-
- public StreamOutput stop()
- {
- this.started = false;
- return this;
- }
-
- public boolean isStarted()
- {
- return this.started;
- }
-
- public void write(EventMessage[] args)
- {
- for(EventMessage event : args)
- {
- System.out.println("--");
- Tweet tweet = (Tweet)event.getUnderlying();
-
- StringBuffer sb = new StringBuffer();
- sb.append(tweet.getId()).append("\t");
- sb.append(tweet.getFromUser()).append("\t\t");
- sb.append(tweet.getText()).append("\n");
-
- System.out.println(sb.toString());
-
- }
-
- // update chart
- barChart.updateFrom(args);
-
- }
-
- public String getStreamName()
- {
- return "tweet-logger";
- }
-
- public void setStreamName(String name)
- {
- //
- }
-}
Copied: sam/trunk/modules/examples/twitter/src/main/resources/iran-tweets.drl (from rev 679, sam/trunk/modules/examples/twitter/src/main/resources/log-tweets.drl)
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/resources/iran-tweets.drl (rev 0)
+++ sam/trunk/modules/examples/twitter/src/main/resources/iran-tweets.drl 2009-07-27 13:07:55 UTC (rev 680)
@@ -0,0 +1,26 @@
+package org.jboss.sam.examples.twitter;
+
+import twitter4j.*;
+import java.util.*;
+
+global org.jboss.sam.internal.drools.SAMAdapter SAM;
+
+# default dialect for the semantic code will be MVEL
+dialect "mvel"
+
+# flag as event
+declare Tweet
+ @role( event )
+ @expires( 5s )
+end
+
+rule "all iran tweets"
+when
+ $tweets: List() from accumulate(
+ $t : Tweet(id>0) over window:time(15s) from entry-point "iran tweets",
+ accumulateList( $t )
+ )
+then
+ System.out.println("RHS => Size "+$tweets.size() + " @ "+new java.util.Date());
+ //SAM.getListener("iran results").update($tweets);
+end
Deleted: sam/trunk/modules/examples/twitter/src/main/resources/log-tweets.drl
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/resources/log-tweets.drl 2009-07-24 08:38:45 UTC (rev 679)
+++ sam/trunk/modules/examples/twitter/src/main/resources/log-tweets.drl 2009-07-27 13:07:55 UTC (rev 680)
@@ -1,21 +0,0 @@
-package org.jboss.sam.examples.twitter;
-
-import twitter4j.*;
-import java.util.*;
-
-global org.jboss.sam.internal.drools.SAMAdapter SAM;
-
-# default dialect for the semantic code will be MVEL
-dialect "mvel"
-
-# flag as event
-declare Tweet
- @role( event )
-end
-
-rule "log tweets"
-when
- $tweets: ArrayList() from entry-point "twitter-search"
-then
- SAM.getListener("tweet-logger").update($tweets);
-end
Modified: sam/trunk/modules/examples/twitter/src/main/resources/sam-cfg.xml
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/resources/sam-cfg.xml 2009-07-24 08:38:45 UTC (rev 679)
+++ sam/trunk/modules/examples/twitter/src/main/resources/sam-cfg.xml 2009-07-27 13:07:55 UTC (rev 680)
@@ -5,7 +5,7 @@
xmlns:ns2="http://org.jboss.sam/08/2008/">
<runtime-configuration>
- <property name="drools.runtimelog.enable" value="false"/>
+ <property name="drools.runtimelog.enable" value="true"/>
</runtime-configuration>
<statements/>
Modified: sam/trunk/modules/examples/twitter/twitter.iml
===================================================================
--- sam/trunk/modules/examples/twitter/twitter.iml 2009-07-24 08:38:45 UTC (rev 679)
+++ sam/trunk/modules/examples/twitter/twitter.iml 2009-07-27 13:07:55 UTC (rev 680)
@@ -4,7 +4,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<exclude-output />
- <output-test url="file://$MODULE_DIR$/target/test-classestwitter" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
@@ -12,6 +12,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="core" />
+ <orderEntry type="module" module-name="toplevel" />
<orderEntry type="module-library">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
<CLASSES>
Modified: sam/trunk/modules/sim/sim.iml
===================================================================
--- sam/trunk/modules/sim/sim.iml 2009-07-24 08:38:45 UTC (rev 679)
+++ sam/trunk/modules/sim/sim.iml 2009-07-27 13:07:55 UTC (rev 680)
@@ -10,7 +10,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="core" />
+ <orderEntry type="module" module-name="toplevel" />
<orderEntry type="module-library">
<library name="M2 Dep: junit:junit:jar:3.8.2:compile">
<CLASSES>
Modified: sam/trunk/modules/sim/src/test/resources/simulation/test.drl
===================================================================
--- sam/trunk/modules/sim/src/test/resources/simulation/test.drl 2009-07-24 08:38:45 UTC (rev 679)
+++ sam/trunk/modules/sim/src/test/resources/simulation/test.drl 2009-07-27 13:07:55 UTC (rev 680)
@@ -6,7 +6,7 @@
# flag as event
declare SensorEventMessage
- @role( event )
+ @role( event )
end
rule "Pick all sensor event messages"
Modified: sam/trunk/pom.xml
===================================================================
--- sam/trunk/pom.xml 2009-07-24 08:38:45 UTC (rev 679)
+++ sam/trunk/pom.xml 2009-07-27 13:07:55 UTC (rev 680)
@@ -22,7 +22,7 @@
<surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args>
<dbcp.version>1.2.2</dbcp.version>
- <drools.version>5.0.1</drools.version>
+ <drools.version>5.1.0.SNAPSHOT</drools.version>
<junit.version>3.8.2</junit.version>
<commons-logging.version>1.1</commons-logging.version>
Modified: sam/trunk/toplevel.iml
===================================================================
--- sam/trunk/toplevel.iml 2009-07-24 08:38:45 UTC (rev 679)
+++ sam/trunk/toplevel.iml 2009-07-27 13:07:55 UTC (rev 680)
@@ -15,7 +15,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="core" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
<CLASSES>
@@ -182,7 +181,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: net.homeip.yusuke:twitter4j:jar:2.0.8:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../.m2/repository/net/homeip/yusuke/twitter4j/2.0.8/twitter4j-2.0.8.jar!/" />
@@ -193,7 +192,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: rome:rome:jar:0.9:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../.m2/repository/rome/rome/0.9/rome-0.9.jar!/" />
@@ -202,7 +201,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:nlog4j:jar:1.2.25:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../.m2/repository/org/slf4j/nlog4j/1.2.25/nlog4j-1.2.25.jar!/" />
@@ -211,7 +210,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: openchart:openchart:jar:1.4.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../.m2/repository/openchart/openchart/1.4.2/openchart-1.4.2.jar!/" />
16 years, 12 months
Overlord SVN: r679 - in sam/trunk: modules/examples/twitter and 2 other directories.
by overlord-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-07-24 04:38:45 -0400 (Fri, 24 Jul 2009)
New Revision: 679
Added:
sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java
Modified:
sam/trunk/SAMM.ipr
sam/trunk/SAMM.iws
sam/trunk/modules/examples/twitter/pom.xml
sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java
sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java
sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java
sam/trunk/modules/examples/twitter/src/main/resources/log-tweets.drl
sam/trunk/modules/examples/twitter/twitter.iml
sam/trunk/toplevel.iml
Log:
Added bar chart to twitter example
Modified: sam/trunk/SAMM.ipr
===================================================================
--- sam/trunk/SAMM.ipr 2009-07-23 12:39:01 UTC (rev 678)
+++ sam/trunk/SAMM.ipr 2009-07-24 08:38:45 UTC (rev 679)
@@ -132,7 +132,7 @@
<component name="Maven Reloaded">
<option name="config">
<value>
- <option name="pluginEnabled" value="false" />
+ <option name="pluginEnabled" value="true" />
<option name="offlineModeEnabled" value="false" />
<option name="updateClasspathsEnabled" value="true" />
<option name="sortDependenciesEnabled" value="false" />
@@ -346,7 +346,7 @@
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="true" />
<option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
- <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
+ <option name="DEFAULT_LAYOUT_MANAGER" value="GridBagLayout" />
</component>
<UsedPathMacros />
</project>
Modified: sam/trunk/SAMM.iws
===================================================================
--- sam/trunk/SAMM.iws 2009-07-23 12:39:01 UTC (rev 678)
+++ sam/trunk/SAMM.iws 2009-07-24 08:38:45 UTC (rev 679)
@@ -17,30 +17,16 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAMM.ipr" afterPath="$PROJECT_DIR$/SAMM.ipr" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/twitter4j" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/pom.xml" afterPath="$PROJECT_DIR$/modules/examples/twitter/pom.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/twitter4j/http" />
- <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="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/sim.iml" afterPath="$PROJECT_DIR$/modules/sim/sim.iml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/log-tweets.drl" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/IO.java" />
<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="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/twitter4j/QueryResultAdapter.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/search-jboss.json" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAMM.ipr" afterPath="$PROJECT_DIR$/SAMM.ipr" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/pom.xml" afterPath="$PROJECT_DIR$/modules/examples/twitter/pom.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java" />
<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="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/twitter4j/http/ResponseAdapter.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/log-tweets.drl" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/resources/log-tweets.drl" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -112,7 +98,7 @@
</component>
<component name="DebuggerManager">
<line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java" line="75" class="org.jboss.sam.internal.drools.SAMAdapter" package="org.jboss.sam.internal.drools">
+ <breakpoint url="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java" line="78" class="org.jboss.sam.internal.drools.StreamOutputAdapter" package="org.jboss.sam.internal.drools">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -125,7 +111,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java" line="48" class="org.jboss.sam.internal.drools.StreamOutputAdapter" package="org.jboss.sam.internal.drools">
+ <breakpoint url="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java" line="61" class="org.jboss.sam.examples.twitter.TweetLogger" package="org.jboss.sam.examples.twitter">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -138,6 +124,32 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
+ <breakpoint url="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java" line="76" class="org.jboss.sam.examples.twitter.TweetLogger" package="org.jboss.sam.examples.twitter">
+ <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$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java" line="51" class="org.jboss.sam.internal.drools.StreamOutputAdapter" package="org.jboss.sam.internal.drools">
+ <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>
@@ -210,22 +222,19 @@
</component>
<component name="FileEditorManager">
<leaf>
- <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="StreamOutputAdapter.java" pinned="false" current="false" current-in-tab="false">
+ <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="40" column="10" selection-start="1472" selection-end="1472" vertical-scroll-proportion="-0.18665019">
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="class#2398:2818" expanded="false" />
- </folding>
+ <state line="78" column="0" selection-start="2357" selection-end="2357" vertical-scroll-proportion="0.7448166">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="TitterSearch.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/TitterSearch.java">
+ <file leaf-file-name="TweetLogger.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/TweetLogger.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="71" column="65" selection-start="2111" selection-end="2111" vertical-scroll-proportion="0.27184466">
+ <state line="76" column="0" selection-start="2150" selection-end="2150" vertical-scroll-proportion="0.48963317">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -233,10 +242,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="TweetLogger.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/TweetLogger.java">
+ <file leaf-file-name="BarChart.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/BarChart.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="61" column="49" selection-start="1895" selection-end="1895" vertical-scroll-proportion="0.75728154">
+ <state line="116" column="23" selection-start="4101" selection-end="4101" vertical-scroll-proportion="1.7400318">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -244,24 +253,17 @@
</provider>
</entry>
</file>
- <file leaf-file-name="IO.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/IO.java">
+ <file leaf-file-name="TitterSearch.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/TitterSearch.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="61" column="11" selection-start="1945" selection-end="1945" vertical-scroll-proportion="0.7378641">
- <folding />
+ <state line="39" column="27" selection-start="1477" selection-end="1477" vertical-scroll-proportion="0.307815">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="log-tweets.drl" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/log-tweets.drl">
- <provider selected="true" editor-type-id="text-editor">
- <state line="18" column="48" selection-start="368" selection-end="368" vertical-scroll-proportion="0.34951457">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -556,89 +558,7 @@
<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/test" />
- <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/test/resources" />
- <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/test/resources/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/test" />
- <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/test/resources" />
- <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/test" />
- <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>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -689,7 +609,13 @@
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<module name="twitter" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="57898" />
+ <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="true" />
@@ -842,28 +768,28 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="390" y="41" width="1267" height="971" extended-state="0" />
+ <frame x="0" y="22" width="1280" height="774" 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="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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31937602" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32608697" order="1" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31600326" order="0" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32496306" 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.32951945" order="9" />
<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="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="6" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="10" />
- <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="4" />
+ <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.18719211" order="4" />
<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="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.32951945" order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.58197933" 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="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.39702517" order="4" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3958641" 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" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="13" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
@@ -953,103 +879,102 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/drools/sam-cfg.xml">
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="389" vertical-scroll-proportion="0.0">
+ <state line="7" column="58" selection-start="318" selection-end="318" vertical-scroll-proportion="0.3181818">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///Users/hbraun/.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/javax/xml/bind/helpers/AbstractUnmarshallerImpl.class">
+ <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/log-tweets.drl">
<provider selected="true" editor-type-id="text-editor">
- <state line="77" column="0" selection-start="4812" selection-end="4812" vertical-scroll-proportion="0.81322956">
+ <state line="19" column="49" selection-start="398" selection-end="398" vertical-scroll-proportion="0.8636364">
<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/internal/drools/SAMAdapter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="49" column="2" selection-start="1666" selection-end="1738" vertical-scroll-proportion="0.5631068">
+ <state line="75" column="0" selection-start="2751" selection-end="2751" vertical-scroll-proportion="0.3323442">
<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/test/resources/database/sql-join.drl">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="7" selection-start="1562" selection-end="1562" vertical-scroll-proportion="0.31644005">
+ <state line="10" column="30" selection-start="275" selection-end="275" vertical-scroll-proportion="0.47477746">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/drools/stream-input.drl">
+ <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home/src.jar!/src/java/lang/Integer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="397" vertical-scroll-proportion="0.0">
+ <state line="34" column="0" selection-start="1105" selection-end="1105" vertical-scroll-proportion="0.3323442">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/sam-cfg.xml">
+ <entry file="jar:///Users/hbraun/.m2/repository/org/mvel/mvel2/2.0.10/mvel2-2.0.10.jar!/org/mvel2/optimizers/impl/refl/ReflectiveAccessorOptimizer.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="22" selection-start="389" selection-end="389" vertical-scroll-proportion="0.23300971">
+ <state line="35" column="0" selection-start="2152" selection-end="2152" vertical-scroll-proportion="0.3323442">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java">
+ <entry file="jar:///Users/hbraun/.m2/repository/org/drools/drools-core/5.0.1/drools-core-5.0.1.jar!/org/drools/base/mvel/MVELConsequence.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="67" column="6" selection-start="2369" selection-end="2604" vertical-scroll-proportion="0.40667492">
+ <state line="22" column="0" selection-start="1058" selection-end="1058" vertical-scroll-proportion="0.5727003">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java">
+ <entry file="jar:///Users/hbraun/.m2/repository/org/drools/drools-core/5.0.1/drools-core-5.0.1.jar!/org/drools/runtime/rule/impl/DefaultConsequenceExceptionHandler.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="88" column="26" selection-start="2619" selection-end="2619" vertical-scroll-proportion="0.86402965">
+ <state line="13" column="0" selection-start="631" selection-end="631" vertical-scroll-proportion="0.3137255">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java">
+ <entry file="jar:///Users/hbraun/.m2/repository/org/drools/drools-core/5.0.1/drools-core-5.0.1.jar!/org/drools/common/AbstractWorkingMemory.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="48" column="13" selection-start="1949" selection-end="1949" vertical-scroll-proportion="-0.43510506">
+ <state line="144" column="0" selection-start="7826" selection-end="7826" vertical-scroll-proportion="0.18300654">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamInputCallback.java">
+ <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home/src.jar!/src/java/net/URLClassLoader.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="17" selection-start="1217" selection-end="1217" vertical-scroll-proportion="0.1553398">
+ <state line="204" column="0" selection-start="7752" selection-end="7752" vertical-scroll-proportion="0.18660288">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/resources/log-tweets.drl">
+ <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home/src.jar!/src/java/lang/ClassLoader.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="48" selection-start="368" selection-end="368" vertical-scroll-proportion="0.34951457">
+ <state line="979" column="0" selection-start="36286" selection-end="36286" vertical-scroll-proportion="0.3323442">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/IO.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="61" column="11" selection-start="1945" selection-end="1945" vertical-scroll-proportion="0.7378641">
+ <state line="78" column="0" selection-start="2357" selection-end="2357" vertical-scroll-proportion="0.7448166">
<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/TweetLogger.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="10" selection-start="1472" selection-end="1472" vertical-scroll-proportion="-0.18665019">
+ <state line="76" column="0" selection-start="2150" selection-end="2150" vertical-scroll-proportion="0.48963317">
<folding>
<element signature="imports" expanded="true" />
- <element signature="class#2398:2818" expanded="false" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java">
+ <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="61" column="49" selection-start="1895" selection-end="1895" vertical-scroll-proportion="0.75728154">
+ <state line="116" column="23" selection-start="4101" selection-end="4101" vertical-scroll-proportion="1.7400318">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -1058,7 +983,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="71" column="65" selection-start="2111" selection-end="2111" vertical-scroll-proportion="0.27184466">
+ <state line="39" column="27" selection-start="1477" selection-end="1477" vertical-scroll-proportion="0.307815">
<folding>
<element signature="imports" expanded="true" />
</folding>
Modified: sam/trunk/modules/examples/twitter/pom.xml
===================================================================
--- sam/trunk/modules/examples/twitter/pom.xml 2009-07-23 12:39:01 UTC (rev 678)
+++ sam/trunk/modules/examples/twitter/pom.xml 2009-07-24 08:38:45 UTC (rev 679)
@@ -53,6 +53,12 @@
<classifier>sources</classifier>
</dependency>
+ <dependency>
+ <groupId>openchart</groupId>
+ <artifactId>openchart</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+
</dependencies>
<!-- Plugins -->
Added: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java (rev 0)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/BarChart.java 2009-07-24 08:38:45 UTC (rev 679)
@@ -0,0 +1,152 @@
+/*
+ * 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.examples.twitter;
+
+/*
+ OpenChart2 Java Charting Library and Toolkit
+ Copyright (C) 2005-2007 Approximatrix, LLC
+ Copyright (C) 2001 Sebastian Müller
+ http://www.approximatrix.com
+
+ This library 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 library 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 library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ BarChart.java
+
+ */
+
+import com.approximatrix.charting.DefaultChart;
+import com.approximatrix.charting.event.ChartDataModelEvent;
+import com.approximatrix.charting.event.ChartDataModelListener;
+import com.approximatrix.charting.model.EditableChartDataModel;
+import com.approximatrix.charting.render.LineChartRenderer;
+import com.approximatrix.charting.swing.ChartPanel;
+import org.jboss.sam.EventMessage;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+
+/** This class implements a simple dialog that displays a bar chart along
+ * side a menu. The chart is rescaled to show 0 to 100 rather than simply
+ * allowing autoscaling. The example is well commented and should be easy
+ * to follow.
+ *
+ * @author armstrong
+ *
+ */
+public class BarChart extends JDialog implements ActionListener, ChartDataModelListener
+{
+ ChartPanel panel;
+ EditableChartDataModel data;
+
+ double numSamples = 2;
+
+ /** Initializes the dialog and its chart in a ChartPanel dialog */
+ public BarChart(String query)
+ {
+ // Init some starting data
+ double[][] model = {{1.0, 1.0, 1.0}};
+
+ double[] columns = {0.0, 1.0, 2.0};
+
+ String[] rows = {query};
+
+ String title = "Tweets per minute";
+
+ // Create an editable chart data model
+ data = new EditableChartDataModel(model, columns, rows);
+
+ // Creating the Swing ChartPanel instead of DefaultChart
+ panel = new ChartPanel(data, title, DefaultChart.LINEAR_X_LINEAR_Y);
+ // Adding ChartRenderer as usual
+ LineChartRenderer renderer = new LineChartRenderer(panel.getCoordSystem(), data);
+ panel.addChartRenderer(renderer, 1);
+ // Register EventListener
+ data.addChartDataModelListener(this);
+
+ setSize(640, 480);
+ this.getContentPane().add(panel, BorderLayout.CENTER);
+
+ }
+
+ public void updateFrom(EventMessage[] tweets)
+ {
+ try
+ {
+ data.insertValue(0, Double.valueOf(tweets.length), Double.valueOf(numSamples));
+ numSamples++;
+ }
+ catch (Throwable e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ /** Listener for our single menu item. When clicked, dispose of this
+ * dialog
+ */
+ public void actionPerformed(java.awt.event.ActionEvent e) {
+
+ //data.insertValue(0, new Double(Math.random() * 10.0 + 20.0), new Double(numSamples));
+ //data.insertValue(1, new Double(Math.random() * 7.0 + 10.0), new Double(time));
+ }
+
+ public void chartDataChanged(ChartDataModelEvent chartDataModelEvent)
+ {
+ // The DataModel changed -> update display
+ panel.revalidate();
+ repaint();
+ }
+
+ /** Main routine to start the demonstration dialog
+ *
+ * @param args unnecessary command line arguments
+ */
+ public static void main(String[] args) {
+
+ // Make this application appear native
+ try {
+ UIManager.setLookAndFeel(
+ UIManager.getSystemLookAndFeelClassName());
+ } catch (Exception e) {
+ System.out.println("Change of LNF failed...");
+ }
+
+ // Construct our bar chart dialog
+ BarChart temp = new BarChart("Micheal Jackson");
+
+ // Make the dialog visible
+ temp.setVisible(true);
+ }
+}
Modified: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java 2009-07-23 12:39:01 UTC (rev 678)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java 2009-07-24 08:38:45 UTC (rev 679)
@@ -40,7 +40,7 @@
private Thread mainThread;
private boolean running = true;
-
+
public static void main(String[] args)
{
final Main app = new Main();
@@ -58,6 +58,8 @@
}
)
);
+
+
}
/**
Modified: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java 2009-07-23 12:39:01 UTC (rev 678)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TitterSearch.java 2009-07-24 08:38:45 UTC (rev 679)
@@ -71,26 +71,23 @@
// fetch new only
- if(TitterSearch.lastUpdate>0)
+ if(TitterSearch.lastUpdate>0)
query.setSinceId(lastUpdate);
QueryResult result = twitter.search(query);
System.out.println("Search results: " + result.getTweets().size());
-
- for(Tweet t : result.getTweets())
+
+ for(StreamInputCallback callback : callbacks)
{
- for(StreamInputCallback callback : callbacks)
+ try
{
- try
- {
- callback.onEvent(t);
- }
- catch (Throwable e)
- {
- System.out.println("Failed to notify listener: "+e.getMessage());
- }
+ callback.onEvent(result.getTweets());
}
+ catch (Throwable e)
+ {
+ System.out.println("Failed to notify listener: "+e.getMessage());
+ }
}
// set last update
@@ -107,7 +104,7 @@
}
catch (InterruptedException e)
{
- e.printStackTrace();
+ e.printStackTrace();
}
}
}
Modified: sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java 2009-07-23 12:39:01 UTC (rev 678)
+++ sam/trunk/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TweetLogger.java 2009-07-24 08:38:45 UTC (rev 679)
@@ -25,6 +25,8 @@
import org.jboss.sam.EventMessage;
import twitter4j.Tweet;
+import java.util.List;
+
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
@@ -32,10 +34,14 @@
{
private boolean started;
+ private BarChart barChart;
+
public StreamOutput start()
{
+ this.barChart = new BarChart("num results");
+ this.barChart.setVisible(true);
+
System.out.println("Started search tweet logger");
-
this.started = true;
return this;
}
@@ -54,16 +60,22 @@
public void write(EventMessage[] args)
{
for(EventMessage event : args)
- {
+ {
System.out.println("--");
Tweet tweet = (Tweet)event.getUnderlying();
+
StringBuffer sb = new StringBuffer();
sb.append(tweet.getId()).append("\t");
sb.append(tweet.getFromUser()).append("\t\t");
sb.append(tweet.getText()).append("\n");
System.out.println(sb.toString());
+
}
+
+ // update chart
+ barChart.updateFrom(args);
+
}
public String getStreamName()
Modified: sam/trunk/modules/examples/twitter/src/main/resources/log-tweets.drl
===================================================================
--- sam/trunk/modules/examples/twitter/src/main/resources/log-tweets.drl 2009-07-23 12:39:01 UTC (rev 678)
+++ sam/trunk/modules/examples/twitter/src/main/resources/log-tweets.drl 2009-07-24 08:38:45 UTC (rev 679)
@@ -1,6 +1,7 @@
package org.jboss.sam.examples.twitter;
import twitter4j.*;
+import java.util.*;
global org.jboss.sam.internal.drools.SAMAdapter SAM;
@@ -14,7 +15,7 @@
rule "log tweets"
when
- $tweet: Tweet() from entry-point "twitter-search"
+ $tweets: ArrayList() from entry-point "twitter-search"
then
- SAM.getListener("tweet-logger").update($tweet);
+ SAM.getListener("tweet-logger").update($tweets);
end
Modified: sam/trunk/modules/examples/twitter/twitter.iml
===================================================================
--- sam/trunk/modules/examples/twitter/twitter.iml 2009-07-23 12:39:01 UTC (rev 678)
+++ sam/trunk/modules/examples/twitter/twitter.iml 2009-07-24 08:38:45 UTC (rev 679)
@@ -7,6 +7,7 @@
<output-test url="file://$MODULE_DIR$/target/test-classestwitter" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -206,6 +207,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: openchart:openchart:jar:1.4.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/openchart/openchart/1.4.2/openchart-1.4.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: sam/trunk/toplevel.iml
===================================================================
--- sam/trunk/toplevel.iml 2009-07-23 12:39:01 UTC (rev 678)
+++ sam/trunk/toplevel.iml 2009-07-24 08:38:45 UTC (rev 679)
@@ -8,6 +8,7 @@
<sourceFolder url="file://$MODULE_DIR$/modules/core/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/modules/core/src/test/resources" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/modules/examples/twitter/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/modules/examples/twitter/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/modules/sim/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/modules/sim/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/modules/sim/src/test/resources" isTestSource="true" />
@@ -210,6 +211,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: openchart:openchart:jar:1.4.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../.m2/repository/openchart/openchart/1.4.2/openchart-1.4.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
17 years
Warning: could not send message for past 4 hours
by Mail Delivery Subsystem
**********************************************
** THIS IS A WARNING MESSAGE ONLY **
** YOU DO NOT NEED TO RESEND YOUR MESSAGE **
**********************************************
The original message was received at Thu, 23 Jul 2009 06:21:11 -0400
from svn01.web.mwc.hst.phx2.redhat.com [10.5.105.7]
----- Transcript of session follows -----
<overlord-commits(a)lists.jboss.org>... Deferred: Connection refused by mx1.lists.jboss.org.
Warning: message still undelivered after 4 hours
Will keep trying until message is 5 days old
17 years
Warning: could not send message for past 4 hours
by Mail Delivery Subsystem
**********************************************
** THIS IS A WARNING MESSAGE ONLY **
** YOU DO NOT NEED TO RESEND YOUR MESSAGE **
**********************************************
The original message was received at Thu, 23 Jul 2009 06:28:20 -0400
from svn01.web.mwc.hst.phx2.redhat.com [10.5.105.7]
----- Transcript of session follows -----
<overlord-commits(a)lists.jboss.org>... Deferred: Connection refused by mx1.lists.jboss.org.
Warning: message still undelivered after 4 hours
Will keep trying until message is 5 days old
17 years