svn commit: r657336 - in /incubator/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel: ode/EmbeddedODEServer.java provider/BPELInvoker.java

[edwardsmj]

Author: edwardsmj
Date: Sat May 17 05:18:16 2008
New Revision: 657336

URL: http://svn.apache.org/viewvc?rev=657336&view=rev
Log:
Fixes to match the Tuscany Service name for a BPEL process to the Service name 
used by the ODE BPEL engine - enables BPEL processes to be used as Web services

Modified:
    
incubator/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
    
incubator/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java

Modified: 
incubator/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java?rev=657336&r1=657335&r2=657336&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
 Sat May 17 05:18:16 2008
@@ -49,6 +49,10 @@
 import org.apache.ode.utils.GUID;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 
+//-------------- Added by Mike Edwards 16/05/2008
+import org.apache.ode.bpel.iapi.Endpoint;
+//-------------- End of Mike Edwards additions
+
 /**
  * Embedded ODE process server
  * 
@@ -171,6 +175,19 @@
                     // Test processes always run with in-mem DAOs
                     // conf.setTransient(true);  //FIXME: what should we use 
for ProcessConfImpl
                     _bpelServer.register(conf);
+                    
+                    //--------------- Added by Mike Edwards for test purposes 
16/05/2008
+                    // Get the lists of endpoints...
+                    //System.out.println( "Process: " + 
conf.getProcessId().toString() );
+                    //Map<String, Endpoint> provideEndpoints = 
conf.getProvideEndpoints();
+                    //for( Endpoint endpoint : provideEndpoints.values() ) {
+                    // System.out.println("Provide endpoints: " + 
endpoint.toString() );
+                    //} // end for
+                    //Map<String, Endpoint> invokeEndpoints = 
conf.getInvokeEndpoints();
+                    //for( Endpoint endpoint : invokeEndpoints.values() ) {
+                    // System.out.println("Invoke endpoints: " + 
endpoint.toString() );
+                    //} // end for
+                    //--------------- End of additions by Mike Edwards
                 }
             }
         });

Modified: 
incubator/tuscany/java/sca/modules/implementation-bpel-ode/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-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java?rev=657336&r1=657335&r2=657336&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
 Sat May 17 05:18:16 2008
@@ -91,8 +91,13 @@
             WSDLInterface wsdlInterface = null;
             wsdlInterface = (WSDLInterface) interfaze;
             
-            Service serviceDefinition = (Service) 
wsdlInterface.getWsdlDefinition().getDefinition().getAllServices().values().iterator().next();
 
-            bpelServiceName = serviceDefinition.getQName();
+            // The following commented out code is bogus and is replaced by 
what follows - Mike Edwards
+            // Service serviceDefinition = (Service) 
wsdlInterface.getWsdlDefinition().getDefinition().getAllServices().values().iterator().next();
 
+            // bpelServiceName = serviceDefinition.getQName();
+            //
+            // Fetch the service name from the service object
+            bpelServiceName = new QName( "http://tuscany.apache.org";, 
service.getName() );
+            //System.out.println("Actual service QName: " + bpelServiceName );
                 
             bpelOperationInputPart = (Part) 
wsdlInterface.getPortType().getOperation(bpelOperationName,null,null).getInput().getMessage().getParts().values().iterator().next();
             bpelOperationOutputPart = (Part) 
wsdlInterface.getPortType().getOperation(bpelOperationName,null,null).getOutput().getMessage().getParts().values().iterator().next();