[overlord-commits] Overlord SVN: r662 - in sam/trunk: modules/core/src/main/java/org/jboss/sam and 10 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Wed Jul 15 05:22:38 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-07-15 05:22:37 -0400 (Wed, 15 Jul 2009)
New Revision: 662
Added:
sam/trunk/modules/core/src/main/java/org/jboss/sam/ActivityMonitor.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/ActivityMonitorFactory.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/ConfigurationDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/DataSourceDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/DatabaseRefDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/EPLDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/PropertyDef.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/config/internal/StreamInputDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StreamOutputDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorFactory.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorImpl.java
Removed:
sam/trunk/modules/core/src/main/java/org/jboss/sam/SAMRuntime.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/SAMRuntimeAware.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/SAMRuntimeFactory.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigurationDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DataSourceDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatabaseRefDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/EPLDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamInputDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamOutputDef.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultRuntimeFactory.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultRuntimeImpl.java
Modified:
sam/trunk/SAMM.iws
sam/trunk/modules/core/src/main/java/org/jboss/sam/EventMessage.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamInput.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/datasource/DataSourceFactory.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/datasource/internal/DBCPDataSourceFactory.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/SamTestSetup.java
sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java
sam/trunk/modules/sim/sim.iml
sam/trunk/modules/sim/src/main/java/org/jboss/sam/simulation/EventSimulation.java
Log:
Cleanup API
Modified: sam/trunk/SAMM.iws
===================================================================
--- sam/trunk/SAMM.iws 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/SAMM.iws 2009-07-15 09:22:37 UTC (rev 662)
@@ -17,33 +17,47 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventMessageFactory.java" afterPath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventMessageFactory.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" afterPath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/simulation/SensorMessageFactory.java" afterPath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/simulation/SensorMessageFactory.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/adapter/invm/Alert.java" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java" afterPath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/SimulationContext.java" afterPath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/SimulationContext.java" />
+ <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="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java" afterPath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/resources/simulation/sam-cfg.xml" afterPath="$PROJECT_DIR$/modules/sim/src/test/resources/simulation/sam-cfg.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java" afterPath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/falloff/ProductionEventMessage.java" afterPath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/falloff/ProductionEventMessage.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/pom.xml" afterPath="$PROJECT_DIR$/modules/sim/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java" afterPath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkHandler.java" afterPath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkHandler.java" />
+ <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/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java" afterPath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/aggregation/SalesEventMessage.java" afterPath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/aggregation/SalesEventMessage.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/Measurement.java" afterPath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/Measurement.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/pattern/LightSwitchEventMessage.java" afterPath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/pattern/LightSwitchEventMessage.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/ContextAwareEntity.java" afterPath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/ContextAwareEntity.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java" afterPath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java" afterPath="$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/modules/core/src/test/java/org/jboss/test/sam/adapter/invm/InVMAdapterTestCase.java" afterPath="" />
+ <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/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/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="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/simulation/SensorEventMessage.java" afterPath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/simulation/SensorEventMessage.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/BufferedStreamOutput.java" afterPath="$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/BufferedStreamOutput.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="" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -141,7 +155,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/EventSimulation.java" line="153" class="org.jboss.sam.simulation.EventSimulation" package="org.jboss.sam.simulation">
+ <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" />
@@ -238,7 +252,98 @@
</subPane>
</component>
<component name="FileEditorManager">
- <leaf />
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="35" column="20" selection-start="1505" selection-end="1505" vertical-scroll-proportion="0.3946869">
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="41" column="66" selection-start="1632" selection-end="1632" vertical-scroll-proportion="0.54648954">
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="53" column="22" selection-start="2050" selection-end="2050" vertical-scroll-proportion="0.71875">
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="108" column="43" selection-start="3303" selection-end="3303" vertical-scroll-proportion="0.63567364">
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="91" column="21" selection-start="3466" selection-end="3466" vertical-scroll-proportion="0.58203125">
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="28" column="13" selection-start="1195" selection-end="1195" vertical-scroll-proportion="0.24288425">
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="106" column="2" selection-start="2693" selection-end="2693" vertical-scroll-proportion="1.2246094">
+ <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">
<FindUsagesManager>
@@ -717,94 +822,6 @@
<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>
- <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/internal" />
- <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>
- <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>
@@ -841,7 +858,11 @@
<component name="ReadonlyStatusHandler">
<option name="SHOW_DIALOG" value="true" />
</component>
- <component name="RecentsManager" />
+ <component name="RecentsManager">
+ <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.jboss.sam.config.internal" />
+ </key>
+ </component>
<component name="RestoreUpdateTree" />
<component name="RunManager" selected="Remote.client">
<configuration default="true" type="Applet" factoryName="Applet">
@@ -989,15 +1010,15 @@
</component>
<component name="ToolWindowManager">
<frame x="346" y="40" width="1328" height="965" extended-state="0" />
- <editor active="false" />
+ <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="true" 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="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="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" />
@@ -1099,111 +1120,107 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/modules/sim/pom.xml">
+ <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="12" column="54" selection-start="479" selection-end="479" vertical-scroll-proportion="0.24211854">
+ <state line="54" column="52" selection-start="1791" selection-end="1791" vertical-scroll-proportion="0.6650367">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamRegistry.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="59" column="26" selection-start="2010" selection-end="2010" vertical-scroll-proportion="0.6860025">
+ <state line="43" column="20" selection-start="1460" selection-end="1460" vertical-scroll-proportion="0.44987774">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSinkEntity.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="24" column="0" selection-start="1102" selection-end="1136" vertical-scroll-proportion="-1.103912">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="47" column="60" selection-start="1590" selection-end="1590" vertical-scroll-proportion="0.52811736">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMStreamInput.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/ActivityMonitorFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="9" selection-start="1461" selection-end="1461" vertical-scroll-proportion="0.33251834">
+ <state line="33" column="42" selection-start="1364" selection-end="1364" vertical-scroll-proportion="0.23471883">
<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/test/java/org/jboss/test/sam/SamTestSetup.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="49" column="7" selection-start="1726" selection-end="1726" vertical-scroll-proportion="0.2117061">
+ <state line="65" column="60" selection-start="2529" selection-end="2529" vertical-scroll-proportion="0.41095892">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/stream/InVMDispatcher.java">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="65" selection-start="1253" selection-end="1265" vertical-scroll-proportion="0.1992528">
+ <state line="35" column="20" selection-start="1505" selection-end="1505" vertical-scroll-proportion="0.3946869">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/main/java/org/jboss/sam/simulation/EventSourceEntity.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="144" column="33" selection-start="4161" selection-end="4161" vertical-scroll-proportion="0.56723714">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="34" column="2" selection-start="1303" selection-end="1303" vertical-scroll-proportion="0.42504743">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/test/resources/simulation/test.drl">
+ <entry file="file://$PROJECT_DIR$/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="17" column="0" selection-start="381" selection-end="381" vertical-scroll-proportion="0.33251834">
+ <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/internal/drools/DroolsEventProcessorImpl.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="125" column="60" selection-start="4292" selection-end="4292" vertical-scroll-proportion="0.44582814">
+ <state line="56" column="71" selection-start="1845" selection-end="1845" vertical-scroll-proportion="1.0929791">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.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="79" column="19" selection-start="2728" selection-end="2728" vertical-scroll-proportion="0.64792174">
+ <state line="106" column="2" selection-start="2693" selection-end="2693" vertical-scroll-proportion="1.2246094">
<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/config/internal/EPLValueAdapter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="173" column="23" selection-start="5886" selection-end="5886" vertical-scroll-proportion="0.7895392">
+ <state line="28" column="13" selection-start="1195" selection-end="1195" vertical-scroll-proportion="0.24288425">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.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="128" column="29" selection-start="4103" selection-end="4143" vertical-scroll-proportion="0.6014944">
+ <state line="41" column="66" selection-start="1632" selection-end="1632" vertical-scroll-proportion="0.54648954">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.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="180" column="55" selection-start="5566" selection-end="5566" vertical-scroll-proportion="0.7210461">
+ <state line="91" column="21" selection-start="3466" selection-end="3466" vertical-scroll-proportion="0.58203125">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.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="149" column="52" selection-start="4682" selection-end="4682" vertical-scroll-proportion="0.66748166">
+ <state line="53" column="22" selection-start="2050" selection-end="2050" vertical-scroll-proportion="0.71875">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/modules/sim/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.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="173" column="58" selection-start="5252" selection-end="5252" vertical-scroll-proportion="0.8630807">
+ <state line="108" column="43" selection-start="3303" selection-end="3303" vertical-scroll-proportion="0.63567364">
<folding />
</state>
</provider>
Copied: sam/trunk/modules/core/src/main/java/org/jboss/sam/ActivityMonitor.java (from rev 658, sam/trunk/modules/core/src/main/java/org/jboss/sam/SAMRuntime.java)
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/ActivityMonitor.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/ActivityMonitor.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam;
+
+import org.jboss.sam.datasource.DataSourceManager;
+
+
+/**
+ * Main component that manages the {@link org.jboss.sam.EventProcessor}
+ * and auxiliary services.
+ *
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public interface ActivityMonitor
+{
+ DataSourceManager getDataSourceManager();
+
+ EventProcessor getEventProcessor();
+
+}
Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/ActivityMonitor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: sam/trunk/modules/core/src/main/java/org/jboss/sam/ActivityMonitorFactory.java (from rev 658, sam/trunk/modules/core/src/main/java/org/jboss/sam/SAMRuntimeFactory.java)
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/ActivityMonitorFactory.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/ActivityMonitorFactory.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam;
+
+import org.jboss.sam.config.Configuration;
+import org.jboss.sam.internal.DefaultActivityMonitorFactory;
+
+/**
+ * Constructs {@link org.jboss.sam.ActivityMonitor}'s.
+ *
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public abstract class ActivityMonitorFactory
+{
+ public abstract ActivityMonitor createMonitor(Configuration configuration);
+
+ public static ActivityMonitorFactory newInstance()
+ {
+ return new DefaultActivityMonitorFactory();
+ }
+}
Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/ActivityMonitorFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/EventMessage.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/EventMessage.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/EventMessage.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -24,9 +24,8 @@
import java.util.Iterator;
/**
- * An event message will be send when an Event occurs.<br>
- * It consist of a timestamp and associated event properties.
- * EventMessage's are written to {@link org.jboss.sam.StreamOutput}'s.
+ * Event messages are written to {@link org.jboss.sam.StreamOutput}'s.<br>
+ * An event message consist of a timestamp and associated event properties.
* <p/>
*
* @author Heiko.Braun <heiko.braun at jboss.com>
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 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -26,9 +26,9 @@
import java.io.InputStream;
/**
- * An event processor glues together {@link org.jboss.sam.StreamInput} and {@link org.jboss.sam.StreamOutput}
- * and provides a way to register {@link org.jboss.sam.ProcessingStatement}'s,
- * both bound (event forwarding) and unbound (event aggregation and filtering).
+ * An event processor manages {@link org.jboss.sam.StreamInput}'s
+ * and {@link org.jboss.sam.StreamOutput}'s. It provides a way to register {@link org.jboss.sam.ProcessingStatement}'s,
+ * which then correlate events across streams.
* <p/>
* Instances are created through {@link org.jboss.sam.EventProcessorFactory}
*
@@ -104,7 +104,8 @@
T getUnderlying();
- void setRuntime(SAMRuntime runtime);
+
+ void setRuntime(ActivityMonitor runtime);
void setProperties(Properties properties);
}
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessorFactory.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -24,6 +24,8 @@
import org.jboss.sam.internal.drools.DroolsEventProcessorImpl;
/**
+ * Condstructs {@link org.jboss.sam.EventProcessor}'s.
+ *
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
public abstract class EventProcessorFactory
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/ProcessingStatement.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -22,10 +22,10 @@
package org.jboss.sam;
/**
- * Represents an EPL (event processing languge) statement.
+ * Represents an EPL (event processing languge) statement.<br/>
* Statements are associated with a {@link org.jboss.sam.EventProcessor}
* and can be bound to a {@link org.jboss.sam.StreamOutput} to forward events,
- * or used unbound to aggregate and filter events.
+ * or used with {@link org.jboss.sam.StreamInput}'s to aggregate and filter events.
*
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/SAMRuntime.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/SAMRuntime.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/SAMRuntime.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam;
-
-import org.jboss.sam.config.Configurator;
-import org.jboss.sam.datasource.DataSourceManager;
-
-import java.util.Properties;
-
-
-/**
- * Glues together SAM building blocks.
- *
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public interface SAMRuntime
-{
- void applyConfiguration(Configurator cfg);
-
- DataSourceManager getDataSourceManager();
-
- EventProcessor getEventProcessor();
-
-}
Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/SAMRuntimeAware.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/SAMRuntimeAware.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/SAMRuntimeAware.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam;
-
-/**
- * Marks SAM components that need to interact with the runtime itself.
- *
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public interface SAMRuntimeAware
-{
- void setRuntime(SAMRuntime runtime);
-}
-
Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/SAMRuntimeFactory.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/SAMRuntimeFactory.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/SAMRuntimeFactory.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam;
-
-import org.jboss.sam.config.Configurator;
-import org.jboss.sam.internal.DefaultRuntimeFactory;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public abstract class SAMRuntimeFactory
-{
- public abstract SAMRuntime createRuntime(Configurator configurator);
-
- public static SAMRuntimeFactory newInstance()
- {
- return new DefaultRuntimeFactory();
- }
-}
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamInput.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamInput.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/StreamInput.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -23,7 +23,7 @@
/**
* Stream inputs are registered with {@link org.jboss.sam.EventProcessor}'s
- * and notify registered {@link org.jboss.sam.StreamInputCallback}'s when new events arrive.
+ * and invoke {@link org.jboss.sam.StreamInputCallback}'s when new events arrive.
* Typically the CEP runtime itself act's as such a listener in order to process events.
*
* @author Heiko.Braun <heiko.braun at jboss.com>
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -23,6 +23,7 @@
import com.sun.xml.bind.marshaller.CharacterEscapeHandler;
import org.jboss.sam.config.internal.NoCharacterEscapeHandler;
+import org.jboss.sam.config.internal.ConfigurationDef;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -34,7 +35,7 @@
import java.net.URL;
/**
- * Marshall/Unmarshall processing node definitions.
+ * Marshall/Unmarshall {@link org.jboss.sam.ActivityMonitor} configuration.
*
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
@@ -65,13 +66,13 @@
public ConfigurationDef unmarshall(InputStream inputStream)
{
- ConfigurationDef pnd = null;
+ ConfigurationDef configurationDef = null;
try
{
JAXBContext jaxb = JAXBContext.newInstance(ConfigurationDef.class);
Unmarshaller unmarshaller = jaxb.createUnmarshaller();
- pnd = (ConfigurationDef) unmarshaller.unmarshal(inputStream);
+ configurationDef = (ConfigurationDef) unmarshaller.unmarshal(inputStream);
}
catch (Exception e)
@@ -91,11 +92,11 @@
}
}
- return pnd;
+ return configurationDef;
}
- public void marshall(ConfigurationDef pnd, OutputStream out)
+ public void marshall(Configuration configuration, OutputStream out)
{
try
{
@@ -105,11 +106,11 @@
// encoding needs to be different to UTF-8, otherwise the custom encode will not be used
marshaller.setProperty(Marshaller.JAXB_ENCODING, "ISO-8859-1");
marshaller.setProperty(CharacterEscapeHandler.class.getName(), new NoCharacterEscapeHandler());
- marshaller.marshal(pnd, out);
+ marshaller.marshal(configuration.getConfigurationDef(), out);
}
catch (JAXBException e)
{
- throw new RuntimeException("Failed to marshall " + pnd, e);
+ throw new RuntimeException("Failed to marshall " + configuration, e);
}
finally
{
Copied: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configuration.java (from rev 660, sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java)
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configuration.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configuration.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -0,0 +1,141 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.config;
+
+import org.jboss.sam.EventProcessor;
+import org.jboss.sam.StreamInput;
+import org.jboss.sam.StreamOutput;
+import org.jboss.sam.ActivityMonitor;
+import org.jboss.sam.config.internal.*;
+import org.jboss.sam.datasource.DataSourceFactory;
+import org.jboss.sam.datasource.DataSourceManager;
+
+import javax.sql.DataSource;
+import java.util.Properties;
+import java.io.ByteArrayInputStream;
+
+/**
+ * An intermediary to configure {@link org.jboss.sam.ActivityMonitor}'s
+ * from configuration descriptors. <br>
+ * Allows for interception/modification of configuration values before the
+ * actuall configuration is applied to runtime components.
+ *
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class Configuration
+{
+ private ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ private ConfigurationDef configurationDef;
+
+ public Configuration(ConfigurationDef configTree, ClassLoader loader)
+ {
+ this.configurationDef = configTree;
+ this.loader = loader;
+ }
+
+ public Configuration(ConfigurationDef configTree)
+ {
+ this.configurationDef = configTree;
+ }
+
+
+ ConfigurationDef getConfigurationDef()
+ {
+ return configurationDef;
+ }
+
+ private void configure(EventProcessor processor)
+ {
+ processor.setName(configurationDef.getName());
+
+ for (StreamInputDef def : configurationDef.getInputs())
+ {
+ StreamInput input = (StreamInput) newInstance(def.getClazz());
+ input.setStreamName(def.getName());
+ processor.addInput(input);
+ }
+
+ for (StreamOutputDef def : configurationDef.getOutputs())
+ {
+ StreamOutput output = (StreamOutput) newInstance(def.getClazz());
+ output.setStreamName(def.getName());
+ processor.addOutput(output);
+ }
+
+ for (StatementDef def : configurationDef.getStatements())
+ {
+ if (def.getBoundTo() != null)
+ {
+ processor.registerBoundStatement(
+ def.getBoundTo(), def.getName(), new ByteArrayInputStream(def.getEpl().getExpression().getBytes())
+ );
+ }
+ else
+ {
+ processor.registerStatement(
+ def.getName(), def.getEpl().getExpression()
+ );
+ }
+ }
+
+ Properties properties = new Properties();
+ for(PropertyDef prop : configurationDef.getProps())
+ {
+ properties.put(prop.getName(), prop.getValue());
+ }
+
+ processor.setProperties(properties);
+
+ }
+
+ private void configure(DataSourceManager manager)
+ {
+ DataSourceFactory dsFactory = DataSourceFactory.newInstance();
+
+ for (DatabaseRefDef def : this.configurationDef.getDatabases())
+ {
+ DataSource ds = dsFactory.createDataSource(def.getDatasource());
+ manager.addDataSource(def.getName(), ds);
+ }
+ }
+
+ private Object newInstance(String clazz)
+ {
+ Object obj = null;
+ try
+ {
+ obj = loader.loadClass(clazz).newInstance();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Failed to load class: " + clazz, e);
+ }
+
+ return obj;
+ }
+
+ public void applyTo(ActivityMonitor monitor)
+ {
+ configure(monitor.getEventProcessor());
+ configure(monitor.getDataSourceManager());
+ }
+}
Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configuration.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigurationDef.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigurationDef.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigurationDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -1,147 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam.config;
-
-import javax.xml.bind.annotation.*;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
- at XmlRootElement(name = "processingNode", namespace = "http://org.jboss.sam/08/2008/")
- at XmlType(
- name = "processingNodeType",
- namespace = "http://org.jboss.sam/08/2008/",
- propOrder = {
- "props", "databases", "inputs", "outputs", "statements"
- }
-)
-public class ConfigurationDef
-{
-
- private String name;
- private URI domain;
-
- private List<StatementDef> statements = new ArrayList<StatementDef>();
-
- private List<StreamInputDef> inputs = new ArrayList<StreamInputDef>();
-
- private List<StreamOutputDef> outputs = new ArrayList<StreamOutputDef>();
-
- private List<PropertyDef> props = new ArrayList<PropertyDef>();
-
- private List<DatabaseRefDef> databases = new ArrayList<DatabaseRefDef>();
-
- public ConfigurationDef()
- {
- }
-
- public ConfigurationDef(String name, URI domain)
- {
- this.name = name;
- this.domain = domain;
- }
-
- @XmlAttribute
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- @XmlAttribute
- public URI getDomain()
- {
- return domain;
- }
-
- public void setDomain(URI domain)
- {
- this.domain = domain;
- }
-
- @XmlElementWrapper(name = "statements")
- @XmlElement(name = "statement")
- public List<StatementDef> getStatements()
- {
- return statements;
- }
-
- public void setStatements(List<StatementDef> statements)
- {
- this.statements = statements;
- }
-
- @XmlElementWrapper(name = "inputs")
- @XmlElement(name = "input")
- public List<StreamInputDef> getInputs()
- {
- return inputs;
- }
-
- public void setInputs(List<StreamInputDef> inputs)
- {
- this.inputs = inputs;
- }
-
- @XmlElementWrapper(name = "outputs")
- @XmlElement(name = "output")
- public List<StreamOutputDef> getOutputs()
- {
- return outputs;
- }
-
- public void setOutputs(List<StreamOutputDef> outputs)
- {
- this.outputs = outputs;
- }
-
- @XmlElementWrapper(name = "runtime-configuration")
- @XmlElement(name = "property")
- public List<PropertyDef> getProps()
- {
- return props;
- }
-
- public void setProps(List<PropertyDef> props)
- {
- this.props = props;
- }
-
- @XmlElementWrapper(name = "database-references")
- @XmlElement(name = "database-reference")
- public List<DatabaseRefDef> getDatabases()
- {
- return databases;
- }
-
- public void setDatabases(List<DatabaseRefDef> databases)
- {
- this.databases = databases;
- }
-}
Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -1,127 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam.config;
-
-import org.jboss.sam.EventProcessor;
-import org.jboss.sam.StreamInput;
-import org.jboss.sam.StreamOutput;
-import org.jboss.sam.datasource.DataSourceFactory;
-import org.jboss.sam.datasource.DataSourceManager;
-
-import javax.sql.DataSource;
-import java.util.Properties;
-import java.io.ByteArrayInputStream;
-
-/**
- * An intermediary to configure {@link org.jboss.sam.SAMRuntime}'s
- * from configuration descriptors. <br>
- * Allows for interception/modification of configuration values before the
- * actuall configuration is applied to runtime components.
- *
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class Configurator
-{
- private ClassLoader loader = Thread.currentThread().getContextClassLoader();
- private ConfigurationDef configTree;
-
- public Configurator(ConfigurationDef configTree, ClassLoader loader)
- {
- this.configTree = configTree;
- this.loader = loader;
- }
-
- public Configurator(ConfigurationDef configTree)
- {
- this.configTree = configTree;
- }
-
- public void configure(EventProcessor processor)
- {
- processor.setName(configTree.getName());
-
- for (StreamInputDef def : configTree.getInputs())
- {
- StreamInput input = (StreamInput) newInstance(def.getClazz());
- input.setStreamName(def.getName());
- processor.addInput(input);
- }
-
- for (StreamOutputDef def : configTree.getOutputs())
- {
- StreamOutput output = (StreamOutput) newInstance(def.getClazz());
- output.setStreamName(def.getName());
- processor.addOutput(output);
- }
-
- for (StatementDef def : configTree.getStatements())
- {
- if (def.getBoundTo() != null)
- {
- processor.registerBoundStatement(
- def.getBoundTo(), def.getName(), new ByteArrayInputStream(def.getEpl().getExpression().getBytes())
- );
- }
- else
- {
- processor.registerStatement(
- def.getName(), def.getEpl().getExpression()
- );
- }
- }
-
- Properties properties = new Properties();
- for(PropertyDef prop : configTree.getProps())
- {
- properties.put(prop.getName(), prop.getValue());
- }
-
- processor.setProperties(properties);
-
- }
-
- public void configure(DataSourceManager manager)
- {
- DataSourceFactory dsFactory = DataSourceFactory.newInstance();
-
- for (DatabaseRefDef def : this.configTree.getDatabases())
- {
- DataSource ds = dsFactory.createDataSource(def.getDatasource());
- manager.addDataSource(def.getName(), ds);
- }
- }
-
- private Object newInstance(String clazz)
- {
- Object obj = null;
- try
- {
- obj = loader.loadClass(clazz).newInstance();
- }
- catch (Exception e)
- {
- throw new RuntimeException("Failed to load class: " + clazz, e);
- }
-
- return obj;
- }
-}
Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DataSourceDef.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DataSourceDef.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DataSourceDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -1,97 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam.config;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
- at XmlType(name = "dataSourceDefType")
-public class DataSourceDef
-{
- private String name;
- private String driver;
- private String url;
-
- private List<PropertyDef> connectionArgs = new ArrayList<PropertyDef>();
-
-
- public DataSourceDef()
- {
- }
-
- public DataSourceDef(String name, String driver, String url)
- {
- this.name = name;
- this.driver = driver;
- this.url = url;
- }
-
- @XmlAttribute
- public String getUrl()
- {
- return url;
- }
-
- public void setUrl(String url)
- {
- this.url = url;
- }
-
- @XmlAttribute
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- @XmlAttribute
- public String getDriver()
- {
- return driver;
- }
-
- public void setDriver(String driver)
- {
- this.driver = driver;
- }
-
- @XmlElement(name = "connection-arg")
- public List<PropertyDef> getConnectionArgs()
- {
- return connectionArgs;
- }
-
- public void setConnectionArgs(List<PropertyDef> connectionArgs)
- {
- this.connectionArgs = connectionArgs;
- }
-}
Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatabaseRefDef.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatabaseRefDef.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatabaseRefDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam.config;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
- at XmlType(name = "databaseRefDefType")
-public class DatabaseRefDef
-{
- private String name;
- private DataSourceDef dataSource;
-
- public DatabaseRefDef()
- {
- }
-
- public DatabaseRefDef(String name)
- {
- this.name = name;
- }
-
- @XmlAttribute
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public DataSourceDef getDatasource()
- {
- return dataSource;
- }
-
- public void setDatasource(DataSourceDef dataSource)
- {
- this.dataSource = dataSource;
- }
-}
Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/EPLDef.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/EPLDef.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/EPLDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam.config;
-
-import org.jboss.sam.config.internal.EPLValueAdapter;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
- at XmlType(name = "eplType")
-public class EPLDef
-{
- private String lang;
- private String expression;
-
- public EPLDef()
- {
- }
-
- public EPLDef(String lang)
- {
- this.lang = lang;
- }
-
- @XmlAttribute(required = true)
- public String getLang()
- {
- return lang;
- }
-
- public void setLang(String lang)
- {
- this.lang = lang;
- }
-
- @XmlValue
- @XmlJavaTypeAdapter(EPLValueAdapter.class)
- public String getExpression()
- {
- return expression;
- }
-
- public void setExpression(String expression)
- {
- this.expression = expression;
- }
-}
Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam.config;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
- at XmlType(
- name = "propertyDefType",
- propOrder = {"name", "value"}
-)
-public class PropertyDef
-{
- private String name;
- private String value;
-
-
- public PropertyDef()
- {
- }
-
- public PropertyDef(String name, String value)
- {
- this.name = name;
- this.value = value;
- }
-
- @XmlAttribute
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- @XmlAttribute
- public String getValue()
- {
- return value;
- }
-
- public void setValue(String value)
- {
- this.value = value;
- }
-
-}
Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam.config;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
- at XmlType(name = "statementDefType")
-
-public class StatementDef
-{
- private String name;
- private EPLDef epl;
- private String boundTo;
-
- public StatementDef()
- {
- }
-
- public StatementDef(String name)
- {
- this.name = name;
- }
-
- public StatementDef(String name, String boundTo)
- {
- this.name = name;
- this.boundTo = boundTo;
- }
-
- @XmlAttribute(required = true)
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public EPLDef getEpl()
- {
- return epl;
- }
-
- public void setEpl(EPLDef epl)
- {
- this.epl = epl;
- }
-
- @XmlAttribute(required = false)
- public String getBoundTo()
- {
- return boundTo;
- }
-
- public void setBoundTo(String boundTo)
- {
- this.boundTo = boundTo;
- }
-}
Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamInputDef.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamInputDef.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamInputDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam.config;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
- at XmlType(name = "inputDefType")
-public class StreamInputDef
-{
- private String name;
- private String clazz;
-
- public StreamInputDef()
- {
- }
-
- public StreamInputDef(String name, String clazz)
- {
- this.name = name;
- this.clazz = clazz;
- }
-
- @XmlAttribute(required = true)
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- @XmlAttribute(required = true)
- public String getClazz()
- {
- return clazz;
- }
-
- public void setClazz(String clazz)
- {
- this.clazz = clazz;
- }
-}
Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamOutputDef.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamOutputDef.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamOutputDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam.config;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
- at XmlType(name = "outputDefType")
-public class StreamOutputDef
-{
- private String name;
- private String clazz;
-
- public StreamOutputDef()
- {
- }
-
- public StreamOutputDef(String name, String clazz)
- {
- this.name = name;
- this.clazz = clazz;
- }
-
- @XmlAttribute(required = true)
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- @XmlAttribute(required = true)
- public String getClazz()
- {
- return clazz;
- }
-
- public void setClazz(String clazz)
- {
- this.clazz = clazz;
- }
-}
Copied: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java (from rev 658, sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigurationDef.java)
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -0,0 +1,147 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.config.internal;
+
+import javax.xml.bind.annotation.*;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+ at XmlRootElement(name = "processingNode", namespace = "http://org.jboss.sam/08/2008/")
+ at XmlType(
+ name = "processingNodeType",
+ namespace = "http://org.jboss.sam/08/2008/",
+ propOrder = {
+ "props", "databases", "inputs", "outputs", "statements"
+ }
+)
+public class ConfigurationDef
+{
+
+ private String name;
+ private URI domain;
+
+ private List<StatementDef> statements = new ArrayList<StatementDef>();
+
+ private List<StreamInputDef> inputs = new ArrayList<StreamInputDef>();
+
+ private List<StreamOutputDef> outputs = new ArrayList<StreamOutputDef>();
+
+ private List<PropertyDef> props = new ArrayList<PropertyDef>();
+
+ private List<DatabaseRefDef> databases = new ArrayList<DatabaseRefDef>();
+
+ public ConfigurationDef()
+ {
+ }
+
+ public ConfigurationDef(String name, URI domain)
+ {
+ this.name = name;
+ this.domain = domain;
+ }
+
+ @XmlAttribute
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ @XmlAttribute
+ public URI getDomain()
+ {
+ return domain;
+ }
+
+ public void setDomain(URI domain)
+ {
+ this.domain = domain;
+ }
+
+ @XmlElementWrapper(name = "statements")
+ @XmlElement(name = "statement")
+ public List<StatementDef> getStatements()
+ {
+ return statements;
+ }
+
+ public void setStatements(List<StatementDef> statements)
+ {
+ this.statements = statements;
+ }
+
+ @XmlElementWrapper(name = "inputs")
+ @XmlElement(name = "input")
+ public List<StreamInputDef> getInputs()
+ {
+ return inputs;
+ }
+
+ public void setInputs(List<StreamInputDef> inputs)
+ {
+ this.inputs = inputs;
+ }
+
+ @XmlElementWrapper(name = "outputs")
+ @XmlElement(name = "output")
+ public List<StreamOutputDef> getOutputs()
+ {
+ return outputs;
+ }
+
+ public void setOutputs(List<StreamOutputDef> outputs)
+ {
+ this.outputs = outputs;
+ }
+
+ @XmlElementWrapper(name = "runtime-configuration")
+ @XmlElement(name = "property")
+ public List<PropertyDef> getProps()
+ {
+ return props;
+ }
+
+ public void setProps(List<PropertyDef> props)
+ {
+ this.props = props;
+ }
+
+ @XmlElementWrapper(name = "database-references")
+ @XmlElement(name = "database-reference")
+ public List<DatabaseRefDef> getDatabases()
+ {
+ return databases;
+ }
+
+ public void setDatabases(List<DatabaseRefDef> databases)
+ {
+ this.databases = databases;
+ }
+}
Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/ConfigurationDef.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/DataSourceDef.java (from rev 658, sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DataSourceDef.java)
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/DataSourceDef.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/DataSourceDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.config.internal;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+ at XmlType(name = "dataSourceDefType")
+public class DataSourceDef
+{
+ private String name;
+ private String driver;
+ private String url;
+
+ private List<PropertyDef> connectionArgs = new ArrayList<PropertyDef>();
+
+
+ public DataSourceDef()
+ {
+ }
+
+ public DataSourceDef(String name, String driver, String url)
+ {
+ this.name = name;
+ this.driver = driver;
+ this.url = url;
+ }
+
+ @XmlAttribute
+ public String getUrl()
+ {
+ return url;
+ }
+
+ public void setUrl(String url)
+ {
+ this.url = url;
+ }
+
+ @XmlAttribute
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ @XmlAttribute
+ public String getDriver()
+ {
+ return driver;
+ }
+
+ public void setDriver(String driver)
+ {
+ this.driver = driver;
+ }
+
+ @XmlElement(name = "connection-arg")
+ public List<PropertyDef> getConnectionArgs()
+ {
+ return connectionArgs;
+ }
+
+ public void setConnectionArgs(List<PropertyDef> connectionArgs)
+ {
+ this.connectionArgs = connectionArgs;
+ }
+}
Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/DataSourceDef.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/DatabaseRefDef.java (from rev 658, sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatabaseRefDef.java)
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/DatabaseRefDef.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/DatabaseRefDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.config.internal;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+ at XmlType(name = "databaseRefDefType")
+public class DatabaseRefDef
+{
+ private String name;
+ private DataSourceDef dataSource;
+
+ public DatabaseRefDef()
+ {
+ }
+
+ public DatabaseRefDef(String name)
+ {
+ this.name = name;
+ }
+
+ @XmlAttribute
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public DataSourceDef getDatasource()
+ {
+ return dataSource;
+ }
+
+ public void setDatasource(DataSourceDef dataSource)
+ {
+ this.dataSource = dataSource;
+ }
+}
Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/DatabaseRefDef.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/EPLDef.java (from rev 658, sam/trunk/modules/core/src/main/java/org/jboss/sam/config/EPLDef.java)
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/EPLDef.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/EPLDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.config.internal;
+
+import org.jboss.sam.config.internal.EPLValueAdapter;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+ at XmlType(name = "eplType")
+public class EPLDef
+{
+ private String lang;
+ private String expression;
+
+ public EPLDef()
+ {
+ }
+
+ public EPLDef(String lang)
+ {
+ this.lang = lang;
+ }
+
+ @XmlAttribute(required = true)
+ public String getLang()
+ {
+ return lang;
+ }
+
+ public void setLang(String lang)
+ {
+ this.lang = lang;
+ }
+
+ @XmlValue
+ @XmlJavaTypeAdapter(EPLValueAdapter.class)
+ public String getExpression()
+ {
+ return expression;
+ }
+
+ public void setExpression(String expression)
+ {
+ this.expression = expression;
+ }
+}
Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/EPLDef.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/PropertyDef.java (from rev 658, sam/trunk/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java)
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/PropertyDef.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/PropertyDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.config.internal;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+ at XmlType(
+ name = "propertyDefType",
+ propOrder = {"name", "value"}
+)
+public class PropertyDef
+{
+ private String name;
+ private String value;
+
+
+ public PropertyDef()
+ {
+ }
+
+ public PropertyDef(String name, String value)
+ {
+ this.name = name;
+ this.value = value;
+ }
+
+ @XmlAttribute
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ @XmlAttribute
+ public String getValue()
+ {
+ return value;
+ }
+
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
+
+}
Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/PropertyDef.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StatementDef.java (from rev 658, sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StatementDef.java)
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StatementDef.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StatementDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.config.internal;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+ at XmlType(name = "statementDefType")
+
+public class StatementDef
+{
+ private String name;
+ private EPLDef epl;
+ private String boundTo;
+
+ public StatementDef()
+ {
+ }
+
+ public StatementDef(String name)
+ {
+ this.name = name;
+ }
+
+ public StatementDef(String name, String boundTo)
+ {
+ this.name = name;
+ this.boundTo = boundTo;
+ }
+
+ @XmlAttribute(required = true)
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public EPLDef getEpl()
+ {
+ return epl;
+ }
+
+ public void setEpl(EPLDef epl)
+ {
+ this.epl = epl;
+ }
+
+ @XmlAttribute(required = false)
+ public String getBoundTo()
+ {
+ return boundTo;
+ }
+
+ public void setBoundTo(String boundTo)
+ {
+ this.boundTo = boundTo;
+ }
+}
Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StatementDef.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StreamInputDef.java (from rev 658, sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamInputDef.java)
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StreamInputDef.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StreamInputDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.config.internal;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+ at XmlType(name = "inputDefType")
+public class StreamInputDef
+{
+ private String name;
+ private String clazz;
+
+ public StreamInputDef()
+ {
+ }
+
+ public StreamInputDef(String name, String clazz)
+ {
+ this.name = name;
+ this.clazz = clazz;
+ }
+
+ @XmlAttribute(required = true)
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ @XmlAttribute(required = true)
+ public String getClazz()
+ {
+ return clazz;
+ }
+
+ public void setClazz(String clazz)
+ {
+ this.clazz = clazz;
+ }
+}
Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StreamInputDef.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StreamOutputDef.java (from rev 658, sam/trunk/modules/core/src/main/java/org/jboss/sam/config/StreamOutputDef.java)
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StreamOutputDef.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StreamOutputDef.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.config.internal;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+ at XmlType(name = "outputDefType")
+public class StreamOutputDef
+{
+ private String name;
+ private String clazz;
+
+ public StreamOutputDef()
+ {
+ }
+
+ public StreamOutputDef(String name, String clazz)
+ {
+ this.name = name;
+ this.clazz = clazz;
+ }
+
+ @XmlAttribute(required = true)
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ @XmlAttribute(required = true)
+ public String getClazz()
+ {
+ return clazz;
+ }
+
+ public void setClazz(String clazz)
+ {
+ this.clazz = clazz;
+ }
+}
Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/internal/StreamOutputDef.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/datasource/DataSourceFactory.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/datasource/DataSourceFactory.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/datasource/DataSourceFactory.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -21,7 +21,7 @@
*/
package org.jboss.sam.datasource;
-import org.jboss.sam.config.DataSourceDef;
+import org.jboss.sam.config.internal.DataSourceDef;
import org.jboss.sam.datasource.internal.DBCPDataSourceFactory;
import javax.sql.DataSource;
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/datasource/internal/DBCPDataSourceFactory.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/datasource/internal/DBCPDataSourceFactory.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/datasource/internal/DBCPDataSourceFactory.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -27,7 +27,7 @@
import org.apache.commons.dbcp.PoolingDataSource;
import org.apache.commons.pool.ObjectPool;
import org.apache.commons.pool.impl.GenericObjectPool;
-import org.jboss.sam.config.DataSourceDef;
+import org.jboss.sam.config.internal.DataSourceDef;
import org.jboss.sam.datasource.DataSourceFactory;
import javax.sql.DataSource;
Copied: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorFactory.java (from rev 658, sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultRuntimeFactory.java)
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorFactory.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorFactory.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.internal;
+
+import org.jboss.sam.ActivityMonitor;
+import org.jboss.sam.ActivityMonitorFactory;
+import org.jboss.sam.config.Configuration;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class DefaultActivityMonitorFactory extends ActivityMonitorFactory
+{
+ public ActivityMonitor createMonitor(Configuration configuration)
+ {
+ DefaultActivityMonitorImpl defaultActivityMonitor = new DefaultActivityMonitorImpl();
+ configuration.applyTo(defaultActivityMonitor);
+ return defaultActivityMonitor;
+ }
+}
Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorImpl.java (from rev 658, sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultRuntimeImpl.java)
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorImpl.java (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorImpl.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.internal;
+
+import org.jboss.sam.EventProcessor;
+import org.jboss.sam.EventProcessorFactory;
+import org.jboss.sam.ActivityMonitor;
+import org.jboss.sam.datasource.DataSourceManager;
+
+/**
+ * Glues together SAM building blocks.
+ *
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class DefaultActivityMonitorImpl implements ActivityMonitor
+{
+ private EventProcessor eventProcessor;
+ private DataSourceManager dataSourceManager;
+
+ DefaultActivityMonitorImpl()
+ {
+ // create and configure a processor
+ this.eventProcessor = EventProcessorFactory.newInstance().createProcessor();
+ this.eventProcessor.setRuntime(this);
+
+ // create and configure datasources
+ this.dataSourceManager = new DataSourceManager();
+ }
+
+ public DataSourceManager getDataSourceManager()
+ {
+ return this.dataSourceManager;
+ }
+
+ public EventProcessor getEventProcessor()
+ {
+ return this.eventProcessor;
+ }
+}
Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultRuntimeFactory.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultRuntimeFactory.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultRuntimeFactory.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam.internal;
-
-import org.jboss.sam.SAMRuntime;
-import org.jboss.sam.SAMRuntimeFactory;
-import org.jboss.sam.config.Configurator;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class DefaultRuntimeFactory extends SAMRuntimeFactory
-{
- public SAMRuntime createRuntime(Configurator configurator)
- {
- DefaultRuntimeImpl defaultRuntime = new DefaultRuntimeImpl();
- defaultRuntime.applyConfiguration(configurator);
- return defaultRuntime;
- }
-}
Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultRuntimeImpl.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultRuntimeImpl.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/DefaultRuntimeImpl.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam.internal;
-
-import org.jboss.sam.EventProcessor;
-import org.jboss.sam.EventProcessorFactory;
-import org.jboss.sam.SAMRuntime;
-import org.jboss.sam.config.Configurator;
-import org.jboss.sam.datasource.DataSourceManager;
-
-/**
- * Glues together SAM building blocks.
- *
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class DefaultRuntimeImpl implements SAMRuntime
-{
- private EventProcessor eventProcessor;
- private DataSourceManager dataSourceManager;
-
- DefaultRuntimeImpl()
- {
- // create and configure a processor
- this.eventProcessor = EventProcessorFactory.newInstance().createProcessor();
- this.eventProcessor.setRuntime(this);
-
- // create and configure datasources
- this.dataSourceManager = new DataSourceManager();
- }
-
- public void applyConfiguration(Configurator cfg)
- {
- cfg.configure(this.eventProcessor);
- cfg.configure(this.dataSourceManager);
- }
-
- public DataSourceManager getDataSourceManager()
- {
- return this.dataSourceManager;
- }
-
- public EventProcessor getEventProcessor()
- {
- return this.eventProcessor;
- }
-}
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 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -30,7 +30,6 @@
import org.drools.builder.ResourceType;
import org.drools.conf.EventProcessingOption;
import org.drools.io.ResourceFactory;
-import org.drools.logger.KnowledgeRuntimeLoggerFactory;
import org.drools.runtime.Globals;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.rule.WorkingMemoryEntryPoint;
@@ -38,7 +37,6 @@
import org.jboss.sam.datasource.DataSourceManager;
import java.io.InputStream;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
@@ -51,7 +49,7 @@
implements EventProcessor<KnowledgeBase>, Globals
{
private String name;
- private SAMRuntime runtime;
+ private ActivityMonitor runtime;
private boolean started;
private KnowledgeBase kbase;
@@ -120,7 +118,7 @@
KnowledgeRuntimeLoggerFactory.newConsoleLogger(session);*/
}
- public void setRuntime(SAMRuntime runtime)
+ public void setRuntime(ActivityMonitor runtime)
{
this.runtime = runtime;
}
Modified: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java
===================================================================
--- sam/trunk/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/SamTestSetup.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -24,14 +24,11 @@
import junit.framework.TestCase;
import org.jboss.sam.*;
import org.jboss.sam.config.ConfigFactory;
-import org.jboss.sam.config.Configurator;
+import org.jboss.sam.config.Configuration;
import org.jboss.sam.internal.stream.InVMDispatcher;
import org.jboss.sam.internal.stream.InVMStreamInput;
import javax.sql.DataSource;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
import java.io.InputStream;
import java.net.URL;
@@ -42,7 +39,7 @@
*/
public abstract class SamTestSetup extends TestCase
{
- protected SAMRuntime runtime;
+ protected ActivityMonitor runtime;
protected EventProcessor eventProcessor;
protected StreamInput streamInput;
protected BufferedStreamOutput bufferedOutput;
@@ -64,9 +61,9 @@
// Main runtime
URL config = loadTestConfiguration(configFile);
- Configurator configurator = new Configurator( ConfigFactory.newInstance().unmarshall(config) );
+ Configuration configuration = new Configuration( ConfigFactory.newInstance().unmarshall(config) );
- runtime = SAMRuntimeFactory.newInstance().createRuntime(configurator);
+ runtime = ActivityMonitorFactory.newInstance().createMonitor(configuration);
eventProcessor = runtime.getEventProcessor();
// Stream input and output
Modified: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java
===================================================================
--- sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -23,6 +23,7 @@
import junit.framework.TestCase;
import org.jboss.sam.config.*;
+import org.jboss.sam.config.internal.*;
import org.jboss.sam.internal.stream.InVMStreamInput;
import org.jboss.test.sam.BufferedStreamOutput;
@@ -87,7 +88,8 @@
// marshall it
ByteArrayOutputStream bout = new ByteArrayOutputStream();
- cfgFactory.marshall(configurationDef, bout);
+ Configuration config = new Configuration(configurationDef);
+ cfgFactory.marshall(config, bout);
// use in unmarshall test
this.XML_CONFIG = bout.toByteArray();
Modified: sam/trunk/modules/sim/sim.iml
===================================================================
--- sam/trunk/modules/sim/sim.iml 2009-07-15 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/sim/sim.iml 2009-07-15 09:22:37 UTC (rev 662)
@@ -11,6 +11,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="toplevel" />
+ <orderEntry type="module" module-name="core" />
<orderEntry type="module-library">
<library name="M2 Dep: junit:junit:jar:3.8.2:compile">
<CLASSES>
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 08:39:59 UTC (rev 661)
+++ sam/trunk/modules/sim/src/main/java/org/jboss/sam/simulation/EventSimulation.java 2009-07-15 09:22:37 UTC (rev 662)
@@ -25,11 +25,11 @@
import org.javasim.SimulationException;
import org.javasim.SimulationProcess;
import org.jboss.sam.EventProcessor;
-import org.jboss.sam.SAMRuntime;
-import org.jboss.sam.SAMRuntimeFactory;
+import org.jboss.sam.ActivityMonitor;
+import org.jboss.sam.ActivityMonitorFactory;
import org.jboss.sam.StreamInput;
import org.jboss.sam.config.ConfigFactory;
-import org.jboss.sam.config.Configurator;
+import org.jboss.sam.config.Configuration;
import org.jboss.sam.internal.stream.InVMDispatcher;
import org.jboss.sam.internal.stream.InVMStreamInput;
@@ -73,7 +73,7 @@
private InVMDispatcher dispatcher;
// SAM properties
- private SAMRuntime runtime;
+ private ActivityMonitor runtime;
private EventProcessor eventProcessor;
private StreamInput streamInput;
@@ -92,8 +92,8 @@
this.context = new SimulationContext(config);
// setup SAM runtime
- Configurator configurator = new Configurator(ConfigFactory.newInstance().unmarshall(bootstrap));
- this.runtime = SAMRuntimeFactory.newInstance().createRuntime(configurator);
+ Configuration configuration = new Configuration(ConfigFactory.newInstance().unmarshall(bootstrap));
+ this.runtime = ActivityMonitorFactory.newInstance().createMonitor(configuration);
this.eventProcessor = runtime.getEventProcessor();
// create input for the default in-vm channel
More information about the overlord-commits
mailing list