July 2008 - overlord-commits - Jboss List Archives

Overlord SVN: r167 - in sam/trunk: src/main/java/org/jboss/sam/internal/esper and 5 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-07-15 08:34:49 -0400 (Tue, 15 Jul 2008) New Revision: 167 Added: sam/trunk/src/test/java/org/jboss/test/sam/stream/ sam/trunk/src/test/java/org/jboss/test/sam/stream/invm/ sam/trunk/src/test/java/org/jboss/test/sam/stream/invm/Alert.java sam/trunk/src/test/java/org/jboss/test/sam/stream/invm/InVMStreamTestCase.java Removed: sam/trunk/src/test/java/org/jboss/test/sam/adapter/ Modified: sam/trunk/SAM.iws sam/trunk/sam-trunk.iml sam/trunk/src/main/java/org/jboss/sam/internal/esper/EsperRuntimeImpl.java sam/trunk/src/test/resources/adapter/invm/esper-cfg.xml sam/trunk/src/test/resources/viz/esper-cfg.xml Log: Test package rename Modified: sam/trunk/SAM.iws =================================================================== --- sam/trunk/SAM.iws 2008-07-15 11:36:35 UTC (rev 166) +++ sam/trunk/SAM.iws 2008-07-15 12:34:49 UTC (rev 167) @@ -17,19 +17,42 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" /> - <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java" /> - <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Histogram.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Histogram.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" /> - <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/SimpleHistogram.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/SimpleHistogram.java" /> - <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util" /> - <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml" /> - <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util/ThreadUtil.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/internal/BufferView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/internal/BufferView.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/std/SizeView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/std/SizeView.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/EPServiceProviderImpl.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/EPServiceProviderImpl.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/adapter/invm/Alert.java" afterPath="" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/EPServicesContextFactoryDefault.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/EPServicesContextFactoryDefault.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/adapter/invm/InVMAdapterTestCase.java" afterPath="" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/RegressionLinestView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/RegressionLinestView.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAM.iws" afterPath="$PROJECT_DIR$/SAM.iws" /> - <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Variance.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Variance.java" /> - <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Mean.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Mean.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/sam/EventMessage.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/sam/EventMessage.java" /> - <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/plugin/PluginLoader.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/plugin/PluginLoader.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/StatementContext.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/StatementContext.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/indicator/jmx/TestJMXLastElementDynamicMBean.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/indicator/jmx/TestJMXLastElementDynamicMBean.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/WeightedAverageView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/WeightedAverageView.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/pattern/PatternContext.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/pattern/PatternContext.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sam-trunk.iml" afterPath="$PROJECT_DIR$/sam-trunk.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/esper/EsperRuntimeImpl.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/esper/EsperRuntimeImpl.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/CorrelationView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/CorrelationView.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/UnivariateStatisticsView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/UnivariateStatisticsView.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/event/BeanEventAdapter.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/event/BeanEventAdapter.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/resources/viz/esper-cfg.xml" afterPath="$PROJECT_DIR$/src/test/resources/viz/esper-cfg.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/resources/adapter/invm/esper-cfg.xml" afterPath="$PROJECT_DIR$/src/test/resources/adapter/invm/esper-cfg.xml" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/ViewFactoryContext.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/ViewFactoryContext.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/Configuration.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/Configuration.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/ConfigurationInformation.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/ConfigurationInformation.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/event/EventAdapterService.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/event/EventAdapterService.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/MultiDimStatsView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/view/stat/MultiDimStatsView.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/plugin/PlugInEventRepresentationContext.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/plugin/PlugInEventRepresentationContext.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/regression/client/MyTrendSpotterView.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/regression/client/MyTrendSpotterView.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream/invm/Alert.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream/invm/Alert.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream/invm/InVMStreamTestCase.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/adapter/invm" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream/invm/InVMAdapterTestCase.java" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/adapter" afterPath="" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/client/TestConfigurationParser.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/client/TestConfigurationParser.java" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/ConfigurationPluginLoader.java" afterPath="/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/client/ConfigurationPluginLoader.java" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -185,7 +208,17 @@ </subPane> </component> <component name="FileEditorManager"> - <leaf /> + <leaf> + <file leaf-file-name="InVMStreamTestCase.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream/invm/InVMStreamTestCase.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="29" column="24" selection-start="1235" selection-end="1235" vertical-scroll-proportion="0.012987013"> + <folding /> + </state> + </provider> + </entry> + </file> + </leaf> </component> <component name="FindManager"> <FindUsagesManager> @@ -401,6 +434,10 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -420,6 +457,98 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sam-trunk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream/invm" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sam-trunk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -467,6 +596,42 @@ <option name="myItemId" value="SAM.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sam-trunk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/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$/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$/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$/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$/src/main/java/org/jboss/sam/simulation" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -474,6 +639,48 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="esper-2.1.0-src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="esper-2.1.0-src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="esper-2.1.0-src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="javasim" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> </PATH_ELEMENT> @@ -860,109 +1067,107 @@ <option name="myLastEditedConfigurable" value="IDE Profiles" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartMapping.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="149" column="35" selection-start="1729" selection-end="4767" vertical-scroll-proportion="0.7756789"> + <state line="33" column="59" selection-start="1488" selection-end="1488" vertical-scroll-proportion="0.24321133"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/ProductionEventMessage.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartMappingRegistry.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="46" column="0" selection-start="1467" selection-end="1467" vertical-scroll-proportion="0.58323497"> + <state line="28" column="17" selection-start="1175" selection-end="1175" vertical-scroll-proportion="0.1794569"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/EventProcessor.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartServer.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="31" selection-start="1514" selection-end="1528" vertical-scroll-proportion="0.3140496"> + <state line="32" column="17" selection-start="1397" selection-end="1397" vertical-scroll-proportion="0.26918536"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/ProcessingStatement.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/PropertyMapping.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="36" selection-start="1394" selection-end="1413" vertical-scroll-proportion="0.24675325"> + <state line="38" column="22" selection-start="1434" selection-end="1434" vertical-scroll-proportion="0.1570248"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/StreamInput.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartBuilder.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="44" column="16" selection-start="1686" selection-end="1686" vertical-scroll-proportion="0.5383707"> + <state line="32" column="10" selection-start="1254" selection-end="1254" vertical-scroll-proportion="0.26918536"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartMetadata.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="13" selection-start="1322" selection-end="1322" vertical-scroll-proportion="-1.5348288"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="29" column="101" selection-start="1235" selection-end="1235" vertical-scroll-proportion="0.20188902"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/internal/jfree/BarChartBuilder.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="50" column="74" selection-start="1711" selection-end="1711" vertical-scroll-proportion="-1.6918536"> + <state line="69" column="17" selection-start="2401" selection-end="2401" vertical-scroll-proportion="0.33293977"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartMapping.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/EventMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="59" selection-start="1488" selection-end="1488" vertical-scroll-proportion="0.24321133"> + <state line="32" column="68" selection-start="1408" selection-end="1408" vertical-scroll-proportion="0.26918536"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartMappingRegistry.java"> + <entry file="file:///home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/util/TestConstructorHelper.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="17" selection-start="1175" selection-end="1175" vertical-scroll-proportion="0.1794569"> + <state line="8" column="13" selection-start="326" selection-end="326" vertical-scroll-proportion="0.09134615"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartServer.java"> + <entry file="file:///home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/util/TestURIUtil.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="17" selection-start="1397" selection-end="1397" vertical-scroll-proportion="0.26918536"> + <state line="9" column="13" selection-start="181" selection-end="181" vertical-scroll-proportion="-0.31971154"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/PropertyMapping.java"> + <entry file="file:///home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/support/bean/SupportBean.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="22" selection-start="1434" selection-end="1434" vertical-scroll-proportion="0.1570248"> + <state line="4" column="13" selection-start="86" selection-end="86" vertical-scroll-proportion="0.08972845"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartBuilder.java"> + <entry file="file:///home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/EPStatementHandle.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="10" selection-start="1254" selection-end="1254" vertical-scroll-proportion="0.26918536"> + <state line="11" column="13" selection-start="342" selection-end="342" vertical-scroll-proportion="-0.1794569"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartMetadata.java"> + <entry file="file:///home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/main/java/com/espertech/esper/core/InternalEventRouter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="101" selection-start="1235" selection-end="1235" vertical-scroll-proportion="0.20188902"> + <state line="14" column="46" selection-start="434" selection-end="434" vertical-scroll-proportion="0.3140496"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/internal/jfree/BarChartBuilder.java"> + <entry file="file:///home/hbraun/dev/prj/esper-2.1.0-src/trunk/esper/src/test/java/com/espertech/esper/support/core/SupportInternalEventRouter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="17" selection-start="2401" selection-end="2401" vertical-scroll-proportion="0.33293977"> + <state line="9" column="61" selection-start="306" selection-end="306" vertical-scroll-proportion="0.08972845"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/EventMessage.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/stream/invm/InVMStreamTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="68" selection-start="1408" selection-end="1408" vertical-scroll-proportion="0.26918536"> + <state line="29" column="24" selection-start="1235" selection-end="1235" vertical-scroll-proportion="0.012987013"> <folding /> </state> </provider> Modified: sam/trunk/sam-trunk.iml =================================================================== --- sam/trunk/sam-trunk.iml 2008-07-15 11:36:35 UTC (rev 166) +++ sam/trunk/sam-trunk.iml 2008-07-15 12:34:49 UTC (rev 167) @@ -66,32 +66,68 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: esper:esper:jar:2.1.0:compile"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../.m2/repository/esper/esper/2.1.0/esper-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:compile"> + <library name="M2 Dep: javasim:javasim:jar:2.0-hbraun:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../.m2/repository/javasim/javasim/2.0-hbraun/javasim-2.0-hbraun.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javasim:javasim:jar:2.0-hbraun:compile"> + <library name="M2 Dep: cglib:cglib-nodep:jar:2.1_3:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../.m2/repository/javasim/javasim/2.0-hbraun/javasim-2.0-hbraun.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../.m2/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: mysql:mysql-connector-java:jar:3.1.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../.m2/repository/mysql/mysql-connector-java/3.1.14/mysql-connector-java-3.1.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: esper:esper:jar:2.2.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../.m2/repository/esper/esper/2.2.0-SNAPSHOT/esper-2.2.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: sam/trunk/src/main/java/org/jboss/sam/internal/esper/EsperRuntimeImpl.java =================================================================== --- sam/trunk/src/main/java/org/jboss/sam/internal/esper/EsperRuntimeImpl.java 2008-07-15 11:36:35 UTC (rev 166) +++ sam/trunk/src/main/java/org/jboss/sam/internal/esper/EsperRuntimeImpl.java 2008-07-15 12:34:49 UTC (rev 167) @@ -97,7 +97,7 @@ } /** - * Any event send to an adapter goes to the EPRuntime + * Any event send to an stream goes to the EPRuntime * @param args */ public void onEvent(Object args) Added: sam/trunk/src/test/java/org/jboss/test/sam/stream/invm/Alert.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/stream/invm/Alert.java (rev 0) +++ sam/trunk/src/test/java/org/jboss/test/sam/stream/invm/Alert.java 2008-07-15 12:34:49 UTC (rev 167) @@ -0,0 +1,47 @@ +/* + * 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.test.sam.stream.invm; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public final class Alert +{ + private final String source; + private final String value; + + public Alert(String source, String value) + { + this.value = value; + this.source = source; + } + + public String getValue() + { + return value; + } + + public String getSource() + { + return source; + } +} Property changes on: sam/trunk/src/test/java/org/jboss/test/sam/stream/invm/Alert.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: sam/trunk/src/test/java/org/jboss/test/sam/stream/invm/InVMStreamTestCase.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/stream/invm/InVMStreamTestCase.java (rev 0) +++ sam/trunk/src/test/java/org/jboss/test/sam/stream/invm/InVMStreamTestCase.java 2008-07-15 12:34:49 UTC (rev 167) @@ -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.test.sam.stream.invm; + +import org.jboss.sam.ProcessingStatement; +import org.jboss.test.sam.SamTestSetup; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class InVMStreamTestCase extends SamTestSetup +{ + public void setUp() + { + createInVMSetup("InVMAdapterTestCase", "adapter/invm/esper-cfg.xml"); + } + + public void testAdapter() throws Exception + { + // setup + String stmt = "select * from Alert.win:length(1)"; + ProcessingStatement view = eventProcessor.registerBoundStatement("InVM","AlertTest", stmt); + + // fire event + generateInVMEvent( new Alert("sensor1", "Threshold exceeded") ); + + // check result + assertTrue("Listener not invoked", bufferedOutput.isInvoked()); + assertFalse( bufferedOutput.getLastNewData().length == 0); + assertEquals( "Threshold exceeded", bufferedOutput.getLastNewData()[0].getProperty("value")); + } + + public void testUnknownAdapter() throws Exception + { + try + { + String stmt = "select * from Alert.win:length(1)"; + eventProcessor.registerBoundStatement("NoSuchAdapter", "AlertTest", stmt); + fail("Expected exception not thrown"); + } + catch (IllegalArgumentException e) + { + // expected behaviour + } + + } +} + Property changes on: sam/trunk/src/test/java/org/jboss/test/sam/stream/invm/InVMStreamTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: sam/trunk/src/test/resources/adapter/invm/esper-cfg.xml =================================================================== --- sam/trunk/src/test/resources/adapter/invm/esper-cfg.xml 2008-07-15 11:36:35 UTC (rev 166) +++ sam/trunk/src/test/resources/adapter/invm/esper-cfg.xml 2008-07-15 12:34:49 UTC (rev 167) @@ -12,7 +12,7 @@ and then declare these packages. The engine attempts to resolve an event type alias to a Java class residing in each declared package. --> - <event-type-auto-alias package-name="org.jboss.test.sam.adapter.invm"/> + <event-type-auto-alias package-name="org.jboss.test.sam.stream.invm"/>  - <event-type-auto-alias package-name="org.jboss.test.sam.adapter.invm"/> + <event-type-auto-alias package-name="org.jboss.test.sam.stream.invm"/> <!-- Sample configuration for database access using DriverManager;

