You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ms...@apache.org on 2007/02/08 23:55:43 UTC
svn commit: r505076 - in /incubator/ode/trunk/axis2/src:
main/java/org/apache/ode/axis2/ODEServer.java
test/java/org/apache/ode/axis2/SoapMessageConverterTestFromRaja1.java
test/resources/raja1.wsdl test/resources/raja1req.soap
Author: mszefler
Date: Thu Feb 8 14:55:43 2007
New Revision: 505076
URL: http://svn.apache.org/viewvc?view=rev&rev=505076
Log:
Minor rearrangement to allow easier overrides from custom modules.
Added:
incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTestFromRaja1.java
incubator/ode/trunk/axis2/src/test/resources/raja1.wsdl
incubator/ode/trunk/axis2/src/test/resources/raja1req.soap
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
Modified: incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?view=diff&rev=505076&r1=505075&r2=505076
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java (original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Thu Feb 8 14:55:43 2007
@@ -58,6 +58,7 @@
import org.apache.ode.bpel.iapi.ProcessStore;
import org.apache.ode.bpel.iapi.ProcessStoreEvent;
import org.apache.ode.bpel.iapi.ProcessStoreListener;
+import org.apache.ode.bpel.iapi.Scheduler;
import org.apache.ode.bpel.scheduler.quartz.QuartzSchedulerImpl;
import org.apache.ode.store.ProcessStoreImpl;
import org.apache.ode.utils.LoggingDataSourceWrapper;
@@ -76,27 +77,27 @@
private static final Messages __msgs = Messages.getMessages(Messages.class);
- private File _appRoot;
+ protected File _appRoot;
- private File _workRoot;
+ protected File _workRoot;
- private BpelServerImpl _server;
+ protected BpelServerImpl _server;
- private ProcessStoreImpl _store;
+ protected ProcessStoreImpl _store;
- private ODEConfigProperties _odeConfig;
+ protected ODEConfigProperties _odeConfig;
- private AxisConfiguration _axisConfig;
+ protected AxisConfiguration _axisConfig;
- private DataSource _datasource;
+ protected DataSource _datasource;
- private TransactionManager _txMgr;
+ protected TransactionManager _txMgr;
- private BpelDAOConnectionFactory _daoCF;
+ protected BpelDAOConnectionFactory _daoCF;
- private ExecutorService _executorService;
+ protected ExecutorService _executorService;
- private QuartzSchedulerImpl _scheduler;
+ protected Scheduler _scheduler;
private DeploymentPoller _poller;
@@ -496,19 +497,24 @@
return new ProcessStoreImpl(ds);
}
+ protected Scheduler createScheduler() {
+ QuartzSchedulerImpl scheduler = new QuartzSchedulerImpl();
+ scheduler.setExecutorService(_executorService, 20);
+ scheduler.setTransactionManager(_txMgr);
+ scheduler.setDataSource(_datasource);
+ scheduler.init();
+ return scheduler;
+ }
+
private void initBpelServer() {
if (__log.isDebugEnabled()) {
__log.debug("ODE initializing");
}
_server = new BpelServerImpl();
-
- _executorService = Executors.newCachedThreadPool();
- _scheduler = new QuartzSchedulerImpl();
+ _scheduler = createScheduler();
_scheduler.setJobProcessor(_server);
- _scheduler.setExecutorService(_executorService, 20);
- _scheduler.setTransactionManager(_txMgr);
- _scheduler.setDataSource(_datasource);
- _scheduler.init();
+
+ _executorService = Executors.newCachedThreadPool();
_server.setDaoConnectionFactory(_daoCF);
_server.setInMemDaoConnectionFactory(new org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl());
Added: incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTestFromRaja1.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTestFromRaja1.java?view=auto&rev=505076
==============================================================================
--- incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTestFromRaja1.java (added)
+++ incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTestFromRaja1.java Thu Feb 8 14:55:43 2007
@@ -0,0 +1,65 @@
+package org.apache.ode.axis2;
+
+import javax.wsdl.Definition;
+import javax.wsdl.Operation;
+import javax.wsdl.PortType;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
+import junit.framework.TestCase;
+
+import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
+import org.apache.axiom.soap.impl.dom.soap11.SOAP11Factory;
+import org.apache.axis2.AxisFault;
+import org.apache.ode.axis2.util.SoapMessageConverter;
+import org.apache.ode.utils.DOMUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+public class SoapMessageConverterTestFromRaja1 extends TestCase {
+ String wsdl1tns;
+ Definition wsdl1;
+ String portName = "RepoAccessor";
+ SoapMessageConverter portmapper;
+
+ PortType portType;
+ Document req1;
+ private Operation op1;
+
+ public SoapMessageConverterTestFromRaja1() throws Exception {
+ }
+
+
+ public void setUp() throws Exception {
+ req1 = DOMUtils.parse(getClass().getResourceAsStream("/raja1req.soap"));
+ WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
+ wsdl1 = reader.readWSDL(getClass().getResource("/raja1.wsdl").toExternalForm());
+ wsdl1tns = wsdl1.getTargetNamespace();
+ portType = wsdl1.getPortType(new QName(wsdl1tns,"SimpleServicesPortType"));
+ op1 = portType.getOperation("addNumbers", null, null);
+ portmapper = new SoapMessageConverter(new SOAP11Factory(),
+ wsdl1, new QName(wsdl1tns,"SimpleServices"),
+ "SimpleServicesHttpPort", true);
+ }
+
+ public void tearDown() {
+
+ }
+
+ public void testParseSOAPRequest() throws Exception {
+ XMLStreamReader sr = XMLInputFactory.newInstance().createXMLStreamReader(getClass().getResourceAsStream("/raja1req.soap"));
+ StAXSOAPModelBuilder builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(new SOAP11Factory(),sr);
+
+ SOAPEnvelope env = builder.getSOAPEnvelope();
+ Element msg = DOMUtils.stringToDOM("<message/>");
+ portmapper.parseSoapRequest(msg,env,op1);
+ System.out.println(DOMUtils.domToString(msg));
+
+ }
+
+}
Added: incubator/ode/trunk/axis2/src/test/resources/raja1.wsdl
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/test/resources/raja1.wsdl?view=auto&rev=505076
==============================================================================
--- incubator/ode/trunk/axis2/src/test/resources/raja1.wsdl (added)
+++ incubator/ode/trunk/axis2/src/test/resources/raja1.wsdl Thu Feb 8 14:55:43 2007
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://ws.sdc.maximus.com" xmlns:tns="http://ws.sdc.maximus.com" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://www.w3.org/2003/05/soap-envelope" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc11="http://schemas.xmlsoap.org/soap/encoding/" xmlns:soapenc12="http://www.w3.org/2003/05/soap-encoding" xmlns:soap11="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:types>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified"
+ elementFormDefault="qualified"
+ targetNamespace="http://ws.sdc.maximus.com">
+ <xsd:element name="addNumbers">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element maxOccurs="1" minOccurs="1" name="Number1" type="xsd:long"/>
+ <xsd:element maxOccurs="1" minOccurs="1" name="Number2" type="xsd:long"/>
+ </xsd:sequence>
+
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="addNumbersResponse">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element maxOccurs="1" minOccurs="1" name="out" type="xsd:long"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="multiplyNumbers">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element maxOccurs="1" minOccurs="1" name="Number1" type="xsd:long"/>
+ <xsd:element maxOccurs="1" minOccurs="1" name="Number2" type="xsd:long"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="multiplyNumbersResponse">
+
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element maxOccurs="1" minOccurs="1" name="out" type="xsd:long"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema> </wsdl:types>
+ <wsdl:message name="multiplyNumbersResponse">
+ <wsdl:part name="parameters" element="tns:multiplyNumbersResponse"/>
+
+ </wsdl:message>
+ <wsdl:message name="addNumbersResponse">
+ <wsdl:part name="parameters" element="tns:addNumbersResponse"/>
+ </wsdl:message>
+ <wsdl:message name="multiplyNumbersRequest">
+ <wsdl:part name="parameters" element="tns:multiplyNumbers"/>
+ </wsdl:message>
+ <wsdl:message name="addNumbersRequest">
+ <wsdl:part name="parameters" element="tns:addNumbers"/>
+
+ </wsdl:message>
+ <wsdl:portType name="SimpleServicesPortType">
+ <wsdl:operation name="addNumbers">
+ <wsdl:input name="addNumbersRequest" message="tns:addNumbersRequest"/>
+ <wsdl:output name="addNumbersResponse" message="tns:addNumbersResponse"/>
+ </wsdl:operation>
+ <wsdl:operation name="multiplyNumbers">
+ <wsdl:input name="multiplyNumbersRequest" message="tns:multiplyNumbersRequest"/>
+ <wsdl:output name="multiplyNumbersResponse" message="tns:multiplyNumbersResponse"/>
+
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="SimpleServicesHttpBinding" type="tns:SimpleServicesPortType">
+ <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="addNumbers">
+ <wsdlsoap:operation soapAction=""/>
+ <wsdl:input name="addNumbersRequest">
+ <wsdlsoap:body use="literal"/>
+ </wsdl:input>
+
+ <wsdl:output name="addNumbersResponse">
+ <wsdlsoap:body use="literal" style="rpc"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="multiplyNumbers">
+ <wsdlsoap:operation soapAction=""/>
+ <wsdl:input name="multiplyNumbersRequest">
+ <wsdlsoap:body use="literal"/>
+ </wsdl:input>
+
+ <wsdl:output name="multiplyNumbersResponse">
+ <wsdlsoap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="SimpleServices">
+ <wsdl:port name="SimpleServicesHttpPort" binding="tns:SimpleServicesHttpBinding">
+ <wsdlsoap:address location="http://10.23.1.199:8080/SimpleWebService/services/SimpleServices"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: incubator/ode/trunk/axis2/src/test/resources/raja1req.soap
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/test/resources/raja1req.soap?view=auto&rev=505076
==============================================================================
--- incubator/ode/trunk/axis2/src/test/resources/raja1req.soap (added)
+++ incubator/ode/trunk/axis2/src/test/resources/raja1req.soap Thu Feb 8 14:55:43 2007
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='utf-8'?>
+<soapenv:Envelope
+xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+<soapenv:Header>
+ <addr:To xmlns:addr="http://www.w3.org/2005/08/addressing">
+
+http://10.23.1.199:8080/SimpleWebService/services/SimpleServices
+ </addr:To>
+ <addr:Action
+xmlns:addr="http://www.w3.org/2005/08/addressing"></addr:Action>
+</soapenv:Header>
+<soapenv:Body>
+ <axis2ns2:addNumbers xmlns:tns="http://ws.sdc.maximus.com"
+ xmlns:axis2ns2="http://ws.sdc.maximus.com"
+ xmlns="http://ws.sdc.maximus.com">
+ <Number1>11</Number1>
+ <Number2>22</Number2>
+ </axis2ns2:addNumbers>
+ </soapenv:Body>
+ </soapenv:Envelope>
+
\ No newline at end of file