[overlord-commits] Overlord SVN: r687 - in sam/trunk: modules/core/src/main/java/org/jboss/sam/config and 1 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-07-29 05:53:14 -0400 (Wed, 29 Jul 2009) New Revision: 687 Modified: sam/trunk/SAMM.iws 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 Log: remove boundTo property form stmt config Modified: sam/trunk/SAMM.iws =================================================================== --- sam/trunk/SAMM.iws 2009-07-29 09:48:25 UTC (rev 686) +++ sam/trunk/SAMM.iws 2009-07-29 09:53:14 UTC (rev 687) @@ -18,11 +18,8 @@ <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/core/src/main/java/org/jboss/sam/ProcessingStatement.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DefaultCallback.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsProcessingStatement.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsProcessingStatement.java" /> + <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/main/java/org/jboss/sam/config/Configuration.java" afterPath="$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/Configuration.java" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -179,96 +176,42 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="EventMessage.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventMessage.java"> + <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="32" column="17" selection-start="1318" selection-end="1318" vertical-scroll-proportion="0.23160434"> + <state line="86" column="8" selection-start="2989" selection-end="2989" vertical-scroll-proportion="0.44390833"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="StreamInput.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamInput.java"> + <file leaf-file-name="StreamOutputDef.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/StreamOutputDef.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="31" selection-start="1602" selection-end="1602" vertical-scroll-proportion="0.36670688"> + <state line="30" column="13" selection-start="1263" selection-end="1263" vertical-scroll-proportion="0.17370325"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="StreamOutput.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamOutput.java"> + <file leaf-file-name="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="32" column="17" selection-start="1369" selection-end="1369" vertical-scroll-proportion="0.23160434"> + <state line="65" column="0" selection-start="1691" selection-end="1691" vertical-scroll-proportion="0.8455971"> <folding /> </state> </provider> </entry> </file> - <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"> + <file leaf-file-name="ConfigParserTestCase.java" pinned="false" current="true" current-in-tab="true"> + <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="48" column="13" selection-start="1828" selection-end="1828" vertical-scroll-proportion="0.25552824"> + <state line="36" column="13" selection-start="1440" selection-end="1440" vertical-scroll-proportion="-0.4127764"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="StreamOutputAdapter.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="68" column="32" selection-start="2158" selection-end="2158" vertical-scroll-proportion="0.8492159"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="MapMessageAdapter.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/MapMessageAdapter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="9" selection-start="1305" selection-end="1305" vertical-scroll-proportion="0.2509047"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="StreamInputCallback.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamInputCallback.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="17" selection-start="1217" selection-end="1217" vertical-scroll-proportion="0.1544029"> - <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="265" column="49" selection-start="7746" selection-end="7746" vertical-scroll-proportion="0.70638824"> - <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="12" selection-start="1313" selection-end="1313" vertical-scroll-proportion="0.27020508"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="DataSourceManager.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/datasource/DataSourceManager.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="13" selection-start="1234" selection-end="1234" vertical-scroll-proportion="0.15724815"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -465,6 +408,14 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -484,9 +435,29 @@ <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/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> @@ -506,25 +477,33 @@ <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/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/main/java" /> + <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/main/java/org" /> + <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/main/java/org/jboss" /> + <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/main/java/org/jboss/sam" /> + <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/config" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -544,10 +523,54 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <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> @@ -563,10 +586,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -606,13 +625,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/main/java/org/jboss/sam/internal" /> + <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/internal/drools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -652,9 +667,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/common" /> + <option name="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> @@ -993,65 +1012,65 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsProcessingStatement.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="34" column="0" selection-start="1352" selection-end="1352" vertical-scroll-proportion="0.27518427"> + <state line="30" column="13" selection-start="1234" selection-end="1234" vertical-scroll-proportion="0.15724815"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/Configuration.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="86" column="18" selection-start="2917" selection-end="2917" vertical-scroll-proportion="0.07616708"> + <state line="32" column="17" selection-start="1318" selection-end="1318" vertical-scroll-proportion="0.23160434"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/Main.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamInput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="102" column="19" selection-start="2861" selection-end="2861" vertical-scroll-proportion="0.21375921"> + <state line="39" column="31" selection-start="1602" selection-end="1602" vertical-scroll-proportion="0.36670688"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamOutput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="51" column="28" selection-start="1731" selection-end="1731" vertical-scroll-proportion="0.59831125"> + <state line="32" column="17" selection-start="1369" selection-end="1369" vertical-scroll-proportion="0.23160434"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessor.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="76" column="18" selection-start="2246" selection-end="2246" vertical-scroll-proportion="0.6486486"> + <state line="48" column="13" selection-start="1828" selection-end="1828" vertical-scroll-proportion="0.25552824"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.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="265" column="49" selection-start="7746" selection-end="7746" vertical-scroll-proportion="0.70638824"> + <state line="60" column="58" selection-start="1862" selection-end="1862" vertical-scroll-proportion="0.694813"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/datasource/DataSourceManager.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamInput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="13" selection-start="1234" selection-end="1234" vertical-scroll-proportion="0.15724815"> + <state line="45" column="50" selection-start="1572" selection-end="1572" vertical-scroll-proportion="0.44390833"> <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/main/java/org/jboss/sam/internal/stream/InVMStreamRegistry.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="12" selection-start="1313" selection-end="1313" vertical-scroll-proportion="0.27020508"> + <state line="43" column="35" selection-start="1589" selection-end="1589" vertical-scroll-proportion="0.35380834"> <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/drools/MapMessageAdapter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="17" selection-start="1318" selection-end="1318" vertical-scroll-proportion="0.23160434"> + <state line="36" column="9" selection-start="1305" selection-end="1305" vertical-scroll-proportion="0.2509047"> <folding /> </state> </provider> @@ -1063,37 +1082,37 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamInput.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ActivityMonitor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="31" selection-start="1602" selection-end="1602" vertical-scroll-proportion="0.36670688"> + <state line="34" column="12" selection-start="1313" selection-end="1313" vertical-scroll-proportion="0.27020508"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/StreamOutput.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="32" column="17" selection-start="1369" selection-end="1369" vertical-scroll-proportion="0.23160434"> + <state line="86" column="8" selection-start="2989" selection-end="2989" vertical-scroll-proportion="0.44390833"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/SAMAdapter.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/config/internal/StreamOutputDef.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="48" column="13" selection-start="1828" selection-end="1828" vertical-scroll-proportion="0.25552824"> + <state line="30" column="13" selection-start="1263" selection-end="1263" vertical-scroll-proportion="0.17370325"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/MapMessageAdapter.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="36" column="9" selection-start="1305" selection-end="1305" vertical-scroll-proportion="0.2509047"> + <state line="65" column="0" selection-start="1691" selection-end="1691" vertical-scroll-proportion="0.8455971"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/drools/StreamOutputAdapter.java"> + <entry file="file://$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="68" column="32" selection-start="2158" selection-end="2158" vertical-scroll-proportion="0.8492159"> + <state line="36" column="13" selection-start="1440" selection-end="1440" vertical-scroll-proportion="-0.4127764"> <folding /> </state> </provider> 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-29 09:48:25 UTC (rev 686) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configuration.java 2009-07-29 09:53:14 UTC (rev 687) @@ -82,12 +82,9 @@ for (StatementDef def : configurationDef.getStatements()) { - if (def.getBoundTo() != null) - { - processor.registerStatement( - def.getName(), new ByteArrayInputStream(def.getEpl().getExpression().getBytes()) - ); - } + processor.registerStatement( + def.getName(), new ByteArrayInputStream(def.getEpl().getExpression().getBytes()) + ); } Properties properties = new Properties(); 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-29 09:48:25 UTC (rev 686) +++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StatementDef.java 2009-07-29 09:53:14 UTC (rev 687) @@ -33,8 +33,7 @@ { private String name; private EPLDef epl; - private String boundTo; - + public StatementDef() { } @@ -44,12 +43,6 @@ this.name = name; } - public StatementDef(String name, String boundTo) - { - this.name = name; - this.boundTo = boundTo; - } - @XmlAttribute(required = true) public String getName() { @@ -71,17 +64,4 @@ this.epl = epl; } - /** - * @deprecated - */ - @XmlAttribute(required = false) - public String getBoundTo() - { - return boundTo; - } - - public void setBoundTo(String boundTo) - { - this.boundTo = boundTo; - } }