riftsaw SVN: r248 - trunk/integration-tests.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-06 09:40:45 -0500 (Fri, 06 Nov 2009)
New Revision: 248
Modified:
trunk/integration-tests/build.xml
Log:
* update the time for waiting AS started.
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2009-11-06 14:09:50 UTC (rev 247)
+++ trunk/integration-tests/build.xml 2009-11-06 14:40:45 UTC (rev 248)
@@ -55,13 +55,13 @@
<echo>Starting the server</echo>
- <waitfor maxwait="2" maxwaitunit="minute">
+ <waitfor maxwait="3" maxwaitunit="minute">
<socket server="localhost" port="1099"/>
</waitfor>
<echo>JNP port detected, just waiting for 1 min 30 secs to ensure server started</echo>
- <sleep minutes="1" seconds="30" />
+ <sleep minutes="2" seconds="30" />
<echo>Server has started</echo>
15 years, 1 month
riftsaw SVN: r247 - in trunk: samples/esb/bpel_loan_fault and 1 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2009-11-06 09:09:50 -0500 (Fri, 06 Nov 2009)
New Revision: 247
Modified:
trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java
trunk/samples/esb/bpel_loan_fault/jboss-esb.xml
trunk/samples/esb/bpel_loan_fault/src/org/jboss/soa/esb/samples/quickstart/loanfault/test/SendEsbMessage.java
Log:
BPEL Invoke fault handling and example working - although example test client has issue because of incompatible versions of QName - still to be investigated.
Modified: trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java
===================================================================
--- trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java 2009-11-06 13:44:23 UTC (rev 246)
+++ trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java 2009-11-06 14:09:50 UTC (rev 247)
@@ -233,9 +233,12 @@
// Check if fault name should be set
if (faultName != null) {
+ logger.debug("Fault '"+faultName+"' detected, throwing exception");
+
//ret.getFault().setReason(faultName.toString());
throw new org.jboss.soa.esb.actions.ActionProcessingDetailFaultException(faultName,
- "Fault", respValue.toString());
+ "Fault '"+faultName+"' occurred when calling service '"+serviceName+"'",
+ respValue.toString());
}
}
} catch(org.jboss.soa.esb.actions.ActionProcessingDetailFaultException fault) {
@@ -243,9 +246,13 @@
// Determine whether to abort action pipeline with exception or return
// fault message for continued processing
if (_config.getAttribute(ABORT_ON_FAULT, "true").equalsIgnoreCase("true")) {
+ logger.debug("Rethrowing BPEL fault: "+fault);
+
throw fault;
} else {
ret = fault.getFaultMessage();
+
+ logger.debug("Returning fault as message: "+ret);
}
} catch(Exception e) {
Modified: trunk/samples/esb/bpel_loan_fault/jboss-esb.xml
===================================================================
--- trunk/samples/esb/bpel_loan_fault/jboss-esb.xml 2009-11-06 13:44:23 UTC (rev 246)
+++ trunk/samples/esb/bpel_loan_fault/jboss-esb.xml 2009-11-06 14:09:50 UTC (rev 247)
@@ -38,8 +38,12 @@
<action name="action2" class="org.jboss.soa.esb.actions.bpel.BPELInvoke">
<property name="service" value="{http://example.com/loan-approval/wsdl/}loanService"/>
<property name="operation" value="request" />
+ <property name="abortOnFault" value="true" />
</action>
- <!-- The next action is for Continuous Integration testing -->
+ <action name="action3" class="org.jboss.soa.esb.actions.SystemPrintln">
+ <property name="printfull" value="true"/>
+ </action>
+ <!-- The next action is for Continuous Integration testing -->
<action name="testStore" class="org.jboss.soa.esb.actions.TestMessageStore"/>
</actions>
</service>
Modified: trunk/samples/esb/bpel_loan_fault/src/org/jboss/soa/esb/samples/quickstart/loanfault/test/SendEsbMessage.java
===================================================================
--- trunk/samples/esb/bpel_loan_fault/src/org/jboss/soa/esb/samples/quickstart/loanfault/test/SendEsbMessage.java 2009-11-06 13:44:23 UTC (rev 246)
+++ trunk/samples/esb/bpel_loan_fault/src/org/jboss/soa/esb/samples/quickstart/loanfault/test/SendEsbMessage.java 2009-11-06 14:09:50 UTC (rev 247)
@@ -38,6 +38,8 @@
*/
public class SendEsbMessage
{
+ protected static final String BODY_FAULT_CODE = "org.jboss.soa.esb.message.fault.detail.code";
+
public static void main(String args[]) throws Exception
{
// Setting the ConnectionFactory such that it will use scout
@@ -53,9 +55,14 @@
esbMessage.getBody().add(args[2]);
- Message respMessage = new ServiceInvoker(args[0], args[1]).deliverSync(esbMessage, 5000);
+ try {
+ Message respMessage = new ServiceInvoker(args[0], args[1]).deliverSync(esbMessage, 5000);
- System.out.println("REPLY: "+respMessage.getBody().get());
+ System.out.println("REPLY: "+respMessage.getBody().get());
+ } catch(org.jboss.soa.esb.couriers.FaultMessageException fme) {
+ System.out.println("FAULT: "+fme.getReturnedMessage().getBody().get(BODY_FAULT_CODE));
+ System.out.println("FAULT ("+fme.getCode()+") MESSAGE: "+fme.getReturnedMessage().getBody().get());
+ }
}
}
15 years, 1 month
riftsaw SVN: r246 - in branches/hbraun/runtime: engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode and 3 other directories.
by riftsaw-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-11-06 08:44:23 -0500 (Fri, 06 Nov 2009)
New Revision: 246
Added:
branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationAdapter.java
branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationAdapter.java
branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java
Removed:
branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationContext.java
branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationContext.java
branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationContext.java
Modified:
branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java
branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/AbstractWebServiceEndpoint.java
branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java
branches/hbraun/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java
Log:
Docs and API comments
Modified: branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java
===================================================================
--- branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java 2009-11-06 13:30:21 UTC (rev 245)
+++ branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java 2009-11-06 13:44:23 UTC (rev 246)
@@ -38,11 +38,11 @@
/**
*
- * @param invocationContext
+ * @param invocationAdapter
* @throws BPELFault
* @throws Exception
*/
- public void invoke(InvocationContext invocationContext) throws BPELFault, Exception;
+ public void invoke(InvocationAdapter invocationAdapter) throws BPELFault, Exception;
/**
* This method closes the BPEL engine.
Copied: branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationAdapter.java (from rev 245, branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationContext.java)
===================================================================
--- branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationAdapter.java (rev 0)
+++ branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationAdapter.java 2009-11-06 13:44:23 UTC (rev 246)
@@ -0,0 +1,64 @@
+/*
+ * 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.runtime.engine;
+
+import org.apache.ode.bpel.iapi.Message;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Hides the message translation details when invoking ODE from
+ * an external component (i.e. ESB or WS).
+ *
+ * @see org.jboss.soa.bpel.runtime.engine.BPELEngine#invoke(InvocationAdapter)
+ *
+ * @author Heiko Braun <hbraun(a)redhat.com>
+ */
+public interface InvocationAdapter<T>
+{
+ String getOperationName();
+ QName getServiceName();
+
+ /**
+ * Callback from the Engine towards the adapter when
+ * turning an external message representation into an ODE request {@link org.apache.ode.bpel.iapi.Message}
+ * @param mex
+ * @param odeRequest
+ */
+ void parseRequest(MyRoleMessageExchange mex, Message odeRequest);
+
+ /**
+ * Callback from the Engine towards the adapter when
+ * turning an ODE response {@link org.apache.ode.bpel.iapi.Message} into an external format <T>
+ * @param mex
+ */
+ void createResponse(MyRoleMessageExchange mex);
+
+ /**
+ * Access the invocation result (response)
+ * @return T
+ */
+ T getInvocationResult();
+
+}
Deleted: branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationContext.java
===================================================================
--- branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationContext.java 2009-11-06 13:30:21 UTC (rev 245)
+++ branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationContext.java 2009-11-06 13:44:23 UTC (rev 246)
@@ -1,43 +0,0 @@
-/*
- * 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.runtime.engine;
-
-import org.apache.ode.bpel.iapi.Message;
-import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
-
-import javax.xml.namespace.QName;
-
-/**
- * @author Heiko Braun <hbraun(a)redhat.com>
- */
-public interface InvocationContext<T>
-{
- String getOperationName();
- QName getServiceName();
-
- void parseRequest(MyRoleMessageExchange mex, Message request);
- void parseResponse(MyRoleMessageExchange mex);
-
- T getInvocationResult();
-
-}
Modified: branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
===================================================================
--- branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2009-11-06 13:30:21 UTC (rev 245)
+++ branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2009-11-06 13:44:23 UTC (rev 246)
@@ -41,7 +41,7 @@
import org.jboss.soa.bpel.runtime.engine.BPELEngine;
import org.jboss.soa.bpel.runtime.engine.BPELFault;
import org.jboss.soa.bpel.runtime.engine.IntegrationLayer;
-import org.jboss.soa.bpel.runtime.engine.InvocationContext;
+import org.jboss.soa.bpel.runtime.engine.InvocationAdapter;
import org.w3c.dom.Element;
import javax.sql.DataSource;
@@ -96,7 +96,7 @@
* required.
* @throws Exception Failed to invoke the operation
*/
- public void invoke(InvocationContext invocationContext)
+ public void invoke(InvocationAdapter invocationAdapter)
throws BPELFault, Exception
{
boolean success = true;
@@ -109,7 +109,7 @@
_txMgr.begin();
if (__log.isDebugEnabled()) __log.debug("Starting transaction.");
- odeMex = createMessageExchange(invocationContext);
+ odeMex = createMessageExchange(invocationAdapter);
//odeMex.setProperty("isTwoWay", Boolean.toString(msgContext.getAxisOperation() instanceof TwoChannelAxisOperation));
if (odeMex.getOperation() != null)
@@ -118,7 +118,7 @@
Message odeRequest = odeMex.createMessage(odeMex.getOperation().getInput().getMessage().getQName());
// distinguish WS and ESB invocation
- invocationContext.parseRequest(odeMex, odeRequest);
+ invocationAdapter.parseRequest(odeMex, odeRequest);
// TODO: Might need to store session id/epr of caller?
//readHeader(msgContext, odeMex);
@@ -184,9 +184,9 @@
try {
// Refreshing the message exchange
odeMex = (MyRoleMessageExchange) _bpelServer.getEngine().getMessageExchange(odeMex.getMessageExchangeId());
- onResponse(odeMex, invocationContext);
+ onResponse(odeMex, invocationAdapter);
- __log.debug("Returning: "+invocationContext.getInvocationResult());
+ __log.debug("Returning: "+ invocationAdapter.getInvocationResult());
commit = true;
@@ -225,17 +225,17 @@
}
- private MyRoleMessageExchange createMessageExchange(InvocationContext context)
+ private MyRoleMessageExchange createMessageExchange(InvocationAdapter adapter)
{
// Creating message exchange
String messageId = new GUID().toString();
MyRoleMessageExchange odeMex = _bpelServer.getEngine()
- .createMessageExchange(messageId, context.getServiceName(), context.getOperationName());
- __log.debug("ODE routed to operation " + odeMex.getOperation() + " from service " + context.getServiceName());
+ .createMessageExchange(messageId, adapter.getServiceName(), adapter.getOperationName());
+ __log.debug("ODE routed to operation " + odeMex.getOperation() + " from service " + adapter.getServiceName());
return odeMex;
}
- private void onResponse(MyRoleMessageExchange mex, InvocationContext invocationContext) throws BPELFault, Exception {
+ private void onResponse(MyRoleMessageExchange mex, InvocationAdapter invocationAdapter) throws BPELFault, Exception {
Element ret=null;
switch (mex.getStatus()) {
@@ -248,7 +248,7 @@
case RESPONSE:
if(true)
{
- invocationContext.parseResponse(mex);
+ invocationAdapter.createResponse(mex);
}
if (__log.isDebugEnabled())
Modified: branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/AbstractWebServiceEndpoint.java
===================================================================
--- branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/AbstractWebServiceEndpoint.java 2009-11-06 13:30:21 UTC (rev 245)
+++ branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/AbstractWebServiceEndpoint.java 2009-11-06 13:44:23 UTC (rev 246)
@@ -90,7 +90,7 @@
log.debug( "ODE inbound message: \n" +DOMWriter.printNode(soapEnvelope, true) );
// Create invocation context
- WSInvocationContext invocationContext = new WSInvocationContext(
+ WSInvocationAdapter invocationContext = new WSInvocationAdapter(
messageElement.getLocalName(),
serviceQName,
soapAdapter
Copied: branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationAdapter.java (from rev 245, branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationContext.java)
===================================================================
--- branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationAdapter.java (rev 0)
+++ branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationAdapter.java 2009-11-06 13:44:23 UTC (rev 246)
@@ -0,0 +1,98 @@
+/*
+ * 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.runtime.ws;
+
+import org.apache.ode.bpel.iapi.Message;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
+import org.jboss.soa.bpel.runtime.engine.InvocationAdapter;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+
+/**
+ * @author Heiko Braun <hbraun(a)redhat.com>
+ */
+public final class WSInvocationAdapter implements InvocationAdapter<SOAPMessage>
+{
+ private final String operationName;
+ private final QName serviceName;
+
+ private SOAPMessage soapRequestMessage;
+ private SOAPMessage soapResponseMessage;
+
+ private final SOAPMessageAdapter soapAdapter;
+
+ public WSInvocationAdapter(String operationName,
+ QName serviceName, SOAPMessageAdapter soapAdapter)
+ {
+ this.operationName = operationName;
+ this.serviceName = serviceName;
+ this.soapAdapter = soapAdapter;
+ }
+
+ public String getOperationName()
+ {
+ return operationName;
+ }
+
+ public QName getServiceName()
+ {
+ return serviceName;
+ }
+
+ public void parseRequest(MyRoleMessageExchange mex, Message request)
+ {
+ if(null==soapRequestMessage)
+ throw new IllegalArgumentException("No request SOAPMessage set");
+
+ soapAdapter.parseSoapRequest(request, soapRequestMessage, mex.getOperation());
+ }
+
+ public void createResponse(MyRoleMessageExchange mex)
+ {
+ try
+ {
+ // create SOAPEnvelope
+ soapResponseMessage = MessageFactory.newInstance().createMessage();
+ soapAdapter.createSoapResponse(soapResponseMessage, mex.getResponse(), mex.getOperation());
+ }
+ catch (SOAPException e)
+ {
+ throw new RuntimeException("Failed to parse SOAP response", e);
+ }
+ }
+
+ public SOAPMessage getInvocationResult()
+ {
+ if(null==soapResponseMessage)
+ throw new IllegalArgumentException("No response SOAPMessage set");
+
+ return soapResponseMessage;
+ }
+
+ public void setSOAPMessage(SOAPMessage soapMessage)
+ {
+ this.soapRequestMessage = soapMessage;
+ }
+}
Deleted: branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationContext.java
===================================================================
--- branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationContext.java 2009-11-06 13:30:21 UTC (rev 245)
+++ branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationContext.java 2009-11-06 13:44:23 UTC (rev 246)
@@ -1,98 +0,0 @@
-/*
- * 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.runtime.ws;
-
-import org.apache.ode.bpel.iapi.Message;
-import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
-import org.jboss.soa.bpel.runtime.engine.InvocationContext;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-/**
- * @author Heiko Braun <hbraun(a)redhat.com>
- */
-public final class WSInvocationContext implements InvocationContext<SOAPMessage>
-{
- private final String operationName;
- private final QName serviceName;
-
- private SOAPMessage soapRequestMessage;
- private SOAPMessage soapResponseMessage;
-
- private final SOAPMessageAdapter soapAdapter;
-
- public WSInvocationContext(String operationName,
- QName serviceName, SOAPMessageAdapter soapAdapter)
- {
- this.operationName = operationName;
- this.serviceName = serviceName;
- this.soapAdapter = soapAdapter;
- }
-
- public String getOperationName()
- {
- return operationName;
- }
-
- public QName getServiceName()
- {
- return serviceName;
- }
-
- public void parseRequest(MyRoleMessageExchange mex, Message request)
- {
- if(null==soapRequestMessage)
- throw new IllegalArgumentException("No request SOAPMessage set");
-
- soapAdapter.parseSoapRequest(request, soapRequestMessage, mex.getOperation());
- }
-
- public void parseResponse(MyRoleMessageExchange mex)
- {
- try
- {
- // create SOAPEnvelope
- soapResponseMessage = MessageFactory.newInstance().createMessage();
- soapAdapter.createSoapResponse(soapResponseMessage, mex.getResponse(), mex.getOperation());
- }
- catch (SOAPException e)
- {
- throw new RuntimeException("Failed to parse SOAP response", e);
- }
- }
-
- public SOAPMessage getInvocationResult()
- {
- if(null==soapResponseMessage)
- throw new IllegalArgumentException("No response SOAPMessage set");
-
- return soapResponseMessage;
- }
-
- public void setSOAPMessage(SOAPMessage soapMessage)
- {
- this.soapRequestMessage = soapMessage;
- }
-}
Modified: branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java
===================================================================
--- branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java 2009-11-06 13:30:21 UTC (rev 245)
+++ branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java 2009-11-06 13:44:23 UTC (rev 246)
@@ -180,8 +180,8 @@
QName serviceQName = new QName(getNamespace(serviceName), getLocalPart(serviceName));
// Create invocationContext
- ESBInvocationContext invocationContext =
- new ESBInvocationContext(_config.getAttribute(OPERATION), serviceQName);
+ ESBInvocationAdapter invocationContext =
+ new ESBInvocationAdapter(_config.getAttribute(OPERATION), serviceQName);
invocationContext.setRequestXML(mesgElem);
// invoke ODE
Copied: branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java (from rev 245, branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationContext.java)
===================================================================
--- branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java (rev 0)
+++ branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java 2009-11-06 13:44:23 UTC (rev 246)
@@ -0,0 +1,90 @@
+/*
+ * 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.esb.actions.bpel;
+
+import org.apache.ode.bpel.iapi.Message;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
+import org.jboss.soa.bpel.runtime.engine.InvocationAdapter;
+import org.w3c.dom.Element;
+
+import javax.xml.namespace.QName;
+
+/**
+ * @author Heiko Braun <hbraun(a)redhat.com>
+ */
+public class ESBInvocationAdapter implements InvocationAdapter<Element>
+{
+ private String operationName;
+ private QName serviceName;
+ private Element requestXML;
+ private Element responseXML;
+
+ public ESBInvocationAdapter(String operationName, QName serviceName)
+ {
+ this.operationName = operationName;
+ this.serviceName = serviceName;
+ }
+
+ public String getOperationName()
+ {
+ return operationName;
+ }
+
+ public QName getServiceName()
+ {
+ return serviceName;
+ }
+
+ public void setRequestXML(Element requestXML)
+ {
+ this.requestXML = requestXML;
+ }
+
+ public void parseRequest(MyRoleMessageExchange mex, Message request)
+ {
+ if(null==this.requestXML)
+ throw new IllegalArgumentException("request XML not set");
+ request.setMessage(this.requestXML);
+ }
+
+ public void createResponse(MyRoleMessageExchange mex)
+ {
+ this.responseXML = mex.getResponse().getMessage();
+ }
+
+ public Element getInvocationResult()
+ {
+ return this.responseXML;
+ }
+
+ // test methods
+ Element getRequestXML()
+ {
+ return requestXML;
+ }
+
+ void setResponseXML(Element responseXML)
+ {
+ this.responseXML = responseXML;
+ }
+}
+
Deleted: branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationContext.java
===================================================================
--- branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationContext.java 2009-11-06 13:30:21 UTC (rev 245)
+++ branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationContext.java 2009-11-06 13:44:23 UTC (rev 246)
@@ -1,90 +0,0 @@
-/*
- * 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.esb.actions.bpel;
-
-import org.apache.ode.bpel.iapi.Message;
-import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
-import org.jboss.soa.bpel.runtime.engine.InvocationContext;
-import org.w3c.dom.Element;
-
-import javax.xml.namespace.QName;
-
-/**
- * @author Heiko Braun <hbraun(a)redhat.com>
- */
-public class ESBInvocationContext implements InvocationContext<Element>
-{
- private String operationName;
- private QName serviceName;
- private Element requestXML;
- private Element responseXML;
-
- public ESBInvocationContext(String operationName, QName serviceName)
- {
- this.operationName = operationName;
- this.serviceName = serviceName;
- }
-
- public String getOperationName()
- {
- return operationName;
- }
-
- public QName getServiceName()
- {
- return serviceName;
- }
-
- public void setRequestXML(Element requestXML)
- {
- this.requestXML = requestXML;
- }
-
- public void parseRequest(MyRoleMessageExchange mex, Message request)
- {
- if(null==this.requestXML)
- throw new IllegalArgumentException("request XML not set");
- request.setMessage(this.requestXML);
- }
-
- public void parseResponse(MyRoleMessageExchange mex)
- {
- this.responseXML = mex.getResponse().getMessage();
- }
-
- public Element getInvocationResult()
- {
- return this.responseXML;
- }
-
- // test methods
- Element getRequestXML()
- {
- return requestXML;
- }
-
- void setResponseXML(Element responseXML)
- {
- this.responseXML = responseXML;
- }
-}
-
Modified: branches/hbraun/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java
===================================================================
--- branches/hbraun/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java 2009-11-06 13:30:21 UTC (rev 245)
+++ branches/hbraun/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java 2009-11-06 13:44:23 UTC (rev 246)
@@ -17,16 +17,13 @@
*/
package org.jboss.soa.esb.actions.bpel;
-import org.apache.ode.bpel.iapi.Message;
-import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
import org.jboss.soa.bpel.runtime.engine.BPELEngine;
import org.jboss.soa.bpel.runtime.engine.BPELFault;
import org.jboss.soa.bpel.runtime.engine.IntegrationLayer;
-import org.jboss.soa.bpel.runtime.engine.InvocationContext;
+import org.jboss.soa.bpel.runtime.engine.InvocationAdapter;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -70,7 +67,7 @@
}
- public void invoke(InvocationContext invocationContext)
+ public void invoke(InvocationAdapter invocationAdapter)
throws BPELFault, Exception {
if (m_fault != null) {
@@ -78,7 +75,7 @@
}
- ESBInvocationContext esbCtx = (ESBInvocationContext) invocationContext;
+ ESBInvocationAdapter esbCtx = (ESBInvocationAdapter) invocationAdapter;
m_request = esbCtx.getRequestXML();
esbCtx.setResponseXML(m_response);
}
15 years, 1 month
riftsaw SVN: r245 - in branches/hbraun/runtime: engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode and 3 other directories.
by riftsaw-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-11-06 08:30:21 -0500 (Fri, 06 Nov 2009)
New Revision: 245
Added:
branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationContext.java
branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationContext.java
branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationContext.java
Modified:
branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java
branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/AbstractWebServiceEndpoint.java
branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java
branches/hbraun/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java
Log:
test drive InvocationContext API
Modified: branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java
===================================================================
--- branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java 2009-11-06 09:29:25 UTC (rev 244)
+++ branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java 2009-11-06 13:30:21 UTC (rev 245)
@@ -17,13 +17,11 @@
*/
package org.jboss.soa.bpel.runtime.engine;
-import org.apache.ode.bpel.iapi.Message;
-import org.w3c.dom.Element;
-
/**
* This interface represents a BPEL engine.
*
* @author gbrown
+ * @author Heiko Braun
*
*/
public interface BPELEngine {
@@ -36,22 +34,15 @@
*
* @throws Exception Failed to initialize
*/
- public void init() throws Exception;
-
- /**
- * This method invokes a BPEL process, associated with the supplied
- * service and operation, using the supplied message.
- *
- * @param operation The operation name
- * @param service The service QName
- * @param message The message
- * @return A response to the message, or null if no response is
- * required.
- * @throws BPELFault Process raised a fault
- * @throws Exception Failed to invoke the operation
- */
- public Element invoke(String operation, javax.xml.namespace.QName service,
- org.w3c.dom.Element message) throws BPELFault, Exception;
+ public void init() throws Exception;
+
+ /**
+ *
+ * @param invocationContext
+ * @throws BPELFault
+ * @throws Exception
+ */
+ public void invoke(InvocationContext invocationContext) throws BPELFault, Exception;
/**
* This method closes the BPEL engine.
Added: branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationContext.java
===================================================================
--- branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationContext.java (rev 0)
+++ branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationContext.java 2009-11-06 13:30:21 UTC (rev 245)
@@ -0,0 +1,43 @@
+/*
+ * 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.runtime.engine;
+
+import org.apache.ode.bpel.iapi.Message;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
+
+import javax.xml.namespace.QName;
+
+/**
+ * @author Heiko Braun <hbraun(a)redhat.com>
+ */
+public interface InvocationContext<T>
+{
+ String getOperationName();
+ QName getServiceName();
+
+ void parseRequest(MyRoleMessageExchange mex, Message request);
+ void parseResponse(MyRoleMessageExchange mex);
+
+ T getInvocationResult();
+
+}
Modified: branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
===================================================================
--- branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2009-11-06 09:29:25 UTC (rev 244)
+++ branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2009-11-06 13:30:21 UTC (rev 245)
@@ -41,18 +41,12 @@
import org.jboss.soa.bpel.runtime.engine.BPELEngine;
import org.jboss.soa.bpel.runtime.engine.BPELFault;
import org.jboss.soa.bpel.runtime.engine.IntegrationLayer;
-import org.jboss.soa.bpel.runtime.ws.MessageContext;
-import org.jboss.soa.bpel.runtime.ws.MessageContextAssoc;
-import org.jboss.soa.bpel.runtime.ws.SOAPMessageAdapter;
+import org.jboss.soa.bpel.runtime.engine.InvocationContext;
import org.w3c.dom.Element;
import javax.sql.DataSource;
import javax.transaction.*;
import javax.transaction.xa.XAResource;
-import javax.xml.namespace.QName;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPMessage;
import java.util.StringTokenizer;
import java.util.concurrent.*;
@@ -102,56 +96,30 @@
* required.
* @throws Exception Failed to invoke the operation
*/
- public Element invoke(String operation, QName service, Element message)
+ public void invoke(InvocationContext invocationContext)
throws BPELFault, Exception
{
- Element ret = null;
-
boolean success = true;
MyRoleMessageExchange odeMex = null;
Future responseFuture = null;
- boolean wsInvocation = (message instanceof SOAPEnvelope);
-
+
try
{
// start TX
_txMgr.begin();
if (__log.isDebugEnabled()) __log.debug("Starting transaction.");
-
- // Creating message exchange
- String messageId = new GUID().toString();
- odeMex = _bpelServer.getEngine().createMessageExchange(messageId, service, operation);
- __log.debug("ODE routed to operation " + odeMex.getOperation() + " from service " + service);
-
+
+ odeMex = createMessageExchange(invocationContext);
//odeMex.setProperty("isTwoWay", Boolean.toString(msgContext.getAxisOperation() instanceof TwoChannelAxisOperation));
+
if (odeMex.getOperation() != null)
{
-
// Preparing message to send to ODE
Message odeRequest = odeMex.createMessage(odeMex.getOperation().getInput().getMessage().getQName());
- //_converter.parseSoapRequest(odeRequest, msgContext.getEnvelope(), odeMex.getOperation());
-
+
// distinguish WS and ESB invocation
- if(wsInvocation)
- {
- MessageContext inboundMessageContext = MessageContextAssoc.getInbound();
- SOAPMessage soapMessage = inboundMessageContext.getMessage();
- SOAPMessageAdapter soapAdapter =
- new SOAPMessageAdapter(
- inboundMessageContext.getWsdlDefinition(),
- inboundMessageContext.getServiceName(),
- inboundMessageContext.getPortName()
- );
- soapAdapter.parseSoapRequest(odeRequest, soapMessage, odeMex.getOperation());
+ invocationContext.parseRequest(odeMex, odeRequest);
- //odeRequest.setMessage(AbstractWebServiceEndpoint.getMessagePayload((SOAPEnvelope)message));
- }
- else
- {
- wsInvocation = false;
- odeRequest.setMessage(message);
- }
-
// TODO: Might need to store session id/epr of caller?
//readHeader(msgContext, odeMex);
@@ -216,9 +184,9 @@
try {
// Refreshing the message exchange
odeMex = (MyRoleMessageExchange) _bpelServer.getEngine().getMessageExchange(odeMex.getMessageExchangeId());
- ret = onResponse(odeMex, wsInvocation);
+ onResponse(odeMex, invocationContext);
- __log.debug("Returning: "+ret);
+ __log.debug("Returning: "+invocationContext.getInvocationResult());
commit = true;
@@ -255,10 +223,19 @@
odeMex.release(true);
}
- return(ret);
}
- private Element onResponse(MyRoleMessageExchange mex, boolean wsInvocation) throws BPELFault, Exception {
+ private MyRoleMessageExchange createMessageExchange(InvocationContext context)
+ {
+ // Creating message exchange
+ String messageId = new GUID().toString();
+ MyRoleMessageExchange odeMex = _bpelServer.getEngine()
+ .createMessageExchange(messageId, context.getServiceName(), context.getOperationName());
+ __log.debug("ODE routed to operation " + odeMex.getOperation() + " from service " + context.getServiceName());
+ return odeMex;
+ }
+
+ private void onResponse(MyRoleMessageExchange mex, InvocationContext invocationContext) throws BPELFault, Exception {
Element ret=null;
switch (mex.getStatus()) {
@@ -269,32 +246,11 @@
case ASYNC:
case RESPONSE:
- if(wsInvocation)
+ if(true)
{
- // create SOAPEnvelope
- SOAPMessage soapResponse = MessageFactory.newInstance().createMessage();
- /*SOAPBody responseBody = soapResponse.getSOAPBody();
- SOAPFactory soapFactory = SOAPFactory.newInstance();
- SOAPElement responseElement = soapFactory.createElement(mex.getResponse().getMessage());
- responseBody.appendChild(responseElement);
- ret = soapResponse.getSOAPPart().getEnvelope();*/
+ invocationContext.parseResponse(mex);
+ }
- MessageContext inboundMessageContext = MessageContextAssoc.getInbound();
- SOAPMessageAdapter soapAdapter =
- new SOAPMessageAdapter(
- inboundMessageContext.getWsdlDefinition(),
- inboundMessageContext.getServiceName(),
- inboundMessageContext.getPortName()
- );
- soapAdapter.createSoapResponse(soapResponse, mex.getResponse(), mex.getOperation());
- ret = soapResponse.getSOAPPart().getEnvelope();
- MessageContextAssoc.createOutbound().setMessage(soapResponse);
- }
- else
- {
- // ESB response
- ret = mex.getResponse().getMessage();
- }
if (__log.isDebugEnabled())
__log.debug("Response message " + ret);
break;
@@ -306,9 +262,7 @@
throw new Exception("Failure response message: "+mex.getFault()+" : "+mex.getFaultExplanation());
default:
throw new Exception("Received ODE message exchange in unexpected state: " + mex.getStatus());
- }
-
- return(ret);
+ }
}
/**
Modified: branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/AbstractWebServiceEndpoint.java
===================================================================
--- branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/AbstractWebServiceEndpoint.java 2009-11-06 09:29:25 UTC (rev 244)
+++ branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/AbstractWebServiceEndpoint.java 2009-11-06 13:30:21 UTC (rev 245)
@@ -51,25 +51,30 @@
{
protected final Log log = LogFactory.getLog(getClass());
- private Definition wsdlDefinition = null;
- private boolean isInit;
+ private SOAPMessageAdapter soapAdapter;
+ private QName serviceQName;
+ private boolean isInitialized;
+
private void init()
{
- if(!isInit)
+ if(!isInitialized)
{
try
{
WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- wsdlDefinition = wsdlReader.readWSDL(getWsdlLocation());
+ Definition wsdlDefinition = wsdlReader.readWSDL(getWsdlLocation());
+ this.serviceQName = QName.valueOf(getServiceName());
+ this.soapAdapter = new SOAPMessageAdapter(wsdlDefinition, serviceQName, getPortName());
}
catch (WSDLException e)
{
throw new RuntimeException("Failed to parse WSDL", e);
}
- isInit = true;
+ isInitialized = true;
}
}
+
public SOAPMessage invoke(SOAPMessage soapMessage)
{
log.debug("Invoking endpoint "+getEndpointId());
@@ -81,53 +86,34 @@
SOAPEnvelope soapEnvelope = soapPart.getEnvelope();
Element messageElement = getMessagePayload(soapEnvelope);
- // make sure namespaces are preserved
- //DOMUtils.pancakeNamespaces(soapEnvelope);
-
if(log.isDebugEnabled())
log.debug( "ODE inbound message: \n" +DOMWriter.printNode(soapEnvelope, true) );
- MessageContext context = MessageContextAssoc.createInbound();
- context.setMessage(soapMessage);
- context.setServiceName(QName.valueOf(getServiceName()));
- context.setPortName(getPortName());
- context.setWsdlDefinition(wsdlDefinition);
-
- Element odeResponse = getEngine().invoke(
+ // Create invocation context
+ WSInvocationContext invocationContext = new WSInvocationContext(
messageElement.getLocalName(),
- QName.valueOf(getServiceName()),
- soapEnvelope
+ serviceQName,
+ soapAdapter
);
+ invocationContext.setSOAPMessage(soapMessage);
- if(!(odeResponse instanceof SOAPEnvelope))
- throw new IllegalArgumentException("Expected SOAPEnvelope, got "+odeResponse.getClass());
+ // Invoke ODE
+ getEngine().invoke(invocationContext);
- if(null==MessageContextAssoc.getOutbound())
- throw new IllegalArgumentException("No outbound MessageContext");
+ // Handle response
+ SOAPMessage responseMessage = invocationContext.getInvocationResult();
- SOAPMessage responseMessage = MessageContextAssoc.getOutbound().getMessage();
-
if(log.isDebugEnabled())
log.debug( "ODE outbound message: \n" +
DOMWriter.printNode(responseMessage.getSOAPPart().getEnvelope(), true)
);
- /* SOAPBody responseBody = soapResponse.getSOAPBody();
- SOAPFactory soapFactory = SOAPFactory.newInstance();
- SOAPElement responseElement = soapFactory.createElement(odeResponse);
- responseBody.appendChild(responseElement);*/
-
return responseMessage;
}
catch (Exception e)
{
throw new RuntimeException("Failed to invoke BPEL process", e);
}
- finally
- {
- MessageContextAssoc.clearAll();
- }
-
}
public static Element getMessagePayload(SOAPEnvelope soapEnvelope)
Added: branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationContext.java
===================================================================
--- branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationContext.java (rev 0)
+++ branches/hbraun/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationContext.java 2009-11-06 13:30:21 UTC (rev 245)
@@ -0,0 +1,98 @@
+/*
+ * 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.runtime.ws;
+
+import org.apache.ode.bpel.iapi.Message;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
+import org.jboss.soa.bpel.runtime.engine.InvocationContext;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+
+/**
+ * @author Heiko Braun <hbraun(a)redhat.com>
+ */
+public final class WSInvocationContext implements InvocationContext<SOAPMessage>
+{
+ private final String operationName;
+ private final QName serviceName;
+
+ private SOAPMessage soapRequestMessage;
+ private SOAPMessage soapResponseMessage;
+
+ private final SOAPMessageAdapter soapAdapter;
+
+ public WSInvocationContext(String operationName,
+ QName serviceName, SOAPMessageAdapter soapAdapter)
+ {
+ this.operationName = operationName;
+ this.serviceName = serviceName;
+ this.soapAdapter = soapAdapter;
+ }
+
+ public String getOperationName()
+ {
+ return operationName;
+ }
+
+ public QName getServiceName()
+ {
+ return serviceName;
+ }
+
+ public void parseRequest(MyRoleMessageExchange mex, Message request)
+ {
+ if(null==soapRequestMessage)
+ throw new IllegalArgumentException("No request SOAPMessage set");
+
+ soapAdapter.parseSoapRequest(request, soapRequestMessage, mex.getOperation());
+ }
+
+ public void parseResponse(MyRoleMessageExchange mex)
+ {
+ try
+ {
+ // create SOAPEnvelope
+ soapResponseMessage = MessageFactory.newInstance().createMessage();
+ soapAdapter.createSoapResponse(soapResponseMessage, mex.getResponse(), mex.getOperation());
+ }
+ catch (SOAPException e)
+ {
+ throw new RuntimeException("Failed to parse SOAP response", e);
+ }
+ }
+
+ public SOAPMessage getInvocationResult()
+ {
+ if(null==soapResponseMessage)
+ throw new IllegalArgumentException("No response SOAPMessage set");
+
+ return soapResponseMessage;
+ }
+
+ public void setSOAPMessage(SOAPMessage soapMessage)
+ {
+ this.soapRequestMessage = soapMessage;
+ }
+}
Modified: branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java
===================================================================
--- branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java 2009-11-06 09:29:25 UTC (rev 244)
+++ branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java 2009-11-06 13:30:21 UTC (rev 245)
@@ -28,6 +28,7 @@
import org.jboss.soa.esb.message.format.MessageFactory;
import javax.naming.*;
+import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.Transformer;
@@ -174,11 +175,21 @@
org.w3c.dom.Element resp=null;
javax.xml.namespace.QName faultName=null;
- try {
- resp = engine.invoke(_config.getAttribute(OPERATION),
- new javax.xml.namespace.QName(getNamespace(serviceName),
- getLocalPart(serviceName)), mesgElem);
- } catch(BPELFault fault) {
+ try
+ {
+ QName serviceQName = new QName(getNamespace(serviceName), getLocalPart(serviceName));
+
+ // Create invocationContext
+ ESBInvocationContext invocationContext =
+ new ESBInvocationContext(_config.getAttribute(OPERATION), serviceQName);
+ invocationContext.setRequestXML(mesgElem);
+
+ // invoke ODE
+ engine.invoke(invocationContext);
+ resp = invocationContext.getInvocationResult();
+ }
+ catch(BPELFault fault)
+ {
resp = fault.getFaultMessage();
faultName = fault.getFaultName();
}
Added: branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationContext.java
===================================================================
--- branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationContext.java (rev 0)
+++ branches/hbraun/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationContext.java 2009-11-06 13:30:21 UTC (rev 245)
@@ -0,0 +1,90 @@
+/*
+ * 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.esb.actions.bpel;
+
+import org.apache.ode.bpel.iapi.Message;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
+import org.jboss.soa.bpel.runtime.engine.InvocationContext;
+import org.w3c.dom.Element;
+
+import javax.xml.namespace.QName;
+
+/**
+ * @author Heiko Braun <hbraun(a)redhat.com>
+ */
+public class ESBInvocationContext implements InvocationContext<Element>
+{
+ private String operationName;
+ private QName serviceName;
+ private Element requestXML;
+ private Element responseXML;
+
+ public ESBInvocationContext(String operationName, QName serviceName)
+ {
+ this.operationName = operationName;
+ this.serviceName = serviceName;
+ }
+
+ public String getOperationName()
+ {
+ return operationName;
+ }
+
+ public QName getServiceName()
+ {
+ return serviceName;
+ }
+
+ public void setRequestXML(Element requestXML)
+ {
+ this.requestXML = requestXML;
+ }
+
+ public void parseRequest(MyRoleMessageExchange mex, Message request)
+ {
+ if(null==this.requestXML)
+ throw new IllegalArgumentException("request XML not set");
+ request.setMessage(this.requestXML);
+ }
+
+ public void parseResponse(MyRoleMessageExchange mex)
+ {
+ this.responseXML = mex.getResponse().getMessage();
+ }
+
+ public Element getInvocationResult()
+ {
+ return this.responseXML;
+ }
+
+ // test methods
+ Element getRequestXML()
+ {
+ return requestXML;
+ }
+
+ void setResponseXML(Element responseXML)
+ {
+ this.responseXML = responseXML;
+ }
+}
+
Modified: branches/hbraun/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java
===================================================================
--- branches/hbraun/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java 2009-11-06 09:29:25 UTC (rev 244)
+++ branches/hbraun/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java 2009-11-06 13:30:21 UTC (rev 245)
@@ -17,16 +17,19 @@
*/
package org.jboss.soa.esb.actions.bpel;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
+import org.apache.ode.bpel.iapi.Message;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
import org.jboss.soa.bpel.runtime.engine.BPELEngine;
import org.jboss.soa.bpel.runtime.engine.BPELFault;
import org.jboss.soa.bpel.runtime.engine.IntegrationLayer;
+import org.jboss.soa.bpel.runtime.engine.InvocationContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
public class TestBPELEngine implements BPELEngine {
public TestBPELEngine() {
@@ -51,38 +54,35 @@
m_response = doc.getDocumentElement();
}
-
- @Override
+
public void addIntegrationLayer(IntegrationLayer il) {
// TODO Auto-generated method stub
}
- @Override
public void close() throws Exception {
// TODO Auto-generated method stub
}
- @Override
public void init() throws Exception {
// TODO Auto-generated method stub
}
- @Override
- public Element invoke(String operation, QName service, Element message)
+ public void invoke(InvocationContext invocationContext)
throws BPELFault, Exception {
if (m_fault != null) {
throw m_fault;
}
-
- m_request = message;
- return(m_response);
+
+
+ ESBInvocationContext esbCtx = (ESBInvocationContext) invocationContext;
+ m_request = esbCtx.getRequestXML();
+ esbCtx.setResponseXML(m_response);
}
- @Override
public void removeIntegrationLayer(IntegrationLayer il) {
// TODO Auto-generated method stub
15 years, 1 month
riftsaw SVN: r244 - trunk/integration-tests.
by riftsaw-commits@lists.jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-11-06 04:29:25 -0500 (Fri, 06 Nov 2009)
New Revision: 244
Modified:
trunk/integration-tests/pom.xml
Log:
RIFTSAW-34: Exclude ATM test case until it is fixed
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2009-11-06 07:15:56 UTC (rev 243)
+++ trunk/integration-tests/pom.xml 2009-11-06 09:29:25 UTC (rev 244)
@@ -278,6 +278,10 @@
<include>**/*TestCase.java</include>
<include>**/*Test.java</include>
</includes>
+ <!-- https://jira.jboss.org/jira/browse/RIFTSAW-34 -->
+ <excludes>
+ <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELAtmTestCase.java</exclude>
+ </excludes>
</configuration>
<executions>
<execution>
15 years, 1 month
riftsaw SVN: r243 - trunk/qa.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-06 02:15:56 -0500 (Fri, 06 Nov 2009)
New Revision: 243
Modified:
trunk/qa/hudson-riftsaw-jboss.sh
Log:
* update the base integration script.
Modified: trunk/qa/hudson-riftsaw-jboss.sh
===================================================================
--- trunk/qa/hudson-riftsaw-jboss.sh 2009-11-06 06:55:26 UTC (rev 242)
+++ trunk/qa/hudson-riftsaw-jboss.sh 2009-11-06 07:15:56 UTC (rev 243)
@@ -5,7 +5,7 @@
MAVEN_OPTS="-Xms512M -Xmx1024M"
RIFTSAW_PARENT_DIR="$WORKSPACE"
JBOSS_VERSION="5.1.0.GA"
-DATABASE="hsql"
+#DATABASE="hsql"
ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
15 years, 1 month
riftsaw SVN: r242 - in trunk: distribution/src/main/release/db/jdbc and 4 other directories.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-06 01:55:26 -0500 (Fri, 06 Nov 2009)
New Revision: 242
Added:
trunk/distribution/src/main/release/db/sql/oracle.drop.sql
trunk/distribution/src/main/release/db/sql/sqlserver.drop.sql
Modified:
trunk/distribution/pom.xml
trunk/distribution/src/main/release/db/jdbc/oracle.properties
trunk/distribution/src/main/release/db/jdbc/sqlserver.properties
trunk/distribution/src/main/release/install/build.xml
trunk/integration-tests/build.xml
trunk/runtime/engine-assembly/resources/bpel-sql/oracle.sql
trunk/runtime/engine-assembly/resources/bpel-sql/sqlserver.sql
Log:
* RIFTSAW-103, fix the oralce, sqlserver sql script.
* Make them installed correctly in the installation script.
Modified: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml 2009-11-06 03:58:46 UTC (rev 241)
+++ trunk/distribution/pom.xml 2009-11-06 06:55:26 UTC (rev 242)
@@ -36,10 +36,12 @@
<properties>
<maven.test.skip>true</maven.test.skip>
<bpel.version>${project.version}</bpel.version>
+
<mysql.connector.version>5.0.8</mysql.connector.version>
<postgresql.version>8.3-603.jdbc3</postgresql.version>
<jtds.version>1.2.2</jtds.version>
<derby.version>10.4.1.3</derby.version>
+ <oracle.version>10.2.0.4</oracle.version>
</properties>
<dependencies>
@@ -167,6 +169,32 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>get.oracle.driver</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <version>${oracle.version}</version>
+ <destFileName>ojdbc14.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>target/libs</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
@@ -212,8 +240,11 @@
<url>http://repo1.maven.org/maven2</url>
</repository>
+ <repository>
+ <id>qa.jboss.com</id>
+ <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url>
+ </repository>
-
<!-- Not all dependencies are resolved when using this repository.
Complains about not finding appropriate version of
org.eclipse.equinox.app plugin. -->
Modified: trunk/distribution/src/main/release/db/jdbc/oracle.properties
===================================================================
--- trunk/distribution/src/main/release/db/jdbc/oracle.properties 2009-11-06 03:58:46 UTC (rev 241)
+++ trunk/distribution/src/main/release/db/jdbc/oracle.properties 2009-11-06 06:55:26 UTC (rev 242)
@@ -1,5 +1,5 @@
-connection.url=jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa
+connection.url=jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10
driver=oracle.jdbc.driver.OracleDriver
username=riftsaw
-password=riftsaw
+password=rsqapwd
dialect=org.hibernate.dialect.Oracle9Dialect
\ No newline at end of file
Modified: trunk/distribution/src/main/release/db/jdbc/sqlserver.properties
===================================================================
--- trunk/distribution/src/main/release/db/jdbc/sqlserver.properties 2009-11-06 03:58:46 UTC (rev 241)
+++ trunk/distribution/src/main/release/db/jdbc/sqlserver.properties 2009-11-06 06:55:26 UTC (rev 242)
@@ -1,5 +1,5 @@
-connection.url=jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/riftsaw
+connection.url=jdbc:jtds:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433/riftsaw
driver=net.sourceforge.jtds.jdbc.Driver
username=riftsaw
-password=riftsaw
+password=rsqapwd
dialect=org.hibernate.dialect.SQLServerDialect
\ No newline at end of file
Added: trunk/distribution/src/main/release/db/sql/oracle.drop.sql
===================================================================
--- trunk/distribution/src/main/release/db/sql/oracle.drop.sql (rev 0)
+++ trunk/distribution/src/main/release/db/sql/oracle.drop.sql 2009-11-06 06:55:26 UTC (rev 242)
@@ -0,0 +1,29 @@
+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_MESSAGE_EXCHANGE;
+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 LARGE_DATA;
+drop table VAR_PROPERTY;
+drop table STORE_DU;
+drop table STORE_PROCESS;
+drop table STORE_PROCESS_PROP;
+drop table STORE_VERSIONS;
+drop sequence hibernate_sequence;
+
+
+
Added: trunk/distribution/src/main/release/db/sql/sqlserver.drop.sql
===================================================================
--- trunk/distribution/src/main/release/db/sql/sqlserver.drop.sql (rev 0)
+++ trunk/distribution/src/main/release/db/sql/sqlserver.drop.sql 2009-11-06 06:55:26 UTC (rev 242)
@@ -0,0 +1,28 @@
+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_MESSAGE_EXCHANGE;
+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 LARGE_DATA;
+drop table VAR_PROPERTY;
+drop table STORE_DU;
+drop table STORE_PROCESS;
+drop table STORE_PROCESS_PROP;
+drop table STORE_VERSIONS;
+
+
+
Modified: trunk/distribution/src/main/release/install/build.xml
===================================================================
--- trunk/distribution/src/main/release/install/build.xml 2009-11-06 03:58:46 UTC (rev 241)
+++ trunk/distribution/src/main/release/install/build.xml 2009-11-06 06:55:26 UTC (rev 242)
@@ -69,6 +69,7 @@
<filterset>
<filter token="database" value="${database}"/>
</filterset>
+
</copy>
<copy file="../db/bpel.properties"
@@ -174,6 +175,13 @@
</copy>
</target>
+ <target name="internal.install.riftsaw.into.jboss.db.oracle">
+ <available file="../db/drivers/ojdbc14.jar" property="oracle.driver.jar.available" />
+ <fail message="please download the oracle driver jar ojdbc14.jar from oracle and put it in the db/drivers directory" unless="oracle.driver.jar.available" />
+ <copy file="../db/drivers/ojdbc14.jar"
+ todir="${deploy.dir}/${bpel-runtime}/lib" />
+ </target>
+
<!-- uninstall database specific driver -->
<target name="internal.uninstall.riftsaw.into.jboss.db.hsql" />
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2009-11-06 03:58:46 UTC (rev 241)
+++ trunk/integration-tests/build.xml 2009-11-06 06:55:26 UTC (rev 242)
@@ -11,6 +11,8 @@
<!--copy file="${riftsaw.test.deployment.properties}"
tofile="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/install/deployment.properties" /-->
+ <copy file="${basedir}/../distribution/target/libs/ojdbc14.jar"
+ todir="${basedir}/../distribution/dist/riftsaw-${riftsaw.engine.version}/db/drivers"/>
</target>
<target name="deploy-riftsaw" >
Modified: trunk/runtime/engine-assembly/resources/bpel-sql/oracle.sql
===================================================================
--- trunk/runtime/engine-assembly/resources/bpel-sql/oracle.sql 2009-11-06 03:58:46 UTC (rev 241)
+++ trunk/runtime/engine-assembly/resources/bpel-sql/oracle.sql 2009-11-06 06:55:26 UTC (rev 242)
@@ -7,13 +7,14 @@
--
CREATE TABLE ode_job (
- jobid CHAR(64) NOT NULL DEFAULT '',
- ts BIGINT NOT NULL DEFAULT 0,
+ jobid CHAR(64) DEFAULT '' NOT NULL,
+ ts INTEGER DEFAULT 0 NOT NULL,
nodeid char(64),
- scheduled int NOT NULL DEFAULT 0,
- transacted int NOT NULL DEFAULT 0,
- details blob(4096),
- PRIMARY KEY(jobid));
+ scheduled int DEFAULT 0 NOT NULL,
+ transacted int DEFAULT 0 NOT NULL,
+ details blob,
+ PRIMARY KEY(jobid)
+);
CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts);
CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid);
@@ -36,10 +37,10 @@
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 LARGE_DATA (ID number(19,0) not null, BIN_DATA blob, 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_BPEL_CORRELATOR_MSG_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);
Modified: trunk/runtime/engine-assembly/resources/bpel-sql/sqlserver.sql
===================================================================
--- trunk/runtime/engine-assembly/resources/bpel-sql/sqlserver.sql 2009-11-06 03:58:46 UTC (rev 241)
+++ trunk/runtime/engine-assembly/resources/bpel-sql/sqlserver.sql 2009-11-06 06:55:26 UTC (rev 242)
@@ -12,7 +12,7 @@
nodeid char(64),
scheduled int NOT NULL DEFAULT 0,
transacted int NOT NULL DEFAULT 0,
- details blob(4096),
+ details image null,
PRIMARY KEY(jobid));
CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts);
@@ -36,7 +36,7 @@
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 LARGE_DATA (ID numeric(19,0) identity not null, BIN_DATA image 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);
15 years, 1 month
riftsaw SVN: r241 - trunk/qa.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-05 22:58:46 -0500 (Thu, 05 Nov 2009)
New Revision: 241
Modified:
trunk/qa/hudson-riftsaw-jdk5.sh
Log:
* not replace the jbossws by default
Modified: trunk/qa/hudson-riftsaw-jdk5.sh
===================================================================
--- trunk/qa/hudson-riftsaw-jdk5.sh 2009-11-06 03:49:55 UTC (rev 240)
+++ trunk/qa/hudson-riftsaw-jdk5.sh 2009-11-06 03:58:46 UTC (rev 241)
@@ -35,4 +35,4 @@
echo ESB_HOME=$ESB_HOME, ESB_CONIFG=$ESB_CONFIG WS_STACK_DIR=$WS_STACK_DIR WS_STACK=$WS_STACK
cd ../integration-tests
-mvn -Dorg.jboss.esb.server.home=$ESB_HOME -Dorg.jboss.esb.server.config=$ESB_CONFIG -Ddatabase=$DATABASE -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR clean install
+mvn -Dorg.jboss.esb.server.home=$ESB_HOME -Dorg.jboss.esb.server.config=$ESB_CONFIG -Ddatabase=$DATABASE -Dws.stack.dir=$WS_STACK_DIR clean install
15 years, 1 month