summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-08-24 20:09:03 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-08-24 20:09:03 +0000
commit9ca6d6bbdf72392fb05f0b469185b91f8c288d34 (patch)
treee32dc0e5a3e59355f20257cb7f9e377f2d9042f5 /sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src
parenta3524a65c02ac46dcad6fd5df36b112673683296 (diff)
Merge revision 951557 from trunk into the 1.6.1 branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@988699 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src')
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/resources/DomainManager.composite2
1 files changed, 2 insertions, 0 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/resources/DomainManager.composite b/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/resources/DomainManager.composite
index 105d1acddb..5e55c20fbc 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/resources/DomainManager.composite
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-manager/src/main/resources/DomainManager.composite
@@ -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">