Author: ramkumar
Date: Wed Dec 17 23:33:54 2008
New Revision: 727669
URL: http://svn.apache.org/viewvc?rev=727669&view=rev
Log:
Fixes for 1.4RC2 review comments
Modified:
tuscany/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-core.xsd
tuscany/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
Modified:
tuscany/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-core.xsd
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-core.xsd?rev=727669&r1=727668&r2=727669&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-core.xsd
(original)
+++
tuscany/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-core.xsd
Wed Dec 17 23:33:54 2008
@@ -154,7 +154,7 @@
maxOccurs="unbounded" />
</sequence>
<attribute name="uri" type="anyURI" use="optional"/>
- <attribute name="name" type="QName" use="optional"/>
+ <attribute name="name" type="NCName" use="optional"/>
<attribute name="requires" type="sca:listOfQNames" use="optional"/>
<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
</complexType>
Modified:
tuscany/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java?rev=727669&r1=727668&r2=727669&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
(original)
+++
tuscany/branches/sca-java-1.4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
Wed Dec 17 23:33:54 2008
@@ -69,13 +69,7 @@
try {
Binding cloned = (Binding)binding.clone();
- //Customise the binding name to make it unique
- // regardless of how many bindings or targets there are
- if ( targetComponent != null){
- cloned.setName(binding.getName() + "#" +
targetComponent.getName() + "/" + serviceBinding.getName());
- } else {
- cloned.setName(binding.getName() + "#" +
serviceBinding.getName());
- }
+ cloned.setName(binding.getName());
// Set the binding URI to the URI of the target service
// that has been matched
