[overlord-commits] Overlord SVN: r659 - in sam/trunk/modules/core/src: main/java/org/jboss/sam/config and 3 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Mon Jul 13 17:17:59 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-07-13 17:17:58 -0400 (Mon, 13 Jul 2009)
New Revision: 659
Modified:
sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java
sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java
sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java
sam/trunk/modules/core/src/test/resources/drools/sam-cfg.xml
Log:
Add drools runtime log property
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java 2009-07-13 21:00:48 UTC (rev 658)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/EventProcessor.java 2009-07-13 21:17:58 UTC (rev 659)
@@ -22,6 +22,7 @@
package org.jboss.sam;
import java.util.Iterator;
+import java.util.Properties;
/**
* An event processor glues together {@link org.jboss.sam.StreamInput} and {@link org.jboss.sam.StreamOutput}
@@ -120,4 +121,5 @@
T getUnderlying();
+ void setProperties(Properties properties);
}
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java 2009-07-13 21:00:48 UTC (rev 658)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java 2009-07-13 21:17:58 UTC (rev 659)
@@ -94,7 +94,7 @@
properties.put(prop.getName(), prop.getValue());
}
-
+ processor.setProperties(properties);
}
Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java 2009-07-13 21:00:48 UTC (rev 658)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java 2009-07-13 21:17:58 UTC (rev 659)
@@ -40,6 +40,7 @@
import java.io.InputStreamReader;
import java.util.Iterator;
import java.util.Map;
+import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -49,7 +50,7 @@
implements EventProcessor<KnowledgeBase>, StreamInputCallback, Globals
{
private String name;
-
+
private KnowledgeBase kbase;
private StatefulKnowledgeSession session;
@@ -71,8 +72,6 @@
this.session = kbase.newStatefulKnowledgeSession();
this.session.getGlobals().setDelegate(this);
- KnowledgeRuntimeLogger logger = KnowledgeRuntimeLoggerFactory.newConsoleLogger(session);
-
}
catch (Exception e)
{
@@ -80,6 +79,13 @@
}
}
+ public void setProperties(Properties properties)
+ {
+ String runtimeLogProp = (String)properties.get("drools.runtimelog.enable");
+ if(runtimeLogProp!=null && runtimeLogProp.equals("true"))
+ KnowledgeRuntimeLoggerFactory.newConsoleLogger(session);
+ }
+
public void setRuntime(SAMRuntime runtime)
{
this.runtime = runtime;
Modified: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java
===================================================================
--- sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java 2009-07-13 21:00:48 UTC (rev 658)
+++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java 2009-07-13 21:17:58 UTC (rev 659)
@@ -35,73 +35,77 @@
*/
public class ConfigParserTestCase extends TestCase
{
- private static byte[] XML_CONFIG = null;
+ private static byte[] XML_CONFIG = null;
- private ConfigFactory cfgFactory;
+ private ConfigFactory cfgFactory;
- protected void setUp() throws Exception
- {
- this.cfgFactory = ConfigFactory.newInstance();
- }
+ protected void setUp() throws Exception
+ {
+ this.cfgFactory = ConfigFactory.newInstance();
+ }
- public void testMarshalling() throws Exception
- {
- ConfigurationDef pnd = new ConfigurationDef("BPMEventProcessor", new URI("http://org.jboss.bpm/console"));
+ public void testMarshalling() throws Exception
+ {
+ ConfigurationDef configurationDef = new ConfigurationDef("BPMEventProcessor", new URI("http://org.jboss.bpm/console"));
- // define stream input and outputs
- pnd.getInputs().add( new StreamInputDef("VMInput", InVMStreamInput.class.getName()) );
- pnd.getOutputs().add( new StreamOutputDef("VMOutput", BufferedStreamOutput.class.getName()) );
+ // define stream input and outputs
+ configurationDef.getInputs().add( new StreamInputDef("VMInput", InVMStreamInput.class.getName()) );
+ configurationDef.getOutputs().add( new StreamOutputDef("VMOutput", BufferedStreamOutput.class.getName()) );
- // construct an EPL
- EPLDef epl = new EPLDef("drl");
- epl.setExpression(
+ // construct an EPL
+ EPLDef epl = new EPLDef("drl");
+ epl.setExpression(
"package org.jboss.test.sam.drools;\n" +
- "\n" +
- "import org.jboss.test.sam.drools.StockTick;\n" +
- "global org.jboss.sam.internal.drools.SAMAdapter SAM;\n" +
- "\n" +
- "rule \"Check event\"\n" +
- "when\n" +
- " $st: StockTick(symbol == \"ACME\")\n" +
- "then\n" +
- " SAM.getListener(\"VMOutput\").update($st);\n" +
- "end"
- );
+ "\n" +
+ "import org.jboss.test.sam.drools.StockTick;\n" +
+ "global org.jboss.sam.internal.drools.SAMAdapter SAM;\n" +
+ "\n" +
+ "rule \"Check event\"\n" +
+ "when\n" +
+ " $st: StockTick(symbol == \"ACME\")\n" +
+ "then\n" +
+ " SAM.getListener(\"VMOutput\").update($st);\n" +
+ "end"
+ );
- // add statements
- StatementDef stmtmDef = new StatementDef("ExampleStatement");
- stmtmDef.setEpl(epl);
+ // add statements
+ StatementDef stmtmDef = new StatementDef("ExampleStatement");
+ stmtmDef.setEpl(epl);
- pnd.getStatements().add(stmtmDef);
+ configurationDef.getStatements().add(stmtmDef);
- // database references
- DatabaseRefDef dbRef = new DatabaseRefDef("hsqlDB");
- DataSourceDef dsDef = new DataSourceDef("hsqlDS", "org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:SamTestSetup");
- dsDef.getConnectionArgs().add(new PropertyDef("user", "sa"));
- dsDef.getConnectionArgs().add(new PropertyDef("password", ""));
- dbRef.setDatasource(dsDef);
- pnd.getDatabases().add(dbRef);
+ // database references
+ DatabaseRefDef dbRef = new DatabaseRefDef("hsqlDB");
+ DataSourceDef dsDef = new DataSourceDef("hsqlDS", "org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:SamTestSetup");
+ dsDef.getConnectionArgs().add(new PropertyDef("user", "sa"));
+ dsDef.getConnectionArgs().add(new PropertyDef("password", ""));
+ dbRef.setDatasource(dsDef);
+ configurationDef.getDatabases().add(dbRef);
- // marshall it
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- cfgFactory.marshall(pnd, bout);
+ // properties
+ configurationDef.getProps().add(new PropertyDef("some", "value"));
- // use in unmarshall test
- this.XML_CONFIG = bout.toByteArray();
- }
+ // marshall it
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ cfgFactory.marshall(configurationDef, bout);
- public void testUnmarshalling() throws Exception
- {
- System.out.println("Config:\n" + new String(XML_CONFIG));
+ // use in unmarshall test
+ this.XML_CONFIG = bout.toByteArray();
+ }
- ConfigurationDef pnd = cfgFactory.unmarshall( new ByteArrayInputStream(XML_CONFIG));
+ public void testUnmarshalling() throws Exception
+ {
+ System.out.println("Config:\n" + new String(XML_CONFIG));
- assertNotNull("ProcessingNodeDef not unmarshalled", pnd);
- assertEquals("BPMEventProcessor", pnd.getName());
- assertEquals(1, pnd.getStatements().size());
- assertEquals(1, pnd.getInputs().size());
- assertEquals(1, pnd.getOutputs().size());
- assertEquals(0, pnd.getProps().size());
- assertNotNull("EPL is null", pnd.getStatements().get(0).getEpl().getExpression());
- }
+ ConfigurationDef configurationDef = cfgFactory.unmarshall( new ByteArrayInputStream(XML_CONFIG));
+
+ assertNotNull("ProcessingNodeDef not unmarshalled", configurationDef);
+ assertEquals("BPMEventProcessor", configurationDef.getName());
+ assertEquals(1, configurationDef.getStatements().size());
+ assertEquals(1, configurationDef.getInputs().size());
+ assertEquals(1, configurationDef.getOutputs().size());
+ assertEquals(1, configurationDef.getProps().size());
+ assertEquals("value", configurationDef.getProps().get(0).getValue());
+ assertNotNull("EPL is null", configurationDef.getStatements().get(0).getEpl().getExpression());
+ }
}
Modified: sam/trunk/modules/core/src/test/resources/drools/sam-cfg.xml
===================================================================
--- sam/trunk/modules/core/src/test/resources/drools/sam-cfg.xml 2009-07-13 21:00:48 UTC (rev 658)
+++ sam/trunk/modules/core/src/test/resources/drools/sam-cfg.xml 2009-07-13 21:17:58 UTC (rev 659)
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
-
-<ns2:processingNode name="DatabaseTestCase"
- domain="http://org.jboss.sam/test/database"
+
+<ns2:processingNode name="DroolsAPITestCase"
+ domain="http://org.jboss.sam/test/drools"
xmlns:ns2="http://org.jboss.sam/08/2008/">
+ <runtime-configuration>
+ <property name="drools.runtimelog.enable" value="true"/>
+ </runtime-configuration>
+
<statements/>
</ns2:processingNode>
\ No newline at end of file
More information about the overlord-commits
mailing list