[jboss-svn-commits] JBL Code SVN: r25378 - in labs/jbossrules/trunk: drools-clips/src/main/java/org/drools/clips and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Feb 21 20:40:46 EST 2009
Author: mark.proctor at jboss.com
Date: 2009-02-21 20:40:45 -0500 (Sat, 21 Feb 2009)
New Revision: 25378
Modified:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/StatelessKnowledgeSession.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsShell.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java
labs/jbossrules/trunk/drools-core/.classpath
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/MapGlobalResolver.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/GlobalResolver.java
Log:
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/StatelessKnowledgeSession.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/StatelessKnowledgeSession.java 2009-02-21 23:25:18 UTC (rev 25377)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/StatelessKnowledgeSession.java 2009-02-22 01:40:45 UTC (rev 25378)
@@ -95,16 +95,17 @@
KnowledgeRuntimeEventManager {
/**
- * Delegate used to resolve any global names not found in the internally collection.
+ * Return the Globals store
* @param globalResolver
*/
- void setGlobalResolver(Globals globalResolver);
+ Globals getGlobals();
/**
- * Sets a global value on the internal collection
+ * Sets a global value on the globals store
* @param identifer the global identifier
* @param value the value assigned to the global identifier
*/
void setGlobal(String identifer,
Object value);
+
}
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsShell.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsShell.java 2009-02-21 23:25:18 UTC (rev 25377)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsShell.java 2009-02-22 01:40:45 UTC (rev 25378)
@@ -288,13 +288,13 @@
implements
GlobalResolver {
private Map<String, Object> vars;
- private Globals delegate;
+ private GlobalResolver delegate;
public GlobalResolver2() {
}
public GlobalResolver2(Map<String, Object> vars,
- Globals delegate) {
+ GlobalResolver delegate) {
this.vars = vars;
this.delegate = delegate;
}
@@ -313,29 +313,16 @@
public Object resolveGlobal(String identifier) {
Object object = this.vars.get( identifier );
if ( object == null ) {
- object = delegate.get( identifier );
+ object = delegate.resolveGlobal( identifier );
}
return object;
}
public void setGlobal(String identifier,
Object value) {
- this.delegate.set( identifier,
+ this.delegate.setGlobal( identifier,
value );
}
-
- public Object get(String identifier) {
- return resolveGlobal( identifier );
- }
-
- public void set(String identifier,
- Object value) {
- setGlobal( identifier, value );
- }
-
- public void setDelegate(Globals delegate) {
- this.delegate = delegate;
- }
}
public void importHandler(ImportDescr descr) {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java 2009-02-21 23:25:18 UTC (rev 25377)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java 2009-02-22 01:40:45 UTC (rev 25378)
@@ -410,9 +410,6 @@
kbase.addKnowledgePackages( pkgs );
kbase = SerializationHelper.serializeObject( kbase );
StatelessKnowledgeSession session = kbase.newStatelessKnowledgeSession();
-
-// session = SerializationHelper.serializeObject(session);
- session.setGlobalResolver( this.globalResolver );
session.setGlobal( "list",
this.list );
Modified: labs/jbossrules/trunk/drools-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-core/.classpath 2009-02-21 23:25:18 UTC (rev 25377)
+++ labs/jbossrules/trunk/drools-core/.classpath 2009-02-22 01:40:45 UTC (rev 25378)
@@ -1,20 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" including="**" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
- <classpathentry kind="src" path="/drools-api"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.5.2/joda-time-1.5.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.7-SNAPSHOT/mvel2-2.0.7-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" including="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
+ <classpathentry kind="src" path="/drools-api"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.5.2/joda-time-1.5.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/mvel"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/MapGlobalResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/MapGlobalResolver.java 2009-02-21 23:25:18 UTC (rev 25377)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/MapGlobalResolver.java 2009-02-22 01:40:45 UTC (rev 25378)
@@ -13,7 +13,7 @@
public class MapGlobalResolver
implements
- GlobalResolver,
+ GlobalResolver, Globals,
Externalizable {
private static final long serialVersionUID = 400L;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2009-02-21 23:25:18 UTC (rev 25377)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2009-02-22 01:40:45 UTC (rev 25378)
@@ -248,7 +248,7 @@
}
public Globals getGlobals() {
- return this.session.getGlobalResolver();
+ return ( Globals ) this.session.getGlobalResolver();
}
// public Future<Object> asyncInsert(Object object) {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java 2009-02-21 23:25:18 UTC (rev 25377)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java 2009-02-22 01:40:45 UTC (rev 25378)
@@ -43,7 +43,7 @@
private InternalRuleBase ruleBase;
private AgendaFilter agendaFilter;
- private GlobalResolver sessionGlobals = new MapGlobalResolver();
+ private MapGlobalResolver sessionGlobals = new MapGlobalResolver();
/** The event mapping */
public Map<WorkingMemoryEventListener, WorkingMemoryEventListenerWrapper> mappedWorkingMemoryListeners;
@@ -54,16 +54,17 @@
public WorkingMemoryEventSupport workingMemoryEventSupport = new WorkingMemoryEventSupport();
public AgendaEventSupport agendaEventSupport = new AgendaEventSupport();
public RuleFlowEventSupport ruleFlowEventSupport = new RuleFlowEventSupport();
-
- private KnowledgeSessionConfiguration conf;
- private Environment environment;
+ private KnowledgeSessionConfiguration conf;
+ private Environment environment;
+
public StatelessKnowledgeSessionImpl() {
}
- public StatelessKnowledgeSessionImpl(final InternalRuleBase ruleBase, final KnowledgeSessionConfiguration conf) {
+ public StatelessKnowledgeSessionImpl(final InternalRuleBase ruleBase,
+ final KnowledgeSessionConfiguration conf) {
this.ruleBase = ruleBase;
- this.conf = ( conf != null ) ? conf : new SessionConfiguration() ;
+ this.conf = (conf != null) ? conf : new SessionConfiguration();
this.environment = EnvironmentFactory.newEnvironment();
}
@@ -78,8 +79,8 @@
(SessionConfiguration) this.conf,
this.environment );
- wm.getGlobalResolver().setDelegate( this.sessionGlobals );
-
+ ((Globals) wm.getGlobalResolver()).setDelegate( this.sessionGlobals );
+
wm.setWorkingMemoryEventSupport( this.workingMemoryEventSupport );
wm.setAgendaEventSupport( this.agendaEventSupport );
wm.setRuleFlowEventSupport( this.ruleFlowEventSupport );
@@ -152,10 +153,9 @@
this.sessionGlobals.setGlobal( identifier,
value );
}
-
- public void setGlobalResolver(org.drools.runtime.Globals globalResolver) {
- this.sessionGlobals = (GlobalResolver) globalResolver;
-
+
+ public Globals getGlobals() {
+ return this.sessionGlobals;
}
public void executeObject(Object object) {
@@ -227,7 +227,7 @@
if ( map != null && !map.isEmpty() ) {
for ( Iterator it = map.entrySet().iterator(); it.hasNext(); ) {
Entry<String, Object> entry = (Entry<String, Object>) it.next();
- sessionGlobals.setGlobal( entry.getKey(),
+ wm.setGlobal( entry.getKey(),
entry.getValue() );
wm.insert( entry.getValue() );
}
@@ -237,7 +237,7 @@
if ( map != null && !map.isEmpty() ) {
for ( Iterator it = map.entrySet().iterator(); it.hasNext(); ) {
Entry<String, Object> entry = (Entry<String, Object>) it.next();
- sessionGlobals.setGlobal( entry.getKey(),
+ wm.setGlobal( entry.getKey(),
entry.getValue() );
results.put( entry.getKey(),
entry.getValue() );
@@ -249,7 +249,7 @@
if ( map != null && !map.isEmpty() ) {
for ( Iterator it = map.entrySet().iterator(); it.hasNext(); ) {
Entry<String, Object> entry = (Entry<String, Object>) it.next();
- sessionGlobals.setGlobal( entry.getKey(),
+ wm.setGlobal( entry.getKey(),
entry.getValue() );
}
}
@@ -260,7 +260,7 @@
Entry<String, Object> entry = (Entry<String, Object>) it.next();
results.put( entry.getKey(),
entry.getValue() );
- sessionGlobals.setGlobal( entry.getKey(),
+ wm.setGlobal( entry.getKey(),
entry.getValue() );
}
}
@@ -285,10 +285,9 @@
}
}
}
-
+
public Parameters newParameters() {
return new ParametersImpl();
}
-
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/GlobalResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/GlobalResolver.java 2009-02-21 23:25:18 UTC (rev 25377)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/GlobalResolver.java 2009-02-22 01:40:45 UTC (rev 25378)
@@ -2,7 +2,7 @@
import java.io.Externalizable;
-public interface GlobalResolver extends org.drools.runtime.Globals {
+public interface GlobalResolver {
public Object resolveGlobal(String identifier);
public void setGlobal(String identifier,
More information about the jboss-svn-commits
mailing list