Author: lresende
Date: Mon Nov 19 16:50:33 2007
New Revision: 596503

URL: http://svn.apache.org/viewvc?rev=596503&view=rev
Log:
Small updates and new test cases for implementation.bpel

Added:
    
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
   (with props)
    
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELHelloWorldTestCase.java
      - copied unchanged from r594440, 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELHelloWorldTestCase.java.FIXME
    
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPingPongTestCase.java
   (with props)
    
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPingTestCase.java
   (with props)
    
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/
    
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.componentType
   (with props)
    
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.composite
   (with props)
Removed:
    
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELHelloWorldTestCase.java.FIXME
Modified:
    incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
    
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.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/BPELPongTestCase.java
    
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.bpel
    
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.componentType
    
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.composite
    
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/pong.wsdl
    
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.bpel

Modified: incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml?rev=596503&r1=596502&r2=596503&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml Mon Nov 19 
16:50:33 2007
@@ -65,6 +65,11 @@
                </dependency>
                <dependency>
                        <groupId>org.apache.tuscany.sca</groupId>
+                       <artifactId>tuscany-databinding-sdo</artifactId>
+                       <version>1.1-incubating-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.tuscany.sca</groupId>
                        
<artifactId>tuscany-implementation-java-runtime</artifactId>
                        <version>1.1-incubating-SNAPSHOT</version>
                </dependency>

Modified: 
incubator/tuscany/java/sca/modules/implementation-bpel/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/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java?rev=596503&r1=596502&r2=596503&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
 Mon Nov 19 16:50:33 2007
@@ -215,8 +215,9 @@
 
             // _deployed.add(d);
         } catch (Exception ex) {
-            System.out.println(d + "DEPLOY: Unexpected exception: " + 
ex.getMessage());
-            return;
+            String errMsg = ">>> DEPLOY: Unexpected exception: " + 
ex.getMessage();
+            __log.debug(errMsg, ex);
+            throw new ODEDeploymentException(errMsg,ex);
         }
         
         try {
@@ -227,7 +228,9 @@
                 _bpelServer.register(conf);
             }
         } catch (Exception ex) {
-            System.out.println(d + "REGISTER: Unexpected exception: " + 
ex.getMessage());
+            String errMsg =">>>REGISTER: Unexpected exception: " + 
ex.getMessage();
+            __log.debug(errMsg , ex);
+            throw new ODEDeploymentException(errMsg, ex);
         }
     }
     

Added: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java?rev=596503&view=auto
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
 (added)
