Author: jeff.yuchang Date: 2010-06-03 06:44:38 -0400 (Thu, 03 Jun 2010) New Revision: 701 Modified: trunk/distribution/src/main/release/db/bpel.properties trunk/pom.xml trunk/runtime/engine-assembly/pom.xml trunk/runtime/engine-assembly/src/main/assembly/sar.xml trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql trunk/runtime/engine-assembly/src/main/resources/bpel.properties trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java Log: * update the riftsaw to use the ODE-1.x-fixes branch, which is using the native Hibernate Implementation. * Had the exception when do the undeploy. Modified: trunk/distribution/src/main/release/db/bpel.properties =================================================================== --- trunk/distribution/src/main/release/db/bpel.properties 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/distribution/src/main/release/db/bpel.properties 2010-06-03 10:44:38 UTC (rev 701) @@ -53,10 +53,8 @@ ## DAO Connection Factory class. ## uncomment the following for hibernate. +bpel.dao.factory=org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl -bpel.dao.factory=org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl -bpel.dao.factory.store=org.apache.ode.dao.jpa.hibernate.ConfStoreDAOConnectionFactoryImpl - ## Transaction Factory ## default is org.apache.ode.il.EmbeddedGeronimoFactory ## available alternatives are: Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/pom.xml 2010-06-03 10:44:38 UTC (rev 701) @@ -72,7 +72,7 @@ </profiles> <properties> - <riftsaw.ode.version>2.1.0.CR1-SNAPSHOT</riftsaw.ode.version> + <riftsaw.ode.version>2.1.0-SNAPSHOT</riftsaw.ode.version> <riftsaw.engine.version>2.1.0-CR1</riftsaw.engine.version> <bpm.console.version>2.1-SNAPSHOT</bpm.console.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -209,16 +209,11 @@ </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-jpa</artifactId> + <artifactId>riftsaw-dao-hibernate</artifactId> <version>${riftsaw.ode.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-jpa-hibernate</artifactId> - <version>${riftsaw.ode.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-jacob</artifactId> <version>${riftsaw.ode.version}</version> </dependency> Modified: trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java =================================================================== --- trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2010-06-03 10:44:38 UTC (rev 701) @@ -22,7 +22,7 @@ import java.util.regex.Pattern; import javax.naming.InitialContext; -import javax.transaction.TransactionManager; +import javax.sql.DataSource; import javax.xml.namespace.QName; import org.apache.commons.logging.Log; @@ -32,9 +32,7 @@ import org.apache.ode.bpel.iapi.EndpointReferenceContext; import org.apache.ode.bpel.iapi.ProcessState; import org.apache.ode.bpel.iapi.ProcessStoreEvent; -import org.apache.ode.dao.store.ConfStoreDAOConnection; -import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory; -import org.apache.ode.dao.store.DeploymentUnitDAO; +import org.apache.ode.il.config.OdeConfigProperties; import org.jboss.soa.bpel.deployer.BPELDeployer; import org.jboss.soa.bpel.deployer.BPELDeploymentUnit; @@ -44,8 +42,8 @@ private static final Log __log = LogFactory.getLog(RiftSawProcessStore.class); private DeployScheduler m_deployScheduler=new DeployScheduler(); - public RiftSawProcessStore(EndpointReferenceContext eprContext, TransactionManager txm, ConfStoreDAOConnectionFactory cf) { - super(eprContext, txm, cf); + public RiftSawProcessStore(EndpointReferenceContext eprContext, DataSource ds, String persistenceType, OdeConfigProperties props, boolean createDatamodel) { + super(eprContext, ds, persistenceType, props, createDatamodel); } public void loadAll() { @@ -138,7 +136,7 @@ // Check for the deployment unit associated with the name boolean deploy=exec(new ProcessStoreImpl.Callable<Boolean>() { - public Boolean call(ConfStoreDAOConnection conn) { + public Boolean call(ConfStoreConnection conn) { boolean ret=false; DeploymentUnitDAO dudao = conn.getDeploymentUnit(bdu.getName()); if (dudao == null) Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-06-03 10:44:38 UTC (rev 701) @@ -20,6 +20,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.common.evt.DebugBpelEventListener; +import org.apache.ode.bpel.dao.BpelDAOConnectionFactory; import org.apache.ode.bpel.engine.BpelManagementFacadeImpl; import org.apache.ode.bpel.engine.BpelServerImpl; import org.apache.ode.bpel.engine.CountLRUDehydrationPolicy; @@ -28,8 +29,6 @@ import org.apache.ode.bpel.iapi.*; import org.apache.ode.bpel.intercept.MessageExchangeInterceptor; import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl; -import org.apache.ode.dao.bpel.BpelDAOConnectionFactory; -import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory; import org.apache.ode.il.config.OdeConfigProperties; import org.apache.ode.il.dbutil.Database; import org.apache.ode.scheduler.simple.JdbcDelegate; @@ -66,7 +65,6 @@ protected OdeConfigProperties _odeConfig; protected TransactionManager _txMgr; protected BpelDAOConnectionFactory _daoCF; - protected ConfStoreDAOConnectionFactory _storeCF; protected Scheduler _scheduler; protected Database _db; protected ExecutorService _executorService; @@ -365,15 +363,6 @@ } finally { _daoCF = null; } - - if (_storeCF != null) - try { - _storeCF.shutdown(); - } catch (Throwable ex) { - __log.debug("Store DAO shutdown failed.", ex); - } finally { - _storeCF = null; - } if (_db != null) try { @@ -433,9 +422,8 @@ __log.debug("USING DAO: "+_odeConfig.getDAOConnectionFactory()); try { _daoCF = _db.createDaoCF(); - _storeCF = _db.createDaoStoreCF(); } catch (Exception ex) { - String errmsg = "DAO INSTANTIATION FAILED: "+_odeConfig.getDAOConnectionFactory() + " and " + _odeConfig.getDAOConfStoreConnectionFactory(); + String errmsg = "DAO INSTANTIATION FAILED: "+_odeConfig.getDAOConnectionFactory(); __log.error(errmsg, ex); throw new Exception(errmsg, ex); @@ -443,14 +431,15 @@ } protected void initProcessStore(EndpointReferenceContext eprContext) { - _store = createProcessStore(eprContext, _txMgr, _storeCF); + _store = createProcessStore(eprContext, _db.getDataSource()); _store.registerListener(new ProcessStoreListenerImpl()); } - protected ProcessStoreImpl createProcessStore(EndpointReferenceContext eprContext, TransactionManager txm, ConfStoreDAOConnectionFactory cf) { - return new RiftSawProcessStore(eprContext, txm, cf); + protected ProcessStoreImpl createProcessStore(EndpointReferenceContext eprContext, DataSource ds) { + return new RiftSawProcessStore(eprContext, ds, _odeConfig.getDAOConnectionFactory(), _odeConfig, false); } + protected Scheduler createScheduler() { SimpleScheduler scheduler = new SimpleScheduler(new GUID().toString(),new JdbcDelegate(_db.getDataSource()), _odeConfig.getProperties()); scheduler.setExecutorService(_executorService); Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-03 10:44:38 UTC (rev 701) @@ -140,6 +140,7 @@ wsdlDefinition = wsdlReference.getDefinition(); wsdlUrl = wsdlReference.getWsdlURL(); } + this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefinition, serviceName, port.getLocalPart()); isInitialized=true; } @@ -158,13 +159,10 @@ boolean isTwoWay = mex.getMessageExchangePattern() == org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern.REQUEST_RESPONSE; - final Callable executionCallable; - if(isTwoWay) { // Defer the invoke until the transaction commits. Scheduler scheduler = executionEnvironment.getScheduler(); - executionCallable = new TwoWayCallable(mex); scheduler.registerSynchronizer(new Scheduler.Synchronizer() { public void afterCompletion(boolean success) @@ -175,7 +173,78 @@ // The invocation must happen in a separate thread, holding on the afterCompletion // blocks other operations that could have been listed there as well. ExecutorService executorService = executionEnvironment.getExecutorService(); - executorService.submit(executionCallable); + executorService.submit(new Callable<Object>(){ + + public Object call() throws Exception { + UserTransaction tx = getUserTransaction(); + tx.begin(); + try + { + // Create SOAPMessage + SOAPMessage soapRequestMessage = MessageFactory.newInstance().createMessage(); + if(log.isDebugEnabled()) + log.debug( "ODE outbound message: \n" +DOMWriter.printNode(mex.getRequest().getMessage(), true) ); + + messageAdapter.createSoapRequest(soapRequestMessage, mex.getRequest(), mex.getOperation()); + + if (log.isDebugEnabled()) { + log.debug("Riftsaw soap request message: \n" + JavaUtils.getSoapMessageASString(soapRequestMessage)); + } + + // The actual WS invocation + Dispatch proxy = getDispatcher(port); + + try { + SOAPMessage soapResponseMessage = (SOAPMessage)proxy.invoke(soapRequestMessage); + + // Create ODE response + Message odeResponse = mex.createMessage(mex.getOperation().getOutput().getMessage().getQName()); + if(soapResponseMessage.getSOAPBody().hasFault()) + { + // fault handling + Document odeMsg = DOMUtils.newDocument(); + Element odeMsgEl = odeMsg.createElementNS(null, "message"); + odeMsg.appendChild(odeMsgEl); + + Fault fault = messageAdapter.parseSoapFault(odeMsgEl, soapResponseMessage, mex.getOperation()); + + handleFault(mex, fault, soapResponseMessage.getSOAPBody().getFault(), odeMsgEl); + + } + else + { + messageAdapter.parseSoapResponse(odeResponse,soapResponseMessage,mex.getOperation()); + mex.reply(odeResponse); + } + + if(log.isDebugEnabled()) + log.debug( "ODE inbound message: \n" +DOMWriter.printNode(odeResponse.getMessage(), true) ); + + + } catch(javax.xml.ws.soap.SOAPFaultException fe) { + + // fault handling + Document odeMsg = DOMUtils.newDocument(); + Element odeMsgEl = odeMsg.createElementNS(null, "message"); + odeMsg.appendChild(odeMsgEl); + + Fault fault=messageAdapter.parseSoapFault(odeMsgEl, fe.getFault(), + mex.getOperation()); + + handleFault(mex, fault, fe.getFault(), odeMsgEl); + } + tx.commit(); + } + catch (Throwable e) + { + log.error("WS invocation failed", e); + tx.rollback(); + mex.replyWithFailure(MessageExchange.FailureType.COMMUNICATION_ERROR, e.getMessage(), null); + } + return null; + } + + }); } public void beforeCompletion(){} @@ -188,136 +257,44 @@ { // one-way invocation ExecutorService executorService = executionEnvironment.getExecutorService(); - executionCallable = new OneWayCallable(mex); - executorService.submit(executionCallable); + executorService.submit(new Callable<Object>(){ - mex.replyOneWayOk(); - } - } - - private class TwoWayCallable implements Callable<Object> { - - private PartnerRoleMessageExchange mex; - - public TwoWayCallable(PartnerRoleMessageExchange mex) { - this.mex = mex; - } - - public Object call() throws Exception { - - return executionEnvironment.getScheduler().execTransaction(new Callable<Object>(){ + public Object call() throws Exception { + UserTransaction tx = getUserTransaction(); + tx.begin(); + try + { + // Create SOAPMessage + SOAPMessage soapRequestMessage = MessageFactory.newInstance().createMessage(); + if(log.isDebugEnabled()) + log.debug( "ODE outbound message: \n" +DOMWriter.printNode(mex.getRequest().getMessage(), true) ); + + messageAdapter.createSoapRequest(soapRequestMessage, mex.getRequest(), mex.getOperation()); - public Object call() throws Exception { - try - { - // Create SOAPMessage - SOAPMessage soapRequestMessage = MessageFactory.newInstance().createMessage(); - if(log.isDebugEnabled()) - log.debug( "ODE outbound message: \n" +DOMWriter.printNode(mex.getRequest().getMessage(), true) ); - - messageAdapter.createSoapRequest(soapRequestMessage, mex.getRequest(), mex.getOperation()); - - if (log.isDebugEnabled()) { - log.debug("Riftsaw soap request message: \n" + JavaUtils.getSoapMessageASString(soapRequestMessage)); - } - - // The actual WS invocation - Dispatch proxy = getDispatcher(port); - - try { - SOAPMessage soapResponseMessage = (SOAPMessage)proxy.invoke(soapRequestMessage); + if (log.isDebugEnabled()) { + log.debug("Riftsaw soap request message: \n" + JavaUtils.getSoapMessageASString(soapRequestMessage)); + } + + // The actual WS invocation + Dispatch proxy = getDispatcher(port); + proxy.invokeOneWay(soapRequestMessage); + tx.commit(); + } + catch (Throwable e) + { + log.error("WS invocation failed", e); + tx.rollback(); + mex.replyWithFailure(MessageExchange.FailureType.COMMUNICATION_ERROR, e.getMessage(), null); + } - // Create ODE response - Message odeResponse = mex.createMessage(mex.getOperation().getOutput().getMessage().getQName()); - if(soapResponseMessage.getSOAPBody().hasFault()) - { - // fault handling - Document odeMsg = DOMUtils.newDocument(); - Element odeMsgEl = odeMsg.createElementNS(null, "message"); - odeMsg.appendChild(odeMsgEl); - - Fault fault = messageAdapter.parseSoapFault(odeMsgEl, soapResponseMessage, mex.getOperation()); + return null; + } + + + }); - handleFault(mex, fault, soapResponseMessage.getSOAPBody().getFault(), odeMsgEl); - - } - else - { - messageAdapter.parseSoapResponse(odeResponse,soapResponseMessage,mex.getOperation()); - mex.reply(odeResponse); - } - - if(log.isDebugEnabled()) - log.debug( "ODE inbound message: \n" +DOMWriter.printNode(odeResponse.getMessage(), true) ); - - } catch(javax.xml.ws.soap.SOAPFaultException fe) { - - // fault handling - Document odeMsg = DOMUtils.newDocument(); - Element odeMsgEl = odeMsg.createElementNS(null, "message"); - odeMsg.appendChild(odeMsgEl); - - Fault fault=messageAdapter.parseSoapFault(odeMsgEl, fe.getFault(), - mex.getOperation()); - - handleFault(mex, fault, fe.getFault(), odeMsgEl); - } - } - catch (Throwable e) - { - log.error("WS invocation failed", e); - mex.replyWithFailure(MessageExchange.FailureType.COMMUNICATION_ERROR, e.getMessage(), null); - } - return null; - } - - }); - } - } - - - private class OneWayCallable implements Callable<Object> { - - private PartnerRoleMessageExchange mex; - - public OneWayCallable(PartnerRoleMessageExchange mex) { - this.mex = mex; - } - - public Object call() throws Exception { - return executionEnvironment.getScheduler().execTransaction(new Callable<Object>(){ - - public Object call() throws Exception { - try - { - // Create SOAPMessage - SOAPMessage soapRequestMessage = MessageFactory.newInstance().createMessage(); - if(log.isDebugEnabled()) - log.debug( "ODE outbound message: \n" +DOMWriter.printNode(mex.getRequest().getMessage(), true) ); - - messageAdapter.createSoapRequest(soapRequestMessage, mex.getRequest(), mex.getOperation()); - - if (log.isDebugEnabled()) { - log.debug("Riftsaw soap request message: \n" + JavaUtils.getSoapMessageASString(soapRequestMessage)); - } - - // The actual WS invocation - Dispatch proxy = getDispatcher(port); - proxy.invokeOneWay(soapRequestMessage); - - } - catch (Throwable e) - { - log.error("WS invocation failed", e); - mex.replyWithFailure(MessageExchange.FailureType.COMMUNICATION_ERROR, e.getMessage(), null); - } - - return null; - } - - }); - } - + mex.replyOneWayOk(); + } } @@ -365,7 +342,6 @@ if(null==dispatcher) { log.debug("Creating Dispatcher ("+this.id+") on " + wsdlUrl + ": "+serviceName); - this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefinition, serviceName, port.getLocalPart()); initializeStack(portName); Service service = Service.create(this.wsdlUrl, serviceName); Modified: trunk/runtime/engine-assembly/pom.xml =================================================================== --- trunk/runtime/engine-assembly/pom.xml 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/runtime/engine-assembly/pom.xml 2010-06-03 10:44:38 UTC (rev 701) @@ -48,14 +48,10 @@ </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-jpa</artifactId> + <artifactId>riftsaw-dao-hibernate</artifactId> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-jpa-hibernate</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-jacob</artifactId> </dependency> <dependency> Modified: trunk/runtime/engine-assembly/src/main/assembly/sar.xml =================================================================== --- trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-06-03 10:44:38 UTC (rev 701) @@ -53,9 +53,7 @@ <include>org.jboss.soa.bpel:riftsaw-bpel-runtime</include> <include>org.jboss.soa.bpel:riftsaw-bpel-schemas</include> <include>org.jboss.soa.bpel:riftsaw-bpel-store</include> - <include>org.jboss.soa.bpel:riftsaw-dao-jpa</include> - <include>org.jboss.soa.bpel:riftsaw-dao-jpa-hibernate</include> - <!--include>org.jboss.soa.bpel:riftsaw-dao-hibernate</include--> + <include>org.jboss.soa.bpel:riftsaw-dao-hibernate</include> <include>org.jboss.soa.bpel.runtime:riftsaw-engine</include> <include>org.jboss.soa.bpel:riftsaw-jacob</include> <include>org.jboss.soa.bpel:riftsaw-scheduler-simple</include> Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql 2010-06-03 10:44:38 UTC (rev 701) @@ -1,12 +1,12 @@ create table ODE_SCHEMA_VERSION(VERSION integer); insert into ODE_SCHEMA_VERSION values (6); - -- Apache ODE - SimpleScheduler Database Schema -- --- MySQL scripts by Maciej Szefler. +-- Apache Derby scripts by Maciej Szefler. -- -- -CREATE TABLE ode_job ( + +CREATE TABLE ODE_JOB ( jobid CHAR(64) NOT NULL DEFAULT '', ts BIGINT NOT NULL DEFAULT 0, nodeid char(64), @@ -26,225 +26,37 @@ PRIMARY KEY(jobid)); -CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); -CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid); +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); - create table ODE_ACTIVITY_RECOVERY ( - ID bigint generated by default as identity, - ACTIONS varchar(255), - ACTIVITY_ID bigint, - CHANNEL varchar(255), - DATE_TIME timestamp, - DETAILS clob, - INSTANCE_ID bigint, - REASON varchar(255), - RETRIES integer, - primary key (ID) - ); - - create table ODE_CORRELATION_SET ( - CORRELATION_SET_ID bigint generated by default as identity, - CORRELATION_KEY varchar(255), - NAME varchar(255), - SCOPE_ID bigint, - primary key (CORRELATION_SET_ID) - ); - - create table ODE_CORRELATOR ( - CORRELATOR_ID bigint generated by default as identity, - CORRELATOR_KEY varchar(255), - PROC_ID bigint, - primary key (CORRELATOR_ID) - ); - - create table ODE_CORSET_PROP ( - ID bigint generated by default as identity, - CORRSET_ID bigint, - PROP_KEY varchar(255), - PROP_VALUE varchar(255), - primary key (ID) - ); - - create table ODE_EVENT ( - EVENT_ID bigint generated by default as identity, - DETAIL varchar(255), - DATA blob, - SCOPE_ID bigint, - TSTAMP timestamp, - TYPE varchar(255), - INSTANCE_ID bigint, - PROCESS_ID bigint, - primary key (EVENT_ID) - ); - - create table ODE_FAULT ( - FAULT_ID bigint generated by default as identity, - ACTIVITY_ID integer, - DATA clob, - MESSAGE varchar(4000), - LINE_NUMBER integer, - NAME varchar(255), - primary key (FAULT_ID) - ); - - create table ODE_MESSAGE ( - MESSAGE_ID bigint generated by default as identity, - DATA clob, - HEADER clob, - TYPE varchar(255), - MESSAGE_EXCHANGE_ID varchar(255), - primary key (MESSAGE_ID) - ); - - create table ODE_MESSAGE_EXCHANGE ( - MESSAGE_EXCHANGE_ID varchar(255) not null, - CALLEE varchar(255), - CHANNEL varchar(255), - CORRELATION_ID varchar(255), - CORRELATION_KEYS varchar(255), - CORRELATION_STATUS varchar(255), - CREATE_TIME timestamp, - DIRECTION char(255), - EPR clob, - FAULT varchar(255), - FAULT_EXPLANATION varchar(255), - OPERATION varchar(255), - PARTNER_LINK_MODEL_ID integer, - PATTERN varchar(255), - PIPED_ID varchar(255), - PORT_TYPE varchar(255), - PROPAGATE_TRANS boolean, - STATUS varchar(255), - SUBSCRIBER_COUNT integer, - CORR_ID bigint, - PARTNER_LINK_ID bigint, - PROCESS_ID bigint, - PROCESS_INSTANCE_ID bigint, - REQUEST_MESSAGE_ID bigint, - RESPONSE_MESSAGE_ID bigint, - primary key (MESSAGE_EXCHANGE_ID) - ); - - create table ODE_MESSAGE_ROUTE ( - MESSAGE_ROUTE_ID bigint generated by default as identity, - CORRELATION_KEY varchar(255), - GROUP_ID varchar(255), - ROUTE_INDEX integer, - PROCESS_INSTANCE_ID bigint, - ROUTE_POLICY varchar(16), - CORR_ID bigint, - primary key (MESSAGE_ROUTE_ID) - ); - - create table ODE_MEX_PROP ( - ID bigint generated by default as identity, - MEX_ID varchar(255), - PROP_KEY varchar(255), - PROP_VALUE varchar(2000), - primary key (ID) - ); - - create table ODE_PARTNER_LINK ( - PARTNER_LINK_ID bigint generated by default as identity, - MY_EPR clob, - MY_ROLE_NAME varchar(255), - MY_ROLE_SERVICE_NAME varchar(255), - MY_SESSION_ID varchar(255), - PARTNER_EPR clob, - PARTNER_LINK_MODEL_ID integer, - PARTNER_LINK_NAME varchar(255), - PARTNER_ROLE_NAME varchar(255), - PARTNER_SESSION_ID varchar(255), - SCOPE_ID bigint, - primary key (PARTNER_LINK_ID) - ); - - create table ODE_PROCESS ( - ID bigint generated by default as identity, - GUID varchar(255), - PROCESS_ID varchar(255), - PROCESS_TYPE varchar(255), - VERSION bigint, - primary key (ID) - ); - - create table ODE_PROCESS_INSTANCE ( - ID bigint generated by default as identity, - DATE_CREATED timestamp, - EXECUTION_STATE blob, - FAULT_ID bigint, - LAST_ACTIVE_TIME timestamp, - LAST_RECOVERY_DATE timestamp, - PREVIOUS_STATE smallint, - SEQUENCE bigint, - INSTANCE_STATE smallint, - INSTANTIATING_CORRELATOR_ID bigint, - PROCESS_ID bigint, - ROOT_SCOPE_ID bigint, - primary key (ID) - ); - - create table ODE_SCOPE ( - SCOPE_ID bigint generated by default as identity, - MODEL_ID integer, - SCOPE_NAME varchar(255), - SCOPE_STATE varchar(255), - PARENT_SCOPE_ID bigint, - PROCESS_INSTANCE_ID bigint, - primary key (SCOPE_ID) - ); - - create table ODE_XML_DATA ( - XML_DATA_ID bigint generated by default as identity, - DATA clob, - IS_SIMPLE_TYPE boolean, - NAME varchar(255), - SCOPE_ID bigint, - primary key (XML_DATA_ID) - ); - - create table ODE_XML_DATA_PROP ( - ID bigint generated by default as identity, - XML_DATA_ID bigint, - PROP_KEY varchar(255), - PROP_VALUE varchar(255), - primary key (ID) - ); - - create table STORE_DU ( - NAME varchar(255) not null, - DEPLOYDT timestamp, - DEPLOYER varchar(255), - DIR varchar(255), - primary key (NAME) - ); - - create table STORE_PROCESS ( - PID varchar(255) not null, - STATE varchar(255), - TYPE varchar(255), - VERSION bigint, - DU varchar(255), - primary key (PID) - ); - - create table STORE_PROCESS_PROP ( - ID bigint generated by default as identity, - PROP_KEY varchar(255), - PROP_VAL varchar(255), - primary key (ID) - ); - - create table STORE_PROC_TO_PROP ( - STORE_PROCESS_PID varchar(255) not null, - STORE_PROPERTY_ID bigint not null, - primary key (STORE_PROCESS_PID, STORE_PROPERTY_ID), - unique (STORE_PROPERTY_ID) - ); - - create table STORE_VERSIONS ( - ID bigint generated by default as identity, - VERSION bigint, - primary key (ID) - ); \ No newline at end of file +create table BPEL_ACTIVITY_RECOVERY (ID bigint not null, PIID bigint, AID bigint, CHANNEL varchar(255), REASON varchar(255), DATE_TIME timestamp, DETAILS varbinary, ACTIONS varchar(255), RETRIES integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_CORRELATION_PROP (ID bigint not null, NAME varchar(255), NAMESPACE varchar(255), VALUE varchar(255), CORR_SET_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_CORRELATION_SET (ID bigint not null, VALUE varchar(255), CORR_SET_NAME varchar(255), SCOPE_ID bigint, PIID bigint, PROCESS_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_CORRELATOR (ID bigint not null, CID varchar(255), PROCESS_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_CORRELATOR_MESSAGE_CKEY (ID bigint not null, CKEY varchar(255), CORRELATOR_MESSAGE_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_EVENT (ID bigint not null, IID bigint, PID bigint, TSTAMP timestamp, TYPE varchar(255), DETAIL longvarchar, DATA varbinary, SID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_FAULT (ID bigint not null, FAULTNAME varchar(255), DATA varbinary, EXPLANATION varchar(4000), LINE_NUM integer, AID integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_INSTANCE (ID bigint not null, INSTANTIATING_CORRELATOR bigint, FAULT bigint, JACOB_STATE_DATA varbinary, PREVIOUS_STATE smallint, PROCESS_ID bigint, STATE smallint, LAST_ACTIVE_DT timestamp, SEQUENCE bigint, FAILURE_COUNT integer, FAILURE_DT timestamp, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_MESSAGE (ID bigint not null, MEX bigint, TYPE varchar(255), MESSAGE_DATA varbinary, MESSAGE_HEADER varbinary, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_MESSAGE_EXCHANGE (ID bigint not null, PORT_TYPE varchar(255), CHANNEL_NAME varchar(255), CLIENTKEY varchar(255), ENDPOINT varbinary, CALLBACK_ENDPOINT varbinary, REQUEST bigint, RESPONSE bigint, INSERT_DT timestamp, OPERATION varchar(255), STATE varchar(255), PROCESS bigint, PIID bigint, DIR char(1), PLINK_MODELID integer, PATTERN varchar(255), CORR_STATUS varchar(255), FAULT_TYPE varchar(255), FAULT_EXPL varchar(255), CALLEE varchar(255), PARTNERLINK bigint, PIPED_ID varchar(255), SUBSCRIBER_COUNT integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_MEX_PROPS (MEX bigint not null, VALUE varchar(8000), NAME varchar(255) not null, primary key (MEX, NAME)); +create table BPEL_PLINK_VAL (ID bigint not null, PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100), MYROLE_EPR_DATA varbinary, PARTNERROLE_EPR_DATA varbinary, PROCESS bigint, SCOPE bigint, SVCNAME varchar(255), MYROLE varchar(100), MODELID integer, MYSESSIONID varchar(255), PARTNERSESSIONID varchar(255), INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_PROCESS (ID bigint not null, PROCID varchar(255) not null, deployer varchar(255), deploydate timestamp, type_name varchar(255), type_ns varchar(255), version bigint, ACTIVE_ bit, guid varchar(255), INSERT_TIME timestamp, MLOCK integer not null, primary key (ID), unique (PROCID)); +create table BPEL_SCOPE (ID bigint not null, PIID bigint, PARENT_SCOPE_ID bigint, STATE varchar(255) not null, NAME varchar(255) not null, MODELID integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_SELECTORS (ID bigint not null, PIID bigint not null, SELGRPID varchar(255) not null, IDX integer not null, CORRELATION_KEY varchar(255) not null, PROC_TYPE varchar(255) not null, ROUTE_POLICY varchar(255), CORRELATOR bigint not null, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR)); +create table BPEL_UNMATCHED (ID bigint not null, MEX bigint, CORRELATION_KEY varchar(255), CORRELATOR bigint not null, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table BPEL_XML_DATA (ID bigint not null, DATA varbinary, NAME varchar(255) not null, SIMPLE_VALUE varchar(255), SCOPE_ID bigint, PIID bigint, IS_SIMPLE_TYPE bit, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create table STORE_DU (NAME varchar(255) not null, deployer varchar(255), DEPLOYDT timestamp, DIR varchar(255), primary key (NAME)); +create table STORE_PROCESS (PID varchar(255) not null, DU varchar(255), TYPE varchar(255), version bigint, STATE varchar(255), primary key (PID)); +create table STORE_PROCESS_PROP (propId varchar(255) not null, value varchar(255), name varchar(255) not null, primary key (propId, name)); +create table STORE_VERSIONS (ID integer not null, VERSION bigint, primary key (ID)); +create table VAR_PROPERTY (ID bigint not null, XML_DATA_ID bigint, PROP_VALUE varchar(255), PROP_NAME varchar(255) not null, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); +create index IDX_CORRELATOR_CID on BPEL_CORRELATOR (CID); +create index IDX_BPEL_CORRELATOR_MESSAGE_CKEY on BPEL_CORRELATOR_MESSAGE_CKEY (CKEY); +create index IDX_SELECTOR_CORRELATOR on BPEL_SELECTORS (CORRELATOR); +create index IDX_SELECTOR_CKEY on BPEL_SELECTORS (CORRELATION_KEY); +create index IDX_SELECTOR_SELGRPID on BPEL_SELECTORS (SELGRPID); +create index IDX_UNMATCHED_CKEY on BPEL_UNMATCHED (CORRELATION_KEY); +create index IDX_UNMATCHED_CORRELATOR on BPEL_UNMATCHED (CORRELATOR); +create sequence hibernate_seqhilo; \ No newline at end of file Modified: trunk/runtime/engine-assembly/src/main/resources/bpel.properties =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel.properties 2010-06-03 10:11:45 UTC (rev 700) +++ trunk/runtime/engine-assembly/src/main/resources/bpel.properties 2010-06-03 10:44:38 UTC (rev 701) @@ -53,9 +53,9 @@ ## DAO Connection Factory class. ## uncomment the following for hibernate. -bpel.dao.factory=org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl -bpel.dao.factory.store=org.apache.ode.dao.jpa.hibernate.ConfStoreDAOConnectionFactoryImpl +bpel.dao.factory=org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl + ## Transaction Factory ## default is org.apache.ode.il.EmbeddedGeronimoFactory ## available alternatives are: