You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2011/05/15 08:57:24 UTC
svn commit: r1103282 -
/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
Author: antelder
Date: Sun May 15 06:57:24 2011
New Revision: 1103282
URL: http://svn.apache.org/viewvc?rev=1103282&view=rev
Log:
Rename init to build and remove the getCompositeURI method as thats now done correctlky by the Tuscany runtime
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java?rev=1103282&r1=1103281&r2=1103282&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java Sun May 15 06:57:24 2011
@@ -28,7 +28,6 @@ import javax.xml.namespace.QName;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.context.CompositeContext;
-import org.apache.tuscany.sca.contribution.Artifact;
import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
@@ -41,7 +40,6 @@ import org.apache.tuscany.sca.runtime.En
public class DeployedComposite {
- private String uri;
private Composite composite;
private Contribution contribution;
private List<Contribution> dependedOnContributions;
@@ -68,7 +66,7 @@ public class DeployedComposite {
this.endpointRegistry = endpointRegistry;
this.extensionPointRegistry = extensionPointRegistry;
try {
- init();
+ build();
} catch (ContributionResolveException e) {
throw new ActivationException(e);
} catch (CompositeBuilderException e) {
@@ -76,7 +74,7 @@ public class DeployedComposite {
}
}
- protected void init() throws ValidationException, ActivationException, ContributionResolveException, CompositeBuilderException {
+ protected void build() throws ValidationException, ActivationException, ContributionResolveException, CompositeBuilderException {
List<Contribution> contributions = new ArrayList<Contribution>();
contributions.add(contribution);
@@ -94,8 +92,6 @@ public class DeployedComposite {
null, // nothing appears to use the domain name in CompositeContext
null, // don't need node uri
deployer.getSystemDefinitions());
-
- this.uri = getCompositeURI(composite, contribution);
}
public void start() throws ActivationException {
@@ -111,25 +107,6 @@ public class DeployedComposite {
}
public String getURI() {
- return uri;
- }
-
- /**
- * Deployable composites don't have the uri set so get it from the artifact in the contribution
- * // TODO: fix the Tuscany code so this uri is correctly set and this method isn't needed
- */
- private static String getCompositeURI(Composite c, Contribution contribution) {
- for (Artifact a : contribution.getArtifacts()) {
- if (a.getModel() != null) {
- if (a.getModel() instanceof Composite) {
- Composite cm = a.getModel();
- if (c.getName().equals(cm.getName())) {
- return cm.getURI();
- }
- }
- }
- }
- // shouldn't ever happen
- throw new IllegalStateException("can't determine composte uri");
+ return composite.getURI();
}
}