Author: nash
Date: Tue Aug 24 20:09:03 2010
New Revision: 988699
URL: http://svn.apache.org/viewvc?rev=988699&view=rev
Log:
Merge revision 951557 from trunk into the 1.6.1 branch
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/resources/DomainManager.composite
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/resources/DomainManager.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/resources/DomainManager.composite?rev=988699&r1=988698&r2=988699&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/resources/DomainManager.composite
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/resources/DomainManager.composite
Tue Aug 24 20:09:03 2010
@@ -171,6 +171,8 @@
</service>
<reference name="deployableCollection"
target="DeployableCompositeCollectionComponent/LocalItemCollection"/>
<reference name="domainManagerConfiguration"
target="DomainManagerConfigurationComponent"/>
+ <reference name="domainSearch" target="DomainSearchComponent"/>
+ <reference name="contributionReader"
target="DeployableCompositeCollectionComponent/ContributionsReader"/>
</component>
<component name="DeployableCompositeServiceComponent">