15 years, 11 months

1
0
0 / 0

Overlord SVN: r166 - in sam/trunk: src/main/java/org/jboss/sam and 1 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-07-15 07:36:35 -0400 (Tue, 15 Jul 2008) New Revision: 166 Modified: sam/trunk/SAM.iws sam/trunk/src/main/java/org/jboss/sam/EventMessage.java sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java Log: Docs and comments Modified: sam/trunk/SAM.iws =================================================================== --- sam/trunk/SAM.iws 2008-07-15 11:26:52 UTC (rev 165) +++ sam/trunk/SAM.iws 2008-07-15 11:36:35 UTC (rev 166) @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4" relativePaths="false"> - <component name="BookmarkManager"> - <editor_bookmark url="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" line="589" /> - </component> + <component name="BookmarkManager" /> <component name="ChangeBrowserSettings"> <option name="MAIN_SPLITTER_PROPORTION" value="0.3" /> <option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" /> @@ -21,17 +19,16 @@ <list default="true" name="Default" comment=""> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/ProductionEventMessage.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Histogram.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Histogram.java" /> - <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/SimpleHistogram.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/SimpleHistogram.java" /> - <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util/ThreadUtil.java" /> + <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml" /> + <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util/ThreadUtil.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAM.iws" afterPath="$PROJECT_DIR$/SAM.iws" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Variance.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Variance.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Mean.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Mean.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/sam/EventMessage.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/sam/EventMessage.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" /> </list> </component> @@ -104,7 +101,7 @@ </component> <component name="DebuggerManager"> <line_breakpoints> - <breakpoint url="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" line="641" class="org.javasim.SimulationProcess" package="org.javasim"> + <breakpoint url="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java" line="102" class="Class at FalloffTestCase.java:102" package="org.jboss.test.sam.samples.falloff"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -117,19 +114,6 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java" line="102" class="Class at FalloffTestCase.java:103" package="org.jboss.test.sam.samples.falloff"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -178,8 +162,8 @@ <property name="field_breakpoints_groupByClasses" value="true" /> <property name="method_breakpoints_groupByClasses" value="true" /> <property name="exception_breakpoints_viewId" value="TABLE" /> - <property name="exception_breakpoints_groupByClasses" value="true" /> <property name="field_breakpoints_viewId" value="TABLE" /> + <property name="exception_breakpoints_groupByClasses" value="true" /> <property name="method_breakpoints_groupByMethods" value="false" /> </ui_properties> </component> @@ -201,19 +185,7 @@ </subPane> </component> <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="FalloffTestCase.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="77" column="50" selection-start="2447" selection-end="2447" vertical-scroll-proportion="0.3046045"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf /> </component> <component name="FindManager"> <FindUsagesManager> @@ -226,7 +198,7 @@ <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" /> </component> <component name="HighlightingSettingsPerFile"> - <setting file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" root0="SKIP_INSPECTION" /> + <setting file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" root0="SKIP_INSPECTION" /> <setting file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java" root0="SKIP_INSPECTION" /> </component> <component name="InspectionManager"> @@ -429,10 +401,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -452,194 +420,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="SAM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="SAM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="SAM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="SAM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -697,29 +477,7 @@ <option name="myItemId" value="javasim" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="javasim-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="SAM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="javasim" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="javasim-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -733,7 +491,7 @@ <showLibraryContents /> <hideEmptyPackages ProjectPane="false" /> <abbreviatePackageNames /> - <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" /> + <showStructure ProjectPane="false" PackagesPane="false" Scope="false" Favorites="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -764,8 +522,8 @@ <property name="cvs_file_history_flatOrder2" value="2" /> <property name="cvs_file_history_flatOrder3" value="3" /> <property name="cvs_file_history_flatOrder0" value="0" /> - <property name="cvs_file_history_flatOrder1" value="1" /> <property name="GenerateAntBuildDialog.forceTargetJdk" value="true" /> + <property name="cvs_file_history_flatOrder1" value="1" /> <property name="MemberChooser.copyJavadoc" value="false" /> <property name="GenerateAntBuildDialog.backupFiles" value="true" /> </component> @@ -788,16 +546,16 @@ </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="JUnit.FalloffTestCase"> - <tempConfiguration default="false" name="FalloffTestCase" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> - <pattern value="org.jboss.test.sam.samples.falloff.*" /> + <component name="RunManager" selected="JUnit.AggregationTestCase.testEventAggregation"> + <tempConfiguration default="false" name="AggregationTestCase.testEventAggregation" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <pattern value="org.jboss.test.sam.samples.aggregation.*" /> <module name="sam-trunk" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" value="org.jboss.test.sam.samples.falloff" /> - <option name="MAIN_CLASS_NAME" value="org.jboss.test.sam.samples.falloff.FalloffTestCase" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> + <option name="PACKAGE_NAME" value="org.jboss.test.sam.samples.aggregation" /> + <option name="MAIN_CLASS_NAME" value="org.jboss.test.sam.samples.aggregation.AggregationTestCase" /> + <option name="METHOD_NAME" value="testEventAggregation" /> + <option name="TEST_OBJECT" value="method" /> <option name="VM_PARAMETERS" /> <option name="PARAMETERS" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> @@ -805,18 +563,25 @@ <option name="TEST_SEARCH_SCOPE"> <value defaultName="wholeProject" /> </option> - <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="41877" /> - <option name="TRANSPORT" value="0" /> - <option name="LOCAL" value="true" /> - </RunnerSettings> <RunnerSettings RunnerId="Run" /> - <ConfigurationWrapper RunnerId="Debug" /> <ConfigurationWrapper RunnerId="Run" /> <method> <option name="Make" value="false" /> </method> </tempConfiguration> + <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <module name="" /> + <method> + <option name="Make" value="true" /> + </method> + </configuration> <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -836,26 +601,6 @@ <option name="Make" value="false" /> </method> </configuration> - <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <module name="" /> - <method> - <option name="Make" value="true" /> - </method> - </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> <configuration default="true" type="Applet" factoryName="Applet"> <module name="" /> <option name="MAIN_CLASS_NAME" /> @@ -868,6 +613,13 @@ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> </configuration> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> <configuration default="false" name="client" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -993,7 +745,7 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="25" width="1680" height="1000" extended-state="6" /> - <editor active="true" /> + <editor active="false" /> <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="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> @@ -1013,7 +765,7 @@ <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27590436" order="0" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27590436" order="0" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.15757205" order="2" /> <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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.69020504" order="2" /> @@ -1108,112 +860,110 @@ <option name="myLastEditedConfigurable" value="IDE Profiles" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/esper/EsperRuntimeImpl.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="109" column="0" selection-start="3486" selection-end="3486" vertical-scroll-proportion="0.02291918"> + <state line="149" column="35" selection-start="1729" selection-end="4767" vertical-scroll-proportion="0.7756789"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/EventProcessorFactory.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/ProductionEventMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="41" column="34" selection-start="1429" selection-end="1429" vertical-scroll-proportion="0.4354644"> + <state line="46" column="0" selection-start="1467" selection-end="1467" vertical-scroll-proportion="0.58323497"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/EventProcessor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="44" selection-start="1076" selection-end="1076" vertical-scroll-proportion="0.022432113"> + <state line="34" column="31" selection-start="1514" selection-end="1528" vertical-scroll-proportion="0.3140496"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/ProcessingStatement.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="13" selection-start="1340" selection-end="1340" vertical-scroll-proportion="-0.32585597"> + <state line="31" column="36" selection-start="1394" selection-end="1413" vertical-scroll-proportion="0.24675325"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/SalesEventMessage.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/StreamInput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="45" column="0" selection-start="1528" selection-end="1528" vertical-scroll-proportion="0.5608028"> + <state line="44" column="16" selection-start="1686" selection-end="1686" vertical-scroll-proportion="0.5383707"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="13" selection-start="1312" selection-end="1312" vertical-scroll-proportion="-1.1610577"> - <folding /> + <state line="34" column="13" selection-start="1322" selection-end="1322" vertical-scroll-proportion="-1.5348288"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="57" column="36" selection-start="1763" selection-end="1763" vertical-scroll-proportion="0.5608028"> + <state line="50" column="74" selection-start="1711" selection-end="1711" vertical-scroll-proportion="-1.6918536"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartMapping.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="6" column="21" selection-start="376" selection-end="386" vertical-scroll-proportion="0.13701923"> + <state line="33" column="59" selection-start="1488" selection-end="1488" vertical-scroll-proportion="0.24321133"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartMappingRegistry.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="23" column="33" selection-start="1055" selection-end="1055" vertical-scroll-proportion="-1.2451923"> + <state line="28" column="17" selection-start="1175" selection-end="1175" vertical-scroll-proportion="0.1794569"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/SimulationContext.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartServer.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="65" column="38" selection-start="2279" selection-end="2279" vertical-scroll-proportion="0.261343"> + <state line="32" column="17" selection-start="1397" selection-end="1397" vertical-scroll-proportion="0.26918536"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/PropertyMapping.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="224" column="0" selection-start="6800" selection-end="6800" vertical-scroll-proportion="-0.41322315"> + <state line="38" column="22" selection-start="1434" selection-end="1434" vertical-scroll-proportion="0.1570248"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartBuilder.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="149" column="35" selection-start="1729" selection-end="4767" vertical-scroll-proportion="0.7756789"> + <state line="32" column="10" selection-start="1254" selection-end="1254" vertical-scroll-proportion="0.26918536"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartMetadata.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="129" column="0" selection-start="3941" selection-end="3941" vertical-scroll-proportion="0.05785124"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="29" column="101" selection-start="1235" selection-end="1235" vertical-scroll-proportion="0.20188902"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/ProductionEventMessage.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/internal/jfree/BarChartBuilder.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="46" column="0" selection-start="1467" selection-end="1467" vertical-scroll-proportion="0.58323497"> + <state line="69" column="17" selection-start="2401" selection-end="2401" vertical-scroll-proportion="0.33293977"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/EventMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="77" column="50" selection-start="2447" selection-end="2447" vertical-scroll-proportion="0.3046045"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="32" column="68" selection-start="1408" selection-end="1408" vertical-scroll-proportion="0.26918536"> + <folding /> </state> </provider> </entry> Modified: sam/trunk/src/main/java/org/jboss/sam/EventMessage.java =================================================================== --- sam/trunk/src/main/java/org/jboss/sam/EventMessage.java 2008-07-15 11:26:52 UTC (rev 165) +++ sam/trunk/src/main/java/org/jboss/sam/EventMessage.java 2008-07-15 11:36:35 UTC (rev 166) @@ -24,7 +24,7 @@ import java.util.Iterator; /** - * SAM's internal event representation.<br> + * 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. * <p> Modified: sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java 2008-07-15 11:26:52 UTC (rev 165) +++ sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java 2008-07-15 11:36:35 UTC (rev 166) @@ -30,6 +30,8 @@ import java.io.IOException; /** + * An aggregation example. + * * @author Heiko.Braun <heiko.braun(a)jboss.com> */ public class AggregationTestCase extends TestCase @@ -44,7 +46,7 @@ { // config Properties config = new Properties(); - config.put(EventSimulation.TOTAL_SIM_TIME, 150.00); + config.put(EventSimulation.TOTAL_SIM_TIME, 100.00); // init simulation = EventSimulation.bootstrap(config);

