Author: jsdelfino
Date: Sun Oct 28 15:42:13 2007
New Revision: 589435
URL: http://svn.apache.org/viewvc?rev=589435&view=rev
Log:
Don't rely on the presence of an sca-contribution.xml file to configure the
domain management components as this cannot work at all with
tuscany-sca-all.jar which contains both the domain and node modules.
Removed:
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/META-INF/
Modified:
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
Modified:
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java?rev=589435&r1=589434&r2=589435&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
Sun Oct 28 15:42:13 2007
@@ -155,8 +155,14 @@
contributionURL,
false);
- if (contribution.getDeployables().size() != 0) {
- Composite composite = contribution.getDeployables().get(0);
+ Composite composite = null;
+ for (DeployedArtifact artifact: contribution.getArtifacts()) {
+ if (domainCompositeName.equals(artifact.getURI())) {
+ composite = (Composite)artifact.getModel();
+ }
+ }
+
+ if (composite != null) {
domainManagementComposite.getIncludes().add(composite);
domainManagementRuntime.getCompositeBuilder().build(composite);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
