[overlord-commits] Overlord SVN: r665 - in sam/trunk: modules/core and 6 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Wed Jul 15 06:25:00 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-07-15 06:24:59 -0400 (Wed, 15 Jul 2009)
New Revision: 665
Modified:
sam/trunk/SAMM.iws
sam/trunk/modules/core/pom.xml
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java
sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java
sam/trunk/modules/core/src/test/resources/adapter/invm/sam-cfg.xml
sam/trunk/modules/core/src/test/resources/database/sam-cfg.xml
sam/trunk/modules/core/src/test/resources/database/sampleJoin.drl
sam/trunk/modules/core/src/test/resources/database/triggerPull.drl
sam/trunk/modules/core/src/test/resources/drools/sam-cfg.xml
Log:
Apply properties to DroolsEventProcessor. Change config root element name
Modified: sam/trunk/SAMM.iws
===================================================================
--- sam/trunk/SAMM.iws 2009-07-15 09:41:12 UTC (rev 664)
+++ sam/trunk/SAMM.iws 2009-07-15 10:24:59 UTC (rev 665)
@@ -18,8 +18,17 @@
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAMM.iws" afterPath="$PROJECT_DIR$/SAMM.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/pom.xml" afterPath="$PROJECT_DIR$/modules/sim/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/drools/sam-cfg.xml" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/drools/sam-cfg.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/adapter/invm/sam-cfg.xml" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/adapter/invm/sam-cfg.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/database/sampleJoin.drl" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/database/sampleJoin.drl" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/pom.xml" afterPath="$PROJECT_DIR$/modules/core/pom.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/database/triggerPull.drl" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/database/triggerPull.drl" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/resources/database/sam-cfg.xml" afterPath="$PROJECT_DIR$/modules/core/src/test/resources/database/sam-cfg.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -91,7 +100,7 @@
</component>
<component name="DebuggerManager">
<line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java" line="48" class="org.jboss.sam.internal.drools.StreamOutputAdapter" package="org.jboss.sam.internal.drools">
+ <breakpoint url="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java" line="75" class="org.jboss.sam.internal.drools.SAMAdapter" package="org.jboss.sam.internal.drools">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -104,7 +113,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java" line="129" class="org.jboss.sam.simulation.EventSourceEntity" package="org.jboss.sam.simulation">
+ <breakpoint url="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java" line="48" class="org.jboss.sam.internal.drools.StreamOutputAdapter" package="org.jboss.sam.internal.drools">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -117,32 +126,6 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSimulation.java" line="155" class="org.jboss.sam.simulation.EventSimulation" package="org.jboss.sam.simulation">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java" line="78" class="org.jboss.test.sam.simulation.SimulationTestCase" package="org.jboss.test.sam.simulation">
- <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>
@@ -215,46 +198,91 @@
</component>
<component name="FileEditorManager">
<leaf>
+ <file leaf-file-name="triggerPull.drl" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/triggerPull.drl">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="23" column="0" selection-start="587" selection-end="587" vertical-scroll-proportion="0.45828146">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="sam-cfg.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/drools/sam-cfg.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="12" column="0" selection-start="367" selection-end="367" vertical-scroll-proportion="0.23471883">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ConfigurationDef.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="33" column="27" selection-start="1360" selection-end="1360" vertical-scroll-proportion="0.19559902">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="sam-cfg.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/sam-cfg.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="1" column="20" selection-start="62" selection-end="81" vertical-scroll-proportion="0.01992528">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="sam-cfg.xml" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/adapter/invm/sam-cfg.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="21" column="0" selection-start="719" selection-end="719" vertical-scroll-proportion="0.41075796">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
<file leaf-file-name="DroolsEventProcessorImpl.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="13" selection-start="1893" selection-end="1893" vertical-scroll-proportion="0.15940224">
+ <state line="119" column="60" selection-start="4172" selection-end="4172" vertical-scroll-proportion="0.37235367">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ExpressionConverter.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/ExpressionConverter.java">
+ <file leaf-file-name="Configuration.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/Configuration.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="67" column="11" selection-start="2712" selection-end="2712" vertical-scroll-proportion="0.8007472">
+ <state line="64" column="15" selection-start="2253" selection-end="2253" vertical-scroll-proportion="-0.039119806">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/core/pom.xml">
+ <file leaf-file-name="SAMAdapter.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="90" column="80" selection-start="3112" selection-end="3112" vertical-scroll-proportion="0.52552927">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <file leaf-file-name="UpdateListener.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/UpdateListener.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="58" selection-start="1006" selection-end="1006" vertical-scroll-proportion="0.01992528">
+ <state line="28" column="10" selection-start="1171" selection-end="1171" vertical-scroll-proportion="0.15647922">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/sim/pom.xml">
+ <file leaf-file-name="StreamOutputAdapter.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="24" selection-start="340" selection-end="340" vertical-scroll-proportion="-0.992528">
+ <state line="80" column="66" selection-start="2380" selection-end="2380" vertical-scroll-proportion="0.84352076">
<folding />
</state>
</provider>
@@ -414,10 +442,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="sim" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -425,26 +449,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="sim" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/sim" />
- <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>
@@ -540,26 +544,6 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/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/test/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/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/test/java/org/jboss/test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -579,33 +563,9 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/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/test/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/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/test/java/org/jboss/test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/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/test/java/org/jboss/test/sam/drools" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -625,33 +585,25 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/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/core/src/test/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/core/src/test/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/core/src/test/java/org/jboss/test" />
+ <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/test/java/org/jboss/test/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/test/java/org/jboss/test/sam/config" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -671,33 +623,27 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- </PATH>
- <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/main/java" />
+ <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" />
- </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" />
<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" />
<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" />
<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/resources" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -738,6 +684,14 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
</subPane>
</component>
@@ -1033,107 +987,107 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/datasource/internal/DBCPDataSourceFactory.java">
+ <entry file="file://$PROJECT_DIR$/modules/sim/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="37" column="13" selection-start="1597" selection-end="1597" vertical-scroll-proportion="0.15940224">
+ <state line="6" column="24" selection-start="340" selection-end="340" vertical-scroll-proportion="-0.992528">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="112" column="64" selection-start="3432" selection-end="3432" vertical-scroll-proportion="0.54171854">
+ <state line="105" column="54" selection-start="2728" selection-end="2728" vertical-scroll-proportion="0.5180573">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/sampleJoin.drl">
<provider selected="true" editor-type-id="text-editor">
- <state line="91" column="21" selection-start="3466" selection-end="3466" vertical-scroll-proportion="0.44209215">
+ <state line="14" column="0" selection-start="436" selection-end="436" vertical-scroll-proportion="0.2789539">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/EPLValueAdapter.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="13" selection-start="1195" selection-end="1195" vertical-scroll-proportion="0.15647922">
+ <state line="127" column="5" selection-start="3968" selection-end="3968" vertical-scroll-proportion="1.0501223">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="17" selection-start="1431" selection-end="1431" vertical-scroll-proportion="0.21515892">
+ <state line="80" column="66" selection-start="2380" selection-end="2380" vertical-scroll-proportion="0.84352076">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java">
+ <entry file="jar:///Users/hbraun/.m2/repository/org/mvel/mvel2/2.0.10/mvel2-2.0.10.jar!/org/mvel2/optimizers/impl/refl/ReflectiveAccessorOptimizer.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="84" column="51" selection-start="2330" selection-end="2330" vertical-scroll-proportion="0.54171854">
+ <state line="49" column="0" selection-start="3038" selection-end="3038" vertical-scroll-proportion="0.38231632">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/Configuration.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/UpdateListener.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="86" column="18" selection-start="2917" selection-end="2917" vertical-scroll-proportion="0.21393643">
+ <state line="28" column="10" selection-start="1171" selection-end="1171" vertical-scroll-proportion="0.15647922">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSimulation.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="70" column="52" selection-start="3071" selection-end="3071" vertical-scroll-proportion="0.59153175">
+ <state line="90" column="80" selection-start="3112" selection-end="3112" vertical-scroll-proportion="0.52552927">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/drools/ApiTestCase.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/triggerPull.drl">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="19" selection-start="1920" selection-end="1920" vertical-scroll-proportion="0.52179325">
+ <state line="23" column="0" selection-start="587" selection-end="587" vertical-scroll-proportion="0.45828146">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/StatementDef.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/Configuration.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="74" column="16" selection-start="1848" selection-end="1848" vertical-scroll-proportion="0.6601467">
+ <state line="64" column="15" selection-start="2253" selection-end="2253" vertical-scroll-proportion="-0.039119806">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="13" selection-start="1893" selection-end="1893" vertical-scroll-proportion="0.15940224">
+ <state line="119" column="60" selection-start="4172" selection-end="4172" vertical-scroll-proportion="0.37235367">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/ExpressionConverter.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/drools/sam-cfg.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="67" column="11" selection-start="2712" selection-end="2712" vertical-scroll-proportion="0.8007472">
+ <state line="12" column="0" selection-start="367" selection-end="367" vertical-scroll-proportion="0.23471883">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/pom.xml">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="33" column="27" selection-start="1360" selection-end="1360" vertical-scroll-proportion="0.19559902">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/pom.xml">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/database/sam-cfg.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="24" selection-start="340" selection-end="340" vertical-scroll-proportion="-0.992528">
+ <state line="1" column="20" selection-start="62" selection-end="81" vertical-scroll-proportion="0.01992528">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/test/resources/adapter/invm/sam-cfg.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="58" selection-start="1006" selection-end="1006" vertical-scroll-proportion="0.01992528">
+ <state line="21" column="0" selection-start="719" selection-end="719" vertical-scroll-proportion="0.41075796">
<folding />
</state>
</provider>
Modified: sam/trunk/modules/core/pom.xml
===================================================================
--- sam/trunk/modules/core/pom.xml 2009-07-15 09:41:12 UTC (rev 664)
+++ sam/trunk/modules/core/pom.xml 2009-07-15 10:24:59 UTC (rev 665)
@@ -96,7 +96,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
- <exclude>org/jboss/test/sam/database/DatabaseTestCase.java</exclude>
+ <!--exclude>org/jboss/test/sam/database/DatabaseTestCase.java</exclude-->
</excludes>
</configuration>
</plugin>
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java 2009-07-15 09:41:12 UTC (rev 664)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java 2009-07-15 10:24:59 UTC (rev 665)
@@ -29,9 +29,9 @@
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
- at XmlRootElement(name = "processingNode", namespace = "http://org.jboss.sam/08/2008/")
+ at XmlRootElement(name = "activityMonitor", namespace = "http://org.jboss.sam/08/2008/")
@XmlType(
- name = "processingNodeType",
+ name = "activityMonitorType",
namespace = "http://org.jboss.sam/08/2008/",
propOrder = {
"props", "databases", "inputs", "outputs", "statements"
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java 2009-07-15 09:41:12 UTC (rev 664)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java 2009-07-15 10:24:59 UTC (rev 665)
@@ -24,6 +24,7 @@
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseConfiguration;
import org.drools.KnowledgeBaseFactory;
+import org.drools.logger.KnowledgeRuntimeLoggerFactory;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.builder.ResourceType;
@@ -51,6 +52,7 @@
private String name;
private ActivityMonitor runtime;
private boolean started;
+ private boolean enableRuntimeLogger;
private KnowledgeBase kbase;
private StatefulKnowledgeSession session;
@@ -80,7 +82,8 @@
{
this.session = kbase.newStatefulKnowledgeSession();
this.session.getGlobals().setDelegate(this);
- //KnowledgeRuntimeLoggerFactory.newConsoleLogger(session);
+ if(enableRuntimeLogger)
+ KnowledgeRuntimeLoggerFactory.newConsoleLogger(session);
//System.out.println("3. Created session");
@@ -113,9 +116,8 @@
public void setProperties(Properties properties)
{
- /*String runtimeLogProp = (String)properties.get("drools.runtimelog.enable");
- if(runtimeLogProp!=null && runtimeLogProp.equals("true"))
- KnowledgeRuntimeLoggerFactory.newConsoleLogger(session);*/
+ String prop = (String)properties.get("drools.runtimelog.enable");
+ enableRuntimeLogger = (prop !=null && "true".equals(prop));
}
public void setRuntime(ActivityMonitor runtime)
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java 2009-07-15 09:41:12 UTC (rev 664)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java 2009-07-15 10:24:59 UTC (rev 665)
@@ -72,7 +72,7 @@
{
StreamOutputAdapter adapter = this.outputAdapters.get(name);
if (null == adapter)
- throw new IllegalArgumentException("Unknown listener '" + name + "'");
+ throw new IllegalArgumentException("Unknown stream output '" + name + "'");
return adapter;
}
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java 2009-07-15 09:41:12 UTC (rev 664)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java 2009-07-15 10:24:59 UTC (rev 665)
@@ -46,6 +46,9 @@
public void update(Object result)
{
+ if(null==result)
+ throw new IllegalArgumentException("Stream output cannot be null");
+
EventMessage[] events = adoptPayload(result);
delegate.write(events);
}
Modified: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java
===================================================================
--- sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java 2009-07-15 09:41:12 UTC (rev 664)
+++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java 2009-07-15 10:24:59 UTC (rev 665)
@@ -102,7 +102,7 @@
* (Constraints applied to working memory)
* @throws Exception
*/
- public void testSQLJoin() throws Exception
+ /* public void testSQLJoin() throws Exception
{
// setup
eventProcessor.registerStatement(
@@ -125,7 +125,7 @@
assertEquals(3, eventMessages.length);
dump(eventMessages);
- }
+ }*/
private void dump(EventMessage[] eventMessages)
{
Modified: sam/trunk/modules/core/src/test/resources/adapter/invm/sam-cfg.xml
===================================================================
--- sam/trunk/modules/core/src/test/resources/adapter/invm/sam-cfg.xml 2009-07-15 09:41:12 UTC (rev 664)
+++ sam/trunk/modules/core/src/test/resources/adapter/invm/sam-cfg.xml 2009-07-15 10:24:59 UTC (rev 665)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
-<ns2:processingNode name="InVMAdapterTestCase"
+<ns2:activityMonitor name="InVMAdapterTestCase"
domain="http://org.jboss.sam/test/database"
xmlns:ns2="http://org.jboss.sam/08/2008/">
<statements>
@@ -19,4 +19,4 @@
]]></epl>
</statement>
</statements>
-</ns2:processingNode>
\ No newline at end of file
+</ns2:activityMonitor>
\ No newline at end of file
Modified: sam/trunk/modules/core/src/test/resources/database/sam-cfg.xml
===================================================================
--- sam/trunk/modules/core/src/test/resources/database/sam-cfg.xml 2009-07-15 09:41:12 UTC (rev 664)
+++ sam/trunk/modules/core/src/test/resources/database/sam-cfg.xml 2009-07-15 10:24:59 UTC (rev 665)
@@ -1,23 +1,25 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
-<ns2:processingNode name="DatabaseTestCase"
+<ns2:activityMonitor name="DatabaseTestCase"
domain="http://org.jboss.sam/test/database"
xmlns:ns2="http://org.jboss.sam/08/2008/">
- <properties/>
+ <runtime-configuration>
+ <property name="drools.runtimelog.enable" value="true"/>
+ </runtime-configuration>
- <database-references>
- <database-reference name="hsqlDB">
- <datasource url="jdbc:hsqldb:mem:SamTestSetup" name="hsqlDS" driver="org.hsqldb.jdbcDriver">
- <connection-arg value="sa" name="user"/>
- <connection-arg value="" name="password"/>
- </datasource>
- </database-reference>
- </database-references>
+ <database-references>
+ <database-reference name="hsqlDB">
+ <datasource url="jdbc:hsqldb:mem:SamTestSetup" name="hsqlDS" driver="org.hsqldb.jdbcDriver">
+ <connection-arg value="sa" name="user"/>
+ <connection-arg value="" name="password"/>
+ </datasource>
+ </database-reference>
+ </database-references>
- <inputs/>
+ <inputs/>
- <outputs/>
+ <outputs/>
- <statements/>
+ <statements/>
-</ns2:processingNode>
\ No newline at end of file
+</ns2:activityMonitor>
\ No newline at end of file
Modified: sam/trunk/modules/core/src/test/resources/database/sampleJoin.drl
===================================================================
--- sam/trunk/modules/core/src/test/resources/database/sampleJoin.drl 2009-07-15 09:41:12 UTC (rev 664)
+++ sam/trunk/modules/core/src/test/resources/database/sampleJoin.drl 2009-07-15 10:24:59 UTC (rev 665)
@@ -6,10 +6,10 @@
rule "Pull any quote for certain threshold"
when
- $query: Query(threshold>99);
+ $query: Query(threshold>99) from entry-point "in-channel"
$sqlStream: ArrayList() from collect (
Map(this['price']>$query.threshold) from SAM.query("hsqlDB", "SELECT symbol, price FROM quotes")
);
then
- SAM.getListener("InVM").update($sqlStream);
+ SAM.getListener("out-channel").update($sqlStream);
end
\ No newline at end of file
Modified: sam/trunk/modules/core/src/test/resources/database/triggerPull.drl
===================================================================
--- sam/trunk/modules/core/src/test/resources/database/triggerPull.drl 2009-07-15 09:41:12 UTC (rev 664)
+++ sam/trunk/modules/core/src/test/resources/database/triggerPull.drl 2009-07-15 10:24:59 UTC (rev 665)
@@ -15,8 +15,9 @@
when
$query: Query() from entry-point "in-channel"
$sqlStream: ArrayList() from collect (
- Map() from SAM.query("hsqlDB", "SELECT symbol, price FROM quotes WHERE symbol like ('"+$query.criteria+"')")
+ List() from SAM.query("hsqlDB", "SELECT symbol, price FROM quotes WHERE symbol like ('"+$query.criteria+"')")
)
then
+ System.out.println("ResultSet: "+ $sqlStream);
SAM.getListener("out-channel").update($sqlStream);
end
Modified: sam/trunk/modules/core/src/test/resources/drools/sam-cfg.xml
===================================================================
--- sam/trunk/modules/core/src/test/resources/drools/sam-cfg.xml 2009-07-15 09:41:12 UTC (rev 664)
+++ sam/trunk/modules/core/src/test/resources/drools/sam-cfg.xml 2009-07-15 10:24:59 UTC (rev 665)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
-<ns2:processingNode name="DroolsAPITestCase"
+<ns2:activityMonitor name="DroolsAPITestCase"
domain="http://org.jboss.sam/test/drools"
xmlns:ns2="http://org.jboss.sam/08/2008/">
<runtime-configuration>
- <property name="drools.runtimelog.enable" value="true"/>
+ <property name="drools.runtimelog.enable" value="false"/>
</runtime-configuration>
<statements/>
-</ns2:processingNode>
\ No newline at end of file
+</ns2:activityMonitor>
\ No newline at end of file
More information about the overlord-commits
mailing list