Copy 1.3 branch revisions 678491, 678875, 679082, 679205, 679334 and 679385

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@679774 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 56 insertions, 54 deletions

diff --git a/java/sca/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/java/sca/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
index 2f042b8e34..30b77a6152 100644
--- a/java/sca/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
+++ b/java/sca/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
@@ -1,58 +1,58 @@
-<?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.    

--->

+<?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"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"

+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:local="http://tuscany.apache.org/xmlns/sca/binding/1.0"
-	xmlns:f="http://foo"

+	xmlns:f="http://foo"
     xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
     xmlns:e="http://echo"
-	name="EchoDataBinding">

-

-    <component name="ComponentA">

-        <implementation.java class="dbecho.ComponentAImpl" />

-        <reference name="componentBReference" target="ComponentB" />

-        <property name="prefix">ABC</property>

-        <property name="prefix1" source="$messagePrefix"></property>

-        <property name="bar" source="$complexProperty/*[local-name()='foo']/*[local-name()='bar']"></property>

-    </component>

-

-    <component name="ComponentB">

-        <implementation.java class="dbecho.ComponentBImpl" />

-    </component>

-

-    <reference name="EchoReference" promote="ComponentB/echoReference">

-        <!-- 

-            <interface.java interface="dbecho.Echo"/>

-        -->

-        <interface.wsdl interface="http://example.com/echo.wsdl#wsdl.interface(EchoPortType)"

-            wsdli:wsdlLocation="http://example.com/echo.wsdl wsdl/echo.wsdl">

-            <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />

-        </interface.wsdl>

-        <e:binding.echo/>

-    </reference>

-

-    <property name="messagePrefix" type="xsd:string">ABC</property>

-    <property name="complexProperty" type="f:FooType">

-        <foo>

-            <bar attr="barAttr">BAR</bar>

-        </foo>

-    </property>

-

-</composite>

+	name="EchoDataBinding">
+
+    <component name="ComponentA">
+        <implementation.java class="dbecho.ComponentAImpl" />
+        <reference name="componentBReference" target="ComponentB" />
+        <property name="prefix">ABC</property>
+        <property name="prefix1" source="$messagePrefix"></property>
+        <property name="bar" source="$complexProperty/*[local-name()='foo']/*[local-name()='bar']"></property>
+    </component>
+
+    <component name="ComponentB">
+        <implementation.java class="dbecho.ComponentBImpl" />
+    </component>
+
+    <reference name="EchoReference" promote="ComponentB/echoReference">
+        <interface.java interface="dbecho.Echo"/>
+    <!-- Replaced interface.wsdl by interface.java because TUSCANY-2324 fix uses the interface specified here
+        <interface.wsdl interface="http://example.com/echo.wsdl#wsdl.interface(EchoPortType)"
+            wsdli:wsdlLocation="http://example.com/echo.wsdl wsdl/echo.wsdl">
+            <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
+        </interface.wsdl>
+    -->
+        <e:binding.echo/>
+    </reference>
+
+    <property name="messagePrefix" type="xsd:string">ABC</property>
+    <property name="complexProperty" type="f:FooType">
+        <foo>
+            <bar attr="barAttr">BAR</bar>
+        </foo>
+    </property>
+
+</composite>
\ No newline at end of file
diff --git a/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite b/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
index f078b9ee9f..35306b9f89 100644
--- a/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
+++ b/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
@@ -101,7 +101,9 @@
     </component>
 
     <reference name="availQuoteProvider" promote="QuoteJoinExternalReferencesComponent/availQuoteProvider">
+        <!-- removed because it doesn't work with TUSCANY-2324 fix
         <interface.java interface="xquery.quote.AvailQuoteProviderService" />
+        -->
         <binding.ws wsdlElement="http://quote.xquery#wsdl.port(AvailQuoteProviderService/AvailQuoteProviderSoapPort)" />
     </reference>
     <reference name="quoteJoinWs" promote="QuoteJoinLocalComponent/quoteJoinWs">