Author: lresende
Date: Fri Sep 14 01:20:11 2007
New Revision: 575580
URL: http://svn.apache.org/viewvc?rev=575580&view=rev
Log:
Starting to get the invocation mechanism ready
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELTestCase.java
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java?rev=575580&r1=575579&r2=575580&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
Fri Sep 14 01:20:11 2007
@@ -21,7 +21,6 @@
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.InputStream;
-import java.net.URL;
import java.net.URI;
import java.util.Collections;
import java.util.Date;
@@ -40,6 +39,7 @@
import org.apache.tuscany.sca.assembly.Property;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.impl.ComponentTypeImpl;
import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
import org.w3c.dom.Node;
@@ -49,7 +49,7 @@
*
* @version $Rev$ $Date$
*/
-public class BPELImplementationImpl implements BPELImplementation {
+public class BPELImplementationImpl extends ComponentTypeImpl implements
BPELImplementation {
private Service _bpelService;
private QName _processName;
@@ -80,41 +80,37 @@
return null;
}
+ @Override
+ public String getURI() {
+ // The sample BPEL implementation does not have a URI
+ return null;
+ }
+
+ @Override
+ public void setURI(String uri) {
+ // The sample BPEL implementation does not have a URI
+ }
+
+ @Override
public ConstrainingType getConstrainingType() {
// The sample BPEL implementation does not support constrainingTypes
return null;
}
+ @Override
public List<Property> getProperties() {
// The sample BPEL implementation does not support properties
return Collections.emptyList();
}
- public List<Service> getServices() {
- // The sample BPEL implementation provides a single fixed CRUD service
- return Collections.singletonList(_bpelService);
- }
+ @Override
public List<Reference> getReferences() {
// The sample BPEL implementation does not support properties
return Collections.emptyList();
}
- public String getURI() {
- // The sample BPEL implementation does not have a URI
- return null;
- }
-
- public void setConstrainingType(ConstrainingType constrainingType) {
- // The sample BPEL implementation does not support constrainingTypes
- }
-
- public void setURI(String uri) {
- // The sample BPEL implementation does not have a URI
- }
-
-
- public boolean isUnresolved() {
+ public boolean isUnresolved() {
return this.unresolved;
}
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java?rev=575580&r1=575579&r2=575580&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
Fri Sep 14 01:20:11 2007
@@ -28,6 +28,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.axiom.om.OMElement;
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.ComponentType;
import org.apache.tuscany.sca.assembly.Property;
@@ -171,9 +172,14 @@
Map<String, Service> serviceMap = new HashMap<String, Service>();
for (Service svc : impl.getServices()) {
- serviceMap.put(svc.getName(), svc);
+ if(svc != null) {
+ serviceMap.put(svc.getName(), svc);
+ }
}
for (Service service : componentType.getServices()) {
+ //set default dataBinding to DOM
+
service.getInterfaceContract().getInterface().setDefaultDataBinding(OMElement.class.getName());
+
serviceMap.put(service.getName(), service);
}
impl.getServices().clear();
@@ -183,21 +189,12 @@
for (Property prop : impl.getProperties()) {
propMap.put(prop.getName(), prop);
}
- for (Property property : componentType.getProperties()) {
- propMap.put(property.getName(), property);
- }
- impl.getProperties().clear();
- impl.getProperties().addAll(propMap.values());
-
- if (componentType.getConstrainingType() != null) {
- impl.setConstrainingType(componentType.getConstrainingType());
- }
}
}
private ComponentType getComponentType(ModelResolver resolver,
BPELImplementation impl) {
- String bpelName = impl.getProcess().getLocalPart();
+ String bpelName = impl.getProcess().getLocalPart().toLowerCase();
String componentTypeURI = bpelName.replace('.', '/') +
".componentType";
ComponentType componentType = assemblyFactory.createComponentType();
componentType.setUnresolved(true);
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java?rev=575580&r1=575579&r2=575580&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
Fri Sep 14 01:20:11 2007
@@ -58,6 +58,7 @@
this.component = component;
this.implementation = implementation;
this.odeServer = odeServer;
+ this.txMgr = txMgr;
}
public Invoker createInvoker(RuntimeComponentService service, Operation
operation) {
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java?rev=575580&r1=575579&r2=575580&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
Fri Sep 14 01:20:11 2007
@@ -44,6 +44,7 @@
public BPELInvoker(Operation operation, EmbeddedODEServer odeServer,
TransactionManager txMgr) {
this.operation = operation;
this.odeServer = odeServer;
+ this.txMgr = txMgr;
}
public Message invoke(Message msg) {
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELTestCase.java?rev=575580&r1=575579&r2=575580&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELTestCase.java
Fri Sep 14 01:20:11 2007
@@ -31,16 +31,16 @@
*/
public class BPELTestCase extends TestCase {
- //private SCADomain scaDomain;
- //HelloPortType bpelService = null;
+ private SCADomain scaDomain;
+ HelloPortType bpelService = null;
/**
* @throws java.lang.Exception
*/
@Override
protected void setUp() throws Exception {
- //scaDomain = SCADomain.newInstance("helloworld.composite");
- //bpelService = scaDomain.getService(HelloPortType.class,
"BPELHelloWorldComponent");
+ scaDomain = SCADomain.newInstance("helloworld.composite");
+ bpelService = scaDomain.getService(HelloPortType.class,
"BPELHelloWorldComponent");
}
@@ -49,7 +49,7 @@
*/
@Override
protected void tearDown() throws Exception {
- //scaDomain.close();
+ scaDomain.close();
}
public void testInvoke() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
