[jboss-svn-commits] JBL Code SVN: r33891 - in labs/jbossrules/trunk: drools-compiler/META-INF and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Jul 14 22:08:36 EDT 2010


Author: mark.proctor at jboss.com
Date: 2010-07-14 22:08:35 -0400 (Wed, 14 Jul 2010)
New Revision: 33891

Modified:
   labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-process/drools-bam/src/main/java/org/drools/process/audit/JPAWorkingMemoryDbLogger.java
Log:
JBRULES-1434 Drools Spring
-fixing code related to the entity manager change for spring persistence

Modified: labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF	2010-07-15 00:43:24 UTC (rev 33890)
+++ labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF	2010-07-15 02:08:35 UTC (rev 33891)
@@ -8,7 +8,7 @@
  tional,org.milyn;resolution:=optional,org.osgi.framework;resolution:=
  optional;version="1.5",org.osgi.util.tracker;resolution:=optional;ver
  sion="1.4",org.quartz;resolution:=optional
-Bnd-LastModified: 1279113493194
+Bnd-LastModified: 1279156563611
 Export-Package: org.drools.logger;uses:="org.drools.event";version="5.
  1.0.SNAPSHOT",org.drools.runtime;uses:="org.drools.command,org.drools
  .time,org.drools.event,org.drools,org.drools.runtime.process,org.droo
@@ -28,8 +28,8 @@
  ",org.drools.osgi.api;uses:="org.osgi.framework,org.drools,org.drools
  .util,org.osgi.util.tracker";version="5.1.0.SNAPSHOT",org.drools;uses
  :="org.drools.io,org.drools.event.knowledgebase,org.drools.runtime,or
- g.drools.definition,org.drools.definition.rule,org.drools.definition.
- type,org.drools.definition.process,org.drools.conf,org.drools.util";v
+ g.drools.definition,org.drools.definition.type,org.drools.definition.
+ rule,org.drools.definition.process,org.drools.conf,org.drools.util";v
  ersion="5.1.0.SNAPSHOT",org.drools.runtime.conf;uses:="org.drools.con
  f";version="5.1.0.SNAPSHOT",org.drools.runtime.process;uses:="org.dro
  ols.runtime";version="5.1.0.SNAPSHOT",org.drools.event.rule;uses:="or
@@ -61,8 +61,8 @@
  uses:="org.drools.command";version="5.1.0.SNAPSHOT",org.drools.defini
  tion.type;version="5.1.0.SNAPSHOT",org.drools.definition.process;uses
  :="org.drools.definition";version="5.1.0.SNAPSHOT",org.drools.agent;u
- ses:="org.drools.runtime,org.drools.event.knowledgeagent,org.drools.i
- o,org.drools,org.drools.builder";version="5.1.0.SNAPSHOT"
+ ses:="org.drools.runtime,org.drools.event.knowledgeagent,org.drools,o
+ rg.drools.io,org.drools.builder";version="5.1.0.SNAPSHOT"
 Bundle-Version: 5.1.0.SNAPSHOT
 Bundle-Name: Drools :: API
 Bundle-Description: A rule production system

Modified: labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF	2010-07-15 00:43:24 UTC (rev 33890)
+++ labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF	2010-07-15 02:08:35 UTC (rev 33891)
@@ -17,7 +17,7 @@
  n="2.0",org.mvel2.optimizers;version="2.0",org.mvel2.templates;versio
  n="2.0",org.mvel2.util;version="2.0",org.osgi.framework;version="1.5"
  ,org.osgi.util.tracker;version="1.4",org.w3c.dom,org.xml.sax
-Bnd-LastModified: 1279113629300
+Bnd-LastModified: 1279156679876
 Export-Package: org.drools.builder.impl;uses:="org.drools.compiler,com
  .sun.tools.xjc";version="5.1.0.SNAPSHOT",org.drools.rule.builder;uses
  :="org.drools.compiler,org.mvel2.compiler,org.mvel2,org.drools.rule.b
@@ -43,8 +43,8 @@
  uses:="org.xml.sax,org.w3c.dom,org.antlr.runtime.tree,org.antlr.runti
  me";version="5.1.0.SNAPSHOT",org.drools.process.builder;uses:="org.dr
  ools.rule.builder,org.drools.compiler";version="5.1.0.SNAPSHOT",org.d
