Author: edwardsmj
Date: Thu May  8 13:36:01 2008
New Revision: 654612

URL: http://svn.apache.org/viewvc?rev=654612&view=rev
Log:
Fix for problems in the BPEL process file and in the componentType file which 
break the specification for BPEL

Modified:
    
incubator/tuscany/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.bpel
    
incubator/tuscany/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.componentType

Modified: 
incubator/tuscany/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.bpel
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.bpel?rev=654612&r1=654611&r2=654612&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.bpel
 (original)
+++ 
incubator/tuscany/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.bpel
 Thu May  8 13:36:01 2008
@@ -1,66 +1,66 @@
-<!--
-  ~ 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.
-  -->
-<process name="HelloWorld"
-    
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld";
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
-    
xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld";
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema";
-    
xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl";
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-  <import location="helloworld.wsdl" 
importType="http://schemas.xmlsoap.org/wsdl/";
-     
namespace="file:///home/mriou/dev/projects/ode/distro-axis2/src/examples/HelloWorld2/HelloWorld2.wsdl"/>
-
-   <partnerLinks>
-      <partnerLink name="helloPartnerLink" 
partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
-   </partnerLinks>
-    
-   <variables>
-     <variable name="myVar" messageType="test:HelloMessage"/>
-     <variable name="tmpVar" type="xsd:string"/>
-   </variables>
-
-   <sequence>
-       <receive
-          name="start"
-          partnerLink="helloPartnerLink"
-          portType="test:HelloPortType"
-          operation="hello"
-          variable="myVar"
-          createInstance="yes"/>
-
-      <assign name="assign1">
-          <copy>
-              <from variable="myVar" part="TestPart"/>
-              <to variable="tmpVar"/>
-          </copy>
-          <copy>
-              <from>concat($tmpVar,' World')</from>
-              <to variable="myVar" part="TestPart"/>
-          </copy>
-      </assign>
-       <reply name="end"  
-              partnerLink="helloPartnerLink"
-              portType="test:HelloPortType" 
-              operation="hello"
-              variable="myVar"/>
-   </sequence>
-</process>
+<!--
+  ~ 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.
+  -->
+<process name="HelloWorld"
+    
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld";
+    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+    
xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld";
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+    
xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl";
+    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+
+  <import location="helloworld.wsdl" 
importType="http://schemas.xmlsoap.org/wsdl/";
+     
namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
+
+   <partnerLinks>
+      <partnerLink name="helloPartnerLink" 
partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
+   </partnerLinks>
+    
+   <variables>
+     <variable name="myVar" messageType="test:HelloMessage"/>
+     <variable name="tmpVar" type="xsd:string"/>
+   </variables>
+
+   <sequence>
+       <receive
+          name="start"
+          partnerLink="helloPartnerLink"
+          portType="test:HelloPortType"
+          operation="hello"
+          variable="myVar"
+          createInstance="yes"/>
+
+      <assign name="assign1">
+          <copy>
+              <from variable="myVar" part="TestPart"/>
+              <to variable="tmpVar"/>
+          </copy>
+          <copy>
+              <from>concat($tmpVar,' World')</from>
+              <to variable="myVar" part="TestPart"/>
+          </copy>
+      </assign>
+       <reply name="end"  
+              partnerLink="helloPartnerLink"
+              portType="test:HelloPortType" 
+              operation="hello"
+              variable="myVar"/>
+   </sequence>
+</process>

Modified: 
incubator/tuscany/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.componentType
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.componentType?rev=654612&r1=654611&r2=654612&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.componentType
 (original)
+++ 
incubator/tuscany/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.componentType
 Thu May  8 13:36:01 2008
@@ -22,7 +22,7 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
        xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
 
-  <service name="HelloService">
+  <service name="helloPartnerLink">
         <interface.wsdl 
interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)"
 />
   </service>
 


Reply via email to