15 years, 11 months

1
0
0 / 0

Overlord SVN: r165 - in cdl/trunk: runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions and 6 other directories.

by overlord-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2008-07-15 07:26:52 -0400 (Tue, 15 Jul 2008) New Revision: 165 Added: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SetOrderConfirmResponseAction.java Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuotesListAction.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/CreditAgency.java cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java Log: * Make the broker example working. Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java 2008-07-15 11:26:52 UTC (rev 165) @@ -149,7 +149,7 @@ ScheduleItem si=new ScheduleItem(category, name); si.setSession(this); - logger.info("Scheduling: " + si + " by thread of " + Thread.currentThread().getName()); + logger.debug("Scheduling: " + si + " by thread of " + Thread.currentThread().getName()); synchronized(joinStates) { JoinState joinState = getJoinStateByScheduleItem(si); @@ -181,14 +181,14 @@ scheduleItems.add(si); SessionManager.saveObject(si); - logger.info("Finished scheduling "+si +"' by thread of " + Thread.currentThread().getName()); + logger.debug("Finished scheduling "+si +"' by thread of " + Thread.currentThread().getName()); } } public void unschedule(String category, String name) throws Exception { - logger.info("Unscheduling: '"+category+"/"+name+"' by thread of " + Thread.currentThread().getName() ); + logger.debug("Unscheduling: '"+category+"/"+name+"' by thread of " + Thread.currentThread().getName() ); synchronized(joinStates) { if (isScheduleItemInJoinState(category, name)) { @@ -204,7 +204,7 @@ scheduleItems.remove(si); SessionManager.removeObject(si); - logger.info("Finished unscheduling: " + si +"' by thread of " + Thread.currentThread().getName()); + logger.debug("Finished unscheduling: " + si +"' by thread of " + Thread.currentThread().getName()); } } Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java 2008-07-15 11:26:52 UTC (rev 165) @@ -93,8 +93,17 @@ } conversationSession.setBusinessObject(businessState); conversationSession.setParent(parentSession); - conversationSession.setServiceName(parentSession.getServiceName()); + + Service service = pojoclass.getAnnotation(Service.class); + if (service != null) { + conversationSession.setServiceName(service.name()); + conversationSession.setConversationType(service.conversationType()); + } else { + conversationSession.setServiceName(parentSession.getServiceName()); + conversationSession.setConversationType(parentSession.getConversationType()); + } + hibernateSession.save(conversationSession); return conversationSession; Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -53,6 +53,8 @@ private Set<ScheduleItem> scheduleItems = new HashSet<ScheduleItem>(); + protected boolean unscheduledServiceItem = false; + public ConversationAction(ConfigTree config) { this.config = config; } @@ -181,6 +183,7 @@ if (session != null && isFirstOrLastConversationAction(message, true)) { logger.debug("This is first conversation action to unschedule the item."); unschedule(message); + unscheduledServiceItem = true; } handle(message); Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -38,8 +38,6 @@ private static Logger logger = Logger.getLogger(MessageRouterAction.class); - private boolean routerFlag = false; - public MessageRouterAction(ConfigTree config) { super(config); } @@ -50,22 +48,28 @@ String messageType = getMessageType(message); logger.info("The received message type is [" + messageType + "]"); + boolean routerFlag = false; for (ConfigTree ct : children) { ConfigTree[] msgNodes = ct.getChildren("message"); String msgType = msgNodes[0].getAttribute("type"); if (routerFlag == false && messageType.equals(msgType)) { - List<Identity> ids = getIdentities(message, null, ct); + String svcDesc = ct.getAttribute(ActionProperties.SERVICE_DESCRIPTION_NAME); + List<Identity> ids = getIdentities(message, svcDesc, ct); Session session = getSession(message, ids); String serviceCategory = ct.getAttribute(ActionProperties.SERVICE_CATEGORY); String serviceName = ct.getAttribute(ActionProperties.SERVICE_NAME); String initiate = ct.getAttribute(ActionProperties.INITIATE); if ("true".equals(initiate) && session == null) { + logger.info("This is an initiate process of " + serviceCategory + "/" + serviceName); + routerFlag = true; invokeService(message, serviceCategory, serviceName); } else if (session != null){ List<ScheduleItem> items = session.getScheduleItems(); for (ScheduleItem item : items) { if (serviceCategory.equals(item.getCategory()) && serviceName.equals(item.getName())) { + logger.info("Invoking the service of " + serviceCategory + "/" + serviceName); + routerFlag = true; invokeService(message, serviceCategory, serviceName); } } @@ -83,7 +87,6 @@ String serviceName) throws MessageDeliverException { ServiceInvoker invoker = new ServiceInvoker(serviceCategory, serviceName); invoker.deliverAsync(message); - routerFlag = true; } } Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -57,7 +57,7 @@ logger.info("MESSAGE TYPE ["+mesgMType+"] RECEIVED."); - if (isFirstOrLastConversationAction(message, true)) { + if (unscheduledServiceItem == false && isFirstOrLastConversationAction(message, true)) { String category=getConfig().getParent().getAttribute(ActionProperties.SERVICE_CATEGORY); String name=getConfig().getParent().getAttribute(ActionProperties.SERVICE_NAME); session.unschedule(category, name); Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -41,16 +41,14 @@ public Message handle(Message message) throws Exception{ String serviceDescriptionName = getConfig().getAttribute(ActionProperties.SERVICE_DESCRIPTION_NAME); List<Identity> ids = getIdentities(message, serviceDescriptionName); - System.out.println("Service Description Name------>" + serviceDescriptionName); - + Session session= getSession(message, ids); - String serviceName=getConfig().getAttribute(ActionProperties.SERVICE_NAME_PROPERTY); - String serviceCategory=getConfig().getAttribute(ActionProperties.SERVICE_CATEGORY_PROPERTY); - + String serviceName=getConfig().getParent().getAttribute(ActionProperties.SERVICE_NAME); + String serviceCategory=getConfig().getParent().getAttribute(ActionProperties.SERVICE_CATEGORY); session.unschedule(serviceCategory, serviceName); - logger.debug("Finish retrieving session action"); + logger.debug("Finished retrieving session action."); return(message); } Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2008-07-15 11:26:52 UTC (rev 165) @@ -60,10 +60,10 @@ private int supplierIndex = 0; @Column(name="selected_quote") - private int selected_quote = -1 ; + private String selectedQuoteValue ; @Column(name="selected_supplier") - private int selected_supplier = -1; + private String selectedSupplierDesc;; public BrokerMain() { initSuppliers(); @@ -131,26 +131,47 @@ public void setQuotes(List<Quote> quotes) { this.quotes = quotes; } + + public void setQuote(Quote quote) { + this.quotes.add(quote); + logger.info("add the quote value : " + quote); + } + - public int getSelected_quote() { - return selected_quote; + public String getSelectedQuoteValue() { + return selectedQuoteValue; } - public void setSelected_quote(int selected_quote) { - this.selected_quote = selected_quote; + public void setSelectedQuoteValue(String selectedQuoteValue) { + this.selectedQuoteValue = selectedQuoteValue; } - public int getSelected_supplier() { - return selected_supplier; + public String getSelectedSupplierDesc() { + return selectedSupplierDesc; } - public void setSelected_supplier(int selected_supplier) { - this.selected_supplier = selected_supplier; + public void setSelectedSupplierDesc(String selectedSupplierDesc) { + this.selectedSupplierDesc = selectedSupplierDesc; } - public void setQuote(Quote quote) { - this.quotes.add(quote); - logger.info("add the quote value : " + quote); + + public Supplier getSelectedSupplier() { + for (Supplier supplier : getSuppliers()) { + if (supplier.getServiceDescription().equals(selectedSupplierDesc)) { + return supplier; + } + } + return null; } + + public Quote getSelectedQuote() { + for (Quote quote : quotes) { + if (quote.getValue().equals(selectedQuoteValue)) { + return quote; + } + } + return null; + } + } Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java 2008-07-15 11:26:52 UTC (rev 165) @@ -19,6 +19,7 @@ */ package org.jboss.soa.overlord.samples.jbossesb.loan.broker; +import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -28,9 +29,11 @@ import javax.persistence.Table; import org.jboss.soa.overlord.conversation.HibernateObject; +import org.jboss.soa.overlord.jbossesb.actions.Service; @Entity @Table(name="T_COMPLETE_TRANSACTION") +@Service(name="{http://www.jboss.org/overlord/loanBroker}CompleteTransaction", conversationType="CompleteTransaction", root=false) public class CompleteTransactionMain implements HibernateObject { private static final long serialVersionUID = 111313L; @@ -39,12 +42,16 @@ @Column(name="ID") private long id; - @OneToOne + @OneToOne(cascade={CascadeType.ALL}) @JoinColumn(name="Confirmation_ID") - private Confirmation confirmation; + private Confirmation confirmation = new Confirmation(); @OneToOne - @JoinColumn(name="ID") + @JoinColumn(name="quote_ID") + private Quote quote; + + @OneToOne + @JoinColumn(name="complete_supplier_ID") private Supplier supplier; public long getId() { @@ -71,4 +78,13 @@ this.confirmation = confirmation; } + public Quote getQuote() { + return quote; + } + + public void setQuote(Quote quote) { + this.quote = quote; + } + + } Added: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java (rev 0) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * 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, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2008, + */ +package org.jboss.soa.overlord.samples.jbossesb.loan.broker; + +import org.apache.log4j.Logger; +import org.jboss.soa.esb.actions.AbstractActionLifecycle; +import org.jboss.soa.esb.helpers.ConfigTree; +import org.jboss.soa.esb.message.Message; +import org.jboss.soa.overlord.jbossesb.util.XMLUtils; +import org.w3c.dom.Node; + +public class SetCreditCheckRequestMessageAction extends AbstractActionLifecycle { + + private static Logger logger = Logger.getLogger(SetCreditCheckRequestMessageAction.class); + + private ConfigTree config; + + public SetCreditCheckRequestMessageAction(ConfigTree config) { + this.config = config; + } + + public Message process(Message message) throws Exception{ + + Node node = XMLUtils.getNode((String)message.getBody().get()); + String idValue = node.getAttributes().getNamedItem("id").getNodeValue(); + message.getBody().add("<CreditCheckRequest id=\"" + idValue +"\"></CreditCheckRequest>"); + + logger.info("Updated credit check request message: "+message.getBody().get()); + + return(message); + } + +} \ No newline at end of file Added: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java (rev 0) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * 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, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2008, + */ +package org.jboss.soa.overlord.samples.jbossesb.loan.broker; + +import org.apache.log4j.Logger; +import org.jboss.soa.esb.actions.AbstractActionLifecycle; +import org.jboss.soa.esb.helpers.ConfigTree; +import org.jboss.soa.esb.message.Message; +import org.jboss.soa.overlord.jbossesb.util.XMLUtils; +import org.w3c.dom.Node; + +/** + * @author jeffyu + * + */ +public class SetOrderConfirmRequestAction extends AbstractActionLifecycle { + + public static Logger logger = Logger.getLogger(SetOrderConfirmRequestAction.class); + + private ConfigTree config; + + public SetOrderConfirmRequestAction(ConfigTree config){ + this.config = config; + } + + public Message process(Message message) throws Exception { + Node node = XMLUtils.getNode((String)message.getBody().get()); + String idValue = node.getAttributes().getNamedItem("id").getNodeValue(); + String supplier = (String) message.getProperties().getProperty("supplierDesc"); + String quoteValue = (String)message.getProperties().getProperty("quoteValue"); + + message.getBody().add("<orderConfirmRequest id=\"" + idValue +"\" supplierDesc=\"" + + supplier+"\" quoteValue=\"" + quoteValue + "\"></orderConfirmRequest>"); + + logger.info("Set 'orderConfirmRequest' : " + message.getBody().get()); + + return message; + } + +} Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuotesListAction.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuotesListAction.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuotesListAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -62,7 +62,7 @@ message.getBody().add(sbuffer.toString()); - logger.info("set quote list message :" + sbuffer.toString()); + logger.info("set quote list message :[" + sbuffer.toString() + "]"); return message; } Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/CreditAgency.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/CreditAgency.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/CreditAgency.java 2008-07-15 11:26:52 UTC (rev 165) @@ -43,6 +43,16 @@ @Column(name="ID") private long id; + public boolean isCreditValid() { + boolean ret=false; + + ret = true; + + System.out.println("IS CREDIT VALID? "+ret); + + return(ret); + } + public long getId() { return this.id; } Added: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SetOrderConfirmResponseAction.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SetOrderConfirmResponseAction.java (rev 0) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SetOrderConfirmResponseAction.java 2008-07-15 11:26:52 UTC (rev 165) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * 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, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2008, + */ +package org.jboss.soa.overlord.samples.jbossesb.loan.supplier; + +import org.apache.log4j.Logger; +import org.jboss.soa.esb.actions.AbstractActionLifecycle; +import org.jboss.soa.esb.helpers.ConfigTree; +import org.jboss.soa.esb.message.Message; +import org.jboss.soa.overlord.jbossesb.util.XMLUtils; +import org.w3c.dom.Node; + +/** + * @author jeffyu + * + */ +public class SetOrderConfirmResponseAction extends AbstractActionLifecycle { + + private Logger logger = Logger.getLogger(SetOrderConfirmResponseAction.class); + + private ConfigTree config; + + public SetOrderConfirmResponseAction(ConfigTree config) { + this.config = config; + } + + public Message process(Message message) throws Exception { + Node node = XMLUtils.getNode((String)message.getBody().get()); + + String idValue = node.getAttributes().getNamedItem("id").getNodeValue(); + String quoteValue = node.getAttributes().getNamedItem("quoteValue").getNodeValue(); + + String supplierDesc = "{http://www.jboss.org/overlord/loanBroker}Supplier1"; + String confirmation = "The quote of " + quoteValue + " has been confirmed."; + + String body = "<orderConfirmResponse id=\"" + idValue + "\" supplierDesc = \"" + + supplierDesc+ "\">"+confirmation +"</orderConfirmResponse>"; + + message.getBody().add(body); + + logger.info("set 'orderConfirmResponse' of [" + body + "]"); + return message; + } + +} Modified: cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml 2008-07-15 11:26:52 UTC (rev 165) @@ -21,4 +21,6 @@ <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency1</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency2</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier1</depends> + <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier11</depends> + <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier12</depends> </jbossesb-deployment> Modified: cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml 2008-07-15 11:26:52 UTC (rev 165) @@ -60,6 +60,21 @@ <jms-bus busid="SupplierService1"> <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier1" /> </jms-bus> + <jms-bus busid="SupplierService11"> + <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier11" /> + </jms-bus> + <jms-bus busid="SupplierService12"> + <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier12" /> + </jms-bus> + <jms-bus busid="CAService"> + <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-creditAgency" /> + </jms-bus> + <jms-bus busid="CAService1"> + <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-creditAgency1" /> + </jms-bus> + <jms-bus busid="CAService2"> + <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-creditAgency2" /> + </jms-bus> </jms-provider> </providers> @@ -85,7 +100,8 @@ <message type="enquiry" /> </route> <route service-category="ESBBroker.BrokerParticipant" - service-name="ESBBrokerProcess.main.5" > + service-name="ESBBrokerProcess.main.5" + serviceDescriptionName="{http://www.jboss.org/overlord/loanBroker}Broker" > <identity type="primary" > <token name="id" locator="//@id" /> </identity> @@ -247,19 +263,9 @@ maxThreads="1"/> </listeners> <actions mep="OneWay"> - <action class="org.jboss.soa.overlord.jbossesb.actions.RetrieveSessionAction" - process="process" name="s5-1"> - <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> - <property name="serviceName" value="ESBBrokerProcess.main.5" /> - <property name="serviceCategory" value="ESBBroker.BrokerParticipant" /> - <property name="identities" > - <identity type="primary" > - <token name="id" locator="//@id" /> - </identity> - </property> - </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SwitchAction" process="process" name="s5-2"> + <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> <property name="paths"> <case service-category="ESBBroker.BrokerParticipant" service-name="ESBBrokerProcess.main.7" > @@ -283,7 +289,6 @@ <actions mep="OneWay"> <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" process="process" name="s6-1"> - <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> <property name="operation" value="cancel" /> <property name="messageType" value="cancel" /> <property name="identities" > @@ -302,18 +307,25 @@ maxThreads="1"/> </listeners> <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.jbossesb.actions.SetVariableAction" name="s7-1"> + <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> + <property name="variable" value="selectedSupplierDesc" /> + <property name="messageExpression" value="//@supplierDesc" /> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.SetVariableAction" name="s7-2"> + <property name="variable" value="selectedQuoteValue" /> + <property name="messageExpression" value="//@quoteValue" /> + </action> <action class="org.jboss.soa.overlord.jbossesb.actions.PerformAction" - process="process" name="s7-1"> - <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> + process="process" name="s7-3"> <property name="serviceCategory" value="ESBBroker.BrokerParticipant" /> <property name="serviceName" value="CompleteTransaction.main" /> - <property name="immediate" value="true" /> - <property name="joinServiceCategory" value="ESBBroker.BrokerParticipant" /> - <property name="joinServiceName" value="ESBBrokerProcess.main.8" /> + <property name="responseServiceCategory" value="ESBBroker.BrokerParticipant" /> + <property name="responseServiceName" value="ESBBrokerProcess.main.8" /> <property name="bindDetails" > - <bind from-expression="/quotes[/selectedQuote]" + <bind from-expression="getSelectedQuote()" to-variable="quote" /> - <bind from-expression="/suppliers[/selectedSupplier]" + <bind from-expression="getSelectedSupplier()" to-variable="supplier" /> </property> </action> @@ -327,9 +339,16 @@ maxThreads="1"/> </listeners> <actions mep="OneWay"> - <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" name="temporarily"> + <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" + process="process" name="s13-1"> <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> - + <property name="operation" value="confirm" /> + <property name="messageType" value="orderConfirmResponse" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + </identity> + </property> </action> </actions> </service> @@ -382,7 +401,6 @@ <actions mep="OneWay"> <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" process="process" name="s9-1"> - <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Request4QuoteMain" /> <property name="operation" value="getQuote" /> <property name="messageType" value="quote" /> <property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/loanBroker}Broker"/> @@ -426,7 +444,7 @@ <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" process="process" name="s10-2"> <property name="operation" value="buy" /> - <property name="messageType" value="purchaseDetails" /> + <property name="messageType" value="buy" /> <property name="clientEPR" value="buyer" /> <property name="identities" > <identity type="primary" > @@ -434,10 +452,13 @@ </identity> </property> </action> + <action class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SetCreditCheckRequestMessageAction" + process="process" name="s10-3"> + </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" - process="process" name="s10-3"> + process="process" name="s10-4"> <property name="operation" value="checkCredit" /> - <property name="messageType" value="creditInformation" /> + <property name="messageType" value="CreditCheckRequest" /> <property name="serviceName" value="CreditAgency.Main" /> <property name="serviceCategory" value="ESBBroker.CreditAgency" /> <property name="responseServiceName" value="CompleteTransaction.main.1" /> @@ -461,6 +482,9 @@ <action class="org.jboss.soa.overlord.jbossesb.actions.RetrieveSessionAction" process="process" name="s11-1"> <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.CompleteTransactionMain" /> + <property name="serviceName" value="CompleteTransaction.main.1" /> + <property name="serviceCategory" value="ESBBroker.BrokerParticipant" /> + <property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/loanBroker}CompleteTransaction" /> <property name="identities" > <identity type="primary" > <token name="id" locator="//@id" /> @@ -472,7 +496,7 @@ <property name="paths"> <case service-category="ESBBroker.BrokerParticipant" service-name="CompleteTransaction.main.2" > - <message type="creditValid" /> + <message type="CreditCheckResponse" /> </case> <case service-category="ESBBroker.BrokerParticipant" service-name="CompleteTransaction.main.4" > @@ -494,25 +518,36 @@ process="process" name="s12-1"> <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.CompleteTransactionMain" /> <property name="operation" value="checkCredit" /> - <property name="messageType" value="creditValid" /> + <property name="messageType" value="CreditCheckResponse" /> <property name="identities" > <identity type="primary" > <token name="id" locator="//@id" /> </identity> </property> </action> - - + <action class="org.jboss.soa.overlord.jbossesb.actions.SetMessageAction" process="process" name="s12-2"> - <property name="stateExpression" value="confirmation" /> + <property name="headerProperty" value="supplierDesc" /> + <property name="stateExpression" value="supplier.serviceDescription" /> </action> + + <action class="org.jboss.soa.overlord.jbossesb.actions.SetMessageAction" + process="process" name="s12-3"> + <property name="headerProperty" value="quoteValue" /> + <property name="stateExpression" value="quote.value" /> + </action> + + <action class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SetOrderConfirmRequestAction" + process="process" name="s12-4"> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" - process="process" name="s12-3"> + process="process" name="s12-5"> <property name="operation" value="confirm" /> - <property name="messageType" value="orderConfirmed" /> - <property name="serviceName" value="/supplier/serviceName" /> - <property name="serviceCategory" value="/supplier/serviceCategory" /> + <property name="messageType" value="orderConfirmRequest" /> + <property name="serviceNameExpression" value="supplier.serviceName" /> + <property name="serviceCategoryExpression" value="supplier.serviceCategory" /> <property name="responseServiceName" value="CompleteTransaction.main.3" /> <property name="responseServiceCategory" value="ESBBroker.BrokerParticipant" /> <property name="identities" > @@ -535,7 +570,8 @@ process="process" name="s13-1"> <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.CompleteTransactionMain" /> <property name="operation" value="confirm" /> - <property name="messageType" value="bookingReference" /> + <property name="messageType" value="orderConfirmResponse" /> + <property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/loanBroker}CompleteTransaction" /> <property name="identities" > <identity type="primary" > <token name="id" locator="//@id" /> @@ -543,16 +579,16 @@ </property> </action> - - <action class="org.jboss.soa.overlord.jbossesb.actions.SetMessageAction" + <action class="org.jboss.soa.overlord.jbossesb.actions.SetVariableAction" process="process" name="s13-2"> - <property name="stateExpression" value="confirmation" /> + <property name="variable" value="confirmation.detail" /> + <property name="messageExpression" value="/orderConfirmResponse" /> </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" process="process" name="s13-3"> <property name="operation" value="buy" /> - <property name="messageType" value="orderConfirmed" /> + <property name="messageType" value="orderConfirmResponse" /> <property name="clientEPR" value="buyer" /> <property name="identities" > <identity type="primary" > @@ -596,19 +632,52 @@ </actions> </service> - <service category="ESBBroker.Suppliers" name="Supplier1.main" description=""> + <service category="ESBBroker.Suppliers" name="Supplier1.main" description=""> <listeners> <jms-listener name="SupplierServiceListener1" busidref="SupplierService1" maxThreads="1"/> </listeners> <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.jbossesb.actions.MessageRouterAction" + process="process" name="su-1"> + <property name="paths"> + <route service-category="ESBBroker.Suppliers" + service-name="Supplier1.main.1" + initiate="true"> + <identity type="primary" > + <token name="id" locator="//@id" /> + <token name="supplierDesc" locator="//@supplierDesc" /> + </identity> + <message type="requestForQuote" /> + </route> + <route service-category="ESBBroker.Suppliers" + service-name="Supplier1.main.2" + initiate="true"> + <identity type="primary" > + <token name="id" locator="//@id" /> + <token name="supplierDesc" locator="//@supplierDesc" /> + </identity> + <message type="orderConfirmRequest" /> + </route> + </property> + </action> + </actions> + </service> + + <service category="ESBBroker.Suppliers" name="Supplier1.main.1" description=""> + <listeners> + <jms-listener name="SupplierServiceListener11" + busidref="SupplierService11" + maxThreads="1"/> + </listeners> + <actions mep="OneWay"> <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" - process="process" name="su1"> + process="process" name="su11-1"> <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SupplierMain" /> </action> <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" - process="process" name="su2"> + process="process" name="su11-2"> <property name="messageType" value="requestForQuote" /> <property name="clientEPR" value="broker" /> <property name="identities" > @@ -618,10 +687,10 @@ </identity> </property> </action> - <action class="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SetQuoteMessageAction" name="su3"> + <action class="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SetQuoteMessageAction" name="su11-3"> </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" - process="process" name="su4"> + process="process" name="su11-4"> <property name="messageType" value="quote" /> <property name="clientEPR" value="broker" /> <property name="identities" > @@ -633,6 +702,129 @@ </action> </actions> </service> + + <service category="ESBBroker.Suppliers" name="Supplier1.main.2" description=""> + <listeners> + <jms-listener name="SupplierServiceListener12" + busidref="SupplierService12" + maxThreads="1"/> + </listeners> + <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" + process="process" name="su12-1"> + <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SupplierMain" /> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" + process="process" name="su12-2"> + <property name="messageType" value="orderConfirmRequest" /> + <property name="clientEPR" value="broker" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + <token name="supplierDesc" locator="//@supplierDesc" /> + </identity> + </property> + </action> + <action class="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SetOrderConfirmResponseAction" name="su12-3"> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" + process="process" name="su12-4"> + <property name="messageType" value="orderConfirmResponse" /> + <property name="clientEPR" value="broker" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + <token name="supplierDesc" locator="//@supplierDesc" /> + </identity> + </property> + </action> + </actions> + </service> + + <service category="ESBBroker.CreditAgency" name="CreditAgency.Main" description=""> + <listeners> + <jms-listener name="CAListener" + busidref="CAService" + maxThreads="1"/> + </listeners> + <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" + process="process" name="c1"> + <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.CreditAgency" /> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" + process="process" name="c2"> + <property name="operation" value="checkCredit" /> + <property name="messageType" value="CreditCheckRequest" /> + <property name="clientEPR" value="broker" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + </identity> + </property> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.IfAction" + process="process" name="c3"> + <property name="paths"> + <if decision-method="isCreditValid" + service-category="ESBBroker.CreditAgency" + service-name="CreditAgency.decision1" + immediate="true" /> + <else service-category="ESBBroker.CreditAgency" + service-name="CreditAgency.decision2" + immediate="true" /> + </property> + </action> + </actions> + </service> + + <service category="ESBBroker.CreditAgency" name="CreditAgency.decision1" description=""> + <listeners> + <jms-listener name="CAListener1" + busidref="CAService1" + maxThreads="1"/> + </listeners> + <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.SetCreditCheckResponseMessageAction" + process="process" name="d2"> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" + process="process" name="d3"> + <property name="operation" value="checkCredit" /> + <property name="messageType" value="CreditCheckResponse" /> + <property name="clientEPR" value="broker" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + </identity> + </property> + </action> + </actions> + </service> + <service category="ESBBroker.CreditAgency" name="CreditAgency.decision2" description=""> + <listeners> + <jms-listener name="CAListener2" + busidref="CAService2" + maxThreads="1"/> + </listeners> + <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.SetCreditCheckInvalidMessageAction" + process="process" name="e2"> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" + process="process" name="e3"> + <property name="operation" value="checkCredit" /> + <property name="messageType" value="CreditCheckInvalid" /> + <property name="clientEPR" value="broker" /> + <property name="identities" > + <identity type="primary" > + <token name="id" locator="//@id" /> + </identity> + </property> + </action> + </actions> + </service> + </services> </jbossesb> Modified: cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml 2008-07-15 11:26:52 UTC (rev 165) @@ -135,4 +135,18 @@ </depends> </mbean> +<mbean code="org.jboss.mq.server.jmx.Queue" + name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier11"> + <depends optional-attribute-name="DestinationManager"> + jboss.mq:service=DestinationManager + </depends> +</mbean> + +<mbean code="org.jboss.mq.server.jmx.Queue" + name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier12"> + <depends optional-attribute-name="DestinationManager"> + jboss.mq:service=DestinationManager + </depends> +</mbean> + </server> Modified: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java =================================================================== --- cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java 2008-07-15 11:26:52 UTC (rev 165) @@ -57,16 +57,21 @@ mesg.getProperties().setProperty("org.jboss.soa.esb.exceptionOnDeliverFailure", "true"); try { + System.out.println("========================================="); + System.out.println("Request: " + mesg.getBody().get()); Message reply=brokerInvoker.deliverSync(mesg, 50000); - System.out.println("Reply: "+reply.getBody().get()); - //String buyReq = "<buy id=\"20\"> </buy>"; - //mesg.getBody().add(buyReq); + Thread.sleep(10000);//Waiting... + + System.out.println("Sending Buy request to Broker..."); + String buyReq = "<buy id=\"20\" supplierDesc=\"{http://www.jboss.org/overlord/loanBroker}Supplier1\" quoteValue=\"10\"></buy>"; + mesg.getBody().add(buyReq); - //reply = brokerInvoker.deliverSync(mesg, 50000); - //System.out.println("Reply: " + reply.getBody().get()); - + System.out.println("Request: " + mesg.getBody().get()); + reply = brokerInvoker.deliverSync(mesg, 50000); + System.out.println("Reply: " + reply.getBody().get()); + System.out.println("========================================="); } catch (Exception e) { logger.error(e); e.printStackTrace(); Modified: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java =================================================================== --- cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java 2008-07-14 19:01:56 UTC (rev 164) +++ cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java 2008-07-15 11:26:52 UTC (rev 165) @@ -57,6 +57,8 @@ mesg.getProperties().setProperty("org.jboss.soa.esb.exceptionOnDeliverFailure", "true"); try { + System.out.println("========================================="); + System.out.println("Request: "+mesg.getBody().get()); Message reply=brokerInvoker.deliverSync(mesg, 20000); if (reply != null) { @@ -64,7 +66,7 @@ } else { System.err.println("NO REPLY"); } - + System.out.println("========================================="); } catch (Exception e) { logger.error(e); e.printStackTrace();

15 years, 11 months

1
0
0 / 0

Overlord SVN: r164 - in sam/trunk: src/test/java/org/jboss/test/sam/samples and 1 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-07-14 15:01:56 -0400 (Mon, 14 Jul 2008) New Revision: 164 Added: sam/trunk/src/test/java/org/jboss/test/sam/samples/falloff/ sam/trunk/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java sam/trunk/src/test/java/org/jboss/test/sam/samples/falloff/ProductionEventMessage.java Modified: sam/trunk/SAM.iws Log: Added falloff example Modified: sam/trunk/SAM.iws =================================================================== --- sam/trunk/SAM.iws 2008-07-14 17:04:28 UTC (rev 163) +++ sam/trunk/SAM.iws 2008-07-14 19:01:56 UTC (rev 164) @@ -21,20 +21,17 @@ <list default="true" name="Default" comment=""> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/ProductionEventMessage.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Histogram.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Histogram.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" /> <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/SimpleHistogram.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/SimpleHistogram.java" /> <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util/ThreadUtil.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAM.iws" afterPath="$PROJECT_DIR$/SAM.iws" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/SimulationContext.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/SimulationContext.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Variance.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Variance.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sam-trunk.iml" afterPath="$PROJECT_DIR$/sam-trunk.iml" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Mean.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Mean.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/SalesEventMessage.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" /> </list> </component> @@ -120,7 +117,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" line="160" class="org.jboss.test.sam.samples.aggregation.AggregationTestCase" package="org.jboss.test.sam.samples.aggregation"> + <breakpoint url="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java" line="102" class="Class at FalloffTestCase.java:103" package="org.jboss.test.sam.samples.falloff"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -133,19 +130,6 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" line="129" class="Class at AggregationTestCase.java:129" package="org.jboss.test.sam.samples.aggregation"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -218,10 +202,10 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="AggregationTestCase.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java"> + <file leaf-file-name="FalloffTestCase.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="139" column="45" selection-start="4279" selection-end="4279" vertical-scroll-proportion="0.41086188"> + <state line="77" column="50" selection-start="2447" selection-end="2447" vertical-scroll-proportion="0.3046045"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -584,7 +568,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -606,47 +590,59 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="SAM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss" /> + <option name="myItemId" value="SAM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sam-trunk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/sam" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -685,10 +681,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/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$/src/main/java/org/jboss/sam/simulation" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -796,14 +788,14 @@ </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="JUnit.AggregationTestCase"> - <tempConfiguration default="false" name="AggregationTestCase" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> - <pattern value="org.jboss.test.sam.samples.aggregation.*" /> + <component name="RunManager" selected="JUnit.FalloffTestCase"> + <tempConfiguration default="false" name="FalloffTestCase" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <pattern value="org.jboss.test.sam.samples.falloff.*" /> <module name="sam-trunk" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" value="org.jboss.test.sam.samples.aggregation" /> - <option name="MAIN_CLASS_NAME" value="org.jboss.test.sam.samples.aggregation.AggregationTestCase" /> + <option name="PACKAGE_NAME" value="org.jboss.test.sam.samples.falloff" /> + <option name="MAIN_CLASS_NAME" value="org.jboss.test.sam.samples.falloff.FalloffTestCase" /> <option name="METHOD_NAME" /> <option name="TEST_OBJECT" value="class" /> <option name="VM_PARAMETERS" /> @@ -814,7 +806,7 @@ <value defaultName="wholeProject" /> </option> <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="44090" /> + <option name="DEBUG_PORT" value="41877" /> <option name="TRANSPORT" value="0" /> <option name="LOCAL" value="true" /> </RunnerSettings> @@ -1116,20 +1108,6 @@ <option name="myLastEditedConfigurable" value="IDE Profiles" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/esper/EventAdapter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="101" column="50" selection-start="2690" selection-end="2690" vertical-scroll-proportion="0.6875754"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SensorMessageFactory.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="52" column="4" selection-start="1680" selection-end="1846" vertical-scroll-proportion="0.64173704"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/esper/EsperRuntimeImpl.java"> <provider selected="true" editor-type-id="text-editor"> <state line="109" column="0" selection-start="3486" selection-end="3486" vertical-scroll-proportion="0.02291918"> @@ -1209,20 +1187,36 @@ </entry> <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="77" column="39" selection-start="2481" selection-end="2481" vertical-scroll-proportion="0.21487603"> + <state line="149" column="35" selection-start="1729" selection-end="4767" vertical-scroll-proportion="0.7756789"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="139" column="45" selection-start="4279" selection-end="4279" vertical-scroll-proportion="0.41086188"> + <state line="129" column="0" selection-start="3941" selection-end="3941" vertical-scroll-proportion="0.05785124"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/ProductionEventMessage.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="46" column="0" selection-start="1467" selection-end="1467" vertical-scroll-proportion="0.58323497"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="77" column="50" selection-start="2447" selection-end="2447" vertical-scroll-proportion="0.3046045"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> </project> Added: sam/trunk/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java (rev 0) +++ sam/trunk/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java 2008-07-14 19:01:56 UTC (rev 164) @@ -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.test.sam.samples.falloff; + +import junit.framework.TestCase; +import org.jboss.sam.EventMessage; +import org.jboss.sam.simulation.*; + +import java.util.*; + +/** + * A sample that demonstrates falloff detection. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class FalloffTestCase extends TestCase +{ + EventSimulation simulation; + SimulationContext context; + + EventSourceEntity source; + EventSinkEntity sink; + + protected void setUp() throws Exception + { + // config + Properties config = new Properties(); + config.put(EventSimulation.TOTAL_SIM_TIME, 100.00); + + // init + simulation = EventSimulation.bootstrap(config); + + // shared between all entities + context = simulation.getContext(); + + // create an event source and sink + source = new EventSourceEntity("FactoryLine", 0.03); + sink = new EventSinkEntity("ProductionRateMonitor"); + + } + + protected void tearDown() throws Exception + { + simulation.done(); + } + + @SuppressWarnings({"unchecked"}) + public void testEventFiltering() + { + // associate a source factory + source.setEventMessageFactory( + new EventMessageFactory() + { + Calendar c = new GregorianCalendar(); + int numMessages = 0; + + public Object createEventMessage(SimulationContext context) + { + context.getMeasurement("dispatched").increment(); + + // simulate a falloff after 20 messages. Production goes down 50%... + if(numMessages<20) + c.add(Calendar.SECOND, 3); + else + c.add(Calendar.SECOND, 6); + + long ts = c.getTimeInMillis(); + + ProductionEventMessage productionRate = new ProductionEventMessage("Assembly Line-A", ts); + numMessages++; + return productionRate; + } + } + ); + + // associate a sink handler + sink.setEventHandler( + new EventSinkHandler() + { + public void handle(EventMessage[] events, SimulationContext context) + { + if(null==context.getAttachment(List.class)) + context.addAttachment(List.class, new ArrayList<EventMessage>()); + + context.getAttachment(List.class).addAll(Arrays.asList(events)); + context.getMeasurement("processed").increment(); + } + } + ); + + simulation.addSource(source); + simulation.addSink(sink); + + // Filters high value orders with amount>5 + simulation.createStatement("insert into RatePerTenSeconds " + + "select line, count(*) as cnt " + + "from org.jboss.test.sam.samples.falloff.ProductionEventMessage" + + ".win:ext_timed(timestamp, 10 seconds)"); + + // Forward any highvalue order to the monitor + simulation.bindStatement("select line, avg(cnt) as avgCnt " + + "from RatePerTenSeconds.win:length(6) " + + "group by line " + + "having cnt < avg(cnt) * 0.75", sink); + + // start simulation + simulation.singleRun(); + + // display status + context.dump(System.out); + + // evaluate results + List<EventMessage> eventMessages = context.getAttachment(List.class); + assertNotNull(eventMessages); + assertTrue(eventMessages.size()>=1); + + for(EventMessage e : eventMessages) + { + System.out.println(e.getProperty("line")+": " + e.getProperty("avgCnt")); + } + } +} Property changes on: sam/trunk/src/test/java/org/jboss/test/sam/samples/falloff/FalloffTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: sam/trunk/src/test/java/org/jboss/test/sam/samples/falloff/ProductionEventMessage.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/samples/falloff/ProductionEventMessage.java (rev 0) +++ sam/trunk/src/test/java/org/jboss/test/sam/samples/falloff/ProductionEventMessage.java 2008-07-14 19:01:56 UTC (rev 164) @@ -0,0 +1,48 @@ +/* + * 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.test.sam.samples.falloff; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public final class ProductionEventMessage +{ + String line; + long timestamp; + + public ProductionEventMessage(String line, long timestamp) + { + this.line = line; + this.timestamp = timestamp; + } + + public String getLine() + { + return line; + } + + public long getTimestamp() + { + return timestamp; + } + +} Property changes on: sam/trunk/src/test/java/org/jboss/test/sam/samples/falloff/ProductionEventMessage.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

15 years, 11 months

1
0
0 / 0

Overlord SVN: r163 - in sam/trunk: src/test/java/org/jboss/test/sam/samples and 1 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-07-14 13:04:28 -0400 (Mon, 14 Jul 2008) New Revision: 163 Added: sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/ sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/SalesEventMessage.java Modified: sam/trunk/SAM.iws sam/trunk/sam-trunk.iml Log: Added aggregation sample Modified: sam/trunk/SAM.iws =================================================================== --- sam/trunk/SAM.iws 2008-07-14 17:04:03 UTC (rev 162) +++ sam/trunk/SAM.iws 2008-07-14 17:04:28 UTC (rev 163) @@ -21,16 +21,20 @@ <list default="true" name="Default" comment=""> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Histogram.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Histogram.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" /> <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/SimpleHistogram.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/SimpleHistogram.java" /> <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util/ThreadUtil.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAM.iws" afterPath="$PROJECT_DIR$/SAM.iws" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/SimulationContext.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/SimulationContext.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Variance.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Variance.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sam-trunk.iml" afterPath="$PROJECT_DIR$/sam-trunk.iml" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Mean.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Mean.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/SalesEventMessage.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" /> </list> </component> @@ -116,6 +120,32 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" line="160" class="org.jboss.test.sam.samples.aggregation.AggregationTestCase" package="org.jboss.test.sam.samples.aggregation"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" line="129" class="Class at AggregationTestCase.java:129" package="org.jboss.test.sam.samples.aggregation"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -164,8 +194,8 @@ <property name="field_breakpoints_groupByClasses" value="true" /> <property name="method_breakpoints_groupByClasses" value="true" /> <property name="exception_breakpoints_viewId" value="TABLE" /> - <property name="field_breakpoints_viewId" value="TABLE" /> <property name="exception_breakpoints_groupByClasses" value="true" /> + <property name="field_breakpoints_viewId" value="TABLE" /> <property name="method_breakpoints_groupByMethods" value="false" /> </ui_properties> </component> @@ -188,11 +218,13 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="FilteringTestCase.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java"> + <file leaf-file-name="AggregationTestCase.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="132" column="59" selection-start="4252" selection-end="4252" vertical-scroll-proportion="0.60566705"> - <folding /> + <state line="139" column="45" selection-start="4279" selection-end="4279" vertical-scroll-proportion="0.41086188"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> @@ -210,8 +242,8 @@ <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" /> </component> <component name="HighlightingSettingsPerFile"> - <setting file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java" root0="SKIP_INSPECTION" /> <setting file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" root0="SKIP_INSPECTION" /> + <setting file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSourceEntity.java" root0="SKIP_INSPECTION" /> </component> <component name="InspectionManager"> <option name="AUTOSCROLL_TO_SOURCE" value="false" /> @@ -254,20 +286,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="samples.pattern" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="SAM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="org.jboss.test.sam" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> @@ -300,24 +318,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="org.jboss.test.sam" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="samples.pattern" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="SAM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="org.jboss.sam" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> @@ -449,10 +449,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -538,59 +534,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="SAM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -660,28 +606,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="SAM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -781,7 +705,29 @@ <option name="myItemId" value="javasim" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="javasim-trunk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="javasim" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="javasim-trunk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:/home/hbraun/dev/prj/javasim/JavaSim/trunk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -795,7 +741,7 @@ <showLibraryContents /> <hideEmptyPackages ProjectPane="false" /> <abbreviatePackageNames /> - <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" /> + <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -826,8 +772,8 @@ <property name="cvs_file_history_flatOrder2" value="2" /> <property name="cvs_file_history_flatOrder3" value="3" /> <property name="cvs_file_history_flatOrder0" value="0" /> - <property name="GenerateAntBuildDialog.forceTargetJdk" value="true" /> <property name="cvs_file_history_flatOrder1" value="1" /> + <property name="GenerateAntBuildDialog.forceTargetJdk" value="true" /> <property name="MemberChooser.copyJavadoc" value="false" /> <property name="GenerateAntBuildDialog.backupFiles" value="true" /> </component> @@ -850,14 +796,14 @@ </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="Remote.client"> - <tempConfiguration default="false" name="SimulationTestCase" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> - <pattern value="org.jboss.test.sam.simulation.*" /> + <component name="RunManager" selected="JUnit.AggregationTestCase"> + <tempConfiguration default="false" name="AggregationTestCase" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <pattern value="org.jboss.test.sam.samples.aggregation.*" /> <module name="sam-trunk" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" value="org.jboss.test.sam.simulation" /> - <option name="MAIN_CLASS_NAME" value="org.jboss.test.sam.simulation.SimulationTestCase" /> + <option name="PACKAGE_NAME" value="org.jboss.test.sam.samples.aggregation" /> + <option name="MAIN_CLASS_NAME" value="org.jboss.test.sam.samples.aggregation.AggregationTestCase" /> <option name="METHOD_NAME" /> <option name="TEST_OBJECT" value="class" /> <option name="VM_PARAMETERS" /> @@ -868,7 +814,7 @@ <value defaultName="wholeProject" /> </option> <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="60790" /> + <option name="DEBUG_PORT" value="44090" /> <option name="TRANSPORT" value="0" /> <option name="LOCAL" value="true" /> </RunnerSettings> @@ -879,13 +825,6 @@ <option name="Make" value="false" /> </method> </tempConfiguration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -905,18 +844,6 @@ <option name="Make" value="false" /> </method> </configuration> - <configuration default="true" type="Applet" factoryName="Applet"> - <module name="" /> - <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="VM_PARAMETERS" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - </configuration> <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> @@ -930,6 +857,25 @@ <option name="Make" value="true" /> </method> </configuration> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> + <configuration default="true" type="Applet" factoryName="Applet"> + <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + </configuration> <configuration default="false" name="client" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -1054,7 +1000,7 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="-3" y="25" width="1686" height="1003" extended-state="6" /> + <frame x="0" y="25" width="1680" height="1000" extended-state="6" /> <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" /> @@ -1162,7 +1108,7 @@ <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1"> <option name="myLastEditedConfigurable" /> </component> - <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667,0.5" version="1"> + <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.26602086" version="1"> <option name="myPlainMode" value="false" /> <option name="myLastEditedConfigurable" value="sam-trunk" /> </component> @@ -1170,108 +1116,110 @@ <option name="myLastEditedConfigurable" value="IDE Profiles" /> </component> <component name="editorHistoryManager"> - <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Quantile.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/esper/EventAdapter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="90" column="8" selection-start="2393" selection-end="2393" vertical-scroll-proportion="0.6635183"> + <state line="101" column="50" selection-start="2690" selection-end="2690" vertical-scroll-proportion="0.6875754"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SensorEventMessage.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SensorMessageFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="37" selection-start="1040" selection-end="1069" vertical-scroll-proportion="0.022432113"> + <state line="52" column="4" selection-start="1680" selection-end="1846" vertical-scroll-proportion="0.64173704"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/esper/EsperRuntimeImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="140" column="16" selection-start="4601" selection-end="4601" vertical-scroll-proportion="0.58774036"> + <state line="109" column="0" selection-start="3486" selection-end="3486" vertical-scroll-proportion="0.02291918"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/resources/samples/esper-default-cfg.xml"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/EventProcessorFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="7" column="0" selection-start="300" selection-end="300" vertical-scroll-proportion="0.1570248"> + <state line="41" column="34" selection-start="1429" selection-end="1429" vertical-scroll-proportion="0.4354644"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/LightSwitchEventMessage.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="26" column="27" selection-start="1159" selection-end="1159" vertical-scroll-proportion="0.13751508"> + <state line="21" column="44" selection-start="1076" selection-end="1076" vertical-scroll-proportion="0.022432113"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/esper/EventAdapter.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="101" column="50" selection-start="2690" selection-end="2690" vertical-scroll-proportion="0.6875754"> + <state line="34" column="13" selection-start="1340" selection-end="1340" vertical-scroll-proportion="-0.32585597"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SensorMessageFactory.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/SalesEventMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="52" column="4" selection-start="1680" selection-end="1846" vertical-scroll-proportion="0.64173704"> + <state line="45" column="0" selection-start="1528" selection-end="1528" vertical-scroll-proportion="0.5608028"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/internal/esper/EsperRuntimeImpl.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="109" column="0" selection-start="3486" selection-end="3486" vertical-scroll-proportion="0.02291918"> + <state line="34" column="13" selection-start="1312" selection-end="1312" vertical-scroll-proportion="-1.1610577"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/EventProcessorFactory.java"> + <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="41" column="34" selection-start="1429" selection-end="1429" vertical-scroll-proportion="0.4354644"> + <state line="57" column="36" selection-start="1763" selection-end="1763" vertical-scroll-proportion="0.5608028"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java"> + <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="28" selection-start="1243" selection-end="1243" vertical-scroll-proportion="0.023341523"> + <state line="6" column="21" selection-start="376" selection-end="386" vertical-scroll-proportion="0.13701923"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java"> + <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="60" selection-start="1828" selection-end="1828" vertical-scroll-proportion="0.112183355"> + <state line="23" column="33" selection-start="1055" selection-end="1055" vertical-scroll-proportion="-1.2451923"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/SimulationContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="224" column="36" selection-start="6832" selection-end="6832" vertical-scroll-proportion="0.08685163"> + <state line="65" column="38" selection-start="2279" selection-end="2279" vertical-scroll-proportion="0.261343"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="640" column="52" selection-start="15820" selection-end="15820" vertical-scroll-proportion="0.42702052"> + <state line="224" column="0" selection-start="6800" selection-end="6800" vertical-scroll-proportion="-0.41322315"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="44" selection-start="1076" selection-end="1076" vertical-scroll-proportion="0.022432113"> + <state line="77" column="39" selection-start="2481" selection-end="2481" vertical-scroll-proportion="0.21487603"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="132" column="59" selection-start="4252" selection-end="4252" vertical-scroll-proportion="0.60566705"> - <folding /> + <state line="139" column="45" selection-start="4279" selection-end="4279" vertical-scroll-proportion="0.41086188"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> Modified: sam/trunk/sam-trunk.iml =================================================================== --- sam/trunk/sam-trunk.iml 2008-07-14 17:04:03 UTC (rev 162) +++ sam/trunk/sam-trunk.iml 2008-07-14 17:04:28 UTC (rev 163) @@ -11,7 +11,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="javasim-trunk" /> <orderEntry type="module-library"> <library name="M2 Dep: jfree:jfreechart:jar:1.0.0:compile"> <CLASSES> @@ -93,42 +92,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: cglib:cglib-nodep:jar:2.1_3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../.m2/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: mysql:mysql-connector-java:jar:3.1.14:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../.m2/repository/mysql/mysql-connector-java/3.1.14/mysql-connector-java-3.1.14.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Added: sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java (rev 0) +++ sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java 2008-07-14 17:04:28 UTC (rev 163) @@ -0,0 +1,165 @@ +/* + * 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.test.sam.samples.aggregation; + +import junit.framework.TestCase; +import org.jboss.sam.simulation.*; +import org.jboss.sam.EventMessage; +import org.javasim.streams.UniformStream; + +import java.util.*; +import java.io.IOException; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class AggregationTestCase extends TestCase +{ + EventSimulation simulation; + SimulationContext context; + + EventSourceEntity source; + EventSinkEntity sink; + + protected void setUp() throws Exception + { + // config + Properties config = new Properties(); + config.put(EventSimulation.TOTAL_SIM_TIME, 150.00); + + // init + simulation = EventSimulation.bootstrap(config); + + // shared between all entities + context = simulation.getContext(); + + // create an event source and sink + source = new EventSourceEntity("RetailStoreEventSource", 0.05); + sink = new EventSinkEntity("SalesVolumeMonitor"); + + } + + protected void tearDown() throws Exception + { + simulation.done(); + } + + @SuppressWarnings({"unchecked"}) + public void testEventAggregation() + { + // associate a source factory + source.setEventMessageFactory( + new EventMessageFactory() + { + String[] stores = new String[] {"London", "Paris", "Mailand"}; + + UniformStream rndStore = new UniformStream(1,3); + UniformStream salesVolume = new UniformStream(1,100); + + public Object createEventMessage(SimulationContext context) + { + context.getMeasurement("dispatched").increment(); + + // we need at least a single match for the test case + String store = randomStore(); + SalesEventMessage salesEvent = new SalesEventMessage( + store, + getVolumen(), + System.currentTimeMillis() + ); + + return salesEvent; + } + + public String randomStore() + { + try + { + double value = Math.round(rndStore.getNumber()); + int l = new Double(value).intValue(); + return stores[l-1]; + } + catch (IOException e) + { + return stores[0]; + } + } + + public double getVolumen() + { + try + { + return salesVolume.getNumber(); + } catch (IOException e) + { + return 10.00; + } + } + + } + ); + + // associate a sink handler + sink.setEventHandler( + new EventSinkHandler() + { + public void handle(EventMessage[] events, SimulationContext context) + { + if(null==context.getAttachment(List.class)) + context.addAttachment(List.class, new ArrayList<EventMessage>()); + + context.getAttachment(List.class).addAll(Arrays.asList(events)); + context.getMeasurement("processed").increment(); + } + } + ); + + simulation.addSource(source); + simulation.addSink(sink); + + // Filters high value orders with amount>5 + simulation.createStatement("insert into AverageSalesVolume " + + "select s.store as location, sum(s.salesVolume) as avg " + + "from org.jboss.test.sam.samples.aggregation.SalesEventMessage.win:length_batch(10) as s " + + "group by s.store"); + + // Forward any highvalue order to the HighValueMonitor + simulation.bindStatement("select * from AverageSalesVolume", sink); + + // start simulation + simulation.singleRun(); + + // display status + context.dump(System.out); + + // evaluate results + List<EventMessage> eventMessages = context.getAttachment(List.class); + assertNotNull(eventMessages); + assertTrue(eventMessages.size()>=1); + + for(EventMessage e : eventMessages) + { + System.out.println(e.getProperty("location")+", " + e.getProperty("avg")); + } + } + +} Property changes on: sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/SalesEventMessage.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/SalesEventMessage.java (rev 0) +++ sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/SalesEventMessage.java 2008-07-14 17:04:28 UTC (rev 163) @@ -0,0 +1,57 @@ +/* + * 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.test.sam.samples.aggregation; + +import java.util.Date; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public final class SalesEventMessage +{ + private String store; + private double salesVolume; + private long timestamp; + + public SalesEventMessage(String store, double salesVolume, long timestamp) + { + this.store = store; + this.salesVolume = salesVolume; + this.timestamp = timestamp; + } + + public String getStore() + { + return store; + } + + public double getSalesVolume() + { + return salesVolume; + } + + public long getTimestamp() + { + return timestamp; + } + +} Property changes on: sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/SalesEventMessage.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

15 years, 11 months

1
0
0 / 0

Overlord SVN: r162 - sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-07-14 13:04:03 -0400 (Mon, 14 Jul 2008) New Revision: 162 Modified: sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java Log: Cleanup filter test case Modified: sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java 2008-07-14 17:03:36 UTC (rev 161) +++ sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java 2008-07-14 17:04:03 UTC (rev 162) @@ -73,6 +73,7 @@ simulation.done(); } + @SuppressWarnings({"unchecked"}) public void testEventFiltering() { // associate a source factory @@ -143,9 +144,9 @@ printStatus(); // evaluate results - List<EventMessage> aggregatedMessages = context.getAttachment(List.class); - assertNotNull(aggregatedMessages); - assertTrue(aggregatedMessages.size()>=1); + List<EventMessage> eventMessages = context.getAttachment(List.class); + assertNotNull(eventMessages); + assertTrue(eventMessages.size()>=1); } private void printStatus()

15 years, 11 months

1
0
0 / 0

Overlord SVN: r161 - sam/trunk/src/main/java/org/jboss/sam/simulation.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-07-14 13:03:36 -0400 (Mon, 14 Jul 2008) New Revision: 161 Modified: sam/trunk/src/main/java/org/jboss/sam/simulation/SimulationContext.java Log: added dump() util method Modified: sam/trunk/src/main/java/org/jboss/sam/simulation/SimulationContext.java =================================================================== --- sam/trunk/src/main/java/org/jboss/sam/simulation/SimulationContext.java 2008-07-14 16:20:55 UTC (rev 160) +++ sam/trunk/src/main/java/org/jboss/sam/simulation/SimulationContext.java 2008-07-14 17:03:36 UTC (rev 161) @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; +import java.io.PrintStream; /** * Shared context between simulation entities and their implementation. @@ -84,4 +85,12 @@ { return Scheduler.currentTime(); } + + public void dump(PrintStream out) + { + for(String key : measurements.keySet()) + { + out.println(key + ": " + measurements.get(key)); + } + } }

15 years, 11 months

1
0
0 / 0

Overlord SVN: r159 - in sam/trunk: src/test/java/org/jboss/test/sam/samples/filtering and 1 other directory.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-07-14 11:51:18 -0400 (Mon, 14 Jul 2008) New Revision: 159 Modified: sam/trunk/SAM.iws sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java Log: Finalize filter sample Modified: sam/trunk/SAM.iws =================================================================== --- sam/trunk/SAM.iws 2008-07-14 15:49:30 UTC (rev 158) +++ sam/trunk/SAM.iws 2008-07-14 15:51:18 UTC (rev 159) @@ -22,19 +22,15 @@ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Histogram.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Histogram.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/OrderEventMessage.java" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java" /> <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/SimpleHistogram.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/SimpleHistogram.java" /> <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util/ThreadUtil.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAM.iws" afterPath="$PROJECT_DIR$/SAM.iws" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Variance.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Variance.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/AggregationTestCase.java" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Mean.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Mean.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" /> </list> </component> @@ -195,7 +191,7 @@ <file leaf-file-name="FilteringTestCase.java" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="25" selection-start="2367" selection-end="2367" vertical-scroll-proportion="0.20188902"> + <state line="132" column="59" selection-start="4252" selection-end="4252" vertical-scroll-proportion="0.60566705"> <folding /> </state> </provider> @@ -667,30 +663,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -710,28 +682,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="SAM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="sam-trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -1311,9 +1261,16 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="21" column="44" selection-start="1076" selection-end="1076" vertical-scroll-proportion="0.022432113"> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="25" selection-start="2367" selection-end="2367" vertical-scroll-proportion="0.20188902"> + <state line="132" column="59" selection-start="4252" selection-end="4252" vertical-scroll-proportion="0.60566705"> <folding /> </state> </provider> Modified: sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java 2008-07-14 15:49:30 UTC (rev 158) +++ sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java 2008-07-14 15:51:18 UTC (rev 159) @@ -25,6 +25,7 @@ import org.javasim.streams.UniformStream; import org.jboss.sam.EventMessage; import org.jboss.sam.simulation.*; +import org.jboss.test.sam.samples.filtering.OrderEventMessage; import java.io.IOException; import java.util.ArrayList; @@ -129,7 +130,7 @@ // Filters high value orders with amount>5 simulation.createStatement("insert into HighValueOrders " + - "select * from org.jboss.test.sam.samples.aggregation.OrderEventMessage as o " + + "select * from org.jboss.test.sam.samples.filtering.OrderEventMessage as o " + "where o.amount>5"); // Forward any highvalue order to the HighValueMonitor Modified: sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java 2008-07-14 15:49:30 UTC (rev 158) +++ sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java 2008-07-14 15:51:18 UTC (rev 159) @@ -19,7 +19,7 @@ * 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.test.sam.samples.aggregation; +package org.jboss.test.sam.samples.filtering; /** * @author Heiko.Braun <heiko.braun(a)jboss.com>

15 years, 11 months

1
0
0 / 0

Overlord SVN: r158 - in sam/trunk: src/test/java/org/jboss/test/sam/samples/filtering and 1 other directory.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-07-14 11:49:30 -0400 (Mon, 14 Jul 2008) New Revision: 158 Modified: sam/trunk/SAM.iws sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java Log: Update filter sample Modified: sam/trunk/SAM.iws =================================================================== --- sam/trunk/SAM.iws 2008-07-14 15:48:05 UTC (rev 157) +++ sam/trunk/SAM.iws 2008-07-14 15:49:30 UTC (rev 158) @@ -195,7 +195,7 @@ <file leaf-file-name="FilteringTestCase.java" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="129" column="16" selection-start="4033" selection-end="4033" vertical-scroll-proportion="0.76269186"> + <state line="74" column="25" selection-start="2367" selection-end="2367" vertical-scroll-proportion="0.20188902"> <folding /> </state> </provider> @@ -1313,7 +1313,7 @@ </entry> <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="129" column="16" selection-start="4033" selection-end="4033" vertical-scroll-proportion="0.76269186"> + <state line="74" column="25" selection-start="2367" selection-end="2367" vertical-scroll-proportion="0.20188902"> <folding /> </state> </provider> Modified: sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java 2008-07-14 15:48:05 UTC (rev 157) +++ sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java 2008-07-14 15:49:30 UTC (rev 158) @@ -72,7 +72,7 @@ simulation.done(); } - public void testEventAggregation() + public void testEventFiltering() { // associate a source factory source.setEventMessageFactory(

15 years, 11 months

1
0
0 / 0

Overlord SVN: r157 - in sam/trunk: src/test/java/org/jboss/test/sam/samples and 1 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-07-14 11:48:05 -0400 (Mon, 14 Jul 2008) New Revision: 157 Added: sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/ sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java Removed: sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/ sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/AggregationTestCase.java sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java Modified: sam/trunk/SAM.iws Log: The aggregation sample was actually a filter sample Modified: sam/trunk/SAM.iws =================================================================== --- sam/trunk/SAM.iws 2008-07-14 15:45:24 UTC (rev 156) +++ sam/trunk/SAM.iws 2008-07-14 15:48:05 UTC (rev 157) @@ -22,17 +22,19 @@ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/internal/SimulationProcessList.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/Scheduler.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Histogram.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Histogram.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/pattern/PatternTestCase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/sam/simulation/EventSimulation.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/OrderEventMessage.java" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation" afterPath="" /> + <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/SimpleHistogram.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/SimpleHistogram.java" /> - <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/simulation/SimulationTestCase.java" /> + <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util/ThreadUtil.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/pom.xml" /> - <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/util/ThreadUtil.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/SAM.iws" afterPath="$PROJECT_DIR$/SAM.iws" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Variance.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Variance.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/AggregationTestCase.java" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java" afterPath="" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Mean.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/stats/Mean.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" afterPath="/home/hbraun/dev/prj/javasim/JavaSim/trunk/src/main/java/org/javasim/SimulationProcess.java" /> </list> </component> @@ -190,10 +192,10 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="AggregationTestCase.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java"> + <file leaf-file-name="FilteringTestCase.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="125" column="45" selection-start="3958" selection-end="3958" vertical-scroll-proportion="2.153483"> + <state line="129" column="16" selection-start="4033" selection-end="4033" vertical-scroll-proportion="0.76269186"> <folding /> </state> </provider> @@ -640,7 +642,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -665,6 +667,30 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -684,6 +710,28 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sam-trunk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -1228,13 +1276,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/OrderEventMessage.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="26" column="19" selection-start="1155" selection-end="1155" vertical-scroll-proportion="0.13751508"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/EventProcessorFactory.java"> <provider selected="true" editor-type-id="text-editor"> <state line="41" column="34" selection-start="1429" selection-end="1429" vertical-scroll-proportion="0.4354644"> @@ -1270,9 +1311,9 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="125" column="45" selection-start="3958" selection-end="3958" vertical-scroll-proportion="2.153483"> + <state line="129" column="16" selection-start="4033" selection-end="4033" vertical-scroll-proportion="0.76269186"> <folding /> </state> </provider> Copied: sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering (from rev 154, sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation) Deleted: sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/AggregationTestCase.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/AggregationTestCase.java 2008-07-14 14:21:06 UTC (rev 154) +++ sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/AggregationTestCase.java 2008-07-14 15:48:05 UTC (rev 157) @@ -1,155 +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.test.sam.samples.aggregation; - -import junit.framework.TestCase; -import org.jboss.sam.EventMessage; -import org.jboss.sam.simulation.*; -import org.javasim.streams.UniformStream; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Properties; -import java.io.IOException; - -/** - * A simple aggregation sample that uses two statments: - * <ul> - * <li>One to aggregate high value orders (unbound) - * <li>Anotherone that forwards the aggregated results to a monitor (bound) - * </ul> - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class AggregationTestCase extends TestCase -{ - EventSimulation simulation; - SimulationContext context; - - EventSourceEntity source; - EventSinkEntity sink; - - protected void setUp() throws Exception - { - // config - Properties config = new Properties(); - config.put(EventSimulation.TOTAL_SIM_TIME, 75.00); - - // init - simulation = EventSimulation.bootstrap(config); - - // shared between all entities - context = simulation.getContext(); - - // create an event source and sink - source = new EventSourceEntity("OrderEventSource", 0.10); - sink = new EventSinkEntity("HighValueMonitor"); - - } - - protected void tearDown() throws Exception - { - simulation.done(); - } - - public void testEventAggregation() - { - // associate a source factory - source.setEventMessageFactory( - new EventMessageFactory() - { - boolean singleMatchEnforced; - UniformStream unitStream = new UniformStream(1,10); - - public Object createEventMessage(SimulationContext context) - { - context.getMeasurement("dispatched").increment(); - - // we need at least a single match for the test case - long amount = singleMatchEnforced ? calcAmount() : 10; - if(!singleMatchEnforced) singleMatchEnforced = true; - - OrderEventMessage order = new OrderEventMessage("Stereo", amount); - return order; - } - - public long calcAmount() - { - try - { - double value = Math.floor(unitStream.getNumber()); - return new Double(value).longValue(); - } - catch (IOException e) - { - return 1; - } - } - - } - ); - - // associate a sink handler - sink.setEventHandler( - new EventSinkHandler() - { - public void handle(EventMessage[] events, SimulationContext context) - { - if(null==context.getAttachment(List.class)) - context.addAttachment(List.class, new ArrayList<EventMessage>()); - - context.getAttachment(List.class).addAll(Arrays.asList(events)); - context.getMeasurement("processed").increment(); - } - } - ); - - simulation.addSource(source); - simulation.addSink(sink); - - // Aggregates high value orders with amount>5 - simulation.createStatement("insert into HighValueOrders " + - "select * from org.jboss.test.sam.samples.aggregation.OrderEventMessage as o " + - "where o.amount>5"); - - // Forward any highvalue order to the HighValueMonitor - simulation.bindStatement("select * from HighValueOrders", sink); - - // start simulation - simulation.singleRun(); - - // display status - printStatus(); - - // evaluate results - List<EventMessage> aggregatedMessages = context.getAttachment(List.class); - assertNotNull(aggregatedMessages); - assertTrue(aggregatedMessages.size()>=1); - } - - private void printStatus() - { - System.out.println("Dispatched: "+context.getMeasurement("dispatched")); - System.out.println("Processed: "+context.getMeasurement("processed")); - } -} Added: sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java (rev 0) +++ sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java 2008-07-14 15:48:05 UTC (rev 157) @@ -0,0 +1,155 @@ +/* + * 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.test.sam.samples.aggregation; + +import junit.framework.TestCase; +import org.javasim.streams.UniformStream; +import org.jboss.sam.EventMessage; +import org.jboss.sam.simulation.*; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Properties; + +/** + * A simple filter sample that uses two statements: + * <ul> + * <li>One statement to filter high value orders (unbound) + * <li>Anotherone that forwards the results to a monitor (bound) + * </ul> + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class FilteringTestCase extends TestCase +{ + EventSimulation simulation; + SimulationContext context; + + EventSourceEntity source; + EventSinkEntity sink; + + protected void setUp() throws Exception + { + // config + Properties config = new Properties(); + config.put(EventSimulation.TOTAL_SIM_TIME, 75.00); + + // init + simulation = EventSimulation.bootstrap(config); + + // shared between all entities + context = simulation.getContext(); + + // create an event source and sink + source = new EventSourceEntity("OrderEventSource", 0.10); + sink = new EventSinkEntity("HighValueMonitor"); + + } + + protected void tearDown() throws Exception + { + simulation.done(); + } + + public void testEventAggregation() + { + // associate a source factory + source.setEventMessageFactory( + new EventMessageFactory() + { + boolean singleMatchEnforced; + UniformStream unitStream = new UniformStream(1,10); + + public Object createEventMessage(SimulationContext context) + { + context.getMeasurement("dispatched").increment(); + + // we need at least a single match for the test case + long amount = singleMatchEnforced ? calcAmount() : 10; + if(!singleMatchEnforced) singleMatchEnforced = true; + + OrderEventMessage order = new OrderEventMessage("Stereo", amount); + return order; + } + + public long calcAmount() + { + try + { + double value = Math.floor(unitStream.getNumber()); + return new Double(value).longValue(); + } + catch (IOException e) + { + return 1; + } + } + + } + ); + + // associate a sink handler + sink.setEventHandler( + new EventSinkHandler() + { + public void handle(EventMessage[] events, SimulationContext context) + { + if(null==context.getAttachment(List.class)) + context.addAttachment(List.class, new ArrayList<EventMessage>()); + + context.getAttachment(List.class).addAll(Arrays.asList(events)); + context.getMeasurement("processed").increment(); + } + } + ); + + simulation.addSource(source); + simulation.addSink(sink); + + // Filters high value orders with amount>5 + simulation.createStatement("insert into HighValueOrders " + + "select * from org.jboss.test.sam.samples.aggregation.OrderEventMessage as o " + + "where o.amount>5"); + + // Forward any highvalue order to the HighValueMonitor + simulation.bindStatement("select * from HighValueOrders", sink); + + // start simulation + simulation.singleRun(); + + // display status + printStatus(); + + // evaluate results + List<EventMessage> aggregatedMessages = context.getAttachment(List.class); + assertNotNull(aggregatedMessages); + assertTrue(aggregatedMessages.size()>=1); + } + + private void printStatus() + { + System.out.println("Dispatched: "+context.getMeasurement("dispatched")); + System.out.println("Processed: "+context.getMeasurement("processed")); + } +} Property changes on: sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/FilteringTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/OrderEventMessage.java 2008-07-14 14:21:06 UTC (rev 154) +++ sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java 2008-07-14 15:48:05 UTC (rev 157) @@ -1,57 +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.test.sam.samples.aggregation; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public final class OrderEventMessage -{ - private String product; - private long amount; - - public OrderEventMessage(String product, long amount) - { - this.product = product; - this.amount = amount; - } - - public String getProduct() - { - return product; - } - - public void setProduct(String product) - { - this.product = product; - } - - public long getAmount() - { - return amount; - } - - public void setAmount(long amount) - { - this.amount = amount; - } -} Copied: sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java (from rev 156, sam/trunk/src/test/java/org/jboss/test/sam/samples/aggregation/OrderEventMessage.java) =================================================================== --- sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java (rev 0) +++ sam/trunk/src/test/java/org/jboss/test/sam/samples/filtering/OrderEventMessage.java 2008-07-14 15:48:05 UTC (rev 157) @@ -0,0 +1,57 @@ +/* + * 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.test.sam.samples.aggregation; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public final class OrderEventMessage +{ + private String product; + private long amount; + + public OrderEventMessage(String product, long amount) + { + this.product = product; + this.amount = amount; + } + + public String getProduct() + { + return product; + } + + public void setProduct(String product) + { + this.product = product; + } + + public long getAmount() + { + return amount; + } + + public void setAmount(long amount) + { + this.amount = amount; + } +}

15 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

overlord-commits July 2008