Author: jsdelfino
Date: Sun Oct 28 15:42:40 2007
New Revision: 589436
URL: http://svn.apache.org/viewvc?rev=589436&view=rev
Log:
Don't rely on the presence of an sca-contribution.xml file to configure the
node 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/node-impl/src/main/resources/META-INF/
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java?rev=589436&r1=589435&r2=589436&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
Sun Oct 28 15:42:40 2007
@@ -35,7 +35,9 @@
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.xml.Constants;
+import org.apache.tuscany.sca.contribution.Artifact;
import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.DeployedArtifact;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.contribution.service.ContributionService;
import org.apache.tuscany.sca.core.assembly.ActivationException;
@@ -141,8 +143,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) {
domainManagementRuntime.getDomainComposite().getIncludes().add(composite);
domainManagementRuntime.getCompositeBuilder().build(composite);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
