[overlord-commits] Overlord SVN: r663 - in sam/trunk: modules/core/src/main/java/org/jboss/sam and 6 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Wed Jul 15 05:36:08 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-07-15 05:36:07 -0400 (Wed, 15 Jul 2009)
New Revision: 663
Modified:
sam/trunk/SAMM.iws
sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configuration.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StatementDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java
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/drools/ApiTestCase.java
sam/trunk/modules/sim/src/main/java/org/jboss/sam/simulation/EventSimulation.java
Log:
Remove obsolte API parts
Modified: sam/trunk/SAMM.iws
===================================================================
--- sam/trunk/SAMM.iws 2009-07-15 09:22:37 UTC (rev 662)
+++ sam/trunk/SAMM.iws 2009-07-15 09:36:07 UTC (rev 663)
@@ -17,47 +17,14 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/DataSourceDef.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="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/StreamOutputDef.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/sim.iml" afterPath="$PROJECT_DIR$/modules/sim/sim.iml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/EPLDef.java" />
- <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/core/src/main/java/org/jboss/sam/config/EPLDef.java" afterPath="" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/DatabaseRefDef.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/Configuration.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/StreamOutputDef.java" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/SAMRuntimeFactory.java" afterPath="" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/StatementDef.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ActivityMonitorFactory.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/datasource/DataSourceFactory.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/datasource/DataSourceFactory.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/Configurator.java" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAMM.iws" afterPath="$PROJECT_DIR$/SAMM.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/datasource/internal/DBCPDataSourceFactory.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/datasource/internal/DBCPDataSourceFactory.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorImpl.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/PropertyDef.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorFactory.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/SAMRuntimeAware.java" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/DefaultRuntimeImpl.java" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/StreamInputDef.java" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/DataSourceDef.java" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/DefaultRuntimeFactory.java" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/StatementDef.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/StatementDef.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" />
<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="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/StreamInputDef.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/DatabaseRefDef.java" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventMessage.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventMessage.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java" afterPath="" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ActivityMonitor.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/Configuration.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/Configuration.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSimulation.java" afterPath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSimulation.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/ConfigurationDef.java" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/SAMRuntime.java" afterPath="" />
+ <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/java/org/jboss/test/sam/drools/ApiTestCase.java" afterPath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/drools/ApiTestCase.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -253,96 +220,69 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="DefaultActivityMonitorFactory.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorFactory.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="35" column="20" selection-start="1505" selection-end="1505" vertical-scroll-proportion="0.3946869">
+ <state line="84" column="51" selection-start="2330" selection-end="2330" vertical-scroll-proportion="0.54171854">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="DefaultActivityMonitorImpl.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorImpl.java">
+ <file leaf-file-name="DroolsEventProcessorImpl.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="66" selection-start="1632" selection-end="1632" vertical-scroll-proportion="0.54648954">
+ <state line="233" column="0" selection-start="7188" selection-end="7188" vertical-scroll-proportion="0.31257784">
<folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="ProcessingStatement.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="53" column="22" selection-start="2050" selection-end="2050" vertical-scroll-proportion="0.71875">
+ <state line="31" column="17" selection-start="1431" selection-end="1431" vertical-scroll-proportion="0.21515892">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ConfigFactory.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.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="108" column="43" selection-start="3303" selection-end="3303" vertical-scroll-proportion="0.63567364">
+ <state line="86" column="18" selection-start="2917" selection-end="2917" vertical-scroll-proportion="0.21393643">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ConfigParserTestCase.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java">
+ <file leaf-file-name="EventSimulation.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSimulation.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="91" column="21" selection-start="3466" selection-end="3466" vertical-scroll-proportion="0.58203125">
+ <state line="71" column="15" selection-start="3119" selection-end="3119" vertical-scroll-proportion="0.61145705">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="EPLValueAdapter.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/EPLValueAdapter.java">
+ <file leaf-file-name="ApiTestCase.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/drools/ApiTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="13" selection-start="1195" selection-end="1195" vertical-scroll-proportion="0.24288425">
+ <state line="55" column="19" selection-start="1920" selection-end="1920" vertical-scroll-proportion="0.52179325">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="EventProcessor.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java">
+ <file leaf-file-name="StatementDef.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/StatementDef.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="106" column="2" selection-start="2693" selection-end="2693" vertical-scroll-proportion="1.2246094">
+ <state line="74" column="16" selection-start="1848" selection-end="1848" vertical-scroll-proportion="0.6601467">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ProcessingStatement.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="56" column="71" selection-start="1845" selection-end="1845" vertical-scroll-proportion="1.0929791">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="EventProcessorFactory.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="41" column="49" selection-start="1482" selection-end="1482" vertical-scroll-proportion="0.63757116">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ActivityMonitor.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ActivityMonitor.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="34" column="2" selection-start="1303" selection-end="1303" vertical-scroll-proportion="0.42504743">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -822,6 +762,94 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/datasource" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="SAMM.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/datasource" />
+ <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/datasource/internal" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="SAMM.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -839,7 +867,7 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" />
+ <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -877,23 +905,6 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</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="" />
- </configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -913,6 +924,23 @@
<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="" />
+ </configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
<configuration default="false" name="client" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -1009,16 +1037,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="346" y="40" width="1328" height="965" extended-state="0" />
+ <frame x="316" y="39" width="1328" height="965" 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.33" 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="false" weight="0.30414388" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32718894" order="1" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24706802" order="1" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30414388" order="0" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718894" order="1" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24706802" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" 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" />
@@ -1120,107 +1148,107 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamInput.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="54" column="52" selection-start="1791" selection-end="1791" vertical-scroll-proportion="0.6650367">
+ <state line="41" column="49" selection-start="1482" selection-end="1482" vertical-scroll-proportion="0.63757116">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventMessage.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="43" column="20" selection-start="1460" selection-end="1460" vertical-scroll-proportion="0.44987774">
+ <state line="41" column="66" selection-start="1632" selection-end="1632" vertical-scroll-proportion="0.35207823">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamOutput.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/datasource/DataSourceFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="60" selection-start="1590" selection-end="1590" vertical-scroll-proportion="0.52811736">
+ <state line="33" column="39" selection-start="1350" selection-end="1350" vertical-scroll-proportion="0.19559902">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ActivityMonitorFactory.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/datasource/DataSourceManager.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="42" selection-start="1364" selection-end="1364" vertical-scroll-proportion="0.23471883">
+ <state line="30" column="13" selection-start="1234" selection-end="1234" vertical-scroll-proportion="0.15647922">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/datasource/internal/DBCPDataSourceFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="65" column="60" selection-start="2529" selection-end="2529" vertical-scroll-proportion="0.41095892">
+ <state line="37" column="13" selection-start="1597" selection-end="1597" vertical-scroll-proportion="0.15940224">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorFactory.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="20" selection-start="1505" selection-end="1505" vertical-scroll-proportion="0.3946869">
+ <state line="112" column="64" selection-start="3432" selection-end="3432" vertical-scroll-proportion="0.54171854">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ActivityMonitor.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="2" selection-start="1303" selection-end="1303" vertical-scroll-proportion="0.42504743">
+ <state line="91" column="21" selection-start="3466" selection-end="3466" vertical-scroll-proportion="0.44209215">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/EPLValueAdapter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="49" selection-start="1482" selection-end="1482" vertical-scroll-proportion="0.63757116">
+ <state line="28" column="13" selection-start="1195" selection-end="1195" vertical-scroll-proportion="0.15647922">
<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/config/internal/StatementDef.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="56" column="71" selection-start="1845" selection-end="1845" vertical-scroll-proportion="1.0929791">
+ <state line="74" column="16" selection-start="1848" selection-end="1848" vertical-scroll-proportion="0.6601467">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/Configuration.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="106" column="2" selection-start="2693" selection-end="2693" vertical-scroll-proportion="1.2246094">
+ <state line="86" column="18" selection-start="2917" selection-end="2917" vertical-scroll-proportion="0.21393643">
<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/drools/ApiTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="13" selection-start="1195" selection-end="1195" vertical-scroll-proportion="0.24288425">
+ <state line="55" column="19" selection-start="1920" selection-end="1920" vertical-scroll-proportion="0.52179325">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorImpl.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="66" selection-start="1632" selection-end="1632" vertical-scroll-proportion="0.54648954">
+ <state line="31" column="17" selection-start="1431" selection-end="1431" vertical-scroll-proportion="0.21515892">
<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/main/java/org/jboss/sam/EventProcessor.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="91" column="21" selection-start="3466" selection-end="3466" vertical-scroll-proportion="0.58203125">
+ <state line="84" column="51" selection-start="2330" selection-end="2330" vertical-scroll-proportion="0.54171854">
<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/DroolsEventProcessorImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="53" column="22" selection-start="2050" selection-end="2050" vertical-scroll-proportion="0.71875">
+ <state line="233" column="0" selection-start="7188" selection-end="7188" vertical-scroll-proportion="0.31257784">
<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/sim/src/main/java/org/jboss/sam/simulation/EventSimulation.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="108" column="43" selection-start="3303" selection-end="3303" vertical-scroll-proportion="0.63567364">
+ <state line="71" column="15" selection-start="3119" selection-end="3119" vertical-scroll-proportion="0.61145705">
<folding />
</state>
</provider>
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java 2009-07-15 09:22:37 UTC (rev 662)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java 2009-07-15 09:36:07 UTC (rev 663)
@@ -72,23 +72,13 @@
Iterator<String> getStreamOutputNames();
/**
- * Creates a statement
- *
- * @param statementName
- * @param epl
- * @return
- */
- ProcessingStatement registerStatement(String statementName, String epl);
-
- /**
* Creates a statement and binds it to an inout or output adapter.
*
- * @param streamName
* @param statementName
- * @param epl
+ * @param in
* @return
*/
- ProcessingStatement registerBoundStatement(String streamName, String statementName, InputStream epl);
+ ProcessingStatement registerStatement(String statementName, InputStream in);
/**
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configuration.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configuration.java 2009-07-15 09:22:37 UTC (rev 662)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configuration.java 2009-07-15 09:36:07 UTC (rev 663)
@@ -57,8 +57,7 @@
this.configurationDef = configTree;
}
-
- ConfigurationDef getConfigurationDef()
+ public ConfigurationDef getConfigurationDef()
{
return configurationDef;
}
@@ -85,14 +84,8 @@
{
if (def.getBoundTo() != null)
{
- processor.registerBoundStatement(
- def.getBoundTo(), def.getName(), new ByteArrayInputStream(def.getEpl().getExpression().getBytes())
- );
- }
- else
- {
processor.registerStatement(
- def.getName(), def.getEpl().getExpression()
+ def.getName(), new ByteArrayInputStream(def.getEpl().getExpression().getBytes())
);
}
}
@@ -135,7 +128,10 @@
public void applyTo(ActivityMonitor monitor)
{
+ if(null==configurationDef)
+ throw new IllegalArgumentException("configurationDef cannot be null");
+
configure(monitor.getEventProcessor());
configure(monitor.getDataSourceManager());
- }
+ }
}
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StatementDef.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StatementDef.java 2009-07-15 09:22:37 UTC (rev 662)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StatementDef.java 2009-07-15 09:36:07 UTC (rev 663)
@@ -71,6 +71,9 @@
this.epl = epl;
}
+ /**
+ * @deprecated
+ */
@XmlAttribute(required = false)
public String getBoundTo()
{
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:22:37 UTC (rev 662)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java 2009-07-15 09:36:07 UTC (rev 663)
@@ -24,10 +24,10 @@
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseConfiguration;
import org.drools.KnowledgeBaseFactory;
-import org.drools.common.NamedEntryPoint;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.builder.ResourceType;
+import org.drools.common.NamedEntryPoint;
import org.drools.conf.EventProcessingOption;
import org.drools.io.ResourceFactory;
import org.drools.runtime.Globals;
@@ -227,17 +227,11 @@
* Create a drools package, register it with the rulebase and make
* sure that the adapter output adapter is available as a drools global variable
*/
- public ProcessingStatement registerBoundStatement(String streamName, String statementName, InputStream epl)
+ public ProcessingStatement registerStatement(String statementName, InputStream epl)
{
if(isStarted())
throw new IllegalStateException("EventProcessor already started");
-
- final StreamOutput out = this.streamOutputs.get(streamName);
- final StreamInput in = this.streamInputs.get(streamName);
-
- if(out == null && in== null)
- throw new IllegalArgumentException("No such stream: " + streamName);
-
+
// -----------------------
// Create a drools package
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:22:37 UTC (rev 662)
+++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/database/DatabaseTestCase.java 2009-07-15 09:36:07 UTC (rev 663)
@@ -25,8 +25,6 @@
import org.jboss.test.sam.InMemoryDatabase;
import org.jboss.test.sam.SamTestSetup;
-import java.io.ByteArrayInputStream;
-
/**
* Test database integration patterns
*
@@ -80,8 +78,7 @@
public void testSQLQuery() throws Exception
{
// setup
- eventProcessor.registerBoundStatement(
- "in-channel",
+ eventProcessor.registerStatement(
"TriggerSQL",
loadDRL("database/triggerPull.drl")
);
@@ -108,8 +105,8 @@
public void testSQLJoin() throws Exception
{
// setup
- eventProcessor.registerBoundStatement(
- "in-channel","" +
+ eventProcessor.registerStatement(
+ "" +
"SQLJoin",
loadDRL("database/sampleJoin.drl")
);
Modified: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/drools/ApiTestCase.java
===================================================================
--- sam/trunk/modules/core/src/test/java/org/jboss/test/sam/drools/ApiTestCase.java 2009-07-15 09:22:37 UTC (rev 662)
+++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/drools/ApiTestCase.java 2009-07-15 09:36:07 UTC (rev 663)
@@ -38,8 +38,7 @@
public void testStreamInput()
{
- eventProcessor.registerBoundStatement(
- "in-channel",
+ eventProcessor.registerStatement(
"stream-input.drl",
loadDRL("drools/stream-input.drl")
);
@@ -54,8 +53,7 @@
public void testAggregationAndForwarding()
{
- eventProcessor.registerBoundStatement(
- "in-channel",
+ eventProcessor.registerStatement(
"forward.drl",
loadDRL("drools/stream-forward.drl")
);
Modified: sam/trunk/modules/sim/src/main/java/org/jboss/sam/simulation/EventSimulation.java
===================================================================
--- sam/trunk/modules/sim/src/main/java/org/jboss/sam/simulation/EventSimulation.java 2009-07-15 09:22:37 UTC (rev 662)
+++ sam/trunk/modules/sim/src/main/java/org/jboss/sam/simulation/EventSimulation.java 2009-07-15 09:36:07 UTC (rev 663)
@@ -55,7 +55,7 @@
* <b>Event sinks</b><br>
* {@link org.jboss.sam.simulation.EventSinkEntity}'s processes event messages that have been forwarded
* from an event processor. They need to be added ({@link #addSink(EventSinkEntity)}) to a simualtion
- * and bound to a processing statement ({@link #bindStatement(String,EventSinkEntity)})
+ * and bound to a processing statement ({@link #bindStatement(java.io.InputStream, EventSinkEntity)}
* <p/>
* <p/>
* <b>Shared context</b><br>
@@ -128,13 +128,13 @@
/**
* Create a aggregation/filtering statement
*
+ * @deprecated
+ *
* @param stmt
*/
public void createStatement(String stmt)
{
- this.eventProcessor.registerStatement(
- UUID.randomUUID().toString(), stmt
- );
+ throw new RuntimeException("Obsolete method");
}
/**
@@ -142,8 +142,8 @@
*/
public void bindStatement(InputStream in, EventSinkEntity sink)
{
- this.eventProcessor.registerBoundStatement(
- sink.getStreamName(), UUID.randomUUID().toString(), in
+ this.eventProcessor.registerStatement(
+ UUID.randomUUID().toString(), in
);
}
More information about the overlord-commits
mailing list