Author: lresende
Date: Tue Feb 27 19:08:04 2007
New Revision: 512587
URL: http://svn.apache.org/viewvc?view=rev&rev=512587
Log:
Fix problem calculating root in contribution services (CallBack-BasicTest
scenario)
Modified:
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java
Modified:
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java?view=diff&rev=512587&r1=512586&r2=512587
==============================================================================
---
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java
(original)
+++
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java
Tue Feb 27 19:08:04 2007
@@ -118,16 +118,21 @@
WireService wireService =
(WireService)((AtomicComponent)wireServiceComponent).getTargetInstance();
- //Start using contribution services
+ //Start using contribution services
if (applicationSCDL == null) {
applicationSCDL =
cl.getResource(SCAContainer.APPLICATION_SCDL);
if (applicationSCDL == null) {
- applicationSCDL =
cl.getResource(SCAContainer.META_APPLICATION_SCDL);
+ applicationSCDL =
cl.getResource(SCAContainer.META_APPLICATION_SCDL);
+ if (applicationSCDL != null)
+ compositePath = SCAContainer.META_APPLICATION_SCDL;
+ } else {
+ if (compositePath == null)
+ compositePath = SCAContainer.APPLICATION_SCDL;
}
if (applicationSCDL == null) {
throw new RuntimeException("application SCDL not found: "
+ SCAContainer.APPLICATION_SCDL);
}
- }
+ }
//lresende - contribution
URL contributionLocation =
getContributionLocation(applicationSCDL, compositePath);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