- rools.rule.builder.dialect.mvel;uses:="org.drools.compiler,org.drools
- .rule.builder,org.mvel2,org.mvel2.compiler,org.mvel2.util,org.drools.
+ rools.rule.builder.dialect.mvel;uses:="org.drools.rule.builder,org.dr
+ ools.compiler,org.mvel2,org.mvel2.compiler,org.mvel2.util,org.drools.
  rule.builder.dialect.java,org.mvel2.ast";version="5.1.0.SNAPSHOT",org
  .drools.testframework;version="5.1.0.SNAPSHOT",org.drools.runtime.pip
  eline.impl;uses:="com.sun.tools.xjc,org.xml.sax,com.sun.codemodel,org

Modified: labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF	2010-07-15 00:43:24 UTC (rev 33890)
+++ labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF	2010-07-15 02:08:35 UTC (rev 33891)
@@ -17,7 +17,7 @@
  g.mvel2.optimizers;version="2.0",org.mvel2.templates;version="2.0",or
  g.mvel2.util;version="2.0",org.osgi.framework;version="1.5",org.w3c.d
  om,org.xml.sax,org.xml.sax.helpers
-Bnd-LastModified: 1279113530147
+Bnd-LastModified: 1279156590475
 Export-Package: org.drools.ruleflow.instance;uses:="org.drools.workflo
  w.instance.impl,org.drools.workflow.instance,org.drools.ruleflow.core
  ,org.drools.workflow.core.node,org.drools.process.instance";version="
@@ -39,7 +39,7 @@
  org.drools.process.core";version="5.1.0.SNAPSHOT",org.drools.audit;us
  es:="org.drools.event,org.drools,org.drools.audit.event,com.thoughtwo
  rks.xstream,org.drools.impl,org.drools.workflow.core.node,org.drools.
- command,org.drools.workflow.instance.node,org.drools.workflow.instanc
+ command,org.drools.workflow.instance,org.drools.workflow.instance.nod
  e,org.drools.rule,org.drools.spi,org.drools.command.impl,org.drools.c
  ommon";version="5.1.0.SNAPSHOT",org.drools.base.extractors;uses:="org
  .drools.base,org.drools,org.drools.spi,org.drools.core.util,org.drool
@@ -49,8 +49,8 @@
  g.drools.core.util,org.drools.rule,org.drools,org.drools.impl,org.mve
  l2.integration,org.mvel2.compiler,org.mvel2.optimizers,org.mvel2.inte
  gration.impl,org.mvel2.templates";version="5.1.0.SNAPSHOT",org.drools
- .process.core.context.variable;uses:="org.drools.process.core,org.dro
- ols.process.core.datatype,org.drools.process.core.datatype.impl.type,
+ .process.core.context.variable;uses:="org.drools.process.core.datatyp
+ e,org.drools.process.core,org.drools.process.core.datatype.impl.type,
  org.drools.process.core.context";version="5.1.0.SNAPSHOT",org.drools.
  base.accumulators;uses:="org.drools,org.drools.rule,org.drools.spi,or
  g.drools.common,org.mvel2,org.mvel2.integration,org.drools.base.mvel"
@@ -170,18 +170,18 @@
  .1.0.SNAPSHOT",org.drools.ruleflow.core.validation;uses:="org.mvel2.c
  ompiler,org.drools.process.core.timer,org.drools.process.core.validat
  ion,org.drools.process.core.datatype,org.drools.workflow.core.node,or
- g.drools.process.core.context.variable,org.drools.time,org.mvel2,org.
- drools.workflow.core.impl,org.drools.process.core.validation.impl,org
- .drools,org.drools.ruleflow.core,org.drools.process.core,org.drools.w
+ g.drools.process.core.context.variable,org.drools.workflow.core.impl,
+ org.mvel2,org.drools.time,org.drools,org.drools.process.core.validati
+ on.impl,org.drools.ruleflow.core,org.drools.process.core,org.drools.w
  orkflow.core";version="5.1.0.SNAPSHOT",org.drools.command.runtime.pro
  cess;uses:="org.drools.command,org.drools.command.impl,javax.xml.bind
  .annotation,org.drools.process.instance,org.drools.xml.jaxb.util,java
  x.xml.bind.annotation.adapters";version="5.1.0.SNAPSHOT",org.drools.o
