Author: jeff.yuchang Date: 2010-06-16 23:58:48 -0400 (Wed, 16 Jun 2010) New Revision: 752 Removed: branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel.properties Modified: branches/RiftSaw-2.1.x/distribution/pom.xml 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/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/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java Log: * fix RiftSaw-163 test case failure. * remove the bpel.properties to avoid duplication. * update saxon version to 9.1.0.8, which is ODE 1.3.4 used. Modified: branches/RiftSaw-2.1.x/distribution/pom.xml =================================================================== --- branches/RiftSaw-2.1.x/distribution/pom.xml 2010-06-16 12:20:45 UTC (rev 751) +++ branches/RiftSaw-2.1.x/distribution/pom.xml 2010-06-17 03:58:48 UTC (rev 752) @@ -107,22 +107,18 @@ <dependency> <groupId>net.sf.saxon</groupId> <artifactId>saxon-dom</artifactId> - <version>9.x</version> </dependency> <dependency> <groupId>net.sf.saxon</groupId> <artifactId>saxon-xpath</artifactId> - <version>9.x</version> </dependency> <dependency> <groupId>net.sf.saxon</groupId> <artifactId>saxon-xqj</artifactId> - <version>9.x</version> </dependency> <dependency> <groupId>net.sf.saxon</groupId> <artifactId>saxon</artifactId> - <version>9.x</version> </dependency> <dependency> 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-16 12:20:45 UTC (rev 751) +++ branches/RiftSaw-2.1.x/distribution/src/main/release/db/sql/mysql.drop.sql 2010-06-17 03:58:48 UTC (rev 752) @@ -1,159 +1,47 @@ drop table ODE_SCHEMA_VERSION; drop table ODE_JOB; - alter table ODE_ACTIVITY_RECOVERY - drop - foreign key FK5274B556E38CB1C9; +drop table if exists ODE_ACTIVITY_RECOVERY; - alter table ODE_CORRELATION_SET - drop - foreign key FK399D7EB621712AFA; +drop table if exists ODE_CORRELATION_SET; - alter table ODE_CORRELATOR - drop - foreign key FKC4413FB8748734BD; +drop table if exists ODE_CORRELATOR; - alter table ODE_CORSET_PROP - drop - foreign key FK3B13A3F744AFA280; +drop table if exists ODE_CORSET_PROP; - alter table ODE_EVENT - drop - foreign key FK410D028BA0243704; +drop table if exists ODE_EVENT; - alter table ODE_EVENT - drop - foreign key FK410D028BE38CB1C9; +drop table if exists ODE_FAULT; - alter table ODE_MESSAGE - drop - foreign key FKBCCD53B81291B75D; +drop table if exists ODE_MESSAGE; - alter table ODE_MESSAGE_EXCHANGE - drop - foreign key FK68EE0ACA57B8F584; +drop table if exists ODE_MESSAGE_EXCHANGE; - alter table ODE_MESSAGE_EXCHANGE - drop - foreign key FK68EE0ACA8618FFF9; +drop table if exists ODE_MESSAGE_ROUTE; - alter table ODE_MESSAGE_EXCHANGE - drop - foreign key FK68EE0ACADB5AB781; +drop table if exists ODE_MEX_PROP; - alter table ODE_MESSAGE_EXCHANGE - drop - foreign key FK68EE0ACA7B80504F; +drop table if exists ODE_PARTNER_LINK; - alter table ODE_MESSAGE_EXCHANGE - drop - foreign key FK68EE0ACADC273092; +drop table if exists ODE_PROCESS; - alter table ODE_MESSAGE_EXCHANGE - drop - foreign key FK68EE0ACAA0243704; +drop table if exists ODE_PROCESS_INSTANCE; - alter table ODE_MESSAGE_ROUTE - drop - foreign key FK8082C6E28618FFF9; +drop table if exists ODE_SCOPE; - alter table ODE_MESSAGE_ROUTE - drop - foreign key FK8082C6E2DB5AB781; +drop table if exists ODE_XML_DATA; - alter table ODE_MEX_PROP - drop - foreign key FKE61574D1AA079EB8; +drop table if exists ODE_XML_DATA_PROP; - alter table ODE_PARTNER_LINK - drop - foreign key FK7337940021712AFA; +drop table if exists STORE_DU; - alter table ODE_PROCESS_INSTANCE - drop - foreign key FK4E20A7D4F3A6B9B7; +drop table if exists STORE_PROCESS; - alter table ODE_PROCESS_INSTANCE - drop - foreign key FK4E20A7D4F0BBEFCC; +drop table if exists STORE_PROCESS_PROP; - alter table ODE_PROCESS_INSTANCE - drop - foreign key FK4E20A7D46C4AB4DE; +drop table if exists STORE_PROC_TO_PROP; - alter table ODE_PROCESS_INSTANCE - drop - foreign key FK4E20A7D4A0243704; +drop table if exists STORE_VERSIONS; - 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-16 12:20:45 UTC (rev 751) +++ branches/RiftSaw-2.1.x/distribution/src/main/release/db/sql/postgres.drop.sql 2010-06-17 03:58:48 UTC (rev 752) @@ -1,130 +1,46 @@ drop table ODE_SCHEMA_VERSION; drop table ODE_JOB; - alter table ODE_ACTIVITY_RECOVERY - drop constraint FK5274B556E38CB1C9; +drop table ODE_ACTIVITY_RECOVERY; - alter table ODE_CORRELATION_SET - drop constraint FK399D7EB621712AFA; +drop table ODE_CORRELATION_SET; - alter table ODE_CORRELATOR - drop constraint FKC4413FB8748734BD; +drop table ODE_CORRELATOR; - alter table ODE_CORSET_PROP - drop constraint FK3B13A3F744AFA280; +drop table ODE_CORSET_PROP; - alter table ODE_EVENT - drop constraint FK410D028BA0243704; +drop table ODE_EVENT; - alter table ODE_EVENT - drop constraint FK410D028BE38CB1C9; +drop table ODE_FAULT; - alter table ODE_MESSAGE - drop constraint FKBCCD53B81291B75D; +drop table ODE_MESSAGE; - alter table ODE_MESSAGE_EXCHANGE - drop constraint FK68EE0ACA57B8F584; +drop table ODE_MESSAGE_EXCHANGE; - alter table ODE_MESSAGE_EXCHANGE - drop constraint FK68EE0ACA8618FFF9; +drop table ODE_MESSAGE_ROUTE; - alter table ODE_MESSAGE_EXCHANGE - drop constraint FK68EE0ACADB5AB781; +drop table ODE_MEX_PROP; - alter table ODE_MESSAGE_EXCHANGE - drop constraint FK68EE0ACA7B80504F; +drop table ODE_PARTNER_LINK; - alter table ODE_MESSAGE_EXCHANGE - drop constraint FK68EE0ACADC273092; +drop table ODE_PROCESS; - alter table ODE_MESSAGE_EXCHANGE - drop constraint FK68EE0ACAA0243704; +drop table ODE_PROCESS_INSTANCE; - alter table ODE_MESSAGE_ROUTE - drop constraint FK8082C6E28618FFF9; +drop table ODE_SCOPE; - alter table ODE_MESSAGE_ROUTE - drop constraint FK8082C6E2DB5AB781; +drop table ODE_XML_DATA; - alter table ODE_MEX_PROP - drop constraint FKE61574D1AA079EB8; +drop table ODE_XML_DATA_PROP; - alter table ODE_PARTNER_LINK - drop constraint FK7337940021712AFA; +drop table STORE_DU; - alter table ODE_PROCESS_INSTANCE - drop constraint FK4E20A7D4F3A6B9B7; +drop table STORE_PROCESS; - alter table ODE_PROCESS_INSTANCE - drop constraint FK4E20A7D4F0BBEFCC; +drop table STORE_PROCESS_PROP; - alter table ODE_PROCESS_INSTANCE - drop constraint FK4E20A7D46C4AB4DE; +drop table STORE_PROC_TO_PROP; - alter table ODE_PROCESS_INSTANCE - drop constraint FK4E20A7D4A0243704; +drop table STORE_VERSIONS; - 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; +drop sequence hibernate_sequence; Modified: branches/RiftSaw-2.1.x/integration-tests/pom.xml =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/pom.xml 2010-06-16 12:20:45 UTC (rev 751) +++ branches/RiftSaw-2.1.x/integration-tests/pom.xml 2010-06-17 03:58:48 UTC (rev 752) @@ -561,8 +561,6 @@ <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-16 12:20:45 UTC (rev 751) +++ branches/RiftSaw-2.1.x/pom.xml 2010-06-17 03:58:48 UTC (rev 752) @@ -89,6 +89,7 @@ <xerces.version>2.9.0</xerces.version> <commons.httpclient.version>3.1</commons.httpclient.version> <cxf.version>2.2.6</cxf.version> + <saxon.version>9.1.0.8</saxon.version> </properties> <dependencyManagement> @@ -211,6 +212,12 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-dao-jpa</artifactId> <version>${riftsaw.ode.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> @@ -274,6 +281,27 @@ <version>${commons.httpclient.version}</version> </dependency> + <dependency> + <groupId>net.sf.saxon</groupId> + <artifactId>saxon-dom</artifactId> + <version>${saxon.version}</version> + </dependency> + <dependency> + <groupId>net.sf.saxon</groupId> + <artifactId>saxon-xpath</artifactId> + <version>${saxon.version}</version> + </dependency> + <dependency> + <groupId>net.sf.saxon</groupId> + <artifactId>saxon-xqj</artifactId> + <version>${saxon.version}</version> + </dependency> + <dependency> + <groupId>net.sf.saxon</groupId> + <artifactId>saxon</artifactId> + <version>${saxon.version}</version> + </dependency> + </dependencies> </dependencyManagement> 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-16 12:20:45 UTC (rev 751) +++ branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2010-06-17 03:58:48 UTC (rev 752) @@ -230,6 +230,10 @@ javax.xml.soap.SOAPHeader soapHeader = soapMessage.getSOAPHeader(); if (soapHeader==null) soapHeader = soapMessage.getSOAPPart().getEnvelope().addHeader(); for (Node headerNode : headerParts.values()) { + //like we may have password header with null value. + if(headerNode == null){ + continue; + } if (Node.ELEMENT_NODE == headerNode.getNodeType()) { if (getFirstChildWithName(new QName(headerNode.getNamespaceURI(), headerNode.getLocalName()),soapHeader) == null) { SOAPElement partElement = soapFactory.createElement((Element) headerNode); Modified: branches/RiftSaw-2.1.x/runtime/engine-assembly/pom.xml =================================================================== --- branches/RiftSaw-2.1.x/runtime/engine-assembly/pom.xml 2010-06-16 12:20:45 UTC (rev 751) +++ branches/RiftSaw-2.1.x/runtime/engine-assembly/pom.xml 2010-06-17 03:58:48 UTC (rev 752) @@ -92,22 +92,18 @@ <dependency> <groupId>net.sf.saxon</groupId> <artifactId>saxon-dom</artifactId> - <version>9.x</version> </dependency> <dependency> <groupId>net.sf.saxon</groupId> <artifactId>saxon-xpath</artifactId> - <version>9.x</version> </dependency> <dependency> <groupId>net.sf.saxon</groupId> <artifactId>saxon-xqj</artifactId> - <version>9.x</version> </dependency> <dependency> <groupId>net.sf.saxon</groupId> <artifactId>saxon</artifactId> - <version>9.x</version> </dependency> </dependencies> Deleted: 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-16 12:20:45 UTC (rev 751) +++ branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel.properties 2010-06-17 03:58:48 UTC (rev 752) @@ -1,116 +0,0 @@ -# -# 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. -# - -## bpel Configuraiton Properties - -## Database Mode ("INTERNAL", "EXTERNAL", "EMBEDDED") -## What kind of database should ODE use? -## * "EMBEDDED" - ODE will create its own embbeded database (Derby) -## and connection pool (Minerva). -## * "EXTERNAL" - ODE will use an app-server provided database and pool. -## The "ode-jbi.db.ext.dataSource" property will need to -## be set. -## * "INTERNAL" - ODE will create its own connection pool for a user- -## specified JDBC URL and driver. -#bpel.db.mode=EMBEDDED - -## External Database [JNDI Name] -## JNDI Name of the DataSource for the ODE database. This is only -## used if the "ode-jbi.db.mode" property is set to "EXTERNAL" -#bpel.db.ext.dataSource=java:comp/env/jdbc/ode - -## Embedded Database Name [String] -## Name of the embedded Derby database. This is only used if the -## "ode-jbi.db.mode" property is set to "EMBEDDED". -#ode-jbi.db.emb.name=hibdb -#ode-jbi.db.emb.name=jpadb - -## Internal Database Configuration -#ode-jbi.db.int.jdbcurl=jdbc:mysql://localhost/ode?user=sa -#ode-jbi.db.int.driver=com.mysql.jdbc.Driver -#bpel.db.int.password = -#bpel.db.int.username = - -## DB Pool Configuration for internal DB -#bpel.db.pool.max = 10 -#bpel.db.pool.min = 1 - -## DAO Connection Factory class. -## uncomment the following for hibernate. -bpel.dao.factory=org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl -bpel.dao.factory.store=org.apache.ode.dao.jpa.hibernate.ConfStoreDAOConnectionFactoryImpl - -## Transaction Factory -## default is org.apache.ode.il.EmbeddedGeronimoFactory -## available alternatives are: -## org.apache.ode.axis2.util.GeronimoFactory -## org.apache.ode.axis2.util.JBossFactory -## org.apache.ode.axis2.util.TomcatFactory - -## org.apache.ode.axis2.util.WLSFactory -bpel.tx.factory.class = org.jboss.soa.bpel.runtime.engine.ode.JBossTransactionFactory - -## JCA connector port (default 2099), set to 0 to disable JCA connector -#bpel.jca.port = - -## JCA conncetor name (default 'ode') -#bpel.jca.name = - -## Working dir -#bpel.working.dir = - -## MEX Interceptors -#bpel.mex.interceptors = - -## Process dehydration -#bpel.process.dehydration = - -## Extension Bundles -## FQCNs, comma separated. -#bpel.extension.bundles.runtime = -#bpel.extension.bundles.validation = - -bpel.db.mode=EXTERNAL -db.emb.create=false -bpel.db.ext.dataSource=java:BPELDB -# if set to true will self-register BPEL endpoints upon deployment to a UDDI. -# this uses the juddi-client-3.0.0 and the uddi client config can be set in the uddi.xml -# file -bpel.uddi.registration=false -# implementation of the client integration class -bpel.uddi.client.impl=org.jboss.soa.bpel.uddi.UDDIRegistrationImpl -# the uddi client config in case you want to use your own client config rather then -# jbossesb.saw/esb.uddi.client.xml. Commented out by default. -#bpel.uddi.config=META-INF/bpel.uddi.client.xml -# only if you don't specify the bpel.uddi.config you need to specify the name of the clerk manager -bpel.uddi.clerk.manager=esb-registry -# name of the clerk -bpel.uddi.clerk=BPELClerk - -hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.hbm2ddl.auto=update -hibernate.current_session_context_class=jta -hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup - -jta.UserTransaction=UserTransaction - -ode.persistence=hibernate - -ode.process.checkguid=false -ode.process.store=org.apache.ode.store.JBossProcessStoreImpl