riftsaw SVN: r751 - in trunk: distribution/src/main/release/db and 10 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-16 08:20:45 -0400 (Wed, 16 Jun 2010)
New Revision: 751
Modified:
trunk/distribution/src/main/release/db/bpel.properties
trunk/distribution/src/main/release/db/sql/mysql.drop.sql
trunk/distribution/src/main/release/db/sql/postgres.drop.sql
trunk/distribution/src/main/release/install/deployment.properties
trunk/integration-tests/pom.xml
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-sql/mysql.sql
trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql
trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.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/SOAPMessageAdapter.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
Log:
* commit the fix for using 2.1.0-SNAPSHOT.
Modified: trunk/distribution/src/main/release/db/bpel.properties
===================================================================
--- trunk/distribution/src/main/release/db/bpel.properties 2010-06-16 10:23:32 UTC (rev 750)
+++ trunk/distribution/src/main/release/db/bpel.properties 2010-06-16 12:20:45 UTC (rev 751)
@@ -53,8 +53,10 @@
## 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:
@@ -108,11 +110,16 @@
bpel.jaxws.client.initializer.impl=(a)jaxws.client.initializer.impl@
+# all hibernate specific properties
+
hibernate.dialect=@dialect@
-hibernate.hbm2ddl.auto=update
+hibernate.hbm2ddl.auto=none
hibernate.current_session_context_class=jta
hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
+hibernate.show_sql=false
+hibernate.connection.isolation=2
+
jta.UserTransaction=UserTransaction
ode.persistence=hibernate
Modified: trunk/distribution/src/main/release/db/sql/mysql.drop.sql
===================================================================
--- trunk/distribution/src/main/release/db/sql/mysql.drop.sql 2010-06-16 10:23:32 UTC (rev 750)
+++ trunk/distribution/src/main/release/db/sql/mysql.drop.sql 2010-06-16 12:20:45 UTC (rev 751)
@@ -1,25 +1,159 @@
drop table ODE_SCHEMA_VERSION;
drop table ODE_JOB;
-drop table BPEL_ACTIVITY_RECOVERY;
-drop table BPEL_CORRELATION_PROP;
-drop table BPEL_CORRELATION_SET;
-drop table BPEL_CORRELATOR;
-drop table BPEL_CORRELATOR_MESSAGE_CKEY;
-drop table BPEL_EVENT;
-drop table BPEL_FAULT;
-drop table BPEL_INSTANCE;
-drop table BPEL_MESSAGE;
-drop table BPEL_MEX_PROPS;
-drop table BPEL_PLINK_VAL;
-drop table BPEL_PROCESS;
-drop table BPEL_SCOPE;
-drop table BPEL_SELECTORS;
-drop table BPEL_UNMATCHED;
-drop table BPEL_XML_DATA;
-drop table VAR_PROPERTY;
-drop table STORE_DU;
-drop table STORE_PROCESS;
-drop table STORE_PROCESS_PROP;
-drop table STORE_VERSIONS;
-drop table BPEL_MESSAGE_EXCHANGE;
-drop table hibernate_unique_key;
+
+ alter table ODE_ACTIVITY_RECOVERY
+ drop
+ foreign key FK5274B556E38CB1C9;
+
+ alter table ODE_CORRELATION_SET
+ drop
+ foreign key FK399D7EB621712AFA;
+
+ alter table ODE_CORRELATOR
+ drop
+ foreign key FKC4413FB8748734BD;
+
+ alter table ODE_CORSET_PROP
+ drop
+ foreign key FK3B13A3F744AFA280;
+
+ alter table ODE_EVENT
+ drop
+ foreign key FK410D028BA0243704;
+
+ alter table ODE_EVENT
+ drop
+ foreign key FK410D028BE38CB1C9;
+
+ alter table ODE_MESSAGE
+ drop
+ foreign key FKBCCD53B81291B75D;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACA57B8F584;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACA8618FFF9;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACADB5AB781;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACA7B80504F;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACADC273092;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACAA0243704;
+
+ alter table ODE_MESSAGE_ROUTE
+ drop
+ foreign key FK8082C6E28618FFF9;
+
+ alter table ODE_MESSAGE_ROUTE
+ drop
+ foreign key FK8082C6E2DB5AB781;
+
+ alter table ODE_MEX_PROP
+ drop
+ foreign key FKE61574D1AA079EB8;
+
+ alter table ODE_PARTNER_LINK
+ drop
+ foreign key FK7337940021712AFA;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop
+ foreign key FK4E20A7D4F3A6B9B7;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop
+ foreign key FK4E20A7D4F0BBEFCC;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop
+ foreign key FK4E20A7D46C4AB4DE;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop
+ foreign key FK4E20A7D4A0243704;
+
+ alter table ODE_SCOPE
+ drop
+ foreign key FK41C9CE458618FFF9;
+
+ alter table ODE_SCOPE
+ drop
+ foreign key FK41C9CE45F6D972EF;
+
+ alter table ODE_XML_DATA
+ drop
+ foreign key FKEF74614121712AFA;
+
+ alter table ODE_XML_DATA_PROP
+ drop
+ foreign key FK936B93A181C9218F;
+
+ alter table STORE_PROCESS
+ drop
+ foreign key FKA83900D1BAFA89CA;
+
+ alter table STORE_PROC_TO_PROP
+ drop
+ foreign key FKB85D957C891ECF61;
+
+ alter table STORE_PROC_TO_PROP
+ drop
+ foreign key FKB85D957C3C8753EC;
+
+ drop table if exists ODE_ACTIVITY_RECOVERY;
+
+ drop table if exists ODE_CORRELATION_SET;
+
+ drop table if exists ODE_CORRELATOR;
+
+ drop table if exists ODE_CORSET_PROP;
+
+ drop table if exists ODE_EVENT;
+
+ drop table if exists ODE_FAULT;
+
+ drop table if exists ODE_MESSAGE;
+
+ drop table if exists ODE_MESSAGE_EXCHANGE;
+
+ drop table if exists ODE_MESSAGE_ROUTE;
+
+ drop table if exists ODE_MEX_PROP;
+
+ drop table if exists ODE_PARTNER_LINK;
+
+ drop table if exists ODE_PROCESS;
+
+ drop table if exists ODE_PROCESS_INSTANCE;
+
+ drop table if exists ODE_SCOPE;
+
+ drop table if exists ODE_XML_DATA;
+
+ drop table if exists ODE_XML_DATA_PROP;
+
+ drop table if exists STORE_DU;
+
+ drop table if exists STORE_PROCESS;
+
+ drop table if exists STORE_PROCESS_PROP;
+
+ drop table if exists STORE_PROC_TO_PROP;
+
+ drop table if exists STORE_VERSIONS;
+
+
+
Modified: trunk/distribution/src/main/release/db/sql/postgres.drop.sql
===================================================================
--- trunk/distribution/src/main/release/db/sql/postgres.drop.sql 2010-06-16 10:23:32 UTC (rev 750)
+++ trunk/distribution/src/main/release/db/sql/postgres.drop.sql 2010-06-16 12:20:45 UTC (rev 751)
@@ -1,25 +1,130 @@
drop table ODE_SCHEMA_VERSION;
drop table ODE_JOB;
-drop table BPEL_ACTIVITY_RECOVERY;
-drop table BPEL_CORRELATION_PROP;
-drop table BPEL_CORRELATION_SET;
-drop table BPEL_CORRELATOR;
-drop table BPEL_CORRELATOR_MESSAGE_CKEY;
-drop table BPEL_EVENT;
-drop table BPEL_FAULT;
-drop table BPEL_INSTANCE;
-drop table BPEL_MESSAGE;
-drop table BPEL_MEX_PROPS;
-drop table BPEL_PLINK_VAL;
-drop table BPEL_PROCESS;
-drop table BPEL_SCOPE;
-drop table BPEL_SELECTORS;
-drop table BPEL_UNMATCHED;
-drop table BPEL_XML_DATA;
-drop table VAR_PROPERTY;
-drop sequence hibernate_seqhilo;
-drop table STORE_DU;
-drop table STORE_PROCESS;
-drop table STORE_PROCESS_PROP;
-drop table STORE_VERSIONS;
-drop table BPEL_MESSAGE_EXCHANGE;
\ No newline at end of file
+
+ alter table ODE_ACTIVITY_RECOVERY
+ drop constraint FK5274B556E38CB1C9;
+
+ alter table ODE_CORRELATION_SET
+ drop constraint FK399D7EB621712AFA;
+
+ alter table ODE_CORRELATOR
+ drop constraint FKC4413FB8748734BD;
+
+ alter table ODE_CORSET_PROP
+ drop constraint FK3B13A3F744AFA280;
+
+ alter table ODE_EVENT
+ drop constraint FK410D028BA0243704;
+
+ alter table ODE_EVENT
+ drop constraint FK410D028BE38CB1C9;
+
+ alter table ODE_MESSAGE
+ drop constraint FKBCCD53B81291B75D;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACA57B8F584;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACA8618FFF9;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACADB5AB781;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACA7B80504F;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACADC273092;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACAA0243704;
+
+ alter table ODE_MESSAGE_ROUTE
+ drop constraint FK8082C6E28618FFF9;
+
+ alter table ODE_MESSAGE_ROUTE
+ drop constraint FK8082C6E2DB5AB781;
+
+ alter table ODE_MEX_PROP
+ drop constraint FKE61574D1AA079EB8;
+
+ alter table ODE_PARTNER_LINK
+ drop constraint FK7337940021712AFA;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop constraint FK4E20A7D4F3A6B9B7;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop constraint FK4E20A7D4F0BBEFCC;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop constraint FK4E20A7D46C4AB4DE;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop constraint FK4E20A7D4A0243704;
+
+ alter table ODE_SCOPE
+ drop constraint FK41C9CE458618FFF9;
+
+ alter table ODE_SCOPE
+ drop constraint FK41C9CE45F6D972EF;
+
+ alter table ODE_XML_DATA
+ drop constraint FKEF74614121712AFA;
+
+ alter table ODE_XML_DATA_PROP
+ drop constraint FK936B93A181C9218F;
+
+ alter table STORE_PROCESS
+ drop constraint FKA83900D1BAFA89CA;
+
+ alter table STORE_PROC_TO_PROP
+ drop constraint FKB85D957C891ECF61;
+
+ alter table STORE_PROC_TO_PROP
+ drop constraint FKB85D957C3C8753EC;
+
+ drop table ODE_ACTIVITY_RECOVERY;
+
+ drop table ODE_CORRELATION_SET;
+
+ drop table ODE_CORRELATOR;
+
+ drop table ODE_CORSET_PROP;
+
+ drop table ODE_EVENT;
+
+ drop table ODE_FAULT;
+
+ drop table ODE_MESSAGE;
+
+ drop table ODE_MESSAGE_EXCHANGE;
+
+ drop table ODE_MESSAGE_ROUTE;
+
+ drop table ODE_MEX_PROP;
+
+ drop table ODE_PARTNER_LINK;
+
+ drop table ODE_PROCESS;
+
+ drop table ODE_PROCESS_INSTANCE;
+
+ drop table ODE_SCOPE;
+
+ drop table ODE_XML_DATA;
+
+ drop table ODE_XML_DATA_PROP;
+
+ drop table STORE_DU;
+
+ drop table STORE_PROCESS;
+
+ drop table STORE_PROCESS_PROP;
+
+ drop table STORE_PROC_TO_PROP;
+
+ drop table STORE_VERSIONS;
+
+ drop sequence hibernate_sequence;
Modified: trunk/distribution/src/main/release/install/deployment.properties
===================================================================
--- trunk/distribution/src/main/release/install/deployment.properties 2010-06-16 10:23:32 UTC (rev 750)
+++ trunk/distribution/src/main/release/install/deployment.properties 2010-06-16 12:20:45 UTC (rev 751)
@@ -19,5 +19,5 @@
org.jboss.esb.home=/var/local/jbossesb-4.7
# database
-# (e.g. hsql derby mysql)
+# (e.g. hsql postgres mysql)
database=hsql
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2010-06-16 10:23:32 UTC (rev 750)
+++ trunk/integration-tests/pom.xml 2010-06-16 12:20:45 UTC (rev 751)
@@ -561,6 +561,8 @@
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELAtmTestCase.java</exclude>
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java</exclude>
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELTravelAgencyTestCase.java</exclude>
+ <!-- comment it for now -->
+ <exclude>**/*RiftSaw163*.java</exclude>
</excludes>
</configuration>
<executions>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-06-16 10:23:32 UTC (rev 750)
+++ trunk/pom.xml 2010-06-16 12:20:45 UTC (rev 751)
@@ -72,8 +72,7 @@
</profiles>
<properties>
- <riftsaw.ode.version>2.1.0.CR1</riftsaw.ode.version> <!-- This version needs to change when trunk requires
- ODE changes, but for now we reuse the 2.1.0.CR1 version -->
+ <riftsaw.ode.version>2.1.0-SNAPSHOT</riftsaw.ode.version> <!-- This version needs to change when trunk requires ODE changes, but for now we reuse the 2.1.0-SNAPSHOT version -->
<riftsaw.engine.version>2.2.0-SNAPSHOT</riftsaw.engine.version>
<bpm.console.version>2.1</bpm.console.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -210,11 +209,16 @@
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
- <artifactId>riftsaw-dao-hibernate</artifactId>
+ <artifactId>riftsaw-dao-jpa</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-16 10:23:32 UTC (rev 750)
+++ trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2010-06-16 12:20:45 UTC (rev 751)
@@ -22,7 +22,7 @@
import java.util.regex.Pattern;
import javax.naming.InitialContext;
-import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
import javax.xml.namespace.QName;
import org.apache.commons.logging.Log;
@@ -32,7 +32,9 @@
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.il.config.OdeConfigProperties;
+import org.apache.ode.dao.store.ConfStoreDAOConnection;
+import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory;
+import org.apache.ode.dao.store.DeploymentUnitDAO;
import org.jboss.soa.bpel.deployer.BPELDeployer;
import org.jboss.soa.bpel.deployer.BPELDeploymentUnit;
@@ -42,8 +44,8 @@
private static final Log __log = LogFactory.getLog(RiftSawProcessStore.class);
private DeployScheduler m_deployScheduler=new DeployScheduler();
- public RiftSawProcessStore(EndpointReferenceContext eprContext, DataSource ds, String persistenceType, OdeConfigProperties props, boolean createDatamodel) {
- super(eprContext, ds, persistenceType, props, createDatamodel);
+ public RiftSawProcessStore(EndpointReferenceContext eprContext, TransactionManager txm, ConfStoreDAOConnectionFactory cf) {
+ super(eprContext, txm, cf);
}
public void loadAll() {
@@ -136,7 +138,7 @@
// Check for the deployment unit associated with the name
boolean deploy=exec(new ProcessStoreImpl.Callable<Boolean>() {
- public Boolean call(ConfStoreConnection conn) {
+ public Boolean call(ConfStoreDAOConnection 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-16 10:23:32 UTC (rev 750)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-06-16 12:20:45 UTC (rev 751)
@@ -20,7 +20,6 @@
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;
@@ -29,6 +28,8 @@
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;
@@ -65,6 +66,7 @@
protected OdeConfigProperties _odeConfig;
protected TransactionManager _txMgr;
protected BpelDAOConnectionFactory _daoCF;
+ protected ConfStoreDAOConnectionFactory _storeCF;
protected Scheduler _scheduler;
protected Database _db;
protected ExecutorService _executorService;
@@ -163,7 +165,8 @@
__log.error(errorMsg, e);
throw new Exception(errorMsg);
}
-
+
+
// Hopefully we have a response
__log.debug("Handling response for MEX " + odeMex);
boolean commit = false;
@@ -363,6 +366,15 @@
} 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 {
@@ -422,8 +434,9 @@
__log.debug("USING DAO: "+_odeConfig.getDAOConnectionFactory());
try {
_daoCF = _db.createDaoCF();
+ _storeCF = _db.createDaoStoreCF();
} catch (Exception ex) {
- String errmsg = "DAO INSTANTIATION FAILED: "+_odeConfig.getDAOConnectionFactory();
+ String errmsg = "DAO INSTANTIATION FAILED: "+_odeConfig.getDAOConnectionFactory() + " and " + _odeConfig.getDAOConfStoreConnectionFactory();
__log.error(errmsg, ex);
throw new Exception(errmsg, ex);
@@ -431,15 +444,14 @@
}
protected void initProcessStore(EndpointReferenceContext eprContext) {
- _store = createProcessStore(eprContext, _db.getDataSource());
+ _store = createProcessStore(eprContext, _txMgr, _storeCF);
_store.registerListener(new ProcessStoreListenerImpl());
}
- protected ProcessStoreImpl createProcessStore(EndpointReferenceContext eprContext, DataSource ds) {
- return new RiftSawProcessStore(eprContext, ds, _odeConfig.getDAOConnectionFactory(), _odeConfig, false);
+ protected ProcessStoreImpl createProcessStore(EndpointReferenceContext eprContext, TransactionManager txm, ConfStoreDAOConnectionFactory cf) {
+ return new RiftSawProcessStore(eprContext, txm, cf);
}
-
protected Scheduler createScheduler() {
SimpleScheduler scheduler = new SimpleScheduler(new GUID().toString(),new JdbcDelegate(_db.getDataSource()), _odeConfig.getProperties());
scheduler.setExecutorService(_executorService);
@@ -747,4 +759,8 @@
{
return _odeConfig;
}
+
+ public BpelServerImpl getBpelServer() {
+ return _bpelServer;
+ }
}
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2010-06-16 10:23:32 UTC (rev 750)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2010-06-16 12:20:45 UTC (rev 751)
@@ -230,7 +230,7 @@
javax.xml.soap.SOAPHeader soapHeader = soapMessage.getSOAPHeader();
if (soapHeader==null) soapHeader = soapMessage.getSOAPPart().getEnvelope().addHeader();
for (Node headerNode : headerParts.values()) {
- if (headerNode.getNodeType() == Node.ELEMENT_NODE) {
+ if (Node.ELEMENT_NODE == headerNode.getNodeType()) {
if (getFirstChildWithName(new QName(headerNode.getNamespaceURI(), headerNode.getLocalName()),soapHeader) == null) {
SOAPElement partElement = soapFactory.createElement((Element) headerNode);
soapHeader.addChildElement(partElement);
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-16 10:23:32 UTC (rev 750)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-16 12:20:45 UTC (rev 751)
@@ -140,7 +140,8 @@
wsdlDefinition = wsdlReference.getDefinition();
wsdlUrl = wsdlReference.getWsdlURL();
}
- this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefinition, serviceName, port.getLocalPart());
+
+ this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefinition, serviceName, port.getLocalPart());
isInitialized=true;
}
@@ -159,10 +160,13 @@
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.getMessageExchangeId());
scheduler.registerSynchronizer(new Scheduler.Synchronizer() {
public void afterCompletion(boolean success)
@@ -173,78 +177,7 @@
// 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(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;
- }
-
- });
+ executorService.submit(executionCallable);
}
public void beforeCompletion(){}
@@ -257,44 +190,140 @@
{
// one-way invocation
ExecutorService executorService = executionEnvironment.getExecutorService();
- executorService.submit(new Callable<Object>(){
+ executionCallable = new OneWayCallable(mex.getMessageExchangeId());
+ executorService.submit(executionCallable);
- 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());
+ mex.replyOneWayOk();
+ }
+ }
+
+ private class TwoWayCallable implements Callable<Object> {
+
+ private String mexId;
+
+ public TwoWayCallable(String mexId) {
+ this.mexId = mexId;
+ }
+
+ public Object call() throws Exception {
+
+ return executionEnvironment.getScheduler().execTransaction(new Callable<Object>(){
- 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);
- }
+ public Object call() throws Exception {
+ //We need to get a new mex from persistence layer.
+ PartnerRoleMessageExchange mex = (PartnerRoleMessageExchange) engine.getBpelServer().getEngine().getMessageExchange(mexId);
+ 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);
- return 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());
- mex.replyOneWayOk();
- }
+ 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 String mexId;
+
+ public OneWayCallable(String mex) {
+ this.mexId = mexId;
+ }
+
+ public Object call() throws Exception {
+ return executionEnvironment.getScheduler().execTransaction(new Callable<Object>(){
+
+ public Object call() throws Exception {
+ //We need to get a new mex from persistence layer.
+ PartnerRoleMessageExchange mex = (PartnerRoleMessageExchange) engine.getBpelServer().getEngine().getMessageExchange(mexId);
+ 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;
+ }
+
+ });
+ }
+
}
@@ -366,8 +395,6 @@
initializer = (JAXWSInitializer)cls.newInstance();
- log.debug("JAXWS Client Initializer instantiated: "+initializer);
-
} catch(Exception e) {
log.error("Unable to obtain JAXWS Initializer class '"+impl+"'", e);
}
Modified: trunk/runtime/engine-assembly/pom.xml
===================================================================
--- trunk/runtime/engine-assembly/pom.xml 2010-06-16 10:23:32 UTC (rev 750)
+++ trunk/runtime/engine-assembly/pom.xml 2010-06-16 12:20:45 UTC (rev 751)
@@ -48,10 +48,14 @@
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
- <artifactId>riftsaw-dao-hibernate</artifactId>
+ <artifactId>riftsaw-dao-jpa</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-16 10:23:32 UTC (rev 750)
+++ trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-06-16 12:20:45 UTC (rev 751)
@@ -53,7 +53,9 @@
<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-hibernate</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.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-16 10:23:32 UTC (rev 750)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql 2010-06-16 12:20:45 UTC (rev 751)
@@ -1,12 +1,12 @@
create table ODE_SCHEMA_VERSION(VERSION integer);
insert into ODE_SCHEMA_VERSION values (6);
+
-- Apache ODE - SimpleScheduler Database Schema
--
--- Apache Derby scripts by Maciej Szefler.
+-- MySQL 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,37 +26,225 @@
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 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
+ 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
Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql
===================================================================
--- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql 2010-06-16 10:23:32 UTC (rev 750)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql 2010-06-16 12:20:45 UTC (rev 751)
@@ -1,5 +1,25 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
create table ODE_SCHEMA_VERSION(VERSION integer);
insert into ODE_SCHEMA_VERSION values (6);
+
-- Apache ODE - SimpleScheduler Database Schema
--
-- MySQL scripts by Maciej Szefler.
@@ -23,7 +43,7 @@
correlationKeySet varchar(255),
retryCount int,
inMem int,
- detailsExt blob(4096) NULL,
+ detailsExt blob(4096),
PRIMARY KEY(jobid),
INDEX IDX_ODE_JOB_TS(ts),
@@ -33,35 +53,222 @@
COMMIT;
-create table BPEL_ACTIVITY_RECOVERY (ID bigint not null, PIID bigint, AID bigint, CHANNEL varchar(255), REASON varchar(255), DATE_TIME datetime, DETAILS blob, ACTIONS varchar(255), RETRIES integer, INSERT_TIME datetime, 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 datetime, 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 datetime, MLOCK integer not null, primary key (ID));
-create table BPEL_CORRELATOR (ID bigint not null, CID varchar(255), PROCESS_ID bigint, INSERT_TIME datetime, 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 datetime, MLOCK integer not null, primary key (ID));
-create table BPEL_EVENT (ID bigint not null, IID bigint, PID bigint, TSTAMP datetime, TYPE varchar(255), DETAIL longtext, DATA blob, SID bigint, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
-create table BPEL_FAULT (ID bigint not null, FAULTNAME varchar(255), DATA blob, EXPLANATION varchar(4000), LINE_NUM integer, AID integer, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
-create table BPEL_INSTANCE (ID bigint not null, INSTANTIATING_CORRELATOR bigint, FAULT bigint, JACOB_STATE_DATA blob, PREVIOUS_STATE smallint, PROCESS_ID bigint, STATE smallint, LAST_ACTIVE_DT datetime, SEQUENCE bigint, FAILURE_COUNT integer, FAILURE_DT datetime, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
-create table BPEL_MESSAGE (ID bigint not null, MEX bigint, TYPE varchar(255), MESSAGE_DATA blob, MESSAGE_HEADER blob, INSERT_TIME datetime, 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 blob, CALLBACK_ENDPOINT blob, REQUEST bigint, RESPONSE bigint, INSERT_DT datetime, 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 datetime, 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 blob, PARTNERROLE_EPR_DATA blob, PROCESS bigint, SCOPE bigint, SVCNAME varchar(255), MYROLE varchar(100), MODELID integer, MYSESSIONID varchar(255), PARTNERSESSIONID varchar(255), INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
-create table BPEL_PROCESS (ID bigint not null, PROCID varchar(255) not null unique, deployer varchar(255), deploydate datetime, type_name varchar(255), type_ns varchar(255), version bigint, ACTIVE_ bit, guid varchar(255), INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
-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 datetime, 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 datetime, 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 datetime, MLOCK integer not null, primary key (ID));
-create table BPEL_XML_DATA (ID bigint not null, DATA blob, NAME varchar(255) not null, SIMPLE_VALUE varchar(255), SCOPE_ID bigint, PIID bigint, IS_SIMPLE_TYPE bit, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
-create table STORE_DU (NAME varchar(255) not null, deployer varchar(255), DEPLOYDT datetime, 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 datetime, 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 table hibernate_unique_key ( next_hi integer );
-insert into hibernate_unique_key values ( 0 );
\ No newline at end of file
+ create table ODE_ACTIVITY_RECOVERY (
+ ID bigint not null auto_increment,
+ ACTIONS varchar(255),
+ ACTIVITY_ID bigint,
+ CHANNEL varchar(255),
+ DATE_TIME datetime,
+ DETAILS longtext,
+ INSTANCE_ID bigint,
+ REASON varchar(255),
+ RETRIES integer,
+ primary key (ID)
+ ) type=InnoDB;
+
+ create table ODE_CORRELATION_SET (
+ CORRELATION_SET_ID bigint not null auto_increment,
+ CORRELATION_KEY varchar(255),
+ NAME varchar(255),
+ SCOPE_ID bigint,
+ primary key (CORRELATION_SET_ID)
+ ) type=InnoDB;
+
+ create table ODE_CORRELATOR (
+ CORRELATOR_ID bigint not null auto_increment,
+ CORRELATOR_KEY varchar(255),
+ PROC_ID bigint,
+ primary key (CORRELATOR_ID)
+ ) type=InnoDB;
+
+ create table ODE_CORSET_PROP (
+ ID bigint not null auto_increment,
+ CORRSET_ID bigint,
+ PROP_KEY varchar(255),
+ PROP_VALUE varchar(255),
+ primary key (ID)
+ ) type=InnoDB;
+
+ create table ODE_EVENT (
+ EVENT_ID bigint not null auto_increment,
+ DETAIL varchar(255),
+ DATA longblob,
+ SCOPE_ID bigint,
+ TSTAMP datetime,
+ TYPE varchar(255),
+ INSTANCE_ID bigint,
+ PROCESS_ID bigint,
+ primary key (EVENT_ID)
+ ) type=InnoDB;
+
+ create table ODE_FAULT (
+ FAULT_ID bigint not null auto_increment,
+ ACTIVITY_ID integer,
+ DATA longtext,
+ MESSAGE longtext,
+ LINE_NUMBER integer,
+ NAME varchar(255),
+ primary key (FAULT_ID)
+ ) type=InnoDB;
+
+ create table ODE_MESSAGE (
+ MESSAGE_ID bigint not null auto_increment,
+ DATA longtext,
+ HEADER longtext,
+ TYPE varchar(255),
+ MESSAGE_EXCHANGE_ID varchar(255),
+ primary key (MESSAGE_ID)
+ ) type=InnoDB;
+
+ 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 datetime,
+ DIRECTION char(1),
+ EPR longtext,
+ 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 bit,
+ 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)
+ ) type=InnoDB;
+
+ create table ODE_MESSAGE_ROUTE (
+ MESSAGE_ROUTE_ID bigint not null auto_increment,
+ 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)
+ ) type=InnoDB;
+
+ create table ODE_MEX_PROP (
+ ID bigint not null auto_increment,
+ MEX_ID varchar(255),
+ PROP_KEY varchar(255),
+ PROP_VALUE longtext,
+ primary key (ID)
+ ) type=InnoDB;
+
+ create table ODE_PARTNER_LINK (
+ PARTNER_LINK_ID bigint not null auto_increment,
+ MY_EPR longtext,
+ MY_ROLE_NAME varchar(255),
+ MY_ROLE_SERVICE_NAME varchar(255),
+ MY_SESSION_ID varchar(255),
+ PARTNER_EPR longtext,
+ 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)
+ ) type=InnoDB;
+
+ create table ODE_PROCESS (
+ ID bigint not null auto_increment,
+ GUID varchar(255),
+ PROCESS_ID varchar(255),
+ PROCESS_TYPE varchar(255),
+ VERSION bigint,
+ primary key (ID)
+ ) type=InnoDB;
+
+ create table ODE_PROCESS_INSTANCE (
+ ID bigint not null auto_increment,
+ DATE_CREATED datetime,
+ EXECUTION_STATE longblob,
+ FAULT_ID bigint,
+ LAST_ACTIVE_TIME datetime,
+ LAST_RECOVERY_DATE datetime,
+ PREVIOUS_STATE smallint,
+ SEQUENCE bigint,
+ INSTANCE_STATE smallint,
+ INSTANTIATING_CORRELATOR_ID bigint,
+ PROCESS_ID bigint,
+ ROOT_SCOPE_ID bigint,
+ primary key (ID)
+ ) type=InnoDB;
+
+ create table ODE_SCOPE (
+ SCOPE_ID bigint not null auto_increment,
+ MODEL_ID integer,
+ SCOPE_NAME varchar(255),
+ SCOPE_STATE varchar(255),
+ PARENT_SCOPE_ID bigint,
+ PROCESS_INSTANCE_ID bigint,
+ primary key (SCOPE_ID)
+ ) type=InnoDB;
+
+ create table ODE_XML_DATA (
+ XML_DATA_ID bigint not null auto_increment,
+ DATA longtext,
+ IS_SIMPLE_TYPE bit,
+ NAME varchar(255),
+ SCOPE_ID bigint,
+ primary key (XML_DATA_ID)
+ ) type=InnoDB;
+
+ create table ODE_XML_DATA_PROP (
+ ID bigint not null auto_increment,
+ XML_DATA_ID bigint,
+ PROP_KEY varchar(255),
+ PROP_VALUE varchar(255),
+ primary key (ID)
+ ) type=InnoDB;
+
+ create table STORE_DU (
+ NAME varchar(255) not null,
+ DEPLOYDT datetime,
+ DEPLOYER varchar(255),
+ DIR varchar(255),
+ primary key (NAME)
+ ) type=InnoDB;
+
+ create table STORE_PROCESS (
+ PID varchar(255) not null,
+ STATE varchar(255),
+ TYPE varchar(255),
+ VERSION bigint,
+ DU varchar(255),
+ primary key (PID)
+ ) type=InnoDB;
+
+ create table STORE_PROCESS_PROP (
+ ID bigint not null auto_increment,
+ PROP_KEY varchar(255),
+ PROP_VAL varchar(255),
+ primary key (ID)
+ ) type=InnoDB;
+
+ 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)
+ ) type=InnoDB;
+
+ create table STORE_VERSIONS (
+ ID bigint not null auto_increment,
+ VERSION bigint,
+ primary key (ID)
+ ) type=InnoDB;
\ No newline at end of file
Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql
===================================================================
--- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql 2010-06-16 10:23:32 UTC (rev 750)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql 2010-06-16 12:20:45 UTC (rev 751)
@@ -1,11 +1,33 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
create table ODE_SCHEMA_VERSION(VERSION integer);
insert into ODE_SCHEMA_VERSION values (6);
+
-- Apache ODE - SimpleScheduler Database Schema
--
-- Apache Derby scripts by Maciej Szefler.
--
--
+DROP TABLE ODE_JOB;
+
CREATE TABLE ODE_JOB (
jobid VARCHAR(64) NOT NULL,
ts number(37) NOT NULL,
@@ -30,33 +52,224 @@
CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid);
-create table BPEL_ACTIVITY_RECOVERY (ID number(19,0) not null, PIID number(19,0), AID number(19,0), CHANNEL varchar2(255 char), REASON varchar2(255 char), DATE_TIME timestamp, DETAILS blob, ACTIONS varchar2(255 char), RETRIES number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_CORRELATION_PROP (ID number(19,0) not null, NAME varchar2(255 char), NAMESPACE varchar2(255 char), VALUE varchar2(255 char), CORR_SET_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_CORRELATION_SET (ID number(19,0) not null, VALUE varchar2(255 char), CORR_SET_NAME varchar2(255 char), SCOPE_ID number(19,0), PIID number(19,0), PROCESS_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_CORRELATOR (ID number(19,0) not null, CID varchar2(255 char), PROCESS_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_CORRELATOR_MESSAGE_CKEY (ID number(19,0) not null, CKEY varchar2(255 char), CORRELATOR_MESSAGE_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_EVENT (ID number(19,0) not null, IID number(19,0), PID number(19,0), TSTAMP timestamp, TYPE varchar2(255 char), DETAIL clob, DATA blob, SID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_FAULT (ID number(19,0) not null, FAULTNAME varchar2(255 char), DATA blob, EXPLANATION varchar2(4000 char), LINE_NUM number(10,0), AID number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_INSTANCE (ID number(19,0) not null, INSTANTIATING_CORRELATOR number(19,0), FAULT number(19,0), JACOB_STATE_DATA blob, PREVIOUS_STATE number(5,0), PROCESS_ID number(19,0), STATE number(5,0), LAST_ACTIVE_DT timestamp, SEQUENCE number(19,0), FAILURE_COUNT number(10,0), FAILURE_DT timestamp, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_MESSAGE (ID number(19,0) not null, MEX number(19,0), TYPE varchar2(255 char), MESSAGE_DATA blob, MESSAGE_HEADER blob, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_MESSAGE_EXCHANGE (ID number(19,0) not null, PORT_TYPE varchar2(255 char), CHANNEL_NAME varchar2(255 char), CLIENTKEY varchar2(255 char), ENDPOINT blob, CALLBACK_ENDPOINT blob, REQUEST number(19,0), RESPONSE number(19,0), INSERT_DT timestamp, OPERATION varchar2(255 char), STATE varchar2(255 char), PROCESS number(19,0), PIID number(19,0), DIR char(1 char), PLINK_MODELID number(10,0), PATTERN varchar2(255 char), CORR_STATUS varchar2(255 char), FAULT_TYPE varchar2(255 char), FAULT_EXPL varchar2(255 char), CALLEE varchar2(255 char), PARTNERLINK number(19,0), PIPED_ID varchar2(255 char), SUBSCRIBER_COUNT number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_MEX_PROPS (MEX number(19,0) not null, VALUE long, NAME varchar2(255 char) not null, primary key (MEX, NAME));
-create table BPEL_PLINK_VAL (ID number(19,0) not null, PARTNER_LINK varchar2(100 char) not null, PARTNERROLE varchar2(100 char), MYROLE_EPR_DATA blob, PARTNERROLE_EPR_DATA blob, PROCESS number(19,0), SCOPE number(19,0), SVCNAME varchar2(255 char), MYROLE varchar2(100 char), MODELID number(10,0), MYSESSIONID varchar2(255 char), PARTNERSESSIONID varchar2(255 char), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_PROCESS (ID number(19,0) not null, PROCID varchar2(255 char) not null unique, deployer varchar2(255 char), deploydate timestamp, type_name varchar2(255 char), type_ns varchar2(255 char), version number(19,0), ACTIVE_ number(1,0), guid varchar2(255 char), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_SCOPE (ID number(19,0) not null, PIID number(19,0), PARENT_SCOPE_ID number(19,0), STATE varchar2(255 char) not null, NAME varchar2(255 char) not null, MODELID number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_SELECTORS (ID number(19,0) not null, PIID number(19,0) not null, SELGRPID varchar2(255 char) not null, IDX number(10,0) not null, CORRELATION_KEY varchar2(255 char) not null, PROC_TYPE varchar2(255 char) not null, ROUTE_POLICY varchar2(255 char), CORRELATOR number(19,0) not null, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR));
-create table BPEL_UNMATCHED (ID number(19,0) not null, MEX number(19,0), CORRELATION_KEY varchar2(255 char), CORRELATOR number(19,0) not null, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_XML_DATA (ID number(19,0) not null, DATA blob, NAME varchar2(255 char) not null, SIMPLE_VALUE varchar2(255 char), SCOPE_ID number(19,0), PIID number(19,0), IS_SIMPLE_TYPE number(1,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table STORE_DU (NAME varchar2(255 char) not null, deployer varchar2(255 char), DEPLOYDT timestamp, DIR varchar2(255 char), primary key (NAME));
-create table STORE_PROCESS (PID varchar2(255 char) not null, DU varchar2(255 char), TYPE varchar2(255 char), version number(19,0), STATE varchar2(255 char), primary key (PID));
-create table STORE_PROCESS_PROP (propId varchar2(255 char) not null, value varchar2(255 char), name varchar2(255 char) not null, primary key (propId, name));
-create table STORE_VERSIONS (ID number(10,0) not null, VERSION number(19,0), primary key (ID));
-create table VAR_PROPERTY (ID number(19,0) not null, XML_DATA_ID number(19,0), PROP_VALUE varchar2(255 char), PROP_NAME varchar2(255 char) not null, INSERT_TIME timestamp, MLOCK number(10,0) 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
+
+ create table ODE_ACTIVITY_RECOVERY (
+ ID number(19,0) not null,
+ ACTIONS varchar2(255),
+ ACTIVITY_ID number(19,0),
+ CHANNEL varchar2(255),
+ DATE_TIME date,
+ DETAILS clob,
+ INSTANCE_ID number(19,0),
+ REASON varchar2(255),
+ RETRIES number(10,0),
+ primary key (ID)
+ );
+
+ create table ODE_CORRELATION_SET (
+ CORRELATION_SET_ID number(19,0) not null,
+ CORRELATION_KEY varchar2(255),
+ NAME varchar2(255),
+ SCOPE_ID number(19,0),
+ primary key (CORRELATION_SET_ID)
+ );
+
+ create table ODE_CORRELATOR (
+ CORRELATOR_ID number(19,0) not null,
+ CORRELATOR_KEY varchar2(255),
+ PROC_ID number(19,0),
+ primary key (CORRELATOR_ID)
+ );
+
+ create table ODE_CORSET_PROP (
+ ID number(19,0) not null,
+ CORRSET_ID number(19,0),
+ PROP_KEY varchar2(255),
+ PROP_VALUE varchar2(255),
+ primary key (ID)
+ );
+
+ create table ODE_EVENT (
+ EVENT_ID number(19,0) not null,
+ DETAIL varchar2(255),
+ DATA blob,
+ SCOPE_ID number(19,0),
+ TSTAMP date,
+ TYPE varchar2(255),
+ INSTANCE_ID number(19,0),
+ PROCESS_ID number(19,0),
+ primary key (EVENT_ID)
+ );
+
+ create table ODE_FAULT (
+ FAULT_ID number(19,0) not null,
+ ACTIVITY_ID number(10,0),
+ DATA clob,
+ MESSAGE varchar2(4000),
+ LINE_NUMBER number(10,0),
+ NAME varchar2(255),
+ primary key (FAULT_ID)
+ );
+
+ create table ODE_MESSAGE (
+ MESSAGE_ID number(19,0) not null,
+ DATA clob,
+ HEADER clob,
+ TYPE varchar2(255),
+ MESSAGE_EXCHANGE_ID varchar2(255),
+ primary key (MESSAGE_ID)
+ );
+
+ create table ODE_MESSAGE_EXCHANGE (
+ MESSAGE_EXCHANGE_ID varchar2(255) not null,
+ CALLEE varchar2(255),
+ CHANNEL varchar2(255),
+ CORRELATION_ID varchar2(255),
+ CORRELATION_KEYS varchar2(255),
+ CORRELATION_STATUS varchar2(255),
+ CREATE_TIME date,
+ DIRECTION char(1),
+ EPR clob,
+ FAULT varchar2(255),
+ FAULT_EXPLANATION varchar2(255),
+ OPERATION varchar2(255),
+ PARTNER_LINK_MODEL_ID number(10,0),
+ PATTERN varchar2(255),
+ PIPED_ID varchar2(255),
+ PORT_TYPE varchar2(255),
+ PROPAGATE_TRANS number(1,0),
+ STATUS varchar2(255),
+ SUBSCRIBER_COUNT number(10,0),
+ CORR_ID number(19,0),
+ PARTNER_LINK_ID number(19,0),
+ PROCESS_ID number(19,0),
+ PROCESS_INSTANCE_ID number(19,0),
+ REQUEST_MESSAGE_ID number(19,0),
+ RESPONSE_MESSAGE_ID number(19,0),
+ primary key (MESSAGE_EXCHANGE_ID)
+ );
+
+ create table ODE_MESSAGE_ROUTE (
+ MESSAGE_ROUTE_ID number(19,0) not null,
+ CORRELATION_KEY varchar2(255),
+ GROUP_ID varchar2(255),
+ ROUTE_INDEX number(10,0),
+ PROCESS_INSTANCE_ID number(19,0),
+ ROUTE_POLICY varchar2(16),
+ CORR_ID number(19,0),
+ primary key (MESSAGE_ROUTE_ID)
+ );
+
+ create table ODE_MEX_PROP (
+ ID number(19,0) not null,
+ MEX_ID varchar2(255),
+ PROP_KEY varchar2(255),
+ PROP_VALUE varchar2(2000),
+ primary key (ID)
+ );
+
+ create table ODE_PARTNER_LINK (
+ PARTNER_LINK_ID number(19,0) not null,
+ MY_EPR clob,
+ MY_ROLE_NAME varchar2(255),
+ MY_ROLE_SERVICE_NAME varchar2(255),
+ MY_SESSION_ID varchar2(255),
+ PARTNER_EPR clob,
+ PARTNER_LINK_MODEL_ID number(10,0),
+ PARTNER_LINK_NAME varchar2(255),
+ PARTNER_ROLE_NAME varchar2(255),
+ PARTNER_SESSION_ID varchar2(255),
+ SCOPE_ID number(19,0),
+ primary key (PARTNER_LINK_ID)
+ );
+
+ create table ODE_PROCESS (
+ ID number(19,0) not null,
+ GUID varchar2(255),
+ PROCESS_ID varchar2(255),
+ PROCESS_TYPE varchar2(255),
+ VERSION number(19,0),
+ primary key (ID)
+ );
+
+ create table ODE_PROCESS_INSTANCE (
+ ID number(19,0) not null,
+ DATE_CREATED date,
+ EXECUTION_STATE blob,
+ FAULT_ID number(19,0),
+ LAST_ACTIVE_TIME date,
+ LAST_RECOVERY_DATE date,
+ PREVIOUS_STATE number(5,0),
+ SEQUENCE number(19,0),
+ INSTANCE_STATE number(5,0),
+ INSTANTIATING_CORRELATOR_ID number(19,0),
+ PROCESS_ID number(19,0),
+ ROOT_SCOPE_ID number(19,0),
+ primary key (ID)
+ );
+
+ create table ODE_SCOPE (
+ SCOPE_ID number(19,0) not null,
+ MODEL_ID number(10,0),
+ SCOPE_NAME varchar2(255),
+ SCOPE_STATE varchar2(255),
+ PARENT_SCOPE_ID number(19,0),
+ PROCESS_INSTANCE_ID number(19,0),
+ primary key (SCOPE_ID)
+ );
+
+ create table ODE_XML_DATA (
+ XML_DATA_ID number(19,0) not null,
+ DATA clob,
+ IS_SIMPLE_TYPE number(1,0),
+ NAME varchar2(255),
+ SCOPE_ID number(19,0),
+ primary key (XML_DATA_ID)
+ );
+
+ create table ODE_XML_DATA_PROP (
+ ID number(19,0) not null,
+ XML_DATA_ID number(19,0),
+ PROP_KEY varchar2(255),
+ PROP_VALUE varchar2(255),
+ primary key (ID)
+ );
+
+ create table STORE_DU (
+ NAME varchar2(255) not null,
+ DEPLOYDT date,
+ DEPLOYER varchar2(255),
+ DIR varchar2(255),
+ primary key (NAME)
+ );
+
+ create table STORE_PROCESS (
+ PID varchar2(255) not null,
+ STATE varchar2(255),
+ TYPE varchar2(255),
+ VERSION number(19,0),
+ DU varchar2(255),
+ primary key (PID)
+ );
+
+ create table STORE_PROCESS_PROP (
+ ID number(19,0) not null,
+ PROP_KEY varchar2(255),
+ PROP_VAL varchar2(255),
+ primary key (ID)
+ );
+
+ create table STORE_PROC_TO_PROP (
+ STORE_PROCESS_PID varchar2(255) not null,
+ STORE_PROPERTY_ID number(19,0) not null,
+ primary key (STORE_PROCESS_PID, STORE_PROPERTY_ID),
+ unique (STORE_PROPERTY_ID)
+ );
+
+ create table STORE_VERSIONS (
+ ID number(19,0) not null,
+ VERSION number(19,0),
+ primary key (ID)
+ );
+
+ create sequence hibernate_sequence;
\ No newline at end of file
Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql
===================================================================
--- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2010-06-16 10:23:32 UTC (rev 750)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2010-06-16 12:20:45 UTC (rev 751)
@@ -1,5 +1,25 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
create table ODE_SCHEMA_VERSION(VERSION integer);
insert into ODE_SCHEMA_VERSION values (6);
+
-- Apache ODE - SimpleScheduler Database Schema
--
-- Apache Derby scripts by Maciej Szefler.
@@ -30,33 +50,224 @@
CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid);
-create table BPEL_ACTIVITY_RECOVERY (ID int8 not null, PIID int8, AID int8, CHANNEL varchar(255), REASON varchar(255), DATE_TIME timestamp, DETAILS bytea, ACTIONS varchar(255), RETRIES int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_CORRELATION_PROP (ID int8 not null, NAME varchar(255), NAMESPACE varchar(255), VALUE varchar(255), CORR_SET_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_CORRELATION_SET (ID int8 not null, VALUE varchar(255), CORR_SET_NAME varchar(255), SCOPE_ID int8, PIID int8, PROCESS_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_CORRELATOR (ID int8 not null, CID varchar(255), PROCESS_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_CORRELATOR_MESSAGE_CKEY (ID int8 not null, CKEY varchar(255), CORRELATOR_MESSAGE_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_EVENT (ID int8 not null, IID int8, PID int8, TSTAMP timestamp, TYPE varchar(255), DETAIL text, DATA bytea, SID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_FAULT (ID int8 not null, FAULTNAME varchar(255), DATA bytea, EXPLANATION varchar(4000), LINE_NUM int4, AID int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_INSTANCE (ID int8 not null, INSTANTIATING_CORRELATOR int8, FAULT int8, JACOB_STATE_DATA bytea, PREVIOUS_STATE int2, PROCESS_ID int8, STATE int2, LAST_ACTIVE_DT timestamp, SEQUENCE int8, FAILURE_COUNT int4, FAILURE_DT timestamp, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_MESSAGE (ID int8 not null, MEX int8, TYPE varchar(255), MESSAGE_DATA bytea, MESSAGE_HEADER bytea, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_MESSAGE_EXCHANGE (ID int8 not null, PORT_TYPE varchar(255), CHANNEL_NAME varchar(255), CLIENTKEY varchar(255), ENDPOINT bytea, CALLBACK_ENDPOINT bytea, REQUEST int8, RESPONSE int8, INSERT_DT timestamp, OPERATION varchar(255), STATE varchar(255), PROCESS int8, PIID int8, DIR char(1), PLINK_MODELID int4, PATTERN varchar(255), CORR_STATUS varchar(255), FAULT_TYPE varchar(255), FAULT_EXPL varchar(255), CALLEE varchar(255), PARTNERLINK int8, PIPED_ID varchar(255), SUBSCRIBER_COUNT int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_MEX_PROPS (MEX int8 not null, VALUE varchar(8000), NAME varchar(255) not null, primary key (MEX, NAME));
-create table BPEL_PLINK_VAL (ID int8 not null, PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100), MYROLE_EPR_DATA bytea, PARTNERROLE_EPR_DATA bytea, PROCESS int8, SCOPE int8, SVCNAME varchar(255), MYROLE varchar(100), MODELID int4, MYSESSIONID varchar(255), PARTNERSESSIONID varchar(255), INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_PROCESS (ID int8 not null, PROCID varchar(255) not null unique, deployer varchar(255), deploydate timestamp, type_name varchar(255), type_ns varchar(255), version int8, ACTIVE_ bool, guid varchar(255), INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_SCOPE (ID int8 not null, PIID int8, PARENT_SCOPE_ID int8, STATE varchar(255) not null, NAME varchar(255) not null, MODELID int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_SELECTORS (ID int8 not null, PIID int8 not null, SELGRPID varchar(255) not null, IDX int4 not null, CORRELATION_KEY varchar(255) not null, PROC_TYPE varchar(255) not null, ROUTE_POLICY varchar(255), CORRELATOR int8 not null, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR));
-create table BPEL_UNMATCHED (ID int8 not null, MEX int8, CORRELATION_KEY varchar(255), CORRELATOR int8 not null, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_XML_DATA (ID int8 not null, DATA bytea, NAME varchar(255) not null, SIMPLE_VALUE varchar(255), SCOPE_ID int8, PIID int8, IS_SIMPLE_TYPE bool, INSERT_TIME timestamp, MLOCK int4 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 int8, 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 int4 not null, VERSION int8, primary key (ID));
-create table VAR_PROPERTY (ID int8 not null, XML_DATA_ID int8, PROP_VALUE varchar(255), PROP_NAME varchar(255) not null, INSERT_TIME timestamp, MLOCK int4 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
+
+ create table ODE_ACTIVITY_RECOVERY (
+ ID int8 not null,
+ ACTIONS varchar(255),
+ ACTIVITY_ID int8,
+ CHANNEL varchar(255),
+ DATE_TIME timestamp,
+ DETAILS text,
+ INSTANCE_ID int8,
+ REASON varchar(255),
+ RETRIES int4,
+ primary key (ID)
+ );
+
+ create table ODE_CORRELATION_SET (
+ CORRELATION_SET_ID int8 not null,
+ CORRELATION_KEY varchar(255),
+ NAME varchar(255),
+ SCOPE_ID int8,
+ primary key (CORRELATION_SET_ID)
+ );
+
+ create table ODE_CORRELATOR (
+ CORRELATOR_ID int8 not null,
+ CORRELATOR_KEY varchar(255),
+ PROC_ID int8,
+ primary key (CORRELATOR_ID)
+ );
+
+ create table ODE_CORSET_PROP (
+ ID int8 not null,
+ CORRSET_ID int8,
+ PROP_KEY varchar(255),
+ PROP_VALUE varchar(255),
+ primary key (ID)
+ );
+
+ create table ODE_EVENT (
+ EVENT_ID int8 not null,
+ DETAIL varchar(255),
+ DATA oid,
+ SCOPE_ID int8,
+ TSTAMP timestamp,
+ TYPE varchar(255),
+ INSTANCE_ID int8,
+ PROCESS_ID int8,
+ primary key (EVENT_ID)
+ );
+
+ create table ODE_FAULT (
+ FAULT_ID int8 not null,
+ ACTIVITY_ID int4,
+ DATA text,
+ MESSAGE varchar(4000),
+ LINE_NUMBER int4,
+ NAME varchar(255),
+ primary key (FAULT_ID)
+ );
+
+ create table ODE_MESSAGE (
+ MESSAGE_ID int8 not null,
+ DATA text,
+ HEADER text,
+ 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(1),
+ EPR text,
+ FAULT varchar(255),
+ FAULT_EXPLANATION varchar(255),
+ OPERATION varchar(255),
+ PARTNER_LINK_MODEL_ID int4,
+ PATTERN varchar(255),
+ PIPED_ID varchar(255),
+ PORT_TYPE varchar(255),
+ PROPAGATE_TRANS bool,
+ STATUS varchar(255),
+ SUBSCRIBER_COUNT int4,
+ CORR_ID int8,
+ PARTNER_LINK_ID int8,
+ PROCESS_ID int8,
+ PROCESS_INSTANCE_ID int8,
+ REQUEST_MESSAGE_ID int8,
+ RESPONSE_MESSAGE_ID int8,
+ primary key (MESSAGE_EXCHANGE_ID)
+ );
+
+ create table ODE_MESSAGE_ROUTE (
+ MESSAGE_ROUTE_ID int8 not null,
+ CORRELATION_KEY varchar(255),
+ GROUP_ID varchar(255),
+ ROUTE_INDEX int4,
+ PROCESS_INSTANCE_ID int8,
+ ROUTE_POLICY varchar(16),
+ CORR_ID int8,
+ primary key (MESSAGE_ROUTE_ID)
+ );
+
+ create table ODE_MEX_PROP (
+ ID int8 not null,
+ MEX_ID varchar(255),
+ PROP_KEY varchar(255),
+ PROP_VALUE varchar(2000),
+ primary key (ID)
+ );
+
+ create table ODE_PARTNER_LINK (
+ PARTNER_LINK_ID int8 not null,
+ MY_EPR text,
+ MY_ROLE_NAME varchar(255),
+ MY_ROLE_SERVICE_NAME varchar(255),
+ MY_SESSION_ID varchar(255),
+ PARTNER_EPR text,
+ PARTNER_LINK_MODEL_ID int4,
+ PARTNER_LINK_NAME varchar(255),
+ PARTNER_ROLE_NAME varchar(255),
+ PARTNER_SESSION_ID varchar(255),
+ SCOPE_ID int8,
+ primary key (PARTNER_LINK_ID)
+ );
+
+ create table ODE_PROCESS (
+ ID int8 not null,
+ GUID varchar(255),
+ PROCESS_ID varchar(255),
+ PROCESS_TYPE varchar(255),
+ VERSION int8,
+ primary key (ID)
+ );
+
+ create table ODE_PROCESS_INSTANCE (
+ ID int8 not null,
+ DATE_CREATED timestamp,
+ EXECUTION_STATE oid,
+ FAULT_ID int8,
+ LAST_ACTIVE_TIME timestamp,
+ LAST_RECOVERY_DATE timestamp,
+ PREVIOUS_STATE int2,
+ SEQUENCE int8,
+ INSTANCE_STATE int2,
+ INSTANTIATING_CORRELATOR_ID int8,
+ PROCESS_ID int8,
+ ROOT_SCOPE_ID int8,
+ primary key (ID)
+ );
+
+ create table ODE_SCOPE (
+ SCOPE_ID int8 not null,
+ MODEL_ID int4,
+ SCOPE_NAME varchar(255),
+ SCOPE_STATE varchar(255),
+ PARENT_SCOPE_ID int8,
+ PROCESS_INSTANCE_ID int8,
+ primary key (SCOPE_ID)
+ );
+
+ create table ODE_XML_DATA (
+ XML_DATA_ID int8 not null,
+ DATA text,
+ IS_SIMPLE_TYPE bool,
+ NAME varchar(255),
+ SCOPE_ID int8,
+ primary key (XML_DATA_ID)
+ );
+
+ create table ODE_XML_DATA_PROP (
+ ID int8 not null,
+ XML_DATA_ID int8,
+ 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 int8,
+ DU varchar(255),
+ primary key (PID)
+ );
+
+ create table STORE_PROCESS_PROP (
+ ID int8 not null,
+ 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 int8 not null,
+ primary key (STORE_PROCESS_PID, STORE_PROPERTY_ID),
+ unique (STORE_PROPERTY_ID)
+ );
+
+ create table STORE_VERSIONS (
+ ID int8 not null,
+ VERSION int8,
+ primary key (ID)
+ );
+
+ create sequence hibernate_sequence;
\ 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-16 10:23:32 UTC (rev 750)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel.properties 2010-06-16 12:20:45 UTC (rev 751)
@@ -53,9 +53,9 @@
## 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:
14 years, 6 months
- 1
- 0
riftsaw SVN: r750 - in trunk: integration-tests and 22 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-06-16 06:23:32 -0400 (Wed, 16 Jun 2010)
New Revision: 750
Added:
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureServiceTestCase.java
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/ClientUsernamePasswordCallback.java
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/harness_request1.xml
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/classes/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Encrypt.properties
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Sign.properties
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/jbossws-cxf.xml
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-keystore.jks
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-truststore.jks
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/lib/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/web.xml
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/wssec.xml
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/ObjectFactory.java
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTest.java
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTestResponse.java
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness.java
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessImpl.java
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessService.java
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Client.java
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Server.java
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/package-info.java
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/index.jsp
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/SecureServiceTestHarnessService.wsdl
Modified:
trunk/integration-tests/build.xml
trunk/integration-tests/pom.xml
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml
trunk/pom.xml
Log:
Added secure-service integration test.
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2010-06-16 03:19:07 UTC (rev 749)
+++ trunk/integration-tests/build.xml 2010-06-16 10:23:32 UTC (rev 750)
@@ -6,6 +6,10 @@
<property file="${riftsaw.test.deployment.properties}" />
+ <condition property="is.cxf.ws.stack">
+ <equals arg1="${ws.stack}" arg2="cxf"/>
+ </condition>
+
<condition property="is.ojdbc.available">
<available file="${basedir}/../distribution/target/libs/ojdbc14.jar" />
</condition>
@@ -127,7 +131,6 @@
<ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/build.xml" />
<ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/build.xml" />
<ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/build.xml" />
- <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml" />
<ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation/build.xml" />
<ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation_with_oneway/build.xml" />
<ant antfile="src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml" />
@@ -155,5 +158,13 @@
<ant antfile="src/test/resources/tutorials/BluePrint4/build.xml" />
<ant antfile="src/test/resources/tutorials/BluePrint5/build.xml" />
+ <antcall target="package-tests-ws-stack" />
</target>
+
+ <target name="package-tests-ws-stack" if="is.cxf.ws.stack" >
+ <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml" />
+ <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_service/build.xml" />
+ <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml" />
+ </target>
+
</project>
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2010-06-16 03:19:07 UTC (rev 749)
+++ trunk/integration-tests/pom.xml 2010-06-16 10:23:32 UTC (rev 750)
@@ -150,6 +150,283 @@
<version>1.2.13</version>
<scope>test</scope>
</dependency>
+
+ <!-- CXF dependencies (copied from jbossws project) -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-http</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-object</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-coloc</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-corba</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-jms</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-rm</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-java2ws</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-wsdlto-core</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
+ <artifactId>cxf-xjc-boolean</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
+ <artifactId>cxf-xjc-bug671</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-dv</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-ts</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
<plugins>
@@ -177,6 +454,7 @@
value="${maven.dependency.org.jboss.soa.bpel.runtime.jb-bpel-store.jar.path}" />
<property name="dependency.rosetta.aop"
value="${maven.dependency.org.jboss.soa.bpel.dependencies.esb.aop.rosetta.aop.path}" />
+
<ant antfile="${basedir}/build.xml">
<target name="unpack-distribution" />
</ant>
@@ -243,6 +521,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/src/test/resources</additionalClasspathElement>
<additionalClasspathElement>${basedir}/src/test/resources/conf</additionalClasspathElement>
<additionalClasspathElement>${basedir}/target/rosetta.aop</additionalClasspathElement>
</additionalClasspathElements>
Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureServiceTestCase.java
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureServiceTestCase.java (rev 0)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureServiceTestCase.java 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.soa.bpel.tests.samples;
+
+import org.jboss.soa.bpel.tests.RiftSawTest;
+import org.jboss.soa.bpel.tests.RiftSawTestSetup;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Service;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
+import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+
+import junit.framework.Test;
+
+/**
+ * Test case for running the Quickstart_bpel_secure_service sample.
+ */
+public class QuickstartBPELSecureServiceTestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "Quickstart_bpel_secure_service";
+ private static final QName SERVICE_NAME = new QName("http://www.jboss.org/bpel/examples/wsdl", "SecureHelloService");
+ private static final QName TH_SERVICE_NAME = new QName("http://harness.tests.bpel.soa.jboss.org/", "SecureServiceTestHarnessService");
+
+ public QuickstartBPELSecureServiceTestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ if (System.getProperty("ws.stack","native").equals("cxf")) {
+ return(new RiftSawTestSetup(QuickstartBPELSecureServiceTestCase.class,
+ TEST_NAME, "Quickstart_bpel_secure_service-1.jar,Quickstart_bpel_secure_service_testharness.war"));
+ } else {
+ return(null);
+ }
+ }
+
+ public void testSendHello() throws Exception {
+ if (System.getProperty("ws.stack","native").equals("cxf") == false) {
+ return;
+ }
+
+ String result=sendSOAPMessage("harness_request1.xml",
+ "http://127.0.0.1:8080/Quickstart_bpel_secure_service_testharness/SecureSe...");
+
+ if (result.contains("<return>true</return>") == false) {
+ fail("Failed to receive successful response from remote test harness");
+ }
+ }
+}
Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/ClientUsernamePasswordCallback.java
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/ClientUsernamePasswordCallback.java (rev 0)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/ClientUsernamePasswordCallback.java 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,74 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.soa.bpel.tests.samples.secureservice;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
+/**
+ */
+
+public class ClientUsernamePasswordCallback implements CallbackHandler {
+
+ private Map<String, String> passwords =
+ new HashMap<String, String>();
+
+ public ClientUsernamePasswordCallback() {
+ passwords.put("Alice", "ecilA");
+ passwords.put("abcd", "dcba");
+ passwords.put("clientx509v1", "storepassword");
+ passwords.put("serverx509v1", "storepassword");
+ }
+
+ /**
+ * Here, we attempt to get the password from the private
+ * alias/passwords map.
+ */
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ for (int i = 0; i < callbacks.length; i++) {
+ WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+
+System.out.println("GPB: Check identifier="+pc.getIdentifier());
+ String pass = passwords.get(pc.getIdentifier());
+ if (pass != null) {
+ pc.setPassword(pass);
+ return;
+ }
+ }
+
+ //
+ // Password not found
+ //
+ throw new IOException();
+ }
+
+ /**
+ * Add an alias/password pair to the callback mechanism.
+ */
+ public void setAliasPassword(String alias, String password) {
+ passwords.put(alias, password);
+ }
+}
Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml 2010-06-16 03:19:07 UTC (rev 749)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml 2010-06-16 10:23:32 UTC (rev 750)
@@ -38,10 +38,14 @@
<target name="deploy" depends="compileserver" >
<echo>Deploy ${ant.project.name}</echo>
- <jar destfile="${deploy.dir}/${sample.jar.name}" >
+ <jar destfile="${deploy.dir}/${ant.project.name}/${sample.jar.name}" >
<fileset dir="${test.dir}/bpelContent"/>
<fileset dir="${server.build.dir}"/>
</jar>
+
+ <copy todir="${deploy.dir}/${ant.project.name}">
+ <fileset dir="${test.dir}/messages"/>
+ </copy>
</target>
<target name="undeploy">
Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties 2010-06-16 03:19:07 UTC (rev 749)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties 2010-06-16 10:23:32 UTC (rev 750)
@@ -2,4 +2,4 @@
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
-org.apache.ws.security.crypto.merlin.file=keystore/client-truststore.jks
\ No newline at end of file
+org.apache.ws.security.crypto.merlin.file=samples/Quickstart_bpel_secure_service/client/resources/keystore/client-truststore.jks
\ No newline at end of file
Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties 2010-06-16 03:19:07 UTC (rev 749)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties 2010-06-16 10:23:32 UTC (rev 750)
@@ -2,5 +2,5 @@
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
-org.apache.ws.security.crypto.merlin.file=keystore/client-keystore.jks
+org.apache.ws.security.crypto.merlin.file=samples/Quickstart_bpel_secure_service/client/resources/keystore/client-keystore.jks
Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml 2010-06-16 03:19:07 UTC (rev 749)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml 2010-06-16 10:23:32 UTC (rev 750)
@@ -42,8 +42,8 @@
<entry key="action" value="UsernameToken Timestamp Signature"/>
<entry key="passwordType" value="PasswordDigest"/>
<entry key="user" value="clientx509v1"/>
- <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/>
- <entry key="signaturePropFile" value="etc/Client_Sign.properties"/>
+ <entry key="passwordCallbackClass" value="org.jboss.soa.bpel.tests.samples.secureservice.ClientUsernamePasswordCallback"/>
+ <entry key="signaturePropFile" value="samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties"/>
<entry key="signatureKeyIdentifier" value="DirectReference"/>
<entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
</map>
@@ -57,8 +57,8 @@
<entry key="action" value="UsernameToken Timestamp Signature"/>
<entry key="passwordType" value="PasswordText"/>
<entry key="user" value="serverx509v1"/>
- <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/>
- <entry key="signaturePropFile" value="etc/Client_Encrypt.properties"/>
+ <entry key="passwordCallbackClass" value="org.jboss.soa.bpel.tests.samples.secureservice.ClientUsernamePasswordCallback"/>
+ <entry key="signaturePropFile" value="samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties"/>
<entry key="signatureKeyIdentifier" value="DirectReference"/>
</map>
</constructor-arg>
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/harness_request1.xml
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/harness_request1.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/harness_request1.xml 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,8 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:har="http://harness.tests.bpel.soa.jboss.org/">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <har:runTest>
+ <arg0>0</arg0>
+ </har:runTest>
+ </soapenv:Body>
+</soapenv:Envelope>
\ No newline at end of file
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,74 @@
+<project name="Quickstart_bpel_secure_service_testharness" default="deploy" basedir=".">
+
+ <description>
+ ${ant.project.name}
+ ${line.separator}
+ </description>
+
+ <property name="version" value="1" />
+
+ <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/>
+ <property name="conf.dir" value="${server.dir}/conf"/>
+
+ <property name="project.under.test" value="Quickstart_bpel_secure_service" />
+
+ <property name="deploy.dir" value="${basedir}/target/tests"/>
+ <property name="test.dir" value="${basedir}/src/test/resources/samples/${ant.project.name}" />
+
+ <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" />
+
+ <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/>
+
+ <path id="compile-classpath">
+ <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. -->
+ </path>
+ <property name="compile-classpath" refid="compile-classpath"/>
+
+ <target name="makewar" description="make war">
+ <!-- Compile... -->
+ <mkdir dir="${war.build.dir}" />
+ <javac fork="true" srcdir="${test.dir}/war/src" destdir="${war.build.dir}" debug="true">
+ <classpath>
+ <path refid="compile-classpath" />
+ <fileset dir="${test.dir}/war/resources/WEB-INF/lib" includes="*.jar" />
+ </classpath>
+ </javac>
+
+ <!-- War... -->
+ <war warfile="${deploy.dir}/${project.under.test}/${ant.project.name}.war"
+ webxml="${test.dir}/war/resources/WEB-INF/web.xml">
+ <webinf dir="${test.dir}/war/resources/WEB-INF">
+ <include name="jboss-web.xml"/>
+ <include name="wssec.xml"/>
+ </webinf>
+ <classes dir="${war.build.dir}" includes="**/*.class"/>
+ <classes dir="${test.dir}/war/resources/WEB-INF" includes="wssec.xml"/>
+ <classes dir="${test.dir}/war/resources/WEB-INF">
+ <include name="etc/*"/>
+ <include name="keystore/*"/>
+ </classes>
+ <fileset dir="${test.dir}/war/view">
+ <include name="**/*"/>
+ </fileset>
+ <classes dir="${test.dir}">
+ <include name="juddi.properties"/>
+ </classes>
+ </war>
+ </target>
+
+ <target name="deploywar" depends="makewar" >
+ </target>
+
+ <target name="undeploywar">
+ <delete file="${deploy.dir}/${project.under.test}/${ant.project.name}.war"/>
+ </target>
+
+ <target name="deploy" depends="deploywar" >
+ <echo>Deploy ${ant.project.name}</echo>
+ </target>
+
+ <target name="undeploy" depends="undeploywar" >
+ <echo>Undeploy ${ant.project.name}</echo>
+ </target>
+
+</project>
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Encrypt.properties
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Encrypt.properties (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Encrypt.properties 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,5 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=storepassword
+org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
+org.apache.ws.security.crypto.merlin.file=keystore/client-truststore.jks
\ No newline at end of file
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Sign.properties
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Sign.properties (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Sign.properties 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,6 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=storepassword
+org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
+org.apache.ws.security.crypto.merlin.file=keystore/client-keystore.jks
+
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/jbossws-cxf.xml
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/jbossws-cxf.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/jbossws-cxf.xml 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,20 @@
+<beans
+ xmlns='http://www.springframework.org/schema/beans'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xsi:schemaLocation='http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd'>
+
+ <jaxws:endpoint
+ id='SecureServiceTestHarnessWS'
+ address='http://@jboss.bind.address@:8080/Quickstart_bpel_secure_service_testharness/SecureServiceTestHarnessWS'
+ implementor='org.jboss.soa.bpel.tests.harness.SecureServiceTestHarnessImpl'>
+ </jaxws:endpoint>
+
+
+</beans>
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-keystore.jks
===================================================================
(Binary files differ)
Property changes on: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-keystore.jks
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-truststore.jks
===================================================================
(Binary files differ)
Property changes on: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-truststore.jks
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/web.xml
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/web.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/web.xml 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>SecureServiceTestHarnessWS</servlet-name>
+ <servlet-class>org.jboss.soa.bpel.tests.harness.SecureServiceTestHarnessImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>SecureServiceTestHarnessWS</servlet-name>
+ <url-pattern>/SecureServiceTestHarnessWS</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/wssec.xml
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/wssec.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/wssec.xml 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xmlns:ns1='http://secure_invoke/helloworld'
+ xsi:schemaLocation="
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
+ http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+
+ <bean id="UsernameTokenSign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor"
+ name="{http://secure_invoke/helloworld}SecureHelloWorldPort.Request" >
+ <constructor-arg>
+ <map>
+ <entry key="action" value="UsernameToken Timestamp Signature"/>
+ <entry key="passwordType" value="PasswordDigest"/>
+ <entry key="user" value="clientx509v1"/>
+ <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/>
+ <entry key="signaturePropFile" value="etc/Client_Sign.properties"/>
+ <entry key="signatureKeyIdentifier" value="DirectReference"/>
+ <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean id="UsernameTokenSign_Response" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"
+ name="{http://secure_invoke/helloworld}SecureHelloWorldPort.Response" >
+ <constructor-arg>
+ <map>
+ <entry key="action" value="UsernameToken Timestamp Signature"/>
+ <entry key="passwordType" value="PasswordText"/>
+ <entry key="user" value="serverx509v1"/>
+ <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/>
+ <entry key="signaturePropFile" value="etc/Client_Encrypt.properties"/>
+ <entry key="signatureKeyIdentifier" value="DirectReference"/>
+ </map>
+ </constructor-arg>
+ </bean>
+
+
+ <cxf:bus>
+ <cxf:outInterceptors>
+ <ref bean="UsernameTokenSign_Request"/>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/>
+ </cxf:outInterceptors>
+ <cxf:inInterceptors>
+ <ref bean="UsernameTokenSign_Response"/>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
+ </cxf:inInterceptors>
+ </cxf:bus>
+
+</beans>
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/ObjectFactory.java
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/ObjectFactory.java (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/ObjectFactory.java 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,71 @@
+
+package org.jboss.soa.bpel.tests.harness;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.jboss.soa.bpel.tests.harness package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _RunTest_QNAME = new QName("http://harness.tests.bpel.soa.jboss.org/", "runTest");
+ private final static QName _RunTestResponse_QNAME = new QName("http://harness.tests.bpel.soa.jboss.org/", "runTestResponse");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.soa.bpel.tests.harness
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link RunTestResponse }
+ *
+ */
+ public RunTestResponse createRunTestResponse() {
+ return new RunTestResponse();
+ }
+
+ /**
+ * Create an instance of {@link RunTest }
+ *
+ */
+ public RunTest createRunTest() {
+ return new RunTest();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link RunTest }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://harness.tests.bpel.soa.jboss.org/", name = "runTest")
+ public JAXBElement<RunTest> createRunTest(RunTest value) {
+ return new JAXBElement<RunTest>(_RunTest_QNAME, RunTest.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link RunTestResponse }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://harness.tests.bpel.soa.jboss.org/", name = "runTestResponse")
+ public JAXBElement<RunTestResponse> createRunTestResponse(RunTestResponse value) {
+ return new JAXBElement<RunTestResponse>(_RunTestResponse_QNAME, RunTestResponse.class, null, value);
+ }
+
+}
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTest.java
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTest.java (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTest.java 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,52 @@
+
+package org.jboss.soa.bpel.tests.harness;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for runTest complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="runTest">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "runTest", propOrder = {
+ "arg0"
+})
+public class RunTest {
+
+ protected int arg0;
+
+ /**
+ * Gets the value of the arg0 property.
+ *
+ */
+ public int getArg0() {
+ return arg0;
+ }
+
+ /**
+ * Sets the value of the arg0 property.
+ *
+ */
+ public void setArg0(int value) {
+ this.arg0 = value;
+ }
+
+}
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTestResponse.java
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTestResponse.java (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTestResponse.java 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,54 @@
+
+package org.jboss.soa.bpel.tests.harness;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for runTestResponse complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="runTestResponse">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "runTestResponse", propOrder = {
+ "_return"
+})
+public class RunTestResponse {
+
+ @XmlElement(name = "return")
+ protected boolean _return;
+
+ /**
+ * Gets the value of the return property.
+ *
+ */
+ public boolean isReturn() {
+ return _return;
+ }
+
+ /**
+ * Sets the value of the return property.
+ *
+ */
+ public void setReturn(boolean value) {
+ this._return = value;
+ }
+
+}
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness.java
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness.java (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness.java 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,30 @@
+package org.jboss.soa.bpel.tests.harness;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+/**
+ * This class was generated by Apache CXF 2.2.6
+ * Mon Jun 14 11:12:40 BST 2010
+ * Generated source version: 2.2.6
+ *
+ */
+
+@WebService(targetNamespace = "http://harness.tests.bpel.soa.jboss.org/", name = "SecureServiceTestHarness")
+(a)XmlSeeAlso({ObjectFactory.class})
+public interface SecureServiceTestHarness {
+
+ @WebResult(name = "return", targetNamespace = "")
+ @RequestWrapper(localName = "runTest", targetNamespace = "http://harness.tests.bpel.soa.jboss.org/", className = "org.jboss.soa.bpel.tests.harness.RunTest")
+ @ResponseWrapper(localName = "runTestResponse", targetNamespace = "http://harness.tests.bpel.soa.jboss.org/", className = "org.jboss.soa.bpel.tests.harness.RunTestResponse")
+ @WebMethod
+ public boolean runTest(
+ @WebParam(name = "arg0", targetNamespace = "")
+ int arg0
+ );
+}
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessImpl.java
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessImpl.java (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessImpl.java 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,98 @@
+
+/**
+ * Please modify this class to meet your needs
+ * This class is not complete
+ */
+
+package org.jboss.soa.bpel.tests.harness;
+
+import java.util.logging.Logger;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Service;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
+import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+
+/**
+ * This class was generated by Apache CXF 2.2.6
+ * Mon Jun 14 11:12:40 BST 2010
+ * Generated source version: 2.2.6
+ *
+ */
+
+(a)javax.jws.WebService(
+ serviceName = "SecureServiceTestHarnessService",
+ portName = "SecureServiceTestHarnessPort",
+ targetNamespace = "http://harness.tests.bpel.soa.jboss.org/",
+ endpointInterface = "org.jboss.soa.bpel.tests.harness.SecureServiceTestHarness")
+
+public class SecureServiceTestHarnessImpl implements SecureServiceTestHarness {
+
+ private static final QName SERVICE_NAME = new QName("http://www.jboss.org/bpel/examples/wsdl", "SecureHelloService");
+
+ private static final Logger LOG = Logger.getLogger(SecureServiceTestHarnessImpl.class.getName());
+
+ /* (non-Javadoc)
+ * @see org.jboss.soa.bpel.tests.harness.SecureServiceTestHarness#runTest(int arg0 )*
+ */
+ public boolean runTest(int arg0) {
+ LOG.info("Executing operation runTest("+arg0+")");
+
+ try {
+ SpringBusFactory bf = new SpringBusFactory();
+ URL busFile = SecureServiceTestHarnessImpl.class.getResource("/wssec.xml");
+
+ Bus bus = bf.createBus(busFile.toString());
+ bf.setThreadDefaultBus(bus);
+
+ QName portName=new QName("http://www.jboss.org/bpel/examples/wsdl", "SecureHelloPort");
+
+ URL wsdlURL = new URL("http://127.0.0.1:8080/Quickstart_bpel_secure_serviceWS?wsdl");
+
+ Service service = Service.create(wsdlURL, SERVICE_NAME);
+ Dispatch<SOAPMessage> dispatcher = service.createDispatch(
+ portName, SOAPMessage.class, Service.Mode.MESSAGE);
+
+ MessageFactory factory = MessageFactory.newInstance();
+
+ String str="<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:wsdl=\"http://www.jboss.org/bpel/examples/wsdl\">"+
+ "<soapenv:Header/><soapenv:Body><wsdl:hello><TestPart>Hello</TestPart></wsdl:hello></soapenv:Body></soapenv:Envelope>";
+
+ java.io.InputStream is=new java.io.ByteArrayInputStream(str.getBytes());
+
+ SOAPMessage soapReq1 = factory.createMessage(null, is);
+
+ System.out.println("Invoking server through Dispatch interface using SOAPMessage");
+ SOAPMessage soapResp = dispatcher.invoke(soapReq1);
+
+ String result=soapResp.getSOAPBody().getTextContent();
+
+ System.out.println("Response from server: " + result);
+
+ return result.contains("Hello World");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ throw new RuntimeException(ex);
+ }
+ }
+
+}
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessService.java
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessService.java (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessService.java 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,77 @@
+
+/*
+ *
+ */
+
+package org.jboss.soa.bpel.tests.harness;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.Service;
+
+/**
+ * This class was generated by Apache CXF 2.2.6
+ * Mon Jun 14 11:12:40 BST 2010
+ * Generated source version: 2.2.6
+ *
+ */
+
+
+@WebServiceClient(name = "SecureServiceTestHarnessService",
+ wsdlLocation = "file:/home/gbrown/dev/riftsaw/workspace/TestHarness/wsdl/SecureServiceTestHarnessService.wsdl",
+ targetNamespace = "http://harness.tests.bpel.soa.jboss.org/")
+public class SecureServiceTestHarnessService extends Service {
+
+ public final static URL WSDL_LOCATION;
+ public final static QName SERVICE = new QName("http://harness.tests.bpel.soa.jboss.org/", "SecureServiceTestHarnessService");
+ public final static QName SecureServiceTestHarnessPort = new QName("http://harness.tests.bpel.soa.jboss.org/", "SecureServiceTestHarnessPort");
+ static {
+ URL url = null;
+ try {
+ url = new URL("file:/home/gbrown/dev/riftsaw/workspace/TestHarness/wsdl/SecureServiceTestHarnessService.wsdl");
+ } catch (MalformedURLException e) {
+ System.err.println("Can not initialize the default wsdl from file:/home/gbrown/dev/riftsaw/workspace/TestHarness/wsdl/SecureServiceTestHarnessService.wsdl");
+ // e.printStackTrace();
+ }
+ WSDL_LOCATION = url;
+ }
+
+ public SecureServiceTestHarnessService(URL wsdlLocation) {
+ super(wsdlLocation, SERVICE);
+ }
+
+ public SecureServiceTestHarnessService(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public SecureServiceTestHarnessService() {
+ super(WSDL_LOCATION, SERVICE);
+ }
+
+ /**
+ *
+ * @return
+ * returns SecureServiceTestHarness
+ */
+ @WebEndpoint(name = "SecureServiceTestHarnessPort")
+ public SecureServiceTestHarness getSecureServiceTestHarnessPort() {
+ return super.getPort(SecureServiceTestHarnessPort, SecureServiceTestHarness.class);
+ }
+
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns SecureServiceTestHarness
+ */
+ @WebEndpoint(name = "SecureServiceTestHarnessPort")
+ public SecureServiceTestHarness getSecureServiceTestHarnessPort(WebServiceFeature... features) {
+ return super.getPort(SecureServiceTestHarnessPort, SecureServiceTestHarness.class, features);
+ }
+
+}
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Client.java
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Client.java (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Client.java 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,65 @@
+
+package org.jboss.soa.bpel.tests.harness;
+
+/**
+ * Please modify this class to meet your needs
+ * This class is not complete
+ */
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+/**
+ * This class was generated by Apache CXF 2.2.6
+ * Mon Jun 14 11:12:40 BST 2010
+ * Generated source version: 2.2.6
+ *
+ */
+
+public final class SecureServiceTestHarness_SecureServiceTestHarnessPort_Client {
+
+ private static final QName SERVICE_NAME = new QName("http://harness.tests.bpel.soa.jboss.org/", "SecureServiceTestHarnessService");
+
+ private SecureServiceTestHarness_SecureServiceTestHarnessPort_Client() {
+ }
+
+ public static void main(String args[]) throws Exception {
+ URL wsdlURL = SecureServiceTestHarnessService.WSDL_LOCATION;
+ if (args.length > 0) {
+ File wsdlFile = new File(args[0]);
+ try {
+ if (wsdlFile.exists()) {
+ wsdlURL = wsdlFile.toURI().toURL();
+ } else {
+ wsdlURL = new URL(args[0]);
+ }
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ SecureServiceTestHarnessService ss = new SecureServiceTestHarnessService(wsdlURL, SERVICE_NAME);
+ SecureServiceTestHarness port = ss.getSecureServiceTestHarnessPort();
+
+ {
+ System.out.println("Invoking runTest...");
+ int _runTest_arg0 = 0;
+ boolean _runTest__return = port.runTest(_runTest_arg0);
+ System.out.println("runTest.result=" + _runTest__return);
+
+
+ }
+
+ System.exit(0);
+ }
+
+}
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Server.java
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Server.java (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Server.java 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,30 @@
+
+package org.jboss.soa.bpel.tests.harness;
+
+import javax.xml.ws.Endpoint;
+
+/**
+ * This class was generated by Apache CXF 2.2.6
+ * Mon Jun 14 11:12:40 BST 2010
+ * Generated source version: 2.2.6
+ *
+ */
+
+public class SecureServiceTestHarness_SecureServiceTestHarnessPort_Server{
+
+ protected SecureServiceTestHarness_SecureServiceTestHarnessPort_Server() throws Exception {
+ System.out.println("Starting Server");
+ Object implementor = new SecureServiceTestHarnessImpl();
+ String address = "http://localhost:9090/SecureServiceTestHarnessPort";
+ Endpoint.publish(address, implementor);
+ }
+
+ public static void main(String args[]) throws Exception {
+ new SecureServiceTestHarness_SecureServiceTestHarnessPort_Server();
+ System.out.println("Server ready...");
+
+ Thread.sleep(5 * 60 * 1000);
+ System.out.println("Server exiting");
+ System.exit(0);
+ }
+}
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/package-info.java
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/package-info.java (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/package-info.java 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,2 @@
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://harness.tests.bpel.soa.jboss.org/")
+package org.jboss.soa.bpel.tests.harness;
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/index.jsp
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/index.jsp (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/index.jsp 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,9 @@
+<html>
+ <body>
+ This is just a place holder.<br>
+ Verify the that the WS has been deployed by hitting
+ <a href="http://localhost:8080/jbossws">
+ http://localhost:8080/jbossws
+ </a>
+ </body>
+</html>
\ No newline at end of file
Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/SecureServiceTestHarnessService.wsdl
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/SecureServiceTestHarnessService.wsdl (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/SecureServiceTestHarnessService.wsdl 2010-06-16 10:23:32 UTC (rev 750)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="SecureServiceTestHarnessService" targetNamespace="http://harness.tests.bpel.soa.jboss.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://harness.tests.bpel.soa.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:types>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://harness.tests.bpel.soa.jboss.org/" elementFormDefault="unqualified" targetNamespace="http://harness.tests.bpel.soa.jboss.org/" version="1.0">
+<xs:element name="runTest" type="tns:runTest"/>
+<xs:element name="runTestResponse" type="tns:runTestResponse"/>
+<xs:complexType name="runTest">
+<xs:sequence>
+<xs:element name="arg0" type="xs:int"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="runTestResponse">
+<xs:sequence>
+<xs:element name="return" type="xs:boolean"/>
+</xs:sequence>
+</xs:complexType>
+</xs:schema>
+ </wsdl:types>
+ <wsdl:message name="runTest">
+ <wsdl:part name="parameters" element="tns:runTest">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="runTestResponse">
+ <wsdl:part name="parameters" element="tns:runTestResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="SecureServiceTestHarness">
+ <wsdl:operation name="runTest">
+ <wsdl:input name="runTest" message="tns:runTest">
+ </wsdl:input>
+ <wsdl:output name="runTestResponse" message="tns:runTestResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="SecureServiceTestHarnessServiceSoapBinding" type="tns:SecureServiceTestHarness">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="runTest">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="runTest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="runTestResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="SecureServiceTestHarnessService">
+ <wsdl:port name="SecureServiceTestHarnessPort" binding="tns:SecureServiceTestHarnessServiceSoapBinding">
+ <soap:address location="http://127.0.0.1:8080/Quickstart_bpel_secure_service_testharness/SecureSe..."/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-06-16 03:19:07 UTC (rev 749)
+++ trunk/pom.xml 2010-06-16 10:23:32 UTC (rev 750)
@@ -72,7 +72,8 @@
</profiles>
<properties>
- <riftsaw.ode.version>2.2.0-SNAPSHOT</riftsaw.ode.version>
+ <riftsaw.ode.version>2.1.0.CR1</riftsaw.ode.version> <!-- This version needs to change when trunk requires
+ ODE changes, but for now we reuse the 2.1.0.CR1 version -->
<riftsaw.engine.version>2.2.0-SNAPSHOT</riftsaw.engine.version>
<bpm.console.version>2.1</bpm.console.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -88,7 +89,7 @@
<commons.codec.version>1.3</commons.codec.version>
<xerces.version>2.9.0</xerces.version>
<commons.httpclient.version>3.1</commons.httpclient.version>
- <cxf.version>2.2.8</cxf.version>
+ <cxf.version>2.2.6</cxf.version>
</properties>
<dependencyManagement>
14 years, 6 months
- 1
- 0
Hudson build is unstable: RiftSaw-mysql-2.1.x #1
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql-2.1.x/1/>
14 years, 6 months
- 1
- 3
riftsaw SVN: r749 - workspace/jeffyu and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-15 23:19:07 -0400 (Tue, 15 Jun 2010)
New Revision: 749
Added:
workspace/jeffyu/riftsaw-jpa/
Removed:
branches/riftsaw-jpa/
Log:
* move riftsaw-jpa to workspace.
Copied: workspace/jeffyu/riftsaw-jpa (from rev 748, branches/riftsaw-jpa)
14 years, 6 months
- 1
- 0
Hudson build became unstable: RiftSaw-2.1.x #3
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-2.1.x/3/changes>
14 years, 6 months
- 1
- 2
Hudson build is unstable: Riftsaw-soa-p-2.1.x #1
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/Riftsaw-soa-p-2.1.x/1/>
14 years, 6 months
- 1
- 1
riftsaw SVN: r748 - in branches/RiftSaw-2.1.x: distribution/src/main/release/db and 10 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-15 10:50:10 -0400 (Tue, 15 Jun 2010)
New Revision: 748
Modified:
branches/RiftSaw-2.1.x/distribution/src/main/release/db/bpel.properties
branches/RiftSaw-2.1.x/distribution/src/main/release/db/sql/mysql.drop.sql
branches/RiftSaw-2.1.x/distribution/src/main/release/db/sql/postgres.drop.sql
branches/RiftSaw-2.1.x/distribution/src/main/release/install/deployment.properties
branches/RiftSaw-2.1.x/integration-tests/pom.xml
branches/RiftSaw-2.1.x/pom.xml
branches/RiftSaw-2.1.x/runtime/engine-assembly/pom.xml
branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/assembly/sar.xml
branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql
branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql
branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql
branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql
branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel.properties
branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java
branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java
branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
Log:
* update riftsaw to use jpa-based hibernate as DAO Impl.
Modified: branches/RiftSaw-2.1.x/distribution/src/main/release/db/bpel.properties
===================================================================
--- branches/RiftSaw-2.1.x/distribution/src/main/release/db/bpel.properties 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/distribution/src/main/release/db/bpel.properties 2010-06-15 14:50:10 UTC (rev 748)
@@ -53,8 +53,10 @@
## 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:
@@ -108,11 +110,16 @@
bpel.jaxws.client.initializer.impl=(a)jaxws.client.initializer.impl@
+# all hibernate specific properties
+
hibernate.dialect=@dialect@
-hibernate.hbm2ddl.auto=update
+hibernate.hbm2ddl.auto=none
hibernate.current_session_context_class=jta
hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
+hibernate.show_sql=false
+hibernate.connection.isolation=2
+
jta.UserTransaction=UserTransaction
ode.persistence=hibernate
Modified: branches/RiftSaw-2.1.x/distribution/src/main/release/db/sql/mysql.drop.sql
===================================================================
--- branches/RiftSaw-2.1.x/distribution/src/main/release/db/sql/mysql.drop.sql 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/distribution/src/main/release/db/sql/mysql.drop.sql 2010-06-15 14:50:10 UTC (rev 748)
@@ -1,25 +1,159 @@
drop table ODE_SCHEMA_VERSION;
drop table ODE_JOB;
-drop table BPEL_ACTIVITY_RECOVERY;
-drop table BPEL_CORRELATION_PROP;
-drop table BPEL_CORRELATION_SET;
-drop table BPEL_CORRELATOR;
-drop table BPEL_CORRELATOR_MESSAGE_CKEY;
-drop table BPEL_EVENT;
-drop table BPEL_FAULT;
-drop table BPEL_INSTANCE;
-drop table BPEL_MESSAGE;
-drop table BPEL_MEX_PROPS;
-drop table BPEL_PLINK_VAL;
-drop table BPEL_PROCESS;
-drop table BPEL_SCOPE;
-drop table BPEL_SELECTORS;
-drop table BPEL_UNMATCHED;
-drop table BPEL_XML_DATA;
-drop table VAR_PROPERTY;
-drop table STORE_DU;
-drop table STORE_PROCESS;
-drop table STORE_PROCESS_PROP;
-drop table STORE_VERSIONS;
-drop table BPEL_MESSAGE_EXCHANGE;
-drop table hibernate_unique_key;
+
+ alter table ODE_ACTIVITY_RECOVERY
+ drop
+ foreign key FK5274B556E38CB1C9;
+
+ alter table ODE_CORRELATION_SET
+ drop
+ foreign key FK399D7EB621712AFA;
+
+ alter table ODE_CORRELATOR
+ drop
+ foreign key FKC4413FB8748734BD;
+
+ alter table ODE_CORSET_PROP
+ drop
+ foreign key FK3B13A3F744AFA280;
+
+ alter table ODE_EVENT
+ drop
+ foreign key FK410D028BA0243704;
+
+ alter table ODE_EVENT
+ drop
+ foreign key FK410D028BE38CB1C9;
+
+ alter table ODE_MESSAGE
+ drop
+ foreign key FKBCCD53B81291B75D;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACA57B8F584;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACA8618FFF9;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACADB5AB781;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACA7B80504F;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACADC273092;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACAA0243704;
+
+ alter table ODE_MESSAGE_ROUTE
+ drop
+ foreign key FK8082C6E28618FFF9;
+
+ alter table ODE_MESSAGE_ROUTE
+ drop
+ foreign key FK8082C6E2DB5AB781;
+
+ alter table ODE_MEX_PROP
+ drop
+ foreign key FKE61574D1AA079EB8;
+
+ alter table ODE_PARTNER_LINK
+ drop
+ foreign key FK7337940021712AFA;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop
+ foreign key FK4E20A7D4F3A6B9B7;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop
+ foreign key FK4E20A7D4F0BBEFCC;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop
+ foreign key FK4E20A7D46C4AB4DE;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop
+ foreign key FK4E20A7D4A0243704;
+
+ alter table ODE_SCOPE
+ drop
+ foreign key FK41C9CE458618FFF9;
+
+ alter table ODE_SCOPE
+ drop
+ foreign key FK41C9CE45F6D972EF;
+
+ alter table ODE_XML_DATA
+ drop
+ foreign key FKEF74614121712AFA;
+
+ alter table ODE_XML_DATA_PROP
+ drop
+ foreign key FK936B93A181C9218F;
+
+ alter table STORE_PROCESS
+ drop
+ foreign key FKA83900D1BAFA89CA;
+
+ alter table STORE_PROC_TO_PROP
+ drop
+ foreign key FKB85D957C891ECF61;
+
+ alter table STORE_PROC_TO_PROP
+ drop
+ foreign key FKB85D957C3C8753EC;
+
+ drop table if exists ODE_ACTIVITY_RECOVERY;
+
+ drop table if exists ODE_CORRELATION_SET;
+
+ drop table if exists ODE_CORRELATOR;
+
+ drop table if exists ODE_CORSET_PROP;
+
+ drop table if exists ODE_EVENT;
+
+ drop table if exists ODE_FAULT;
+
+ drop table if exists ODE_MESSAGE;
+
+ drop table if exists ODE_MESSAGE_EXCHANGE;
+
+ drop table if exists ODE_MESSAGE_ROUTE;
+
+ drop table if exists ODE_MEX_PROP;
+
+ drop table if exists ODE_PARTNER_LINK;
+
+ drop table if exists ODE_PROCESS;
+
+ drop table if exists ODE_PROCESS_INSTANCE;
+
+ drop table if exists ODE_SCOPE;
+
+ drop table if exists ODE_XML_DATA;
+
+ drop table if exists ODE_XML_DATA_PROP;
+
+ drop table if exists STORE_DU;
+
+ drop table if exists STORE_PROCESS;
+
+ drop table if exists STORE_PROCESS_PROP;
+
+ drop table if exists STORE_PROC_TO_PROP;
+
+ drop table if exists STORE_VERSIONS;
+
+
+
Modified: branches/RiftSaw-2.1.x/distribution/src/main/release/db/sql/postgres.drop.sql
===================================================================
--- branches/RiftSaw-2.1.x/distribution/src/main/release/db/sql/postgres.drop.sql 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/distribution/src/main/release/db/sql/postgres.drop.sql 2010-06-15 14:50:10 UTC (rev 748)
@@ -1,25 +1,130 @@
drop table ODE_SCHEMA_VERSION;
drop table ODE_JOB;
-drop table BPEL_ACTIVITY_RECOVERY;
-drop table BPEL_CORRELATION_PROP;
-drop table BPEL_CORRELATION_SET;
-drop table BPEL_CORRELATOR;
-drop table BPEL_CORRELATOR_MESSAGE_CKEY;
-drop table BPEL_EVENT;
-drop table BPEL_FAULT;
-drop table BPEL_INSTANCE;
-drop table BPEL_MESSAGE;
-drop table BPEL_MEX_PROPS;
-drop table BPEL_PLINK_VAL;
-drop table BPEL_PROCESS;
-drop table BPEL_SCOPE;
-drop table BPEL_SELECTORS;
-drop table BPEL_UNMATCHED;
-drop table BPEL_XML_DATA;
-drop table VAR_PROPERTY;
-drop sequence hibernate_seqhilo;
-drop table STORE_DU;
-drop table STORE_PROCESS;
-drop table STORE_PROCESS_PROP;
-drop table STORE_VERSIONS;
-drop table BPEL_MESSAGE_EXCHANGE;
\ No newline at end of file
+
+ alter table ODE_ACTIVITY_RECOVERY
+ drop constraint FK5274B556E38CB1C9;
+
+ alter table ODE_CORRELATION_SET
+ drop constraint FK399D7EB621712AFA;
+
+ alter table ODE_CORRELATOR
+ drop constraint FKC4413FB8748734BD;
+
+ alter table ODE_CORSET_PROP
+ drop constraint FK3B13A3F744AFA280;
+
+ alter table ODE_EVENT
+ drop constraint FK410D028BA0243704;
+
+ alter table ODE_EVENT
+ drop constraint FK410D028BE38CB1C9;
+
+ alter table ODE_MESSAGE
+ drop constraint FKBCCD53B81291B75D;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACA57B8F584;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACA8618FFF9;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACADB5AB781;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACA7B80504F;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACADC273092;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACAA0243704;
+
+ alter table ODE_MESSAGE_ROUTE
+ drop constraint FK8082C6E28618FFF9;
+
+ alter table ODE_MESSAGE_ROUTE
+ drop constraint FK8082C6E2DB5AB781;
+
+ alter table ODE_MEX_PROP
+ drop constraint FKE61574D1AA079EB8;
+
+ alter table ODE_PARTNER_LINK
+ drop constraint FK7337940021712AFA;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop constraint FK4E20A7D4F3A6B9B7;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop constraint FK4E20A7D4F0BBEFCC;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop constraint FK4E20A7D46C4AB4DE;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop constraint FK4E20A7D4A0243704;
+
+ alter table ODE_SCOPE
+ drop constraint FK41C9CE458618FFF9;
+
+ alter table ODE_SCOPE
+ drop constraint FK41C9CE45F6D972EF;
+
+ alter table ODE_XML_DATA
+ drop constraint FKEF74614121712AFA;
+
+ alter table ODE_XML_DATA_PROP
+ drop constraint FK936B93A181C9218F;
+
+ alter table STORE_PROCESS
+ drop constraint FKA83900D1BAFA89CA;
+
+ alter table STORE_PROC_TO_PROP
+ drop constraint FKB85D957C891ECF61;
+
+ alter table STORE_PROC_TO_PROP
+ drop constraint FKB85D957C3C8753EC;
+
+ drop table ODE_ACTIVITY_RECOVERY;
+
+ drop table ODE_CORRELATION_SET;
+
+ drop table ODE_CORRELATOR;
+
+ drop table ODE_CORSET_PROP;
+
+ drop table ODE_EVENT;
+
+ drop table ODE_FAULT;
+
+ drop table ODE_MESSAGE;
+
+ drop table ODE_MESSAGE_EXCHANGE;
+
+ drop table ODE_MESSAGE_ROUTE;
+
+ drop table ODE_MEX_PROP;
+
+ drop table ODE_PARTNER_LINK;
+
+ drop table ODE_PROCESS;
+
+ drop table ODE_PROCESS_INSTANCE;
+
+ drop table ODE_SCOPE;
+
+ drop table ODE_XML_DATA;
+
+ drop table ODE_XML_DATA_PROP;
+
+ drop table STORE_DU;
+
+ drop table STORE_PROCESS;
+
+ drop table STORE_PROCESS_PROP;
+
+ drop table STORE_PROC_TO_PROP;
+
+ drop table STORE_VERSIONS;
+
+ drop sequence hibernate_sequence;
Modified: branches/RiftSaw-2.1.x/distribution/src/main/release/install/deployment.properties
===================================================================
--- branches/RiftSaw-2.1.x/distribution/src/main/release/install/deployment.properties 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/distribution/src/main/release/install/deployment.properties 2010-06-15 14:50:10 UTC (rev 748)
@@ -19,5 +19,5 @@
org.jboss.esb.home=/var/local/jbossesb-4.7
# database
-# (e.g. hsql derby mysql)
+# (e.g. hsql postgres mysql)
database=hsql
Modified: branches/RiftSaw-2.1.x/integration-tests/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/pom.xml 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/integration-tests/pom.xml 2010-06-15 14:50:10 UTC (rev 748)
@@ -561,6 +561,8 @@
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELAtmTestCase.java</exclude>
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java</exclude>
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELTravelAgencyTestCase.java</exclude>
+ <!-- comment it for now -->
+ <exclude>**/*RiftSaw163*.java</exclude>
</excludes>
</configuration>
<executions>
Modified: branches/RiftSaw-2.1.x/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/pom.xml 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/pom.xml 2010-06-15 14:50:10 UTC (rev 748)
@@ -209,11 +209,16 @@
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
- <artifactId>riftsaw-dao-hibernate</artifactId>
+ <artifactId>riftsaw-dao-jpa</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: branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2010-06-15 14:50:10 UTC (rev 748)
@@ -22,7 +22,7 @@
import java.util.regex.Pattern;
import javax.naming.InitialContext;
-import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
import javax.xml.namespace.QName;
import org.apache.commons.logging.Log;
@@ -32,7 +32,9 @@
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.il.config.OdeConfigProperties;
+import org.apache.ode.dao.store.ConfStoreDAOConnection;
+import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory;
+import org.apache.ode.dao.store.DeploymentUnitDAO;
import org.jboss.soa.bpel.deployer.BPELDeployer;
import org.jboss.soa.bpel.deployer.BPELDeploymentUnit;
@@ -42,8 +44,8 @@
private static final Log __log = LogFactory.getLog(RiftSawProcessStore.class);
private DeployScheduler m_deployScheduler=new DeployScheduler();
- public RiftSawProcessStore(EndpointReferenceContext eprContext, DataSource ds, String persistenceType, OdeConfigProperties props, boolean createDatamodel) {
- super(eprContext, ds, persistenceType, props, createDatamodel);
+ public RiftSawProcessStore(EndpointReferenceContext eprContext, TransactionManager txm, ConfStoreDAOConnectionFactory cf) {
+ super(eprContext, txm, cf);
}
public void loadAll() {
@@ -136,7 +138,7 @@
// Check for the deployment unit associated with the name
boolean deploy=exec(new ProcessStoreImpl.Callable<Boolean>() {
- public Boolean call(ConfStoreConnection conn) {
+ public Boolean call(ConfStoreDAOConnection conn) {
boolean ret=false;
DeploymentUnitDAO dudao = conn.getDeploymentUnit(bdu.getName());
if (dudao == null)
Modified: branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-06-15 14:50:10 UTC (rev 748)
@@ -20,7 +20,6 @@
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;
@@ -29,6 +28,8 @@
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;
@@ -65,6 +66,7 @@
protected OdeConfigProperties _odeConfig;
protected TransactionManager _txMgr;
protected BpelDAOConnectionFactory _daoCF;
+ protected ConfStoreDAOConnectionFactory _storeCF;
protected Scheduler _scheduler;
protected Database _db;
protected ExecutorService _executorService;
@@ -163,7 +165,8 @@
__log.error(errorMsg, e);
throw new Exception(errorMsg);
}
-
+
+
// Hopefully we have a response
__log.debug("Handling response for MEX " + odeMex);
boolean commit = false;
@@ -363,6 +366,15 @@
} 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 {
@@ -422,8 +434,9 @@
__log.debug("USING DAO: "+_odeConfig.getDAOConnectionFactory());
try {
_daoCF = _db.createDaoCF();
+ _storeCF = _db.createDaoStoreCF();
} catch (Exception ex) {
- String errmsg = "DAO INSTANTIATION FAILED: "+_odeConfig.getDAOConnectionFactory();
+ String errmsg = "DAO INSTANTIATION FAILED: "+_odeConfig.getDAOConnectionFactory() + " and " + _odeConfig.getDAOConfStoreConnectionFactory();
__log.error(errmsg, ex);
throw new Exception(errmsg, ex);
@@ -431,15 +444,14 @@
}
protected void initProcessStore(EndpointReferenceContext eprContext) {
- _store = createProcessStore(eprContext, _db.getDataSource());
+ _store = createProcessStore(eprContext, _txMgr, _storeCF);
_store.registerListener(new ProcessStoreListenerImpl());
}
- protected ProcessStoreImpl createProcessStore(EndpointReferenceContext eprContext, DataSource ds) {
- return new RiftSawProcessStore(eprContext, ds, _odeConfig.getDAOConnectionFactory(), _odeConfig, false);
+ protected ProcessStoreImpl createProcessStore(EndpointReferenceContext eprContext, TransactionManager txm, ConfStoreDAOConnectionFactory cf) {
+ return new RiftSawProcessStore(eprContext, txm, cf);
}
-
protected Scheduler createScheduler() {
SimpleScheduler scheduler = new SimpleScheduler(new GUID().toString(),new JdbcDelegate(_db.getDataSource()), _odeConfig.getProperties());
scheduler.setExecutorService(_executorService);
@@ -747,4 +759,8 @@
{
return _odeConfig;
}
+
+ public BpelServerImpl getBpelServer() {
+ return _bpelServer;
+ }
}
Modified: branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2010-06-15 14:50:10 UTC (rev 748)
@@ -230,7 +230,7 @@
javax.xml.soap.SOAPHeader soapHeader = soapMessage.getSOAPHeader();
if (soapHeader==null) soapHeader = soapMessage.getSOAPPart().getEnvelope().addHeader();
for (Node headerNode : headerParts.values()) {
- if (headerNode.getNodeType() == Node.ELEMENT_NODE) {
+ if (Node.ELEMENT_NODE == headerNode.getNodeType()) {
if (getFirstChildWithName(new QName(headerNode.getNamespaceURI(), headerNode.getLocalName()),soapHeader) == null) {
SOAPElement partElement = soapFactory.createElement((Element) headerNode);
soapHeader.addChildElement(partElement);
Modified: branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-15 14:50:10 UTC (rev 748)
@@ -140,7 +140,8 @@
wsdlDefinition = wsdlReference.getDefinition();
wsdlUrl = wsdlReference.getWsdlURL();
}
- this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefinition, serviceName, port.getLocalPart());
+
+ this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefinition, serviceName, port.getLocalPart());
isInitialized=true;
}
@@ -159,10 +160,13 @@
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.getMessageExchangeId());
scheduler.registerSynchronizer(new Scheduler.Synchronizer() {
public void afterCompletion(boolean success)
@@ -173,78 +177,7 @@
// 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(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;
- }
-
- });
+ executorService.submit(executionCallable);
}
public void beforeCompletion(){}
@@ -257,44 +190,140 @@
{
// one-way invocation
ExecutorService executorService = executionEnvironment.getExecutorService();
- executorService.submit(new Callable<Object>(){
+ executionCallable = new OneWayCallable(mex.getMessageExchangeId());
+ executorService.submit(executionCallable);
- 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());
+ mex.replyOneWayOk();
+ }
+ }
+
+ private class TwoWayCallable implements Callable<Object> {
+
+ private String mexId;
+
+ public TwoWayCallable(String mexId) {
+ this.mexId = mexId;
+ }
+
+ public Object call() throws Exception {
+
+ return executionEnvironment.getScheduler().execTransaction(new Callable<Object>(){
- 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);
- }
+ public Object call() throws Exception {
+ //We need to get a new mex from persistence layer.
+ PartnerRoleMessageExchange mex = (PartnerRoleMessageExchange) engine.getBpelServer().getEngine().getMessageExchange(mexId);
+ 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);
- return 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());
- mex.replyOneWayOk();
- }
+ 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 String mexId;
+
+ public OneWayCallable(String mex) {
+ this.mexId = mexId;
+ }
+
+ public Object call() throws Exception {
+ return executionEnvironment.getScheduler().execTransaction(new Callable<Object>(){
+
+ public Object call() throws Exception {
+ //We need to get a new mex from persistence layer.
+ PartnerRoleMessageExchange mex = (PartnerRoleMessageExchange) engine.getBpelServer().getEngine().getMessageExchange(mexId);
+ 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;
+ }
+
+ });
+ }
+
}
@@ -366,8 +395,6 @@
initializer = (JAXWSInitializer)cls.newInstance();
- log.debug("JAXWS Client Initializer instantiated: "+initializer);
-
} catch(Exception e) {
log.error("Unable to obtain JAXWS Initializer class '"+impl+"'", e);
}
Modified: branches/RiftSaw-2.1.x/runtime/engine-assembly/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine-assembly/pom.xml 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/runtime/engine-assembly/pom.xml 2010-06-15 14:50:10 UTC (rev 748)
@@ -48,10 +48,14 @@
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
- <artifactId>riftsaw-dao-hibernate</artifactId>
+ <artifactId>riftsaw-dao-jpa</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: branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/assembly/sar.xml
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/assembly/sar.xml 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/assembly/sar.xml 2010-06-15 14:50:10 UTC (rev 748)
@@ -53,7 +53,9 @@
<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-hibernate</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.runtime:riftsaw-engine</include>
<include>org.jboss.soa.bpel:riftsaw-jacob</include>
<include>org.jboss.soa.bpel:riftsaw-scheduler-simple</include>
Modified: branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql 2010-06-15 14:50:10 UTC (rev 748)
@@ -1,12 +1,12 @@
create table ODE_SCHEMA_VERSION(VERSION integer);
insert into ODE_SCHEMA_VERSION values (6);
+
-- Apache ODE - SimpleScheduler Database Schema
--
--- Apache Derby scripts by Maciej Szefler.
+-- MySQL 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,37 +26,225 @@
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 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
+ 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
Modified: branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql 2010-06-15 14:50:10 UTC (rev 748)
@@ -1,5 +1,25 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
create table ODE_SCHEMA_VERSION(VERSION integer);
insert into ODE_SCHEMA_VERSION values (6);
+
-- Apache ODE - SimpleScheduler Database Schema
--
-- MySQL scripts by Maciej Szefler.
@@ -23,7 +43,7 @@
correlationKeySet varchar(255),
retryCount int,
inMem int,
- detailsExt blob(4096) NULL,
+ detailsExt blob(4096),
PRIMARY KEY(jobid),
INDEX IDX_ODE_JOB_TS(ts),
@@ -33,35 +53,222 @@
COMMIT;
-create table BPEL_ACTIVITY_RECOVERY (ID bigint not null, PIID bigint, AID bigint, CHANNEL varchar(255), REASON varchar(255), DATE_TIME datetime, DETAILS blob, ACTIONS varchar(255), RETRIES integer, INSERT_TIME datetime, 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 datetime, 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 datetime, MLOCK integer not null, primary key (ID));
-create table BPEL_CORRELATOR (ID bigint not null, CID varchar(255), PROCESS_ID bigint, INSERT_TIME datetime, 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 datetime, MLOCK integer not null, primary key (ID));
-create table BPEL_EVENT (ID bigint not null, IID bigint, PID bigint, TSTAMP datetime, TYPE varchar(255), DETAIL longtext, DATA blob, SID bigint, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
-create table BPEL_FAULT (ID bigint not null, FAULTNAME varchar(255), DATA blob, EXPLANATION varchar(4000), LINE_NUM integer, AID integer, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
-create table BPEL_INSTANCE (ID bigint not null, INSTANTIATING_CORRELATOR bigint, FAULT bigint, JACOB_STATE_DATA blob, PREVIOUS_STATE smallint, PROCESS_ID bigint, STATE smallint, LAST_ACTIVE_DT datetime, SEQUENCE bigint, FAILURE_COUNT integer, FAILURE_DT datetime, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
-create table BPEL_MESSAGE (ID bigint not null, MEX bigint, TYPE varchar(255), MESSAGE_DATA blob, MESSAGE_HEADER blob, INSERT_TIME datetime, 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 blob, CALLBACK_ENDPOINT blob, REQUEST bigint, RESPONSE bigint, INSERT_DT datetime, 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 datetime, 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 blob, PARTNERROLE_EPR_DATA blob, PROCESS bigint, SCOPE bigint, SVCNAME varchar(255), MYROLE varchar(100), MODELID integer, MYSESSIONID varchar(255), PARTNERSESSIONID varchar(255), INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
-create table BPEL_PROCESS (ID bigint not null, PROCID varchar(255) not null unique, deployer varchar(255), deploydate datetime, type_name varchar(255), type_ns varchar(255), version bigint, ACTIVE_ bit, guid varchar(255), INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
-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 datetime, 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 datetime, 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 datetime, MLOCK integer not null, primary key (ID));
-create table BPEL_XML_DATA (ID bigint not null, DATA blob, NAME varchar(255) not null, SIMPLE_VALUE varchar(255), SCOPE_ID bigint, PIID bigint, IS_SIMPLE_TYPE bit, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
-create table STORE_DU (NAME varchar(255) not null, deployer varchar(255), DEPLOYDT datetime, 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 datetime, 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 table hibernate_unique_key ( next_hi integer );
-insert into hibernate_unique_key values ( 0 );
\ No newline at end of file
+ create table ODE_ACTIVITY_RECOVERY (
+ ID bigint not null auto_increment,
+ ACTIONS varchar(255),
+ ACTIVITY_ID bigint,
+ CHANNEL varchar(255),
+ DATE_TIME datetime,
+ DETAILS longtext,
+ INSTANCE_ID bigint,
+ REASON varchar(255),
+ RETRIES integer,
+ primary key (ID)
+ ) type=InnoDB;
+
+ create table ODE_CORRELATION_SET (
+ CORRELATION_SET_ID bigint not null auto_increment,
+ CORRELATION_KEY varchar(255),
+ NAME varchar(255),
+ SCOPE_ID bigint,
+ primary key (CORRELATION_SET_ID)
+ ) type=InnoDB;
+
+ create table ODE_CORRELATOR (
+ CORRELATOR_ID bigint not null auto_increment,
+ CORRELATOR_KEY varchar(255),
+ PROC_ID bigint,
+ primary key (CORRELATOR_ID)
+ ) type=InnoDB;
+
+ create table ODE_CORSET_PROP (
+ ID bigint not null auto_increment,
+ CORRSET_ID bigint,
+ PROP_KEY varchar(255),
+ PROP_VALUE varchar(255),
+ primary key (ID)
+ ) type=InnoDB;
+
+ create table ODE_EVENT (
+ EVENT_ID bigint not null auto_increment,
+ DETAIL varchar(255),
+ DATA longblob,
+ SCOPE_ID bigint,
+ TSTAMP datetime,
+ TYPE varchar(255),
+ INSTANCE_ID bigint,
+ PROCESS_ID bigint,
+ primary key (EVENT_ID)
+ ) type=InnoDB;
+
+ create table ODE_FAULT (
+ FAULT_ID bigint not null auto_increment,
+ ACTIVITY_ID integer,
+ DATA longtext,
+ MESSAGE longtext,
+ LINE_NUMBER integer,
+ NAME varchar(255),
+ primary key (FAULT_ID)
+ ) type=InnoDB;
+
+ create table ODE_MESSAGE (
+ MESSAGE_ID bigint not null auto_increment,
+ DATA longtext,
+ HEADER longtext,
+ TYPE varchar(255),
+ MESSAGE_EXCHANGE_ID varchar(255),
+ primary key (MESSAGE_ID)
+ ) type=InnoDB;
+
+ 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 datetime,
+ DIRECTION char(1),
+ EPR longtext,
+ 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 bit,
+ 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)
+ ) type=InnoDB;
+
+ create table ODE_MESSAGE_ROUTE (
+ MESSAGE_ROUTE_ID bigint not null auto_increment,
+ 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)
+ ) type=InnoDB;
+
+ create table ODE_MEX_PROP (
+ ID bigint not null auto_increment,
+ MEX_ID varchar(255),
+ PROP_KEY varchar(255),
+ PROP_VALUE longtext,
+ primary key (ID)
+ ) type=InnoDB;
+
+ create table ODE_PARTNER_LINK (
+ PARTNER_LINK_ID bigint not null auto_increment,
+ MY_EPR longtext,
+ MY_ROLE_NAME varchar(255),
+ MY_ROLE_SERVICE_NAME varchar(255),
+ MY_SESSION_ID varchar(255),
+ PARTNER_EPR longtext,
+ 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)
+ ) type=InnoDB;
+
+ create table ODE_PROCESS (
+ ID bigint not null auto_increment,
+ GUID varchar(255),
+ PROCESS_ID varchar(255),
+ PROCESS_TYPE varchar(255),
+ VERSION bigint,
+ primary key (ID)
+ ) type=InnoDB;
+
+ create table ODE_PROCESS_INSTANCE (
+ ID bigint not null auto_increment,
+ DATE_CREATED datetime,
+ EXECUTION_STATE longblob,
+ FAULT_ID bigint,
+ LAST_ACTIVE_TIME datetime,
+ LAST_RECOVERY_DATE datetime,
+ PREVIOUS_STATE smallint,
+ SEQUENCE bigint,
+ INSTANCE_STATE smallint,
+ INSTANTIATING_CORRELATOR_ID bigint,
+ PROCESS_ID bigint,
+ ROOT_SCOPE_ID bigint,
+ primary key (ID)
+ ) type=InnoDB;
+
+ create table ODE_SCOPE (
+ SCOPE_ID bigint not null auto_increment,
+ MODEL_ID integer,
+ SCOPE_NAME varchar(255),
+ SCOPE_STATE varchar(255),
+ PARENT_SCOPE_ID bigint,
+ PROCESS_INSTANCE_ID bigint,
+ primary key (SCOPE_ID)
+ ) type=InnoDB;
+
+ create table ODE_XML_DATA (
+ XML_DATA_ID bigint not null auto_increment,
+ DATA longtext,
+ IS_SIMPLE_TYPE bit,
+ NAME varchar(255),
+ SCOPE_ID bigint,
+ primary key (XML_DATA_ID)
+ ) type=InnoDB;
+
+ create table ODE_XML_DATA_PROP (
+ ID bigint not null auto_increment,
+ XML_DATA_ID bigint,
+ PROP_KEY varchar(255),
+ PROP_VALUE varchar(255),
+ primary key (ID)
+ ) type=InnoDB;
+
+ create table STORE_DU (
+ NAME varchar(255) not null,
+ DEPLOYDT datetime,
+ DEPLOYER varchar(255),
+ DIR varchar(255),
+ primary key (NAME)
+ ) type=InnoDB;
+
+ create table STORE_PROCESS (
+ PID varchar(255) not null,
+ STATE varchar(255),
+ TYPE varchar(255),
+ VERSION bigint,
+ DU varchar(255),
+ primary key (PID)
+ ) type=InnoDB;
+
+ create table STORE_PROCESS_PROP (
+ ID bigint not null auto_increment,
+ PROP_KEY varchar(255),
+ PROP_VAL varchar(255),
+ primary key (ID)
+ ) type=InnoDB;
+
+ 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)
+ ) type=InnoDB;
+
+ create table STORE_VERSIONS (
+ ID bigint not null auto_increment,
+ VERSION bigint,
+ primary key (ID)
+ ) type=InnoDB;
\ No newline at end of file
Modified: branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql 2010-06-15 14:50:10 UTC (rev 748)
@@ -1,11 +1,33 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
create table ODE_SCHEMA_VERSION(VERSION integer);
insert into ODE_SCHEMA_VERSION values (6);
+
-- Apache ODE - SimpleScheduler Database Schema
--
-- Apache Derby scripts by Maciej Szefler.
--
--
+DROP TABLE ODE_JOB;
+
CREATE TABLE ODE_JOB (
jobid VARCHAR(64) NOT NULL,
ts number(37) NOT NULL,
@@ -30,33 +52,224 @@
CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid);
-create table BPEL_ACTIVITY_RECOVERY (ID number(19,0) not null, PIID number(19,0), AID number(19,0), CHANNEL varchar2(255 char), REASON varchar2(255 char), DATE_TIME timestamp, DETAILS blob, ACTIONS varchar2(255 char), RETRIES number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_CORRELATION_PROP (ID number(19,0) not null, NAME varchar2(255 char), NAMESPACE varchar2(255 char), VALUE varchar2(255 char), CORR_SET_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_CORRELATION_SET (ID number(19,0) not null, VALUE varchar2(255 char), CORR_SET_NAME varchar2(255 char), SCOPE_ID number(19,0), PIID number(19,0), PROCESS_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_CORRELATOR (ID number(19,0) not null, CID varchar2(255 char), PROCESS_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_CORRELATOR_MESSAGE_CKEY (ID number(19,0) not null, CKEY varchar2(255 char), CORRELATOR_MESSAGE_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_EVENT (ID number(19,0) not null, IID number(19,0), PID number(19,0), TSTAMP timestamp, TYPE varchar2(255 char), DETAIL clob, DATA blob, SID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_FAULT (ID number(19,0) not null, FAULTNAME varchar2(255 char), DATA blob, EXPLANATION varchar2(4000 char), LINE_NUM number(10,0), AID number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_INSTANCE (ID number(19,0) not null, INSTANTIATING_CORRELATOR number(19,0), FAULT number(19,0), JACOB_STATE_DATA blob, PREVIOUS_STATE number(5,0), PROCESS_ID number(19,0), STATE number(5,0), LAST_ACTIVE_DT timestamp, SEQUENCE number(19,0), FAILURE_COUNT number(10,0), FAILURE_DT timestamp, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_MESSAGE (ID number(19,0) not null, MEX number(19,0), TYPE varchar2(255 char), MESSAGE_DATA blob, MESSAGE_HEADER blob, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_MESSAGE_EXCHANGE (ID number(19,0) not null, PORT_TYPE varchar2(255 char), CHANNEL_NAME varchar2(255 char), CLIENTKEY varchar2(255 char), ENDPOINT blob, CALLBACK_ENDPOINT blob, REQUEST number(19,0), RESPONSE number(19,0), INSERT_DT timestamp, OPERATION varchar2(255 char), STATE varchar2(255 char), PROCESS number(19,0), PIID number(19,0), DIR char(1 char), PLINK_MODELID number(10,0), PATTERN varchar2(255 char), CORR_STATUS varchar2(255 char), FAULT_TYPE varchar2(255 char), FAULT_EXPL varchar2(255 char), CALLEE varchar2(255 char), PARTNERLINK number(19,0), PIPED_ID varchar2(255 char), SUBSCRIBER_COUNT number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_MEX_PROPS (MEX number(19,0) not null, VALUE long, NAME varchar2(255 char) not null, primary key (MEX, NAME));
-create table BPEL_PLINK_VAL (ID number(19,0) not null, PARTNER_LINK varchar2(100 char) not null, PARTNERROLE varchar2(100 char), MYROLE_EPR_DATA blob, PARTNERROLE_EPR_DATA blob, PROCESS number(19,0), SCOPE number(19,0), SVCNAME varchar2(255 char), MYROLE varchar2(100 char), MODELID number(10,0), MYSESSIONID varchar2(255 char), PARTNERSESSIONID varchar2(255 char), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_PROCESS (ID number(19,0) not null, PROCID varchar2(255 char) not null unique, deployer varchar2(255 char), deploydate timestamp, type_name varchar2(255 char), type_ns varchar2(255 char), version number(19,0), ACTIVE_ number(1,0), guid varchar2(255 char), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_SCOPE (ID number(19,0) not null, PIID number(19,0), PARENT_SCOPE_ID number(19,0), STATE varchar2(255 char) not null, NAME varchar2(255 char) not null, MODELID number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_SELECTORS (ID number(19,0) not null, PIID number(19,0) not null, SELGRPID varchar2(255 char) not null, IDX number(10,0) not null, CORRELATION_KEY varchar2(255 char) not null, PROC_TYPE varchar2(255 char) not null, ROUTE_POLICY varchar2(255 char), CORRELATOR number(19,0) not null, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR));
-create table BPEL_UNMATCHED (ID number(19,0) not null, MEX number(19,0), CORRELATION_KEY varchar2(255 char), CORRELATOR number(19,0) not null, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table BPEL_XML_DATA (ID number(19,0) not null, DATA blob, NAME varchar2(255 char) not null, SIMPLE_VALUE varchar2(255 char), SCOPE_ID number(19,0), PIID number(19,0), IS_SIMPLE_TYPE number(1,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID));
-create table STORE_DU (NAME varchar2(255 char) not null, deployer varchar2(255 char), DEPLOYDT timestamp, DIR varchar2(255 char), primary key (NAME));
-create table STORE_PROCESS (PID varchar2(255 char) not null, DU varchar2(255 char), TYPE varchar2(255 char), version number(19,0), STATE varchar2(255 char), primary key (PID));
-create table STORE_PROCESS_PROP (propId varchar2(255 char) not null, value varchar2(255 char), name varchar2(255 char) not null, primary key (propId, name));
-create table STORE_VERSIONS (ID number(10,0) not null, VERSION number(19,0), primary key (ID));
-create table VAR_PROPERTY (ID number(19,0) not null, XML_DATA_ID number(19,0), PROP_VALUE varchar2(255 char), PROP_NAME varchar2(255 char) not null, INSERT_TIME timestamp, MLOCK number(10,0) 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
+
+ create table ODE_ACTIVITY_RECOVERY (
+ ID number(19,0) not null,
+ ACTIONS varchar2(255),
+ ACTIVITY_ID number(19,0),
+ CHANNEL varchar2(255),
+ DATE_TIME date,
+ DETAILS clob,
+ INSTANCE_ID number(19,0),
+ REASON varchar2(255),
+ RETRIES number(10,0),
+ primary key (ID)
+ );
+
+ create table ODE_CORRELATION_SET (
+ CORRELATION_SET_ID number(19,0) not null,
+ CORRELATION_KEY varchar2(255),
+ NAME varchar2(255),
+ SCOPE_ID number(19,0),
+ primary key (CORRELATION_SET_ID)
+ );
+
+ create table ODE_CORRELATOR (
+ CORRELATOR_ID number(19,0) not null,
+ CORRELATOR_KEY varchar2(255),
+ PROC_ID number(19,0),
+ primary key (CORRELATOR_ID)
+ );
+
+ create table ODE_CORSET_PROP (
+ ID number(19,0) not null,
+ CORRSET_ID number(19,0),
+ PROP_KEY varchar2(255),
+ PROP_VALUE varchar2(255),
+ primary key (ID)
+ );
+
+ create table ODE_EVENT (
+ EVENT_ID number(19,0) not null,
+ DETAIL varchar2(255),
+ DATA blob,
+ SCOPE_ID number(19,0),
+ TSTAMP date,
+ TYPE varchar2(255),
+ INSTANCE_ID number(19,0),
+ PROCESS_ID number(19,0),
+ primary key (EVENT_ID)
+ );
+
+ create table ODE_FAULT (
+ FAULT_ID number(19,0) not null,
+ ACTIVITY_ID number(10,0),
+ DATA clob,
+ MESSAGE varchar2(4000),
+ LINE_NUMBER number(10,0),
+ NAME varchar2(255),
+ primary key (FAULT_ID)
+ );
+
+ create table ODE_MESSAGE (
+ MESSAGE_ID number(19,0) not null,
+ DATA clob,
+ HEADER clob,
+ TYPE varchar2(255),
+ MESSAGE_EXCHANGE_ID varchar2(255),
+ primary key (MESSAGE_ID)
+ );
+
+ create table ODE_MESSAGE_EXCHANGE (
+ MESSAGE_EXCHANGE_ID varchar2(255) not null,
+ CALLEE varchar2(255),
+ CHANNEL varchar2(255),
+ CORRELATION_ID varchar2(255),
+ CORRELATION_KEYS varchar2(255),
+ CORRELATION_STATUS varchar2(255),
+ CREATE_TIME date,
+ DIRECTION char(1),
+ EPR clob,
+ FAULT varchar2(255),
+ FAULT_EXPLANATION varchar2(255),
+ OPERATION varchar2(255),
+ PARTNER_LINK_MODEL_ID number(10,0),
+ PATTERN varchar2(255),
+ PIPED_ID varchar2(255),
+ PORT_TYPE varchar2(255),
+ PROPAGATE_TRANS number(1,0),
+ STATUS varchar2(255),
+ SUBSCRIBER_COUNT number(10,0),
+ CORR_ID number(19,0),
+ PARTNER_LINK_ID number(19,0),
+ PROCESS_ID number(19,0),
+ PROCESS_INSTANCE_ID number(19,0),
+ REQUEST_MESSAGE_ID number(19,0),
+ RESPONSE_MESSAGE_ID number(19,0),
+ primary key (MESSAGE_EXCHANGE_ID)
+ );
+
+ create table ODE_MESSAGE_ROUTE (
+ MESSAGE_ROUTE_ID number(19,0) not null,
+ CORRELATION_KEY varchar2(255),
+ GROUP_ID varchar2(255),
+ ROUTE_INDEX number(10,0),
+ PROCESS_INSTANCE_ID number(19,0),
+ ROUTE_POLICY varchar2(16),
+ CORR_ID number(19,0),
+ primary key (MESSAGE_ROUTE_ID)
+ );
+
+ create table ODE_MEX_PROP (
+ ID number(19,0) not null,
+ MEX_ID varchar2(255),
+ PROP_KEY varchar2(255),
+ PROP_VALUE varchar2(2000),
+ primary key (ID)
+ );
+
+ create table ODE_PARTNER_LINK (
+ PARTNER_LINK_ID number(19,0) not null,
+ MY_EPR clob,
+ MY_ROLE_NAME varchar2(255),
+ MY_ROLE_SERVICE_NAME varchar2(255),
+ MY_SESSION_ID varchar2(255),
+ PARTNER_EPR clob,
+ PARTNER_LINK_MODEL_ID number(10,0),
+ PARTNER_LINK_NAME varchar2(255),
+ PARTNER_ROLE_NAME varchar2(255),
+ PARTNER_SESSION_ID varchar2(255),
+ SCOPE_ID number(19,0),
+ primary key (PARTNER_LINK_ID)
+ );
+
+ create table ODE_PROCESS (
+ ID number(19,0) not null,
+ GUID varchar2(255),
+ PROCESS_ID varchar2(255),
+ PROCESS_TYPE varchar2(255),
+ VERSION number(19,0),
+ primary key (ID)
+ );
+
+ create table ODE_PROCESS_INSTANCE (
+ ID number(19,0) not null,
+ DATE_CREATED date,
+ EXECUTION_STATE blob,
+ FAULT_ID number(19,0),
+ LAST_ACTIVE_TIME date,
+ LAST_RECOVERY_DATE date,
+ PREVIOUS_STATE number(5,0),
+ SEQUENCE number(19,0),
+ INSTANCE_STATE number(5,0),
+ INSTANTIATING_CORRELATOR_ID number(19,0),
+ PROCESS_ID number(19,0),
+ ROOT_SCOPE_ID number(19,0),
+ primary key (ID)
+ );
+
+ create table ODE_SCOPE (
+ SCOPE_ID number(19,0) not null,
+ MODEL_ID number(10,0),
+ SCOPE_NAME varchar2(255),
+ SCOPE_STATE varchar2(255),
+ PARENT_SCOPE_ID number(19,0),
+ PROCESS_INSTANCE_ID number(19,0),
+ primary key (SCOPE_ID)
+ );
+
+ create table ODE_XML_DATA (
+ XML_DATA_ID number(19,0) not null,
+ DATA clob,
+ IS_SIMPLE_TYPE number(1,0),
+ NAME varchar2(255),
+ SCOPE_ID number(19,0),
+ primary key (XML_DATA_ID)
+ );
+
+ create table ODE_XML_DATA_PROP (
+ ID number(19,0) not null,
+ XML_DATA_ID number(19,0),
+ PROP_KEY varchar2(255),
+ PROP_VALUE varchar2(255),
+ primary key (ID)
+ );
+
+ create table STORE_DU (
+ NAME varchar2(255) not null,
+ DEPLOYDT date,
+ DEPLOYER varchar2(255),
+ DIR varchar2(255),
+ primary key (NAME)
+ );
+
+ create table STORE_PROCESS (
+ PID varchar2(255) not null,
+ STATE varchar2(255),
+ TYPE varchar2(255),
+ VERSION number(19,0),
+ DU varchar2(255),
+ primary key (PID)
+ );
+
+ create table STORE_PROCESS_PROP (
+ ID number(19,0) not null,
+ PROP_KEY varchar2(255),
+ PROP_VAL varchar2(255),
+ primary key (ID)
+ );
+
+ create table STORE_PROC_TO_PROP (
+ STORE_PROCESS_PID varchar2(255) not null,
+ STORE_PROPERTY_ID number(19,0) not null,
+ primary key (STORE_PROCESS_PID, STORE_PROPERTY_ID),
+ unique (STORE_PROPERTY_ID)
+ );
+
+ create table STORE_VERSIONS (
+ ID number(19,0) not null,
+ VERSION number(19,0),
+ primary key (ID)
+ );
+
+ create sequence hibernate_sequence;
\ No newline at end of file
Modified: branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2010-06-15 14:50:10 UTC (rev 748)
@@ -1,5 +1,25 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
create table ODE_SCHEMA_VERSION(VERSION integer);
insert into ODE_SCHEMA_VERSION values (6);
+
-- Apache ODE - SimpleScheduler Database Schema
--
-- Apache Derby scripts by Maciej Szefler.
@@ -30,33 +50,224 @@
CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid);
-create table BPEL_ACTIVITY_RECOVERY (ID int8 not null, PIID int8, AID int8, CHANNEL varchar(255), REASON varchar(255), DATE_TIME timestamp, DETAILS bytea, ACTIONS varchar(255), RETRIES int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_CORRELATION_PROP (ID int8 not null, NAME varchar(255), NAMESPACE varchar(255), VALUE varchar(255), CORR_SET_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_CORRELATION_SET (ID int8 not null, VALUE varchar(255), CORR_SET_NAME varchar(255), SCOPE_ID int8, PIID int8, PROCESS_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_CORRELATOR (ID int8 not null, CID varchar(255), PROCESS_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_CORRELATOR_MESSAGE_CKEY (ID int8 not null, CKEY varchar(255), CORRELATOR_MESSAGE_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_EVENT (ID int8 not null, IID int8, PID int8, TSTAMP timestamp, TYPE varchar(255), DETAIL text, DATA bytea, SID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_FAULT (ID int8 not null, FAULTNAME varchar(255), DATA bytea, EXPLANATION varchar(4000), LINE_NUM int4, AID int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_INSTANCE (ID int8 not null, INSTANTIATING_CORRELATOR int8, FAULT int8, JACOB_STATE_DATA bytea, PREVIOUS_STATE int2, PROCESS_ID int8, STATE int2, LAST_ACTIVE_DT timestamp, SEQUENCE int8, FAILURE_COUNT int4, FAILURE_DT timestamp, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_MESSAGE (ID int8 not null, MEX int8, TYPE varchar(255), MESSAGE_DATA bytea, MESSAGE_HEADER bytea, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_MESSAGE_EXCHANGE (ID int8 not null, PORT_TYPE varchar(255), CHANNEL_NAME varchar(255), CLIENTKEY varchar(255), ENDPOINT bytea, CALLBACK_ENDPOINT bytea, REQUEST int8, RESPONSE int8, INSERT_DT timestamp, OPERATION varchar(255), STATE varchar(255), PROCESS int8, PIID int8, DIR char(1), PLINK_MODELID int4, PATTERN varchar(255), CORR_STATUS varchar(255), FAULT_TYPE varchar(255), FAULT_EXPL varchar(255), CALLEE varchar(255), PARTNERLINK int8, PIPED_ID varchar(255), SUBSCRIBER_COUNT int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_MEX_PROPS (MEX int8 not null, VALUE varchar(8000), NAME varchar(255) not null, primary key (MEX, NAME));
-create table BPEL_PLINK_VAL (ID int8 not null, PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100), MYROLE_EPR_DATA bytea, PARTNERROLE_EPR_DATA bytea, PROCESS int8, SCOPE int8, SVCNAME varchar(255), MYROLE varchar(100), MODELID int4, MYSESSIONID varchar(255), PARTNERSESSIONID varchar(255), INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_PROCESS (ID int8 not null, PROCID varchar(255) not null unique, deployer varchar(255), deploydate timestamp, type_name varchar(255), type_ns varchar(255), version int8, ACTIVE_ bool, guid varchar(255), INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_SCOPE (ID int8 not null, PIID int8, PARENT_SCOPE_ID int8, STATE varchar(255) not null, NAME varchar(255) not null, MODELID int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_SELECTORS (ID int8 not null, PIID int8 not null, SELGRPID varchar(255) not null, IDX int4 not null, CORRELATION_KEY varchar(255) not null, PROC_TYPE varchar(255) not null, ROUTE_POLICY varchar(255), CORRELATOR int8 not null, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR));
-create table BPEL_UNMATCHED (ID int8 not null, MEX int8, CORRELATION_KEY varchar(255), CORRELATOR int8 not null, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
-create table BPEL_XML_DATA (ID int8 not null, DATA bytea, NAME varchar(255) not null, SIMPLE_VALUE varchar(255), SCOPE_ID int8, PIID int8, IS_SIMPLE_TYPE bool, INSERT_TIME timestamp, MLOCK int4 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 int8, 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 int4 not null, VERSION int8, primary key (ID));
-create table VAR_PROPERTY (ID int8 not null, XML_DATA_ID int8, PROP_VALUE varchar(255), PROP_NAME varchar(255) not null, INSERT_TIME timestamp, MLOCK int4 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
+
+ create table ODE_ACTIVITY_RECOVERY (
+ ID int8 not null,
+ ACTIONS varchar(255),
+ ACTIVITY_ID int8,
+ CHANNEL varchar(255),
+ DATE_TIME timestamp,
+ DETAILS text,
+ INSTANCE_ID int8,
+ REASON varchar(255),
+ RETRIES int4,
+ primary key (ID)
+ );
+
+ create table ODE_CORRELATION_SET (
+ CORRELATION_SET_ID int8 not null,
+ CORRELATION_KEY varchar(255),
+ NAME varchar(255),
+ SCOPE_ID int8,
+ primary key (CORRELATION_SET_ID)
+ );
+
+ create table ODE_CORRELATOR (
+ CORRELATOR_ID int8 not null,
+ CORRELATOR_KEY varchar(255),
+ PROC_ID int8,
+ primary key (CORRELATOR_ID)
+ );
+
+ create table ODE_CORSET_PROP (
+ ID int8 not null,
+ CORRSET_ID int8,
+ PROP_KEY varchar(255),
+ PROP_VALUE varchar(255),
+ primary key (ID)
+ );
+
+ create table ODE_EVENT (
+ EVENT_ID int8 not null,
+ DETAIL varchar(255),
+ DATA oid,
+ SCOPE_ID int8,
+ TSTAMP timestamp,
+ TYPE varchar(255),
+ INSTANCE_ID int8,
+ PROCESS_ID int8,
+ primary key (EVENT_ID)
+ );
+
+ create table ODE_FAULT (
+ FAULT_ID int8 not null,
+ ACTIVITY_ID int4,
+ DATA text,
+ MESSAGE varchar(4000),
+ LINE_NUMBER int4,
+ NAME varchar(255),
+ primary key (FAULT_ID)
+ );
+
+ create table ODE_MESSAGE (
+ MESSAGE_ID int8 not null,
+ DATA text,
+ HEADER text,
+ 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(1),
+ EPR text,
+ FAULT varchar(255),
+ FAULT_EXPLANATION varchar(255),
+ OPERATION varchar(255),
+ PARTNER_LINK_MODEL_ID int4,
+ PATTERN varchar(255),
+ PIPED_ID varchar(255),
+ PORT_TYPE varchar(255),
+ PROPAGATE_TRANS bool,
+ STATUS varchar(255),
+ SUBSCRIBER_COUNT int4,
+ CORR_ID int8,
+ PARTNER_LINK_ID int8,
+ PROCESS_ID int8,
+ PROCESS_INSTANCE_ID int8,
+ REQUEST_MESSAGE_ID int8,
+ RESPONSE_MESSAGE_ID int8,
+ primary key (MESSAGE_EXCHANGE_ID)
+ );
+
+ create table ODE_MESSAGE_ROUTE (
+ MESSAGE_ROUTE_ID int8 not null,
+ CORRELATION_KEY varchar(255),
+ GROUP_ID varchar(255),
+ ROUTE_INDEX int4,
+ PROCESS_INSTANCE_ID int8,
+ ROUTE_POLICY varchar(16),
+ CORR_ID int8,
+ primary key (MESSAGE_ROUTE_ID)
+ );
+
+ create table ODE_MEX_PROP (
+ ID int8 not null,
+ MEX_ID varchar(255),
+ PROP_KEY varchar(255),
+ PROP_VALUE varchar(2000),
+ primary key (ID)
+ );
+
+ create table ODE_PARTNER_LINK (
+ PARTNER_LINK_ID int8 not null,
+ MY_EPR text,
+ MY_ROLE_NAME varchar(255),
+ MY_ROLE_SERVICE_NAME varchar(255),
+ MY_SESSION_ID varchar(255),
+ PARTNER_EPR text,
+ PARTNER_LINK_MODEL_ID int4,
+ PARTNER_LINK_NAME varchar(255),
+ PARTNER_ROLE_NAME varchar(255),
+ PARTNER_SESSION_ID varchar(255),
+ SCOPE_ID int8,
+ primary key (PARTNER_LINK_ID)
+ );
+
+ create table ODE_PROCESS (
+ ID int8 not null,
+ GUID varchar(255),
+ PROCESS_ID varchar(255),
+ PROCESS_TYPE varchar(255),
+ VERSION int8,
+ primary key (ID)
+ );
+
+ create table ODE_PROCESS_INSTANCE (
+ ID int8 not null,
+ DATE_CREATED timestamp,
+ EXECUTION_STATE oid,
+ FAULT_ID int8,
+ LAST_ACTIVE_TIME timestamp,
+ LAST_RECOVERY_DATE timestamp,
+ PREVIOUS_STATE int2,
+ SEQUENCE int8,
+ INSTANCE_STATE int2,
+ INSTANTIATING_CORRELATOR_ID int8,
+ PROCESS_ID int8,
+ ROOT_SCOPE_ID int8,
+ primary key (ID)
+ );
+
+ create table ODE_SCOPE (
+ SCOPE_ID int8 not null,
+ MODEL_ID int4,
+ SCOPE_NAME varchar(255),
+ SCOPE_STATE varchar(255),
+ PARENT_SCOPE_ID int8,
+ PROCESS_INSTANCE_ID int8,
+ primary key (SCOPE_ID)
+ );
+
+ create table ODE_XML_DATA (
+ XML_DATA_ID int8 not null,
+ DATA text,
+ IS_SIMPLE_TYPE bool,
+ NAME varchar(255),
+ SCOPE_ID int8,
+ primary key (XML_DATA_ID)
+ );
+
+ create table ODE_XML_DATA_PROP (
+ ID int8 not null,
+ XML_DATA_ID int8,
+ 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 int8,
+ DU varchar(255),
+ primary key (PID)
+ );
+
+ create table STORE_PROCESS_PROP (
+ ID int8 not null,
+ 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 int8 not null,
+ primary key (STORE_PROCESS_PID, STORE_PROPERTY_ID),
+ unique (STORE_PROPERTY_ID)
+ );
+
+ create table STORE_VERSIONS (
+ ID int8 not null,
+ VERSION int8,
+ primary key (ID)
+ );
+
+ create sequence hibernate_sequence;
\ No newline at end of file
Modified: branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel.properties
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel.properties 2010-06-15 14:17:47 UTC (rev 747)
+++ branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel.properties 2010-06-15 14:50:10 UTC (rev 748)
@@ -53,9 +53,9 @@
## 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:
14 years, 6 months
- 1
- 0
riftsaw SVN: r747 - workspace and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-15 10:17:47 -0400 (Tue, 15 Jun 2010)
New Revision: 747
Added:
workspace/gbrown/
Removed:
branches/gbrown/
Log:
* move Gary's branch to workspace
Copied: workspace/gbrown (from rev 746, branches/gbrown)
14 years, 6 months
- 1
- 0
riftsaw SVN: r746 - workspace and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-15 10:16:43 -0400 (Tue, 15 Jun 2010)
New Revision: 746
Added:
branches/RiftSaw-2.0-M1/
Removed:
workspace/RiftSaw-2.0-M1/
Log:
* move RiftSaw-2.0-M1 back, as it is stable release.
Copied: branches/RiftSaw-2.0-M1 (from rev 745, workspace/RiftSaw-2.0-M1)
14 years, 6 months
- 1
- 0
riftsaw SVN: r745 - in branches: ODE and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-15 10:05:15 -0400 (Tue, 15 Jun 2010)
New Revision: 745
Added:
branches/RiftSaw-ODE-2.1.x/
Removed:
branches/ODE/ODE-1.x-jpa/
Log:
* rename it to RiftSaw-ODE-2.1.x
Copied: branches/RiftSaw-ODE-2.1.x (from rev 744, branches/ODE/ODE-1.x-jpa)
14 years, 6 months
- 1
- 0