Author: mszefler
Date: Tue Feb 20 12:00:19 2007
New Revision: 509726
URL: http://svn.apache.org/viewvc?view=rev&rev=509726
Log:
* Initilize in-memory store inside server.
* Do not use Operation.toString() as certain versions of wsdl4j do NPE.
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?view=diff&rev=509726&r1=509725&r2=509726
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
(original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
Tue Feb 20 12:00:19 2007
@@ -444,7 +444,6 @@
_scheduler.setJobProcessor(_server);
_server.setDaoConnectionFactory(_daoCF);
- _server.setInMemDaoConnectionFactory(new
org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl());
_server.setEndpointReferenceContext(new
EndpointReferenceContextImpl(this));
_server.setMessageExchangeContext(new P2PMexContextImpl(this, new
MessageExchangeContextImpl(this), _scheduler));
_server.setBindingContext(new BindingContextImpl(this, _store));
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?view=diff&rev=509726&r1=509725&r2=509726
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
Tue Feb 20 12:00:19 2007
@@ -628,7 +628,7 @@
}
if (BpelProcess.__log.isDebugEnabled()) {
- BpelProcess.__log.debug("INVOKING PARTNER: partnerLink=" +
partnerLink + ", op=" + operation + " channel="
+ BpelProcess.__log.debug("INVOKING PARTNER: partnerLink=" +
partnerLink + ", op=" + operation.getName() + " channel="
+ channel + ")");
}
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java?view=diff&rev=509726&r1=509725&r2=509726
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
Tue Feb 20 12:00:19 2007
@@ -18,14 +18,29 @@
*/
package org.apache.ode.bpel.engine;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import javax.xml.namespace.QName;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.dao.BpelDAOConnection;
import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.evt.BpelEvent;
-import org.apache.ode.bpel.iapi.*;
+import org.apache.ode.bpel.iapi.BindingContext;
+import org.apache.ode.bpel.iapi.BpelEngine;
+import org.apache.ode.bpel.iapi.BpelEngineException;
import org.apache.ode.bpel.iapi.BpelEventListener;
+import org.apache.ode.bpel.iapi.BpelServer;
+import org.apache.ode.bpel.iapi.EndpointReferenceContext;
+import org.apache.ode.bpel.iapi.MessageExchangeContext;
+import org.apache.ode.bpel.iapi.ProcessConf;
+import org.apache.ode.bpel.iapi.Scheduler;
import org.apache.ode.bpel.iapi.Scheduler.JobInfo;
import org.apache.ode.bpel.iapi.Scheduler.JobProcessorException;
import org.apache.ode.bpel.iapi.Scheduler.Synchronizer;
@@ -33,13 +48,6 @@
import org.apache.ode.bpel.o.OProcess;
import org.apache.ode.utils.msg.MessageBundle;
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
/**
* <p>
* The BPEL server implementation.
@@ -102,6 +110,9 @@
SHUTDOWN, INIT, RUNNING
}
+ public BpelServerImpl() {
+ }
+
public void start() {
_mngmtLock.writeLock().lock();
try {
@@ -170,6 +181,7 @@
_db = new BpelDatabase(_contexts.dao, _contexts.scheduler);
_state = State.INIT;
+
_engine = new BpelEngineImpl(_contexts);
} finally {
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java?view=diff&rev=509726&r1=509725&r2=509726
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java
Tue Feb 20 12:00:19 2007
@@ -23,6 +23,7 @@
import org.apache.ode.bpel.iapi.*;
import org.apache.ode.bpel.iapi.BpelEventListener;
import org.apache.ode.bpel.intercept.MessageExchangeInterceptor;
+import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -42,8 +43,7 @@
BindingContext bindingContext;
BpelDAOConnectionFactory dao;
- BpelDAOConnectionFactory inMemDao;
-
+ BpelDAOConnectionFactory inMemDao = new BpelDAOConnectionFactoryImpl();
/** Global Message-Exchange interceptors. Must be copy-on-write!!! */
final List<MessageExchangeInterceptor >globalIntereceptors = new
CopyOnWriteArrayList<MessageExchangeInterceptor>();
