Author: heiko.braun(a)jboss.com
Date: 2009-09-09 07:02:09 -0400 (Wed, 09 Sep 2009)
New Revision: 832
Modified:
sam/trunk/SAMM.iws
sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java
sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java
sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java
sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
sam/trunk/pom.xml
sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java
sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVTSnapshot.java
sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java
sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/stream/InVMDispatcher.java
sam/trunk/sam/examples/twitter/pom.xml
sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java
sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java
Log:
Fix cvt references. Identify point2cvt reference visually
Modified: sam/trunk/SAMM.iws
===================================================================
--- sam/trunk/SAMM.iws 2009-09-08 15:49:14 UTC (rev 831)
+++ sam/trunk/SAMM.iws 2009-09-09 11:02:09 UTC (rev 832)
@@ -87,7 +87,7 @@
</component>
<component name="DebuggerManager">
<line_breakpoints>
- <breakpoint
url="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java"
line="78" class="org.jboss.sam.examples.twitter.InMemorySwapHandler"
package="org.jboss.sam.examples.twitter">
+ <breakpoint
url="file://$PROJECT_DIR$/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java"
line="105" class="org.jboss.bpm.console.server.CVTFacade"
package="org.jboss.bpm.console.server">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -100,7 +100,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint
url="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java"
line="87" class="org.jboss.sam.cvt.internal.DefaultCVT"
package="org.jboss.sam.cvt.internal">
+ <breakpoint
url="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java"
line="45" class="org.jboss.sam.examples.twitter.InMemorySwapHandler"
package="org.jboss.sam.examples.twitter">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -113,19 +113,6 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint
url="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java"
line="41" class="org.jboss.sam.examples.twitter.InMemorySwapHandler"
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>
</line_breakpoints>
<breakpoint_any>
<breakpoint>
@@ -198,33 +185,15 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="DefaultCVT.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java">
+ <file leaf-file-name="CVTView.java" pinned="false"
current="true" current-in-tab="true">
+ <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java">
<provider selected="true"
editor-type-id="text-editor">
- <state line="63" column="0"
selection-start="2100" selection-end="2100"
vertical-scroll-proportion="0.18789408">
+ <state line="117" column="32"
selection-start="3673" selection-end="3673"
vertical-scroll-proportion="0.71929824">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="CVTOutput.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java">
- <provider selected="true"
editor-type-id="text-editor">
- <state line="68" column="0"
selection-start="1962" selection-end="1962"
vertical-scroll-proportion="0.5049505">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="InMemorySwapHandler.java"
pinned="false" current="true" current-in-tab="true">
- <entry
file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java">
- <provider selected="true"
editor-type-id="text-editor">
- <state line="49" column="8"
selection-start="1634" selection-end="1634"
vertical-scroll-proportion="0.19059406">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -455,6 +424,10 @@
<option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/sam/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$/sam/examples/twitter/src/main/resources"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -1124,6 +1097,186 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/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="console" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode"
/>
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gui-war" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console"
/>
+ <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="console" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode"
/>
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gui-war" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console/public"
/>
+ <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="console" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode"
/>
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gui-war" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console/public"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console/public/images"
/>
+ <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="console" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode"
/>
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gui-war" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/java" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -1557,16 +1710,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="328" y="41" width="1313"
height="955" extended-state="0" />
+ <frame x="301" y="30" width="1371"
height="1002" extended-state="0" />
<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="false"
anchor="left" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="true" weight="0.36787975"
order="0" />
- <window_info id="Find" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.31934732"
order="1" />
- <window_info id="Structure" active="false"
anchor="left" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.24451666"
order="1" />
+ <window_info id="Project" active="false"
anchor="left" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="true" weight="0.3517398"
order="0" />
+ <window_info id="Find" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.41878453"
order="1" />
+ <window_info id="Structure" active="false"
anchor="left" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.24432677"
order="1" />
<window_info id="Messages" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.32908458"
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" />
@@ -1578,7 +1731,7 @@
<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.24691358"
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.3951049"
order="4" />
+ <window_info id="Debug" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.39116022"
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" />
@@ -1668,121 +1821,113 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java">
+ <entry file="file://$PROJECT_DIR$/sam/examples/twitter/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="67"
selection-start="1685" selection-end="1750"
vertical-scroll-proportion="0.57054454">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="190" column="15"
selection-start="4982" selection-end="5518"
vertical-scroll-proportion="0.7667087">
+ <state line="53" column="71"
selection-start="1581" selection-end="1581"
vertical-scroll-proportion="0.64761907">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterNavigation.java">
+ <entry
file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/resources/iran-tweets.drl">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="6"
selection-start="1381" selection-end="1381"
vertical-scroll-proportion="0.15841584">
+ <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$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTParser.java">
+ <entry
file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/internal/stream/InVMDispatcher.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="65" column="17"
selection-start="2536" selection-end="2536"
vertical-scroll-proportion="0.9079445">
+ <state line="48" column="16"
selection-start="1712" selection-end="1712"
vertical-scroll-proportion="0.53333336">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadEvent.java">
+ <entry
file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="37" column="0"
selection-start="1313" selection-end="1313"
vertical-scroll-proportion="0.33663365">
+ <state line="271" column="4"
selection-start="7922" selection-end="7922"
vertical-scroll-proportion="0.2761905">
<folding />
</state>
</provider>
</entry>
- <entry
file="jar:///Users/hbraun/.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/org/jboss/resteasy/core/MethodInjectorImpl.class">
+ <entry
file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="0"
selection-start="1001" selection-end="1001"
vertical-scroll-proportion="0.60850114">
+ <state line="49" column="43"
selection-start="1717" selection-end="1717"
vertical-scroll-proportion="0.17660819">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java">
+ <entry
file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="13"
selection-start="1295" selection-end="1295"
vertical-scroll-proportion="0.23762377">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="117" column="47"
selection-start="3260" selection-end="3260"
vertical-scroll-proportion="0.85730994">
+ <folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CurrentSnapshotAction.java">
+ <entry
file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="13"
selection-start="1453" selection-end="1453"
vertical-scroll-proportion="0.15841584">
+ <state line="48" column="69"
selection-start="1625" selection-end="1625"
vertical-scroll-proportion="0.44912282">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadSnapshotAction.java">
+ <entry
file="file://$PROJECT_DIR$/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="37"
selection-start="1731" selection-end="1731"
vertical-scroll-proportion="0.2522068">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="100" column="50"
selection-start="3005" selection-end="3005"
vertical-scroll-proportion="1.0666667">
+ <folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java">
+ <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="44" column="13"
selection-start="1819" selection-end="1819"
vertical-scroll-proportion="-0.37623763">
+ <state line="33" column="32"
selection-start="502" selection-end="502"
vertical-scroll-proportion="0.6175439">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterEditor.java">
+ <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="108" column="42"
selection-start="3534" selection-end="3534"
vertical-scroll-proportion="0.9079445">
- <folding>
- <element signature="class#2936:3425" expanded="false"
/>
- </folding>
+ <state line="47" column="33"
selection-start="1692" selection-end="1692"
vertical-scroll-proportion="0.39298245">
+ <folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java">
+ <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditorNavigation.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="113" column="15"
selection-start="3390" selection-end="3390"
vertical-scroll-proportion="0.5940594">
+ <state line="30" column="6"
selection-start="1274" selection-end="1274"
vertical-scroll-proportion="0.1497076">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java">
+ <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="68" column="0"
selection-start="1962" selection-end="1962"
vertical-scroll-proportion="0.5049505">
+ <state line="130" column="75"
selection-start="4122" selection-end="4184"
vertical-scroll-proportion="0.6952381">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java">
+ <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="63" column="0"
selection-start="2100" selection-end="2100"
vertical-scroll-proportion="0.18789408">
+ <state line="118" column="74"
selection-start="2994" selection-end="2994"
vertical-scroll-proportion="0.64444447">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java">
+ <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="49" column="8"
selection-start="1634" selection-end="1634"
vertical-scroll-proportion="0.19059406">
+ <state line="83" column="52"
selection-start="2632" selection-end="2632"
vertical-scroll-proportion="0.5239766">
<folding />
</state>
</provider>
</entry>
+ <entry
file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="117" column="32"
selection-start="3673" selection-end="3673"
vertical-scroll-proportion="0.71929824">
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
Modified:
sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java
===================================================================
---
sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java 2009-09-08
15:49:14 UTC (rev 831)
+++
sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java 2009-09-09
11:02:09 UTC (rev 832)
@@ -23,17 +23,16 @@
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.WindowCloseListener;
import com.googlecode.gchart.client.GChart;
import com.mvc4g.client.Controller;
-import com.mvc4g.client.ViewInterface;
import com.mvc4g.client.Event;
+import com.mvc4g.client.ViewInterface;
import org.gwt.mosaic.ui.client.layout.BoxLayout;
import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
-import org.gwt.mosaic.ui.client.WindowPanel;
-import org.jboss.bpm.console.client.util.ConsoleLog;
+import org.gwt.mosaic.ui.client.Label;
import org.jboss.bpm.console.client.LazyPanel;
+import org.jboss.bpm.console.client.util.ConsoleLog;
import java.util.HashMap;
import java.util.List;
@@ -49,7 +48,7 @@
private Controller controller = null;
- private ValueTable valueTable= null;
+ private ValueTable currentValues = null;
private CVTChart chart;
private int numSamples = 0;
@@ -57,8 +56,6 @@
private Map<Double, String> point2snapshot = new HashMap<Double,String>();
private String tableName;
- private WindowPanel window;
-
private HistoryView history;
private boolean initialzed;
@@ -101,12 +98,13 @@
this.add(chart, new BoxLayoutData(BoxLayoutData.FillStyle.VERTICAL));
chart.update();
- this.valueTable = new ValueTable();
- this.add(valueTable, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+ this.add(new Label("Current Events"));
+ this.currentValues = new ValueTable();
+ this.add(currentValues, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+
this.history = new HistoryView();
- controller.addView(HistoryView.ID, this.history);
- createSnapshotWindow(this.history);
+ controller.addView(HistoryView.ID, this.history);
this.initialzed = true;
}
@@ -114,46 +112,19 @@
private void displaySnapshot(String sid)
{
- if(sid!=valueTable.getSnapshotId()) // not recent one
+ if(sid.equals(currentValues.getSnapshotId())) // not recent one
{
- controller.handleEvent(
- new Event(LoadSnapshotAction.ID, new LoadEvent(tableName, sid))
- );
-
- window.center();
+ ConsoleLog.debug("Skip current snapshot");
+ currentValues.highlight();
}
else
{
- ConsoleLog.debug("Skip current snapshot");
+ controller.handleEvent(
+ new Event(LoadSnapshotAction.ID, new LoadEvent(tableName, sid))
+ );
}
}
- /**
- * The 'layout' window panel.
- */
- private void createSnapshotWindow(HistoryView history) {
- window = new WindowPanel("Past events");
- window.setAnimationEnabled(true);
- window.setSize("320px", "180px");
-
- LayoutPanel panel = new LayoutPanel();
-
- panel.add(history);
-
- window.setWidget(panel);
-
- window.addWindowCloseListener(new WindowCloseListener() {
- public void onWindowClosed() {
- //window = null;
- }
-
- public String onWindowClosing() {
- return null;
- }
- });
- }
-
-
public void setController(Controller controller)
{
this.controller = controller;
@@ -187,7 +158,7 @@
private void updateListBox(String snapshotId, List<List<String>> results)
{
- valueTable.update(snapshotId, results);
+ currentValues.update(snapshotId, results);
}
}
Modified:
sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java
===================================================================
---
sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java 2009-09-08
15:49:14 UTC (rev 831)
+++
sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java 2009-09-09
11:02:09 UTC (rev 832)
@@ -23,7 +23,9 @@
import com.mvc4g.client.ViewInterface;
import com.mvc4g.client.Controller;
+import com.google.gwt.user.client.WindowCloseListener;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.gwt.mosaic.ui.client.WindowPanel;
import java.util.List;
@@ -37,14 +39,45 @@
private ValueTable valueTable;
private Controller controller;
+ private WindowPanel window;
+
public HistoryView()
{
super();
this.valueTable = new ValueTable();
this.add(valueTable);
+ this.window = createSnapshotWindow();
+
}
+ /**
+ * The 'layout' window panel.
+ */
+ private WindowPanel createSnapshotWindow() {
+ WindowPanel window = new WindowPanel("Past events");
+ window.setAnimationEnabled(true);
+ window.setSize("320px", "180px");
+
+ LayoutPanel panel = new LayoutPanel();
+
+ panel.add(this);
+
+ window.setWidget(panel);
+
+ window.addWindowCloseListener(new WindowCloseListener() {
+ public void onWindowClosed() {
+ //window = null;
+ }
+
+ public String onWindowClosing() {
+ return null;
+ }
+ });
+
+ return window;
+ }
+
public void setController(Controller controller)
{
this.controller = controller;
@@ -52,6 +85,7 @@
public void update(String snapshotId, List<List<String>> results)
{
- this.valueTable.update(snapshotId, results);
+ this.valueTable.update(snapshotId, results);
+ window.show();
}
}
Modified:
sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java
===================================================================
---
sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java 2009-09-08
15:49:14 UTC (rev 831)
+++
sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java 2009-09-09
11:02:09 UTC (rev 832)
@@ -22,13 +22,19 @@
package org.jboss.bpm.console.client.sam;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.gwt.mosaic.ui.client.layout.BoxLayout;
+import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
import org.gwt.mosaic.ui.client.ListBox;
import org.gwt.mosaic.ui.client.list.DefaultListModel;
+import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import java.util.List;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.Timer;
+import com.google.gwt.core.client.GWT;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -38,18 +44,28 @@
private ListBox listBox = null;
private String snapshotId;
+ private Image reload;
+
public ValueTable()
{
- super();
+ super(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+
+ ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
+ reload = icons.reloadIcon().createImage();
+ this.add(reload);
+
+
this.listBox = createListBox();
- this.add(listBox);
+ this.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+
+ reload.setVisibleRect(-50,-50,32,32);
}
public String getSnapshotId()
{
return snapshotId;
}
-
+
public void update(String snapshotId, List<List<String>> results)
{
this.snapshotId = snapshotId;
@@ -64,8 +80,25 @@
{
model.add(row);
}
+
+ // highlight
+ highlight();
}
+ public void highlight()
+ {
+ reload.setVisibleRect(0,0,32,32);
+ Timer t = new Timer()
+ {
+
+ public void run()
+ {
+ reload.setVisibleRect(-50,-50,32,32);
+ }
+ };
+ t.schedule(500);
+ }
+
private ListBox createListBox()
{
final ListBox<List<String>> listBox =
Modified:
sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
===================================================================
---
sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-09-08
15:49:14 UTC (rev 831)
+++
sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-09-09
11:02:09 UTC (rev 832)
@@ -1,3 +1,7 @@
+.cvt-highlight
+{
+ background-color:#FFFFCC;
+}
.bpm-layout {
border: 1px solid green;
Modified: sam/trunk/pom.xml
===================================================================
--- sam/trunk/pom.xml 2009-09-08 15:49:14 UTC (rev 831)
+++ sam/trunk/pom.xml 2009-09-09 11:02:09 UTC (rev 832)
@@ -19,7 +19,7 @@
<!-- Properties -->
<properties>
-
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!--surefire.security.args>-Djava.security.manager
-Djava.security.policy=src/test/etc/tst.policy</surefire.security.args-->
<surefire.security.args></surefire.security.args>
<surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args>
Modified: sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java
===================================================================
--- sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java 2009-09-08
15:49:14 UTC (rev 831)
+++ sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java 2009-09-09
11:02:09 UTC (rev 832)
@@ -37,7 +37,7 @@
* when the table is updated. The default SwapHandler implementation purges all records.
*
* @see org.jboss.sam.cvt.internal.NoopSwapHandler
- *
+ *
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class DefaultCVT implements CVT
@@ -46,6 +46,8 @@
private List<Map<String,Object>> table = new
ArrayList<Map<String,Object>>();
+ private Object lock = new Object();
+
private String[] columns;
private String name;
@@ -61,23 +63,33 @@
public void swap()
{
- synchronized(table)
+ synchronized(lock)
{
- swapHandler.store(snapshot());
+ CVTSnapshot tmp = snapshot();
+ if(!swapHandler.maintains(tmp.getSnapshotId()))
+ {
+ log.debug("Storing " + tmp.getSnapshotId());
+ swapHandler.store(tmp);
+ }
+ else
+ {
+ log.warn("SwapHandler already maintains " +tmp.getSnapshotId());
+ }
}
}
public void clear()
{
- synchronized(table)
+ synchronized(lock)
{
- this.table.clear();
+ this.table = new ArrayList<Map<String,Object>>(); // avoid references
into SwapHandler
+ this.currentSnapshot = null; // invalidate snapshot anf roce re-creation
}
}
public int size()
{
- synchronized(table)
+ synchronized(lock)
{
return table.size();
}
@@ -85,10 +97,11 @@
public void update(EventMessage[] events)
{
- synchronized(table)
+ synchronized(lock)
{
- clear();
- currentSnapshot = null; // invalidate snapshot
+ log.debug("Update "+this.name+": " +events.length + " new
records");
+
+ clear();
for(EventMessage event : events)
{
@@ -104,13 +117,18 @@
public CVTSnapshot snapshot()
{
- synchronized(table)
+ synchronized(lock)
{
if(null==currentSnapshot) // create once and assign reference ID
{
- List<Map<String, Object>> list =
Collections.unmodifiableList(table);
- currentSnapshot = new DefaultCVTSnapshot(UUID.randomUUID().toString(), list);
+ String id = UUID.randomUUID().toString();
+ log.debug("Creating new snapshot: " +id);
+ currentSnapshot = new DefaultCVTSnapshot(id,
Collections.unmodifiableList(table));
}
+ else
+ {
+ log.debug("Re-using existing snapshot:
"+currentSnapshot.getSnapshotId());
+ }
return currentSnapshot;
}
}
@@ -128,37 +146,37 @@
public void dump(PrintStream out)
{
- synchronized(table)
+ CVTSnapshot tmp = snapshot();
+
+ int i=1;
+ Iterator<Map<String,Object>> iterator = tmp.getTable().iterator();
+ StringBuffer sb = new StringBuffer();
+ sb.append("[").append(name).append("]\n");
+ sb.append("-----------\n");
+ while(iterator.hasNext())
{
- int i=1;
- Iterator<Map<String,Object>> 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)
{
- Map row = iterator.next();
+ sb.append(row.get(s)).append("\t\t\t");
+ }
- 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");
- sb.append("\n");
- i++;
- }
- sb.append("-----------\n");
+ try
+ {
+ out.write(sb.toString().getBytes());
+ }
+ catch (IOException e)
+ {
+ //
+ }
- try
- {
- out.write(sb.toString().getBytes());
- }
- catch (IOException e)
- {
- //
- }
- }
}
public String getName()
Modified:
sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVTSnapshot.java
===================================================================
---
sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVTSnapshot.java 2009-09-08
15:49:14 UTC (rev 831)
+++
sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVTSnapshot.java 2009-09-09
11:02:09 UTC (rev 832)
@@ -31,18 +31,18 @@
*/
public final class DefaultCVTSnapshot implements CVTSnapshot
{
- private String refId;
+ private String snapshotId;
private List<Map<String,Object>> table;
- public DefaultCVTSnapshot(String refId, List<Map<String, Object>> table)
+ public DefaultCVTSnapshot(String snapshotId, List<Map<String, Object>>
table)
{
- this.refId = refId;
+ this.snapshotId = snapshotId;
this.table = table;
}
public String getSnapshotId()
{
- return refId;
+ return snapshotId;
}
public List<Map<String, Object>> getTable()
Modified:
sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java
===================================================================
---
sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java 2009-09-08
15:49:14 UTC (rev 831)
+++
sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java 2009-09-09
11:02:09 UTC (rev 832)
@@ -36,6 +36,7 @@
import org.drools.runtime.rule.WorkingMemoryEntryPoint;
import org.jboss.sam.*;
import org.jboss.sam.datasource.DataSourceManager;
+import org.jboss.logging.Logger;
import java.io.InputStream;
import java.util.Iterator;
@@ -49,6 +50,9 @@
public class DroolsEventProcessorImpl
implements EventProcessor<KnowledgeBase>, Globals
{
+
+ private final static Logger log = Logger.getLogger(DroolsEventProcessorImpl.class);
+
private String name;
private ActivityMonitor runtime;
private boolean started;
@@ -67,8 +71,6 @@
KnowledgeBaseConfiguration conf =
KnowledgeBaseFactory.newKnowledgeBaseConfiguration();
conf.setOption( EventProcessingOption.STREAM );
this.kbase = KnowledgeBaseFactory.newKnowledgeBase(conf);
-
- //System.out.println("1. Created kbase");
}
private StatefulKnowledgeSession getSession()
@@ -85,15 +87,12 @@
if(enableRuntimeLogger)
KnowledgeRuntimeLoggerFactory.newConsoleLogger(session);
- //System.out.println("3. Created session");
-
- System.out.println("Known entry-points:");
for(WorkingMemoryEntryPoint entryPoint : session.getWorkingMemoryEntryPoints())
{
if(entryPoint instanceof NamedEntryPoint)
{
NamedEntryPoint nep = (NamedEntryPoint)entryPoint;
- System.out.println("-> " + nep.getEntryPoint().getEntryPointId());
+ log.debug("Entry-point: " + nep.getEntryPoint().getEntryPointId());
}
}
@@ -270,8 +269,6 @@
}
this.kbase.addKnowledgePackages(builder.getKnowledgePackages());
- //System.out.println("2. Build packages");
-
// -----------------------
DroolsProcessingStatement stmt =
Modified:
sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/stream/InVMDispatcher.java
===================================================================
---
sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/stream/InVMDispatcher.java 2009-09-08
15:49:14 UTC (rev 831)
+++
sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/stream/InVMDispatcher.java 2009-09-09
11:02:09 UTC (rev 832)
@@ -22,12 +22,15 @@
package org.jboss.sam.internal.stream;
import org.jboss.sam.StreamInputCallback;
+import org.jboss.logging.Logger;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class InVMDispatcher
{
+ private final static Logger log = Logger.getLogger(InVMDispatcher.class);
+
public final static String DEFAULT_CHANNEL_NAME = "InVM-Channel";
private InVMStreamRegistry channelRegistry;
@@ -43,7 +46,7 @@
public void dispatch(Object event)
{
if(channelRegistry.getChannelCallbackSize()==0)
- System.out.println("WARN: There a no callbacks registered with InVMDispatcher
'" +this.streamName+"'");
+ log.warn("There are no callbacks registered with InVMDispatcher '"
+this.streamName+"'");
for (StreamInputCallback callback : channelRegistry.getChannelCallbacks(streamName))
{
Modified: sam/trunk/sam/examples/twitter/pom.xml
===================================================================
--- sam/trunk/sam/examples/twitter/pom.xml 2009-09-08 15:49:14 UTC (rev 831)
+++ sam/trunk/sam/examples/twitter/pom.xml 2009-09-09 11:02:09 UTC (rev 832)
@@ -30,6 +30,12 @@
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified:
sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java
===================================================================
---
sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java 2009-09-08
15:49:14 UTC (rev 831)
+++
sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java 2009-09-09
11:02:09 UTC (rev 832)
@@ -32,23 +32,23 @@
*/
public class InMemorySwapHandler implements SwapHandler
{
+
+ private LinkedList<CVTSnapshot> buffer = new LinkedList<CVTSnapshot>();
- private List<CVTSnapshot> snapshots = new LinkedList<CVTSnapshot>();
-
private final static int MAX_SNAPSHOTS = 50;
public void store(CVTSnapshot snapshot)
{
- synchronized(snapshots)
+ synchronized(buffer)
{
- if(snapshots.size()<MAX_SNAPSHOTS)
+ if(buffer.size()<MAX_SNAPSHOTS)
{
- snapshots.add(snapshot);
+ buffer.addLast(snapshot);
}
else
{
- snapshots.remove(0); // first is the oldest
- snapshots.add(snapshot);
+ buffer.removeFirst(); // first is the oldest
+ buffer.addLast(snapshot);
}
}
}
@@ -58,14 +58,14 @@
return internalLoad(snapshotId, true);
}
- public CVTSnapshot internalLoad(String snapshotId, boolean failfast)
+ private CVTSnapshot internalLoad(String id, boolean failfast)
{
CVTSnapshot match = null;
- synchronized(snapshots)
+ synchronized(buffer)
{
- for(CVTSnapshot snapshot : snapshots)
+ for(CVTSnapshot snapshot : buffer)
{
- if(snapshotId.equals(snapshot.getSnapshotId()))
+ if(id.equals(snapshot.getSnapshotId()))
{
match = snapshot;
break;
@@ -74,7 +74,7 @@
}
if(null==match && failfast)
- throw new RuntimeException("No snapshot with id "+snapshotId);
+ throw new RuntimeException("No snapshot with id "+id);
return match;
}
Modified:
sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java
===================================================================
---
sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java 2009-09-08
15:49:14 UTC (rev 831)
+++
sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java 2009-09-09
11:02:09 UTC (rev 832)
@@ -23,6 +23,7 @@
import org.jboss.sam.StreamInput;
import org.jboss.sam.StreamInputCallback;
+import org.jboss.logging.Logger;
import twitter4j.*;
import java.util.ArrayList;
@@ -34,6 +35,8 @@
public class SearchInput implements StreamInput
{
+ private final static Logger log = Logger.getLogger(SearchInput.class);
+
// pull interval in seconds
// (remeber there is a 150 hits per hour limit on twitter search)
private int interval = 30;
@@ -68,7 +71,7 @@
public void run()
{
- System.out.println("Started search watchdog");
+ log.info("Started search watchdog");
while(keepRunning)
{
@@ -87,13 +90,13 @@
}
catch (TwitterException e)
{
- System.out.println("Query failed: " +e.getMessage());
+ log.warn("Query failed: " +e.getMessage());
result = null;
}
if(result!=null)
{
- System.out.println("Search results: " +
result.getTweets().size());
+ log.debug("Search results: " + result.getTweets().size());
for(StreamInputCallback callback : callbacks)
{
@@ -104,7 +107,7 @@
}
catch (Throwable e)
{
- System.out.println("Failed to notify listener:
"+e.getMessage());
+ log.error("Failed to notify listener: "+e.getMessage(),
e);
}
}
@@ -128,7 +131,7 @@
}
}
- System.out.println("Shutdown search watchdog");
+ log.info("Shutdown search watchdog");
}
}