* Updated the activity-monitor version to 1.2.0-SNAPSHOT.

* Updated the JNDI name.
riftsaw · Jan 10, 2012 · a178543 · a178543
1 parent e9b7a3d
commit a178543
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/console/integration/src/main/java/org/jboss/soa/bpel/console/JNDINamingUtils.java b/console/integration/src/main/java/org/jboss/soa/bpel/console/JNDINamingUtils.java
@@ -25,4 +25,5 @@ public class JNDINamingUtils {
 
     public static final String BPEL_ENGINE = "java:global/BPELEngine";
 
+    public static final String BPEL_EMF = "java:global/BPELEMFactory";
 }
diff --git a/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessHistoryPluginImpl.java b/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessHistoryPluginImpl.java
@@ -36,7 +36,7 @@ public ProcessHistoryPluginImpl() {
 	    try
 	    {
 	      InitialContext ctx = new InitialContext();	      
-	      EntityManagerFactory emf  = (EntityManagerFactory)ctx.lookup("bpel/EntityManagerFactory");
+	      EntityManagerFactory emf  = (EntityManagerFactory)ctx.lookup(JNDINamingUtils.BPEL_EMF);
 	      if (null == emf) {
 	    	  throw new IllegalStateException("EntityManagerFactory is null");
 	      }

diff --git a/engine/src/main/java/org/riftsaw/engine/internal/BPELEngineImpl.java b/engine/src/main/java/org/riftsaw/engine/internal/BPELEngineImpl.java
@@ -79,6 +79,7 @@ public class BPELEngineImpl implements BPELEngine {
     private static final Log LOG=LogFactory.getLog(BPELEngineImpl.class);
 
     private static final String _jndiName = "BPELEngine";
+    private static final String _emfJndiName = "BPELEMFactory";
 
     private BpelServerImpl _bpelServer;
     private RiftSawProcessStore _store;
@@ -156,6 +157,12 @@ public void init(ServiceLocator locator, java.util.Properties props) throws Exce
 
         LOG.info("Register the BPEL Engine into JNDI");
         JndiServiceActivator.registerToJndi(_jndiName, this);
+        // hack to expose the EntityManagerFactory.
+        // See org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl as well.
+        Object emf = _odeConfig.getProperties().get("ode.emf");
+        if (emf != null) {
+            JndiServiceActivator.registerToJndi(_emfJndiName, emf);
+        }
     }
 
     /**

diff --git a/pom.xml b/pom.xml
@@ -101,7 +101,7 @@
 		<riftsaw.ode.version>3.0.0-SNAPSHOT</riftsaw.ode.version>
 		<riftsaw.engine.version>3.0.0-SNAPSHOT</riftsaw.engine.version>
 		<bpel.console.version>2.4.0-SNAPSHOT</bpel.console.version>
-		<activity.monitor.model.version>1.0.0.Final</activity.monitor.model.version>
+		<activity.monitor.model.version>1.2.0-SNAPSHOT</activity.monitor.model.version>
 		<dsp.version>1.0.0.Final</dsp.version>
 		<commons.logging.version>1.1.1</commons.logging.version>
 		<commons.lang.version>2.4</commons.lang.version>