[jboss-svn-commits] JBL Code SVN: r31332 - in labs/jbossrules/trunk/drools-core: META-INF and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jan 29 19:44:40 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-01-29 19:44:40 -0500 (Fri, 29 Jan 2010)
New Revision: 31332
Modified:
labs/jbossrules/trunk/drools-core/.classpath
labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/impl/InputMarshaller.java
Log:
-persistence cleanup, remove need for shadowing.
Modified: labs/jbossrules/trunk/drools-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-core/.classpath 2010-01-30 00:38:29 UTC (rev 31331)
+++ labs/jbossrules/trunk/drools-core/.classpath 2010-01-30 00:44:40 UTC (rev 31332)
@@ -1,23 +1,24 @@
+<?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/apache/felix/javax.servlet/1.0.0/javax.servlet-1.0.0.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/junit/junit/4.6/junit-4.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.compendium/1.4.0/org.osgi.compendium-1.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.foundation/1.2.0/org.osgi.foundation-1.2.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/apache/felix/javax.servlet/1.0.0/javax.servlet-1.0.0.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/junit/junit/4.6/junit-4.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.compendium/1.4.0/org.osgi.compendium-1.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.foundation/1.2.0/org.osgi.foundation-1.2.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/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF 2010-01-30 00:38:29 UTC (rev 31331)
+++ labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF 2010-01-30 00:44:40 UTC (rev 31332)
@@ -71,7 +71,7 @@
ls,org.osgi.framework";version="5.1.0.SNAPSHOT",org.drools.impl;uses:
="org.drools,org.drools.definitions.rule.impl,org.drools.event.knowle
gebase.impl,org.drools.event,org.drools.rule,org.drools.definitions.i
- mpl,org.drools.common,org.drools.agent,org.drools.command,org.drools.
+ mpl,org.drools.common,org.drools.command,org.drools.agent,org.drools.
command.impl,org.drools.event.rule.impl,org.drools.spi,org.drools.eve
nt.process.impl,org.drools.runtime.impl,org.drools.runtime.rule.impl,
org.drools.process.instance.event,org.drools.process.instance,org.dro
@@ -162,8 +162,8 @@
i,org.drools,org.drools.common,org.drools.process.instance";version="
5.1.0.SNAPSHOT",org.drools.base.mvel;uses:="org.mvel2.integration,org
.drools,org.drools.common,org.mvel2.integration.impl,org.mvel2,org.dr
- ools.rule,org.drools.spi,org.mvel2.compiler,org.drools.util,org.drool
- s.type,org.drools.base,org.mvel2.debug";version="5.1.0.SNAPSHOT",org.
+ ools.rule,org.drools.spi,org.mvel2.compiler,org.drools.type,org.drool
+ s.util,org.drools.base,org.mvel2.debug";version="5.1.0.SNAPSHOT",org.
drools.event.process.impl;uses:="org.drools.event,org.drools,org.droo
ls.common";version="5.1.0.SNAPSHOT",org.drools.process.instance.impl;
uses:="org.drools.process.instance,org.drools.process.core,org.drools
@@ -308,7 +308,7 @@
Bundle-Vendor: JBoss Inc.
DynamicImport-Package: *
Bundle-Version: 5.1.0.SNAPSHOT
-Bnd-LastModified: 1264632445217
+Bnd-LastModified: 1264724432806
Bundle-Activator: org.drools.osgi.core.Activator
Bundle-ManifestVersion: 2
Bundle-Description: A rule production system
@@ -317,11 +317,13 @@
erters,com.thoughtworks.xstream.converters.collections,com.thoughtwor
ks.xstream.io,com.thoughtworks.xstream.io.xml,com.thoughtworks.xstrea
m.mapper,javax.management,javax.management.openmbean,javax.swing,java
- x.swing.border,javax.swing.event,javax.xml.parsers,org.mvel2,org.mvel
- 2.asm,org.mvel2.asm.util,org.mvel2.ast,org.mvel2.compiler,org.mvel2.d
- ebug,org.mvel2.integration,org.mvel2.integration.impl,org.mvel2.optim
- izers,org.mvel2.templates,org.mvel2.util,org.osgi.framework;version="
- 1.5",org.w3c.dom,org.xml.sax,org.xml.sax.helpers
+ x.swing.border,javax.swing.event,javax.xml.parsers,org.mvel2;version=
+ "2.0",org.mvel2.asm;version="2.0",org.mvel2.asm.util;version="2.0",or
+ g.mvel2.ast;version="2.0",org.mvel2.compiler;version="2.0",org.mvel2.
+ debug;version="2.0",org.mvel2.integration;version="2.0",org.mvel2.int
+ egration.impl;version="2.0",org.mvel2.optimizers;version="2.0",org.mv
+ el2.templates;version="2.0",org.mvel2.util;version="2.0",org.osgi.fra
+ mework;version="1.5",org.w3c.dom,org.xml.sax,org.xml.sax.helpers
Bundle-SymbolicName: org.drools.core
Bundle-DocURL: http://www.jboss.org/
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/impl/InputMarshaller.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/impl/InputMarshaller.java 2010-01-30 00:38:29 UTC (rev 31331)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/impl/InputMarshaller.java 2010-01-30 00:44:40 UTC (rev 31332)
@@ -122,8 +122,10 @@
agenda );
context.wm = session;
+
+ context.handles.put( context.wm.getInitialFactHandle().getId(), context.wm.getInitialFactHandle() );
- readFactHandles( context );
+ readFactHandles( context );
readActionQueue( context );
More information about the jboss-svn-commits
mailing list