+++ 
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
 Mon Nov 19 16:50:33 2007
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.implementation.bpel.ode;
+
+/**
+ * Thrown when ODE failed to shutdown.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class ODEDeploymentException extends RuntimeException {
+    private static final long serialVersionUID = -2869674556330744215L;
+
+    public ODEDeploymentException(Throwable cause) {
+        super(cause);
+    }
+
+    public ODEDeploymentException(String message) {
+        super(message);
+    }
+
+    public ODEDeploymentException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

Propchange: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

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=596503&r1=596502&r2=596503&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
 Mon Nov 19 16:50:33 2007
@@ -85,8 +85,7 @@
             URL deployURL = 
this.implementation.getProcessDefinition().getLocation();
             
             File deploymentDir = new 
File(deployURL.toURI().getPath()).getParentFile();
-            System.out.println("Deploying : " + deploymentDir.toString());
-            System.out.println(deploymentDir);
+            System.out.println(">>> Deploying : " + deploymentDir.toString());
 
             // deploy the process
             if (odeServer.isInitialized()) {

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=596503&r1=596502&r2=596503&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
 Mon Nov 19 16:50:33 2007
@@ -61,6 +61,7 @@
     
     public BPELInvoker(Operation operation, EmbeddedODEServer odeServer, 
TransactionManager txMgr) {
         this.operation = operation;
+        this.bpelOperationName = operation.getName();
         this.odeServer = odeServer;
         this.txMgr = txMgr;
 
@@ -69,15 +70,13 @@
 
     
     private void initializeInvocation() {
-
-        this.bpelOperationName = operation.getName();
-        
+      
         Interface interfaze = operation.getInterface();
         if(interfaze instanceof WSDLInterface){
             WSDLInterface wsdlInterface = null;
             wsdlInterface = (WSDLInterface) interfaze;
             
-            Service serviceDefinition = (Service) 
wsdlInterface.getWsdlDefinition().getDefinition().getServices().values().iterator().next();
 
+            Service serviceDefinition = (Service) 
wsdlInterface.getWsdlDefinition().getDefinition().getAllServices().values().iterator().next();
 
             bpelServiceName = serviceDefinition.getQName();
                 
             bpelOperationInputPart = (Part) 
wsdlInterface.getPortType().getOperation(bpelOperationName,null,null).getInput().getMessage().getParts().values().iterator().next();
@@ -188,6 +187,7 @@
         contentMessage.appendChild(contentPart);
         dom.appendChild(contentMessage);
         
+        System.out.println("::arg:::::: " + DOMUtils.domToString((Element) 
args[0]));
         System.out.println("::message:: " + 
DOMUtils.domToString(dom.getDocumentElement()));
 
         org.apache.ode.bpel.iapi.Message request = mex.createMessage(new 
QName("", ""));

Added: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPingPongTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPingPongTestCase.java?rev=596503&view=auto
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPingPongTestCase.java
 (added)
+++ 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPingPongTestCase.java
 Mon Nov 19 16:50:33 2007
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.implementation.bpel;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.implementation.bpel.example.ping.PingPortType;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+/**
+ * Tests the BPEL service
+ * 
+ * @version $Rev$ $Date$
+ */
+public class BPELPingPongTestCase extends TestCase {
+
+    private SCADomain scaDomain;
+    PingPortType bpelPing = null;
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Override
+    protected void setUp() throws Exception {
+        //scaDomain = SCADomain.newInstance("ping-pong/ping-pong.composite");
+        //bpelPing = scaDomain.getService(PingPortType.class, 
"BPELPingPong-PingComponent/PingService");
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Override
+    protected void tearDown() throws Exception {
+        //scaDomain.close();
+    }
+
+    public void testPing() {
+        //String response = bpelPing.Ping("Ping");
+        //System.out.println("response:" + response);
+        //assertNotNull(response);
+        // assertEquals("Hello World", response);
+    }
+}

Propchange: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPingPongTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPingPongTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPingTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPingTestCase.java?rev=596503&view=auto
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPingTestCase.java
 (added)
+++ 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPingTestCase.java
 Mon Nov 19 16:50:33 2007
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.implementation.bpel;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.implementation.bpel.example.ping.PingPortType;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+/**
+ * Tests the BPEL service
+ * 
+ * @version $Rev$ $Date$
+ */
+public class BPELPingTestCase extends TestCase {
+
+    private SCADomain scaDomain;
+    PingPortType bpelService = null;
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Override
+    protected void setUp() throws Exception {
+        //scaDomain = SCADomain.newInstance("ping/ping.composite");
+        //bpelService = scaDomain.getService(PingPortType.class, 
"BPELPingComponent");
+
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Override
+    protected void tearDown() throws Exception {
+        //scaDomain.close();
+    }
+
+    public void testInvoke() {
+        /*
+        String response = bpelService.Ping("Ping");
+        System.out.println("response:" + response);
+        assertNotNull(response);
+        */
+        // assertEquals("Hello World", response);
+    }
+}

Propchange: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPingTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPingTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPongTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPongTestCase.java?rev=596503&r1=596502&r2=596503&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPongTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELPongTestCase.java
 Mon Nov 19 16:50:33 2007
@@ -22,10 +22,6 @@
 import junit.framework.TestCase;
 
 import org.apache.tuscany.implementation.bpel.example.pong.PongPortType;
-import org.apache.tuscany.implementation.bpel.example.pong.PongRequest;
-import org.apache.tuscany.implementation.bpel.example.pong.PongResponse;
-import 
org.apache.tuscany.implementation.bpel.example.pong.impl.PongFactoryImpl;
-import 
org.apache.tuscany.implementation.bpel.example.pong.impl.PongRequestImpl;
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 
 /**
@@ -37,7 +33,7 @@
 
     private SCADomain scaDomain;
     PongPortType bpelService = null;
-    
+
     /**
      * @throws java.lang.Exception
      */
@@ -55,15 +51,12 @@
     protected void tearDown() throws Exception {
         scaDomain.close();
     }
