Modified: tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java?rev=679774&r1=679773&r2=679774&view=diff ============================================================================== --- tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java (original) +++ tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java Fri Jul 25 05:09:35 2008 @@ -561,7 +561,7 @@ CompositeService compositeService = (CompositeService)componentService.getService(); if (compositeService != null) { if (serviceName != null) { - serviceName = "$promoted$." + serviceName; + serviceName = "$promoted$." + component.getName() + "." + serviceName; } componentContext = ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext();
Modified: tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java?rev=679774&r1=679773&r2=679774&view=diff ============================================================================== --- tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java (original) +++ tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java Fri Jul 25 05:09:35 2008 @@ -203,7 +203,7 @@ CompositeService compositeService = (CompositeService)componentService.getService(); if (compositeService != null) { if (serviceName != null) { - serviceName = "$promoted$." + serviceName; + serviceName = "$promoted$." + component.getName() + "." + serviceName; } componentContext = ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext(); Modified: tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=679774&r1=679773&r2=679774&view=diff ============================================================================== --- tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java (original) +++ tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java Fri Jul 25 05:09:35 2008 @@ -683,7 +683,7 @@ CompositeService compositeService = (CompositeService)componentService.getService(); if (compositeService != null) { if (serviceName != null) { - serviceName = "$promoted$." + serviceName; + serviceName = "$promoted$." + component.getName() + "." + serviceName; } componentContext = ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext(); Modified: tuscany/java/sca/samples/databinding-echo/src/main/resources/EchoDataBinding.composite URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/databinding-echo/src/main/resources/EchoDataBinding.composite?rev=679774&r1=679773&r2=679774&view=diff ============================================================================== --- tuscany/java/sca/samples/databinding-echo/src/main/resources/EchoDataBinding.composite (original) +++ tuscany/java/sca/samples/databinding-echo/src/main/resources/EchoDataBinding.composite Fri Jul 25 05:09:35 2008 @@ -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 Modified: tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite?rev=679774&r1=679773&r2=679774&view=diff ============================================================================== --- tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite (original) +++ tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite Fri Jul 25 05:09:35 2008 @@ -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">
