riftsaw SVN: r165 - in trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime: ws and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-10-09 16:02:36 -0400 (Fri, 09 Oct 2009)
New Revision: 165
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/JAXWSBindingContext.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceProviderFactory.java
Log:
More verbose debug logging
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 2009-10-09 16:54:54 UTC (rev 164)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2009-10-09 20:02:36 UTC (rev 165)
@@ -136,7 +136,7 @@
// Creating message exchange
String messageId = new GUID().toString();
- odeMex = _bpelServer.getEngine().createMessageExchange("" + messageId, service,
+ odeMex = _bpelServer.getEngine().createMessageExchange(messageId, service,
operation);
__log.debug("ODE routed to operation " + odeMex.getOperation() + " from service " + service);
//odeMex.setProperty("isTwoWay", Boolean.toString(msgContext.getAxisOperation() instanceof TwoChannelAxisOperation));
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2009-10-09 16:54:54 UTC (rev 164)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2009-10-09 20:02:36 UTC (rev 165)
@@ -27,12 +27,14 @@
import org.jboss.soa.bpel.runtime.ws.WSDLReference;
import javax.wsdl.Definition;
+import javax.wsdl.Import;
import javax.wsdl.PortType;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
import java.io.File;
import java.net.URL;
+import java.util.Iterator;
import java.util.List;
import java.util.UUID;
@@ -118,6 +120,7 @@
if(url!=null)
{
targetWsdlFile = f;
+ log.debug("Matching "+processId + " to WSDL file "+targetWsdlFile);
break;
}
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2009-10-09 16:54:54 UTC (rev 164)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2009-10-09 20:02:36 UTC (rev 165)
@@ -93,7 +93,7 @@
metaData.getServiceName(),
metaData.getPortName(),
metaData.getEndpointId(),
- wsdlRef.getWsdlFile().toURL(),
+ wsdlRef.getWsdlFileURL(),
classLoader
);
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceProviderFactory.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceProviderFactory.java 2009-10-09 16:54:54 UTC (rev 164)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceProviderFactory.java 2009-10-09 20:02:36 UTC (rev 165)
@@ -57,7 +57,7 @@
CtClass stringType = pool.get("java.lang.String");
- String implClassName = PKG_PREFIX+"BPELWebServiceProvider_"+endpointId;
+ String implClassName = PKG_PREFIX+"BPELWebServiceEndpoint_"+endpointId;
CtClass impl = pool.makeClass(implClassName);
// BPELWebServiceProvider.endpointId property
15 years, 2 months
- 1
- 0
riftsaw SVN: r164 - trunk/runtime/engine-assembly/resources/META-INF.
by riftsaw-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-10-09 12:54:54 -0400 (Fri, 09 Oct 2009)
New Revision: 164
Modified:
trunk/runtime/engine-assembly/resources/META-INF/jboss-beans.xml
Log:
Reference correct sql script when schema is created
Modified: trunk/runtime/engine-assembly/resources/META-INF/jboss-beans.xml
===================================================================
--- trunk/runtime/engine-assembly/resources/META-INF/jboss-beans.xml 2009-10-09 15:15:42 UTC (rev 163)
+++ trunk/runtime/engine-assembly/resources/META-INF/jboss-beans.xml 2009-10-09 16:54:54 UTC (rev 164)
@@ -5,7 +5,7 @@
name="BPELDatabaseInitializer">
<property name="datasource"><value>java:/BPELDB</value></property>
<property name="existsSql"><value>select * from ODE_JOB</value></property>
- <property name="sqlFiles"><value>bpel-sql/bpel.derby.sql</value></property>
+ <property name="sqlFiles"><value>bpel-sql/bpel.hsql.sql</value></property>
<property name="useEOL"><value>false</value></property>
<depends>jboss.jca:service=DataSourceBinding,name=BPELDB</depends>
</bean>
15 years, 2 months
- 1
- 0
riftsaw SVN: r163 - trunk/runtime/engine-assembly/resources/bpel-sql.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2009-10-09 11:15:42 -0400 (Fri, 09 Oct 2009)
New Revision: 163
Added:
trunk/runtime/engine-assembly/resources/bpel-sql/derby.sql
trunk/runtime/engine-assembly/resources/bpel-sql/hsql.sql
trunk/runtime/engine-assembly/resources/bpel-sql/mysql.sql
trunk/runtime/engine-assembly/resources/bpel-sql/oracle.sql
trunk/runtime/engine-assembly/resources/bpel-sql/postgres.sql
trunk/runtime/engine-assembly/resources/bpel-sql/sqlserver.sql
Log:
ODE1.3.3 SQL scripts
Added: trunk/runtime/engine-assembly/resources/bpel-sql/derby.sql
===================================================================
--- trunk/runtime/engine-assembly/resources/bpel-sql/derby.sql (rev 0)
+++ trunk/runtime/engine-assembly/resources/bpel-sql/derby.sql 2009-10-09 15:15:42 UTC (rev 163)
@@ -0,0 +1,53 @@
+-- Apache ODE - SimpleScheduler Database Schema
+--
+-- Apache Derby scripts by Maciej Szefler.
+--
+--
+
+CREATE TABLE ode_job (
+ jobid CHAR(64) NOT NULL DEFAULT '',
+ ts BIGINT NOT NULL DEFAULT 0,
+ nodeid char(64),
+ scheduled int NOT NULL DEFAULT 0,
+ transacted int NOT NULL DEFAULT 0,
+ details blob(4096),
+ PRIMARY KEY(jobid));
+
+CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts);
+CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid);
+
+
+create table ODE_SCHEMA_VERSION(VERSION integer);
+insert into ODE_SCHEMA_VERSION values (5);
+create table BPEL_ACTIVITY_RECOVERY (ID bigint not null, PIID bigint, AID bigint, CHANNEL varchar(255), REASON varchar(255), DATE_TIME timestamp, LDATA_ID bigint, 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 clob(32000), LDATA_ID bigint, SID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID));
+create table BPEL_FAULT (ID bigint not null, FAULTNAME varchar(255), LDATA_ID bigint, 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 bigint, 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), DATA bigint, HEADER bigint, 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), LDATA_EPR_ID bigint, LDATA_CEPR_ID bigint, 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 bigint, PARTNERROLE_EPR bigint, 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 unique, deployer varchar(255), deploydate timestamp, type_name varchar(255), type_ns varchar(255), version bigint, ACTIVE_ smallint, guid varchar(255), INSERT_TIME timestamp, 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 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, LDATA_ID bigint, NAME varchar(255) not null, SCOPE_ID bigint, PIID bigint, IS_SIMPLE_TYPE smallint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID));
+create table LARGE_DATA (ID bigint not null, BIN_DATA blob(2G), INSERT_TIME timestamp, MLOCK integer not null, 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 table hibernate_unique_key ( next_hi integer );
+insert into hibernate_unique_key values ( 0 );
+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));
Added: trunk/runtime/engine-assembly/resources/bpel-sql/hsql.sql
===================================================================
--- trunk/runtime/engine-assembly/resources/bpel-sql/hsql.sql (rev 0)
+++ trunk/runtime/engine-assembly/resources/bpel-sql/hsql.sql 2009-10-09 15:15:42 UTC (rev 163)
@@ -0,0 +1,47 @@
+create table ODE_SCHEMA_VERSION(VERSION integer);
+insert into ODE_SCHEMA_VERSION values (5);
+-- Apache ODE - SimpleScheduler Database Schema
+--
+-- Apache Derby scripts by Maciej Szefler.
+--
+--
+
+CREATE TABLE ode_job (
+ jobid CHAR(64) NOT NULL DEFAULT '',
+ ts BIGINT NOT NULL DEFAULT 0,
+ nodeid char(64),
+ scheduled int NOT NULL DEFAULT 0,
+ transacted int NOT NULL DEFAULT 0,
+ details blob(4096),
+ PRIMARY KEY(jobid));
+
+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 generated by default as identity (start with 1), PIID bigint, AID bigint, CHANNEL varchar(255), REASON varchar(255), DATE_TIME timestamp, LDATA_ID bigint, ACTIONS varchar(255), RETRIES integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID));
+create table BPEL_CORRELATION_PROP (ID bigint generated by default as identity (start with 1), 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 generated by default as identity (start with 1), 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 generated by default as identity (start with 1), CID varchar(255), PROCESS_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID));
+create table BPEL_CORRELATOR_MESSAGE_CKEY (ID bigint generated by default as identity (start with 1), CKEY varchar(255), CORRELATOR_MESSAGE_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID));
+create table BPEL_EVENT (ID bigint generated by default as identity (start with 1), IID bigint, PID bigint, TSTAMP timestamp, TYPE varchar(255), DETAIL longvarchar, LDATA_ID bigint, SID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID));
+create table BPEL_FAULT (ID bigint generated by default as identity (start with 1), FAULTNAME varchar(255), LDATA_ID bigint, EXPLANATION varchar(4000), LINE_NUM integer, AID integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID));
+create table BPEL_INSTANCE (ID bigint generated by default as identity (start with 1), INSTANTIATING_CORRELATOR bigint, FAULT bigint, JACOB_STATE bigint, 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 generated by default as identity (start with 1), MEX bigint, TYPE varchar(255), DATA bigint, HEADER bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID));
+create table BPEL_MESSAGE_EXCHANGE (ID bigint generated by default as identity (start with 1), PORT_TYPE varchar(255), CHANNEL_NAME varchar(255), CLIENTKEY varchar(255), LDATA_EPR_ID bigint, LDATA_CEPR_ID bigint, 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 generated by default as identity (start with 1), PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100), MYROLE_EPR bigint, PARTNERROLE_EPR bigint, 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 generated by default as identity (start with 1), 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 generated by default as identity (start with 1), 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 generated by default as identity (start with 1), 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 generated by default as identity (start with 1), 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 generated by default as identity (start with 1), LDATA_ID bigint, NAME varchar(255) not null, SCOPE_ID bigint, PIID bigint, IS_SIMPLE_TYPE bit, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID));
+create table LARGE_DATA (ID bigint generated by default as identity (start with 1), BIN_DATA blob(2G), INSERT_TIME timestamp, MLOCK integer not null, primary key (ID));
+create table VAR_PROPERTY (ID bigint generated by default as identity (start with 1), 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);
Added: trunk/runtime/engine-assembly/resources/bpel-sql/mysql.sql
===================================================================
--- trunk/runtime/engine-assembly/resources/bpel-sql/mysql.sql (rev 0)
+++ trunk/runtime/engine-assembly/resources/bpel-sql/mysql.sql 2009-10-09 15:15:42 UTC (rev 163)
@@ -0,0 +1,50 @@
+create table ODE_SCHEMA_VERSION(VERSION integer);
+insert into ODE_SCHEMA_VERSION values (5);
+-- Apache ODE - SimpleScheduler Database Schema
+--
+-- MySQL scripts by Maciej Szefler.
+--
+--
+DROP TABLE IF EXISTS ODE_JOB;
+
+CREATE TABLE ODE_JOB (
+ jobid CHAR(64) NOT NULL DEFAULT '',
+ ts BIGINT NOT NULL DEFAULT 0,
+ nodeid char(64) NULL,
+ scheduled int NOT NULL DEFAULT 0,
+ transacted int NOT NULL DEFAULT 0,
+ details blob(4096) NULL,
+ PRIMARY KEY(jobid),
+ INDEX IDX_ODE_JOB_TS(ts),
+ INDEX IDX_ODE_JOB_NODEID(nodeid)
+)
+TYPE=InnoDB;
+
+COMMIT;
+
+create table BPEL_ACTIVITY_RECOVERY (ID bigint not null auto_increment, PIID bigint, AID bigint, CHANNEL varchar(255), REASON varchar(255), DATE_TIME datetime, LDATA_ID bigint, ACTIONS varchar(255), RETRIES integer, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
+create table BPEL_CORRELATION_PROP (ID bigint not null auto_increment, 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 auto_increment, 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 auto_increment, 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 auto_increment, 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 auto_increment, IID bigint, PID bigint, TSTAMP datetime, TYPE varchar(255), DETAIL text, LDATA_ID bigint, SID bigint, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
+create table BPEL_FAULT (ID bigint not null auto_increment, FAULTNAME varchar(255), LDATA_ID bigint, 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 auto_increment, INSTANTIATING_CORRELATOR bigint, FAULT bigint, JACOB_STATE bigint, 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 auto_increment, MEX bigint, TYPE varchar(255), DATA bigint, HEADER bigint, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
+create table BPEL_MESSAGE_EXCHANGE (ID bigint not null auto_increment, PORT_TYPE varchar(255), CHANNEL_NAME varchar(255), CLIENTKEY varchar(255), LDATA_EPR_ID bigint, LDATA_CEPR_ID bigint, 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 auto_increment, PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100), MYROLE_EPR bigint, PARTNERROLE_EPR bigint, 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 auto_increment, 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 auto_increment, 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 auto_increment, 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 auto_increment, 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 auto_increment, LDATA_ID bigint, NAME varchar(255) not null, SCOPE_ID bigint, PIID bigint, IS_SIMPLE_TYPE bit, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
+create table LARGE_DATA (ID bigint not null auto_increment, BIN_DATA blob(2G), INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
+create table VAR_PROPERTY (ID bigint not null auto_increment, 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);
Added: trunk/runtime/engine-assembly/resources/bpel-sql/oracle.sql
===================================================================
--- trunk/runtime/engine-assembly/resources/bpel-sql/oracle.sql (rev 0)
+++ trunk/runtime/engine-assembly/resources/bpel-sql/oracle.sql 2009-10-09 15:15:42 UTC (rev 163)
@@ -0,0 +1,48 @@
+create table ODE_SCHEMA_VERSION(VERSION integer);
+insert into ODE_SCHEMA_VERSION values (5);
+-- Apache ODE - SimpleScheduler Database Schema
+--
+-- Apache Derby scripts by Maciej Szefler.
+--
+--
+
+CREATE TABLE ode_job (
+ jobid CHAR(64) NOT NULL DEFAULT '',
+ ts BIGINT NOT NULL DEFAULT 0,
+ nodeid char(64),
+ scheduled int NOT NULL DEFAULT 0,
+ transacted int NOT NULL DEFAULT 0,
+ details blob(4096),
+ PRIMARY KEY(jobid));
+
+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 number(19,0) not null, PIID number(19,0), AID number(19,0), CHANNEL varchar2(255 char), REASON varchar2(255 char), DATE_TIME timestamp, LDATA_ID number(19,0), 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, LDATA_ID number(19,0), 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), LDATA_ID number(19,0), 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 number(19,0), 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), DATA number(19,0), HEADER number(19,0), 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), LDATA_EPR_ID number(19,0), LDATA_CEPR_ID number(19,0), 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 number(19,0), PARTNERROLE_EPR number(19,0), 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, LDATA_ID number(19,0), NAME varchar2(255 char) not null, 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 LARGE_DATA (ID number(19,0) not null, BIN_DATA blob(2G), INSERT_TIME timestamp, MLOCK number(10,0) not null, 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_sequence;
Added: trunk/runtime/engine-assembly/resources/bpel-sql/postgres.sql
===================================================================
--- trunk/runtime/engine-assembly/resources/bpel-sql/postgres.sql (rev 0)
+++ trunk/runtime/engine-assembly/resources/bpel-sql/postgres.sql 2009-10-09 15:15:42 UTC (rev 163)
@@ -0,0 +1,48 @@
+create table ODE_SCHEMA_VERSION(VERSION integer);
+insert into ODE_SCHEMA_VERSION values (5);
+-- Apache ODE - SimpleScheduler Database Schema
+--
+-- Apache Derby scripts by Maciej Szefler.
+--
+--
+
+CREATE TABLE ode_job (
+ jobid CHAR(64) NOT NULL DEFAULT '',
+ ts BIGINT NOT NULL DEFAULT 0,
+ nodeid char(64),
+ scheduled int NOT NULL DEFAULT 0,
+ transacted int NOT NULL DEFAULT 0,
+ details blob(4096),
+ PRIMARY KEY(jobid));
+
+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 int8 not null, PIID int8, AID int8, CHANNEL varchar(255), REASON varchar(255), DATE_TIME timestamp, LDATA_ID int8, 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, LDATA_ID int8, SID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
+create table BPEL_FAULT (ID int8 not null, FAULTNAME varchar(255), LDATA_ID int8, 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 int8, 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), DATA int8, HEADER int8, 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), LDATA_EPR_ID int8, LDATA_CEPR_ID int8, 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 int8, PARTNERROLE_EPR int8, 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, LDATA_ID int8, NAME varchar(255) not null, SCOPE_ID int8, PIID int8, IS_SIMPLE_TYPE bool, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
+create table LARGE_DATA (ID int8 not null, BIN_DATA blob(2G), INSERT_TIME timestamp, MLOCK int4 not null, 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_sequence;
Added: trunk/runtime/engine-assembly/resources/bpel-sql/sqlserver.sql
===================================================================
--- trunk/runtime/engine-assembly/resources/bpel-sql/sqlserver.sql (rev 0)
+++ trunk/runtime/engine-assembly/resources/bpel-sql/sqlserver.sql 2009-10-09 15:15:42 UTC (rev 163)
@@ -0,0 +1,47 @@
+create table ODE_SCHEMA_VERSION(VERSION integer);
+insert into ODE_SCHEMA_VERSION values (5);
+-- Apache ODE - SimpleScheduler Database Schema
+--
+-- Apache Derby scripts by Maciej Szefler.
+--
+--
+
+CREATE TABLE ode_job (
+ jobid CHAR(64) NOT NULL DEFAULT '',
+ ts BIGINT NOT NULL DEFAULT 0,
+ nodeid char(64),
+ scheduled int NOT NULL DEFAULT 0,
+ transacted int NOT NULL DEFAULT 0,
+ details blob(4096),
+ PRIMARY KEY(jobid));
+
+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 numeric(19,0) identity not null, PIID numeric(19,0) null, AID numeric(19,0) null, CHANNEL varchar(255) null, REASON varchar(255) null, DATE_TIME datetime null, LDATA_ID numeric(19,0) null, ACTIONS varchar(255) null, RETRIES int null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table BPEL_CORRELATION_PROP (ID numeric(19,0) identity not null, NAME varchar(255) null, NAMESPACE varchar(255) null, VALUE varchar(255) null, CORR_SET_ID numeric(19,0) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table BPEL_CORRELATION_SET (ID numeric(19,0) identity not null, VALUE varchar(255) null, CORR_SET_NAME varchar(255) null, SCOPE_ID numeric(19,0) null, PIID numeric(19,0) null, PROCESS_ID numeric(19,0) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table BPEL_CORRELATOR (ID numeric(19,0) identity not null, CID varchar(255) null, PROCESS_ID numeric(19,0) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table BPEL_CORRELATOR_MESSAGE_CKEY (ID numeric(19,0) identity not null, CKEY varchar(255) null, CORRELATOR_MESSAGE_ID numeric(19,0) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table BPEL_EVENT (ID numeric(19,0) identity not null, IID numeric(19,0) null, PID numeric(19,0) null, TSTAMP datetime null, TYPE varchar(255) null, DETAIL text null, LDATA_ID numeric(19,0) null, SID numeric(19,0) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table BPEL_FAULT (ID numeric(19,0) identity not null, FAULTNAME varchar(255) null, LDATA_ID numeric(19,0) null, EXPLANATION varchar(4000) null, LINE_NUM int null, AID int null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table BPEL_INSTANCE (ID numeric(19,0) identity not null, INSTANTIATING_CORRELATOR numeric(19,0) null, FAULT numeric(19,0) null, JACOB_STATE numeric(19,0) null, PREVIOUS_STATE smallint null, PROCESS_ID numeric(19,0) null, STATE smallint null, LAST_ACTIVE_DT datetime null, SEQUENCE numeric(19,0) null, FAILURE_COUNT int null, FAILURE_DT datetime null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table BPEL_MESSAGE (ID numeric(19,0) identity not null, MEX numeric(19,0) null, TYPE varchar(255) null, DATA numeric(19,0) null, HEADER numeric(19,0) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table BPEL_MESSAGE_EXCHANGE (ID numeric(19,0) identity not null, PORT_TYPE varchar(255) null, CHANNEL_NAME varchar(255) null, CLIENTKEY varchar(255) null, LDATA_EPR_ID numeric(19,0) null, LDATA_CEPR_ID numeric(19,0) null, REQUEST numeric(19,0) null, RESPONSE numeric(19,0) null, INSERT_DT datetime null, OPERATION varchar(255) null, STATE varchar(255) null, PROCESS numeric(19,0) null, PIID numeric(19,0) null, DIR char(1) null, PLINK_MODELID int null, PATTERN varchar(255) null, CORR_STATUS varchar(255) null, FAULT_TYPE varchar(255) null, FAULT_EXPL varchar(255) null, CALLEE varchar(255) null, PARTNERLINK numeric(19,0) null, PIPED_ID varchar(255) null, SUBSCRIBER_COUNT int null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table BPEL_MEX_PROPS (MEX numeric(19,0) not null, VALUE varchar(8000) null, NAME varchar(255) not null, primary key (MEX, NAME));
+create table BPEL_PLINK_VAL (ID numeric(19,0) identity not null, PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100) null, MYROLE_EPR numeric(19,0) null, PARTNERROLE_EPR numeric(19,0) null, PROCESS numeric(19,0) null, SCOPE numeric(19,0) null, SVCNAME varchar(255) null, MYROLE varchar(100) null, MODELID int null, MYSESSIONID varchar(255) null, PARTNERSESSIONID varchar(255) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table BPEL_PROCESS (ID numeric(19,0) identity not null, PROCID varchar(255) not null unique, deployer varchar(255) null, deploydate datetime null, type_name varchar(255) null, type_ns varchar(255) null, version numeric(19,0) null, ACTIVE_ tinyint null, guid varchar(255) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table BPEL_SCOPE (ID numeric(19,0) identity not null, PIID numeric(19,0) null, PARENT_SCOPE_ID numeric(19,0) null, STATE varchar(255) not null, NAME varchar(255) not null, MODELID int null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table BPEL_SELECTORS (ID numeric(19,0) identity not null, PIID numeric(19,0) not null, SELGRPID varchar(255) not null, IDX int not null, CORRELATION_KEY varchar(255) not null, PROC_TYPE varchar(255) not null, ROUTE_POLICY varchar(255) null, CORRELATOR numeric(19,0) not null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR));
+create table BPEL_UNMATCHED (ID numeric(19,0) identity not null, MEX numeric(19,0) null, CORRELATION_KEY varchar(255) null, CORRELATOR numeric(19,0) not null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table BPEL_XML_DATA (ID numeric(19,0) identity not null, LDATA_ID numeric(19,0) null, NAME varchar(255) not null, SCOPE_ID numeric(19,0) null, PIID numeric(19,0) null, IS_SIMPLE_TYPE tinyint null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table LARGE_DATA (ID numeric(19,0) identity not null, BIN_DATA blob(2G) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID));
+create table VAR_PROPERTY (ID numeric(19,0) identity not null, XML_DATA_ID numeric(19,0) null, PROP_VALUE varchar(255) null, PROP_NAME varchar(255) not null, INSERT_TIME datetime null, MLOCK int 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);
15 years, 2 months
- 1
- 0
riftsaw SVN: r162 - in trunk: console/identity and 3 other directories.
by riftsaw-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-10-09 08:37:28 -0400 (Fri, 09 Oct 2009)
New Revision: 162
Modified:
trunk/console/identity/riftsaw-console-identity.iml
trunk/console/integration/riftsaw-console-integration.iml
trunk/pom.xml
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java
trunk/runtime/jbossesb-bpel/jbossesb-bpel.iml
Log:
Fix RIFTSAW-45: loan approval example fails
Modified: trunk/console/identity/riftsaw-console-identity.iml
===================================================================
--- trunk/console/identity/riftsaw-console-identity.iml 2009-09-30 13:38:30 UTC (rev 161)
+++ trunk/console/identity/riftsaw-console-identity.iml 2009-10-09 12:37:28 UTC (rev 162)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
+<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
@@ -8,7 +7,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntryProperties />
</component>
</module>
Modified: trunk/console/integration/riftsaw-console-integration.iml
===================================================================
--- trunk/console/integration/riftsaw-console-integration.iml 2009-09-30 13:38:30 UTC (rev 161)
+++ trunk/console/integration/riftsaw-console-integration.iml 2009-10-09 12:37:28 UTC (rev 162)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
+<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
@@ -13,18 +12,18 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -33,7 +32,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: stax:stax-api:jar:1.0.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -42,7 +41,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.apache.xmlbeans:xmlbeans:jar:2.4.0:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/xmlbeans/xmlbeans/2.4.0/xmlbeans-2.4.0.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/2.4.0/xmlbeans-2.4.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -51,18 +50,18 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.bpm:gwt-console-rpc:jar:1.1.2-SNAPSHOT:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/bpm/gwt-console-rpc/1.1.2-SNAPSHOT/gwt-console-rpc-1.1.2-SNAPSHOT.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/bpm/gwt-console-rpc/1.1.2-SNAPSHOT/gwt-console-rpc-1.1.2-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/bpm/gwt-console-rpc/1.1.2-SNAPSHOT/gwt-console-rpc-1.1.2-SNAPSHOT-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/bpm/gwt-console-rpc/1.1.2-SNAPSHOT/gwt-console-rpc-1.1.2-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -71,29 +70,29 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.bpm:gwt-console-server-integration:jar:1.1.2-SNAPSHOT:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/bpm/gwt-console-server-integration/1.1.2-SNAPSHOT/gwt-console-server-integration-1.1.2-SNAPSHOT.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/bpm/gwt-console-server-integration/1.1.2-SNAPSHOT/gwt-console-server-integration-1.1.2-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/bpm/gwt-console-server-integration/1.1.2-SNAPSHOT/gwt-console-server-integration-1.1.2-SNAPSHOT-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/bpm/gwt-console-server-integration/1.1.2-SNAPSHOT/gwt-console-server-integration-1.1.2-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-utils:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-utils/1.3.3/riftsaw-utils-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-utils/1.3.3/riftsaw-utils-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -102,7 +101,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-bpel-api:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-bpel-api/1.3.3/riftsaw-bpel-api-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-bpel-api/1.3.3/riftsaw-bpel-api-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -111,7 +110,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-bpel-epr:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-bpel-epr/1.3.3/riftsaw-bpel-epr-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-bpel-epr/1.3.3/riftsaw-bpel-epr-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -120,7 +119,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -129,18 +128,18 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javassist:javassist:jar:3.11.0.GA:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-bpel-store:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-bpel-store/1.3.3/riftsaw-bpel-store-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-bpel-store/1.3.3/riftsaw-bpel-store-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -149,7 +148,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-bpel-dao:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-bpel-dao/1.3.3/riftsaw-bpel-dao-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-bpel-dao/1.3.3/riftsaw-bpel-dao-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -158,7 +157,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-scheduler-simple:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-scheduler-simple/1.3.3/riftsaw-scheduler-simple-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-scheduler-simple/1.3.3/riftsaw-scheduler-simple-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -167,7 +166,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: wsdl4j:wsdl4j:jar:1.6.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -176,7 +175,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-agents:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-agents/1.3.3/riftsaw-agents-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-agents/1.3.3/riftsaw-agents-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -185,7 +184,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-bpel-runtime:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-bpel-runtime/1.3.3/riftsaw-bpel-runtime-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-bpel-runtime/1.3.3/riftsaw-bpel-runtime-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -194,13 +193,12 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-bpel-schemas:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-bpel-schemas/1.3.3/riftsaw-bpel-schemas-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-bpel-schemas/1.3.3/riftsaw-bpel-schemas-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
</module>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-09-30 13:38:30 UTC (rev 161)
+++ trunk/pom.xml 2009-10-09 12:37:28 UTC (rev 162)
@@ -52,7 +52,7 @@
<modules>
<module>runtime</module>
<module>console</module>
- <module>docs/docbook</module>
+ <!--module>docs/docbook</module-->
<module>distribution</module>
</modules>
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 2009-09-30 13:38:30 UTC (rev 161)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2009-10-09 12:37:28 UTC (rev 162)
@@ -25,12 +25,14 @@
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.iapi.Message;
import org.apache.ode.utils.DOMUtils;
+import org.apache.ode.utils.stl.CollectionsX;
import org.apache.ode.utils.wsdl.WsdlUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import javax.wsdl.*;
+import javax.wsdl.extensions.ElementExtensible;
import javax.wsdl.extensions.soap.SOAPBinding;
import javax.xml.namespace.QName;
import javax.xml.soap.*;
@@ -44,7 +46,7 @@
* {@link org.apache.ode.bpel.iapi.Message} representation and vice versa.
*
* @see org.jboss.soa.bpel.runtime.ws.WebServiceClient
- *
+ *
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class SOAPMessageAdapter
@@ -102,12 +104,11 @@
}
}
- public void createSoapRequest(SOAPMessage soapMessage, Message odeRequestMessage, Operation odeOperation)
+ public void createSoapRequest(SOAPMessage soapMessage, Message odeRequestMessage, Operation wsdlOperation)
{
-
- BindingOperation bop = binding.getBindingOperation(odeOperation.getName(), null, null);
+ BindingOperation bop = binding.getBindingOperation(wsdlOperation.getName(), null, null);
if (bop == null)
- throw new RuntimeException("Operation "+odeOperation.getName()+"not found on "+serviceName+"/"+portName);
+ throw new RuntimeException("Operation "+wsdlOperation.getName()+"not found on "+serviceName+"/"+portName);
BindingInput bi = bop.getBindingInput();
if (bi == null)
@@ -116,52 +117,60 @@
// Headers
createSoapHeaders(
soapMessage,
- odeOperation.getInput().getMessage(),
+ getSOAPHeaders(bi),
+ wsdlOperation.getInput().getMessage(),
odeRequestMessage.getHeaderParts()
);
// SOAP Body
+ javax.wsdl.extensions.soap.SOAPBody wsdlSoapBody = getSOAPBody(bi);
+
createSoapBody(
soapMessage,
- odeOperation.getInput().getMessage(),
+ wsdlSoapBody,
+ wsdlOperation.getInput().getMessage(),
odeRequestMessage.getMessage(),
- odeOperation.getName()
+ wsdlOperation.getName()
);
}
- public void createSoapResponse(SOAPMessage soapMessage, Message odeResponseMessage, Operation odeOperation)
+ public void createSoapResponse(SOAPMessage soapMessage, Message odeResponseMessage, Operation wsdlOperation)
{
- BindingOperation bop = binding.getBindingOperation(odeOperation.getName(),null,null);
+ BindingOperation bop = binding.getBindingOperation(wsdlOperation.getName(),null,null);
if (bop == null)
- throw new RuntimeException("Operation "+odeOperation.getName()+"not found on "+serviceName+"/"+portName);
+ throw new RuntimeException("Operation "+wsdlOperation.getName()+"not found on "+serviceName+"/"+portName);
BindingOutput bo = bop.getBindingOutput();
if (bo == null)
throw new RuntimeException("Binding output not found on "+serviceName+"/"+portName);
// Headers
- if (odeResponseMessage.getHeaderParts().size() > 0)
+ if (odeResponseMessage.getHeaderParts().size() > 0 || getSOAPHeaders(bo).size() > 0)
createSoapHeaders(
soapMessage,
- odeOperation.getOutput().getMessage(),
+ getSOAPHeaders(bo),
+ wsdlOperation.getOutput().getMessage(),
odeResponseMessage.getHeaderParts()
);
// SOAP Body
+ javax.wsdl.extensions.soap.SOAPBody wsdlSOAPBody = getSOAPBody(bo);
createSoapBody(
soapMessage,
- odeOperation.getOutput().getMessage(),
+ wsdlSOAPBody,
+ wsdlOperation.getOutput().getMessage(),
odeResponseMessage.getMessage(),
- odeOperation.getName() + "Response"
+ wsdlOperation.getName() + "Response"
);
}
- private void createSoapBody(SOAPMessage soapMessage, javax.wsdl.Message wsdlMessageDef,
+ private void createSoapBody(SOAPMessage soapMessage,
+ javax.wsdl.extensions.soap.SOAPBody wsdlSoapBody, javax.wsdl.Message wsdlMessageDef,
Element message, String operationName)
{
try
@@ -171,19 +180,16 @@
SOAPElement partHolder = null;
if(isRPC)
{
- partHolder = soapFactory.createElement(new QName(soapBody.getNamespaceURI(), operationName, "odens"));
- soapBody.addChildElement(partHolder);
+ partHolder = soapFactory.createElement(new QName(wsdlSoapBody.getNamespaceURI(), operationName, "odens"));
}
else
{
partHolder = soapBody;
}
- Map parts = wsdlMessageDef.getParts();
- Iterator it = parts.keySet().iterator(); // TODO: Part order
- while(it.hasNext())
- {
- Part part = (Part)parts.get(it.next());
+ List<Part> parts = wsdlMessageDef.getOrderedParts(wsdlSoapBody.getParts());
+ for(Part part : parts)
+ {
Element srcPartEl = DOMUtils.findChildByName(message, new QName(null, part.getName()));
if (srcPartEl == null)
throw new RuntimeException("Part is missing" +part.getName());
@@ -198,6 +204,10 @@
for (Iterator<SOAPElement> i = partElement.getChildElements(); i.hasNext();) partHolder.addChildElement(i.next());
}
}
+
+ // late bind
+ if(isRPC)
+ soapBody.addChildElement(partHolder);
}
catch (SOAPException e)
{
@@ -205,7 +215,9 @@
}
}
- private void createSoapHeaders(SOAPMessage soapMessage, javax.wsdl.Message wsdlMessageDef, Map<String, Node> headerParts)
+ private void createSoapHeaders(SOAPMessage soapMessage, List<SOAPHeader> headers,
+ javax.wsdl.Message wsdlMessageDef,
+ Map<String, Node> headerParts)
{
log.warn("createSoapHeaders() not implemented");
}
@@ -221,9 +233,9 @@
throw new RuntimeException("Binding output not found on "+serviceName+"/"+portName);
- extractSoapBodyParts(odeMessage, soapMessage, odeOperation.getOutput().getMessage(), odeOperation.getName() + "Response");
+ javax.wsdl.extensions.soap.SOAPBody wsdlSOAPBody = getSOAPBody(bo);
+ extractSoapBodyParts(odeMessage, soapMessage, wsdlSOAPBody, odeOperation.getOutput().getMessage(), odeOperation.getName() + "Response");
-
extractSoapHeaderParts(odeMessage, soapMessage, odeOperation.getOutput().getMessage());
}
@@ -232,12 +244,16 @@
log.warn("extractSoapHeaderParts() not implemented");
}
- private void extractSoapBodyParts(Message odeMessage, SOAPMessage soapMessage, javax.wsdl.Message wsdlMessageDef, String operationName)
- {
+ private void extractSoapBodyParts(
+ Message odeMessage,
+ SOAPMessage soapMessage,
+ javax.wsdl.extensions.soap.SOAPBody wsdlSOAPBody,
+ javax.wsdl.Message wsdlMessageDef, String operationName)
+ {
try
{
SOAPBody soapBody = soapMessage.getSOAPBody();
- Map parts = wsdlMessageDef.getParts(); // TODO: Part order
+ List<Part> parts = wsdlMessageDef.getOrderedParts(wsdlSOAPBody.getParts());
if(isRPC)
{
@@ -245,16 +261,14 @@
// we're concerned. All we need to do is copy the soap:body children, since doc-lit rpc looks the same
// in ode and soap.
- QName rpcWrapQName = new QName(soapBody.getNamespaceURI(), operationName);
+ QName rpcWrapQName = new QName(wsdlSOAPBody.getNamespaceURI(), operationName);
SOAPElement partWrapper = getFirstChildWithName(rpcWrapQName, soapBody);
if (partWrapper == null)
throw new RuntimeException("Expected part wrapper '"+rpcWrapQName+"'missing on service:"+serviceName+"/"+portName);
- Iterator it = parts.keySet().iterator();
- while(it.hasNext())
- {
- Part part = (Part)parts.get(it.next());
+ for(Part part : parts)
+ {
SOAPElement srcPart = getFirstChildWithName(new QName(null, part.getName()), partWrapper);
if (srcPart == null)
throw new RuntimeException("Soap body does not contain required part +"+part.getName());
@@ -267,10 +281,8 @@
// In doc-literal style, we expect the elements in the body to correspond (in order) to the
// parts defined in the binding. All the parts should be element-typed, otherwise it is a mess.
Iterator<SOAPElement> srcParts = soapBody.getChildElements();
- Iterator it = parts.keySet().iterator();
- while(it.hasNext())
+ for(Part part : parts)
{
- Part part = (Part)parts.get(it.next());
SOAPElement srcPart = srcParts.next();
Document doc = DOMUtils.newDocument();
Element destPart = doc.createElementNS(null, part.getName());
@@ -281,7 +293,7 @@
}
catch (SOAPException e)
{
- throw new RuntimeException("Failed to extact soap body parts", e);
+ throw new RuntimeException("Failed to extract soap body parts", e);
}
}
@@ -311,4 +323,20 @@
throw new RuntimeException(e);
}
}
+
+ public static <T> T getFirstExtensibilityElement(ElementExtensible parent, Class<T> cls) {
+ Collection<T> ee = CollectionsX.filter(parent.getExtensibilityElements(), cls);
+
+ return ee.isEmpty() ? null : ee.iterator().next();
+
+ }
+
+ public static javax.wsdl.extensions.soap.SOAPBody getSOAPBody(ElementExtensible ee) {
+ return getFirstExtensibilityElement(ee, javax.wsdl.extensions.soap.SOAPBody.class);
+ }
+
+ public static List<SOAPHeader> getSOAPHeaders(ElementExtensible eee) {
+ return CollectionsX.filter(new ArrayList<SOAPHeader>(), (Collection<Object>) eee.getExtensibilityElements(),
+ SOAPHeader.class);
+ }
}
Modified: trunk/runtime/jbossesb-bpel/jbossesb-bpel.iml
===================================================================
--- trunk/runtime/jbossesb-bpel/jbossesb-bpel.iml 2009-09-30 13:38:30 UTC (rev 161)
+++ trunk/runtime/jbossesb-bpel/jbossesb-bpel.iml 2009-10-09 12:37:28 UTC (rev 162)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
+<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
@@ -15,7 +14,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: junit:junit:jar:3.8.1:test">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/junit/junit/3.8.1/junit-3.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -24,7 +23,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.esb:jbossesb-rosetta:jar:4.5.GA:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/esb/jbossesb-rosetta/4.5.GA/jbossesb-rosetta-4.5.GA.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/esb/jbossesb-rosetta/4.5.GA/jbossesb-rosetta-4.5.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -33,7 +32,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-bpel-api:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-bpel-api/1.3.3/riftsaw-bpel-api-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-bpel-api/1.3.3/riftsaw-bpel-api-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -42,7 +41,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-utils:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-utils/1.3.3/riftsaw-utils-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-utils/1.3.3/riftsaw-utils-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -51,7 +50,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-bpel-epr:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-bpel-epr/1.3.3/riftsaw-bpel-epr-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-bpel-epr/1.3.3/riftsaw-bpel-epr-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -60,7 +59,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -69,18 +68,18 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javassist:javassist:jar:3.11.0.GA:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-bpel-store:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-bpel-store/1.3.3/riftsaw-bpel-store-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-bpel-store/1.3.3/riftsaw-bpel-store-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -89,7 +88,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-bpel-dao:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-bpel-dao/1.3.3/riftsaw-bpel-dao-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-bpel-dao/1.3.3/riftsaw-bpel-dao-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -98,7 +97,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-scheduler-simple:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-scheduler-simple/1.3.3/riftsaw-scheduler-simple-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-scheduler-simple/1.3.3/riftsaw-scheduler-simple-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -107,7 +106,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: wsdl4j:wsdl4j:jar:1.6.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -116,7 +115,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-agents:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-agents/1.3.3/riftsaw-agents-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-agents/1.3.3/riftsaw-agents-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -125,7 +124,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.esb:jbossts-common:jar:4.5.GA:test">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/esb/jbossts-common/4.5.GA/jbossts-common-4.5.GA.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/esb/jbossts-common/4.5.GA/jbossts-common-4.5.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -134,7 +133,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.soa.bpel:riftsaw-bpel-runtime:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/soa/bpel/riftsaw-bpel-runtime/1.3.3/riftsaw-bpel-runtime-1.3.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/soa/bpel/riftsaw-bpel-runtime/1.3.3/riftsaw-bpel-runtime-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -143,15 +142,14 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: log4j:log4j:jar:1.2.14:test">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
- <orderEntryProperties />
</component>
</module>
15 years, 2 months
- 1
- 0