-    
+
     public void testInvoke() {
-        /*
-        PongRequest pongRequest = PongFactoryImpl.INSTANCE.createPongRequest();
-        pongRequest.setText("Pong");
-        
-        PongResponse response = bpelService.Pong(pongRequest);
+        String response = bpelService.Pong("Pong");
+        System.out.println("response:" + response);
         assertNotNull(response);
-        */
-        //assertEquals("Hello World", response);
+        
+        // assertEquals("Hello World", response);
     }
 }

Added: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.componentType
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.componentType?rev=596503&view=auto
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.componentType
 (added)
+++ 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.componentType
 Mon Nov 19 16:50:33 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"; 
+       xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance";
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+       xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+
+  <service name="PingService">
+       <interface.wsdl 
interface="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl#wsdl.interface(PingPortType)"
 />
+  </service>
+
+  <service name="PongService">
+       <interface.wsdl 
interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)"
 />
+  </service>
+
+  <reference name="Pong">
+       <interface.wsdl 
interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)"
 />
+  </reference>
+</componentType>  
\ No newline at end of file

Propchange: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.componentType
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.componentType
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.componentType
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.composite?rev=596503&view=auto
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.composite
 (added)
+++ 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.composite
 Mon Nov 19 16:50:33 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+       targetNamespace="http://bpel";
+    
xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.bpel";
+    
xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.bpel";
+    name="ping">
+    
+    <component name="BPELPingPong-PingComponent">
+        <implementation.bpel process="ping:Ping"/>
+        <reference name="Pong" 
target="BPELPingPong-PongComponent/PongService"/>
+    </component>
+    
+    <component name="BPELPingPong-PongComponent">
+        <implementation.bpel process="pong:Pong"/>
+    </component>
+
+</composite>
\ No newline at end of file

Propchange: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping-pong/ping-pong.composite
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.bpel
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.bpel?rev=596503&r1=596502&r2=596503&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.bpel
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.bpel
 Mon Nov 19 16:50:33 2007
@@ -25,7 +25,7 @@
         
xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/ping.bpel";
         
xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl";
         
xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl";
-        expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0">
+        expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
 
     <import location="ping.wsdl"
             
namespace="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl";

Modified: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.componentType
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.componentType?rev=596503&r1=596502&r2=596503&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.componentType
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.componentType
 Mon Nov 19 16:50:33 2007
@@ -22,8 +22,15 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
        xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
 
+  <reference name="Pong">
+       <interface.wsdl 
interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)"
 />
+  </reference>
+
   <service name="PingService">
         <interface.wsdl 
interface="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl#wsdl.interface(PingPortType)"
 />
   </service>
 
+  <service name="PongService">
+        <interface.wsdl 
interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)"
 />
+  </service>
 </componentType>  

Modified: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.composite?rev=596503&r1=596502&r2=596503&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.composite
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.composite
 Mon Nov 19 16:50:33 2007
@@ -26,5 +26,4 @@
     <component name="BPELPingComponent">
         <implementation.bpel process="ping:Ping"/>
     </component>
-
 </composite>

Modified: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/pong.wsdl
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/pong.wsdl?rev=596503&r1=596502&r2=596503&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/pong.wsdl
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/pong.wsdl
 Mon Nov 19 16:50:33 2007
@@ -81,13 +81,4 @@
     <plnk:partnerLinkType name="PongPartnerLinkType">
         <plnk:role name="Provider" portType="tns:PongPortType"/>
     </plnk:partnerLinkType>
-    
-    <!--
-    
-    This is an abstract interface/portType definition.  Note the lack of 
-    binding and service.  Since Pong is only exposed on the JBI bus, the
-    JBI endpoint is defined in Pong.dd.
-
-    -->
-
 </definitions>

Modified: 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.bpel
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.bpel?rev=596503&r1=596502&r2=596503&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.bpel
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.bpel
 Mon Nov 19 16:50:33 2007
@@ -30,9 +30,6 @@
             
namespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl";
             importType="http://schemas.xmlsoap.org/wsdl/"; />
 
-    <import location="pong.wsdl"
-            
namespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl";
-            importType="http://schemas.xmlsoap.org/wsdl/"; />
 
     <partnerLinks>
         <partnerLink name="PongPartnerLink"



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to