- sgi.core;uses:="org.drools.impl,org.drools,org.osgi.framework,org.dro
+ sgi.core;uses:="org.drools,org.drools.impl,org.osgi.framework,org.dro
  ols.io.impl";version="5.1.0.SNAPSHOT",org.drools.ruleflow.core.factor
  y;uses:="org.drools.workflow.core.impl,org.drools.ruleflow.core,org.d
  rools.workflow.core.node,org.drools.workflow.core,org.drools.process.
- core.datatype,org.drools.process.core,org.drools.process.core.context
+ core,org.drools.process.core.datatype,org.drools.process.core.context
  .exception,org.drools.process.core.context.variable,org.drools.proces
  s.core.event,org.drools.process.core.timer,org.drools.process.core.im
  pl";version="5.1.0.SNAPSHOT",org.drools.workflow.core.impl;uses:="org
@@ -193,8 +193,8 @@
  .drools.process.instance,org.drools.process.instance.context.exclusiv
  e,org.drools.workflow.instance.node,org.drools.workflow.instance,org.
  drools.process.core,org.drools.process.instance.context.variable,org.
- drools.common,org.drools.core.util,org.drools.impl,org.drools,org.dro
- ols.concurrent,org.drools.spi,org.drools.process.instance.timer,org.d
+ drools.common,org.drools.core.util,org.drools.impl,org.drools.concurr
+ ent,org.drools,org.drools.spi,org.drools.process.instance.timer,org.d
  rools.base,org.drools.rule,org.drools.process.instance.impl,org.drool
  s.process.instance.event,org.drools.ruleflow.instance";version="5.1.0
  .SNAPSHOT",org.drools.rule;uses:="org.drools.spi,org.drools.common,or
@@ -277,8 +277,8 @@
  .impl,org.drools.io.internal,org.drools.builder.conf.impl,org.drools.
  core.util";version="5.1.0.SNAPSHOT",org.drools.process.instance.conte
  xt.exception;uses:="org.drools.base,org.drools.workflow.instance,org.
- drools,org.drools.spi,org.drools.process.instance,org.drools.workflow
- .core,org.drools.process.core.context.exception,org.drools.common,org
+ drools,org.drools.spi,org.drools.process.instance,org.drools.process.
+ core.context.exception,org.drools.workflow.core,org.drools.common,org
  .drools.process.core,org.drools.process.instance.context";version="5.
  1.0.SNAPSHOT",org.drools.process.instance.impl.factory;uses:="org.dro
  ols.process.core,org.drools.process.instance,org.drools.process.insta
@@ -297,8 +297,8 @@
  on="5.1.0.SNAPSHOT",org.drools.process.core.datatype.impl.type;uses:=
  "org.drools.process.core.datatype,org.drools.process.core,com.thought
  works.xstream";version="5.1.0.SNAPSHOT",org.drools.command.runtime.ru
- le;uses:="org.drools.command,org.drools.command.impl,org.drools.impl,
- org.drools,org.drools.spi,org.drools.runtime.impl,javax.xml.bind.anno
+ le;uses:="org.drools.command,org.drools.command.impl,org.drools,org.d
+ rools.impl,org.drools.spi,org.drools.runtime.impl,javax.xml.bind.anno
  tation,org.drools.common,javax.xml.bind.annotation.adapters,org.drool
  s.xml.jaxb.util,org.mvel2";version="5.1.0.SNAPSHOT"
 Bundle-Version: 5.1.0.SNAPSHOT

Modified: labs/jbossrules/trunk/drools-process/drools-bam/src/main/java/org/drools/process/audit/JPAWorkingMemoryDbLogger.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bam/src/main/java/org/drools/process/audit/JPAWorkingMemoryDbLogger.java	2010-07-15 00:43:24 UTC (rev 33890)
+++ labs/jbossrules/trunk/drools-process/drools-bam/src/main/java/org/drools/process/audit/JPAWorkingMemoryDbLogger.java	2010-07-15 02:08:35 UTC (rev 33891)
@@ -112,7 +112,7 @@
     }
 
     protected EntityManager getEntityManager() {
-        return (EntityManager) env.get(EnvironmentName.ENTITY_MANAGER);
+        return (EntityManager) env.get(EnvironmentName.CMD_SCOPED_ENTITY_MANAGER);
     }
 
 }



More information about the jboss-svn-commits mailing list