[overlord-commits] Overlord SVN: r684 - in sam/trunk: modules/core and 7 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Wed Jul 29 05:31:23 EDT 2009
Author: heiko.braun at 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 at 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 at 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 at 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 at 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 at 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 at 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 />
More information about the overlord-commits
mailing list