diff options
10 files changed, 117 insertions, 117 deletions
diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/InstalledContribution.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionDescription.java index 0f2eacbaf7..6ddffb06da 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/InstalledContribution.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionDescription.java @@ -35,7 +35,7 @@ import org.apache.tuscany.sca.contribution.java.JavaImport; import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
-public class InstalledContribution implements Serializable {
+public class ContributionDescription implements Serializable {
private static final long serialVersionUID = 1L;
private String uri;
@@ -54,10 +54,10 @@ public class InstalledContribution implements Serializable { // the URI and XML content of composites to include in the contribution
private Map<String, String> additionalDeployables = new HashMap<String, String>();
- public InstalledContribution(String url) {
+ public ContributionDescription(String url) {
this(null, url);
}
- public InstalledContribution(String uri, String url) {
+ public ContributionDescription(String uri, String url) {
this.url = url;
this.uri = uri;
if (uri == null || uri.length() < 1) {
diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java index 85d5c80d10..165463c8b3 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java @@ -80,11 +80,11 @@ public interface DomainRegistry { String getDomainURI(); - void installContribution(InstalledContribution ic); + void installContribution(ContributionDescription cd); void uninstallContribution(String uri); List<String> getInstalledContributionURIs(); - InstalledContribution getInstalledContribution(String uri); - void updateInstalledContribution(InstalledContribution ic); + ContributionDescription getInstalledContribution(String uri); + void updateInstalledContribution(ContributionDescription cd); void addContributionListener(ContributionListener listener); void removeContributionListener(ContributionListener listener); diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java index 1af82d2272..c0302022a6 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java @@ -40,7 +40,7 @@ import org.apache.tuscany.sca.runtime.BaseDomainRegistry; import org.apache.tuscany.sca.runtime.ContributionListener; import org.apache.tuscany.sca.runtime.DomainRegistry; import org.apache.tuscany.sca.runtime.EndpointListener; -import org.apache.tuscany.sca.runtime.InstalledContribution; +import org.apache.tuscany.sca.runtime.ContributionDescription; import org.apache.tuscany.sca.runtime.RuntimeProperties; /** @@ -51,7 +51,7 @@ public class DomainRegistryImpl extends BaseDomainRegistry implements DomainRegi private List<Endpoint> endpoints = new ArrayList<Endpoint>(); private Map<String, Map<String, Composite>> runningComposites = new HashMap<String, Map<String, Composite>>(); - private Map<String, InstalledContribution> installedContributions = new HashMap<String, InstalledContribution>(); + private Map<String, ContributionDescription> contributionDescriptions = new HashMap<String, ContributionDescription>(); protected boolean quietLogging; @@ -202,30 +202,30 @@ public class DomainRegistryImpl extends BaseDomainRegistry implements DomainRegi return compositeURIs; } - public void installContribution(InstalledContribution ic) { - installedContributions.put(ic.getURI(), ic); + public void installContribution(ContributionDescription cd) { + contributionDescriptions.put(cd.getURI(), cd); } public void uninstallContribution(String uri) { - installedContributions.remove(uri); + contributionDescriptions.remove(uri); for (ContributionListener listener : contributionlisteners) { listener.contributionRemoved(uri); } } public List<String> getInstalledContributionURIs() { - return new ArrayList<String>(installedContributions.keySet()); + return new ArrayList<String>(contributionDescriptions.keySet()); } - public InstalledContribution getInstalledContribution(String uri) { - return installedContributions.get(uri); + public ContributionDescription getInstalledContribution(String uri) { + return contributionDescriptions.get(uri); } @Override - public void updateInstalledContribution(InstalledContribution ic) { - installedContributions.put(ic.getURI(), ic); + public void updateInstalledContribution(ContributionDescription cd) { + contributionDescriptions.put(cd.getURI(), cd); for (ContributionListener listener : contributionlisteners) { - listener.contributionUpdated(ic.getURI()); + listener.contributionUpdated(cd.getURI()); } } diff --git a/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java b/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java index d724eaf4b0..1d78b2f86a 100644 --- a/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java +++ b/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java @@ -91,7 +91,7 @@ import org.apache.tuscany.sca.monitor.ValidationException; import org.apache.tuscany.sca.runtime.BaseDomainRegistry; import org.apache.tuscany.sca.runtime.DomainRegistry; import org.apache.tuscany.sca.runtime.EndpointReferenceBinder; -import org.apache.tuscany.sca.runtime.InstalledContribution; +import org.apache.tuscany.sca.runtime.ContributionDescription; import org.apache.tuscany.sca.xsd.XSDFactory; import org.apache.tuscany.sca.xsd.XSDefinition; @@ -854,10 +854,10 @@ public class DeployerImpl implements Deployer { public void uninstallContribution(String uri) { } - public void installContribution(InstalledContribution ic) { + public void installContribution(ContributionDescription cd) { } - public InstalledContribution getInstalledContribution(String uri) { + public ContributionDescription getInstalledContribution(String uri) { return null; } @@ -875,7 +875,7 @@ public class DeployerImpl implements Deployer { return null; } - public void updateInstalledContribution(InstalledContribution ic) { + public void updateInstalledContribution(ContributionDescription cd) { } @Override diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java index 2dc04d8277..c6e3060c21 100644 --- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java +++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java @@ -64,7 +64,7 @@ import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract; import org.apache.tuscany.sca.runtime.BaseDomainRegistry; import org.apache.tuscany.sca.runtime.ContributionListener; import org.apache.tuscany.sca.runtime.DomainRegistry; -import org.apache.tuscany.sca.runtime.InstalledContribution; +import org.apache.tuscany.sca.runtime.ContributionDescription; import org.apache.tuscany.sca.runtime.RuntimeEndpoint; import org.apache.tuscany.sca.runtime.RuntimeProperties; import org.oasisopen.sca.ServiceRuntimeException; @@ -106,7 +106,7 @@ public class HazelcastDomainRegistry extends BaseDomainRegistry implements Domai protected Map<Object, Object> endpointWsdls; protected Map<String, Endpoint> localEndpoints = new ConcurrentHashMap<String, Endpoint>(); - protected Map<String, InstalledContribution> installedContributions; + protected Map<String, ContributionDescription> contributionDescriptions; protected AssemblyFactory assemblyFactory; protected Object shutdownMutex = new Object(); @@ -149,21 +149,21 @@ public class HazelcastDomainRegistry extends BaseDomainRegistry implements Domai runningComposites = hazelcastInstance.getMap(domainURI + "/RunningComposites"); runningCompositeOwners = hazelcastInstance.getMap(domainURI + "/RunningCompositeOwners"); - installedContributions = hazelcastInstance.getMap(domainURI + "/InstalledContributions"); - ((IMap<String, InstalledContribution>)installedContributions).addEntryListener(new EntryListener<String, InstalledContribution>() { - public void entryAdded(EntryEvent<String, InstalledContribution> event) { + contributionDescriptions = hazelcastInstance.getMap(domainURI + "/InstalledContributions"); + ((IMap<String, ContributionDescription>)contributionDescriptions).addEntryListener(new EntryListener<String, ContributionDescription>() { + public void entryAdded(EntryEvent<String, ContributionDescription> event) { } - public void entryRemoved(EntryEvent<String, InstalledContribution> event) { + public void entryRemoved(EntryEvent<String, ContributionDescription> event) { for (ContributionListener listener : contributionlisteners) { listener.contributionRemoved(event.getKey()); } } - public void entryUpdated(EntryEvent<String, InstalledContribution> event) { + public void entryUpdated(EntryEvent<String, ContributionDescription> event) { for (ContributionListener listener : contributionlisteners) { listener.contributionUpdated(event.getKey()); } } - public void entryEvicted(EntryEvent<String, InstalledContribution> event) { + public void entryEvicted(EntryEvent<String, ContributionDescription> event) { } }, false); @@ -633,25 +633,25 @@ public class HazelcastDomainRegistry extends BaseDomainRegistry implements Domai } public List<String> getInstalledContributionURIs() { - return new ArrayList<String>(installedContributions.keySet()); + return new ArrayList<String>(contributionDescriptions.keySet()); } - public InstalledContribution getInstalledContribution(String uri) { - return installedContributions.get(uri); + public ContributionDescription getInstalledContribution(String uri) { + return contributionDescriptions.get(uri); } public void uninstallContribution(String uri) { - installedContributions.remove(uri); + contributionDescriptions.remove(uri); } @Override - public void installContribution(InstalledContribution ic) { - installedContributions.put(ic.getURI(), ic); + public void installContribution(ContributionDescription cd) { + contributionDescriptions.put(cd.getURI(), cd); } @Override - public void updateInstalledContribution(InstalledContribution ic) { - installedContributions.put(ic.getURI(), ic); + public void updateInstalledContribution(ContributionDescription cd) { + contributionDescriptions.put(cd.getURI(), cd); } @Override diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java index 3a659f4f5a..37eeb4cae4 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java @@ -31,7 +31,7 @@ import org.apache.tuscany.sca.contribution.Contribution; import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.monitor.ValidationException; import org.apache.tuscany.sca.runtime.ActivationException; -import org.apache.tuscany.sca.runtime.InstalledContribution; +import org.apache.tuscany.sca.runtime.ContributionDescription; import org.oasisopen.sca.NoSuchServiceException; /** @@ -239,7 +239,7 @@ public interface Node { List<String> getDeployableCompositeURIs(String contributionURI); // TODO: should this be exposed on the interface? - public InstalledContribution getInstalledContribution(String contributionURI); + public ContributionDescription getInstalledContribution(String contributionURI); void validateContribution(String string) throws ContributionReadException, ValidationException; diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java index 741e227adf..d1448f498d 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java @@ -52,7 +52,7 @@ import org.apache.tuscany.sca.runtime.ActiveNodes; import org.apache.tuscany.sca.runtime.CompositeActivator; import org.apache.tuscany.sca.runtime.ContributionListener; import org.apache.tuscany.sca.runtime.DomainRegistry; -import org.apache.tuscany.sca.runtime.InstalledContribution; +import org.apache.tuscany.sca.runtime.ContributionDescription; import org.oasisopen.sca.NoSuchServiceException; public class NodeImpl implements Node { @@ -106,31 +106,31 @@ public class NodeImpl implements Node { } public String installContribution(String uri, String contributionURL, String metaDataURL, List<String> dependentContributionURIs) throws ContributionReadException, ValidationException { - InstalledContribution ic = new InstalledContribution(uri, IOHelper.getLocationAsURL(contributionURL).toString()); + ContributionDescription cd = new ContributionDescription(uri, IOHelper.getLocationAsURL(contributionURL).toString()); if (dependentContributionURIs != null) { - ic.getDependentContributionURIs().addAll(dependentContributionURIs); + cd.getDependentContributionURIs().addAll(dependentContributionURIs); } if (metaDataURL != null) { - mergeContributionMetaData(metaDataURL, loadContribution(ic)); + mergeContributionMetaData(metaDataURL, loadContribution(cd)); } - peekIntoContribution(ic); + peekIntoContribution(cd); - domainRegistry.installContribution(ic); + domainRegistry.installContribution(cd); - return ic.getURI(); + return cd.getURI(); } public void installContribution(Contribution contribution, List<String> dependentContributionURIs) { - InstalledContribution ic = new InstalledContribution(contribution.getURI(), contribution.getLocation()); + ContributionDescription cd = new ContributionDescription(contribution.getURI(), contribution.getLocation()); if (dependentContributionURIs != null) { - ic.getDependentContributionURIs().addAll(dependentContributionURIs); + cd.getDependentContributionURIs().addAll(dependentContributionURIs); } - ic.configureMetaData(contribution); - domainRegistry.installContribution(ic); - loadedContributions.put(ic.getURI(), contribution); + cd.configureMetaData(contribution); + domainRegistry.installContribution(cd); + loadedContributions.put(cd.getURI(), contribution); } public void uninstallContribution(String contributionURI) { @@ -155,16 +155,16 @@ public class NodeImpl implements Node { * we need to know about deployables and exports so peek into the contribution to try to get those, * and just ignore any errors they might happen while doing that. */ - protected void peekIntoContribution(InstalledContribution ic) { + protected void peekIntoContribution(ContributionDescription cd) { Contribution contribution = null; try { - contribution = loadContribution(ic); + contribution = loadContribution(cd); } catch (Exception e) { // ignore it } if (contribution != null) { - ic.configureMetaData(contribution); + cd.configureMetaData(contribution); } } @@ -177,49 +177,49 @@ public class NodeImpl implements Node { } public List<String> getDeployableCompositeURIs(String contributionURI) { - InstalledContribution ic = domainRegistry.getInstalledContribution(contributionURI); - return new ArrayList<String>(ic.getDeployables()); + ContributionDescription cd = domainRegistry.getInstalledContribution(contributionURI); + return new ArrayList<String>(cd.getDeployables()); } public String addDeploymentComposite(String contributionURI, Reader compositeXML) throws ContributionReadException, XMLStreamException, ValidationException { - InstalledContribution ic = getInstalledContribution(contributionURI); + ContributionDescription cd = getInstalledContribution(contributionURI); // load it to check its valid composite XML Composite composite = deployer.loadXMLDocument(compositeXML); - return addDeploymentComposite(ic, composite); + return addDeploymentComposite(cd, composite); } public String addDeploymentComposite(String contributionURI, Composite composite) { - InstalledContribution ic = getInstalledContribution(contributionURI); - return addDeploymentComposite(ic, composite); + ContributionDescription cd = getInstalledContribution(contributionURI); + return addDeploymentComposite(cd, composite); } - protected String addDeploymentComposite(InstalledContribution ic, Composite composite) { + protected String addDeploymentComposite(ContributionDescription cd, Composite composite) { if (composite.getURI() == null || composite.getURI().length() < 1) { composite.setURI(composite.getName().getLocalPart() + ".composite"); } - composite.setContributionURI(ic.getURI()); - ic.getAdditionalDeployables().put(composite.getURI(), Utils.modelToXML(composite, false, extensionPointRegistry)); - domainRegistry.updateInstalledContribution(ic); + composite.setContributionURI(cd.getURI()); + cd.getAdditionalDeployables().put(composite.getURI(), Utils.modelToXML(composite, false, extensionPointRegistry)); + domainRegistry.updateInstalledContribution(cd); return composite.getURI(); } public void validateContribution(String contributionURI) throws ContributionReadException, ValidationException { - InstalledContribution ic = getInstalledContribution(contributionURI); - Contribution contribution = loadContribution(ic); + ContributionDescription cd = getInstalledContribution(contributionURI); + Contribution contribution = loadContribution(cd); Monitor monitor = deployer.createMonitor(); try { - deployer.resolve(contribution, calculateDependentContributions(ic), monitor); + deployer.resolve(contribution, calculateDependentContributions(cd), monitor); } catch (Exception e) { - loadedContributions.remove(ic.getURI()); + loadedContributions.remove(cd.getURI()); throw new RuntimeException(e); } try { monitor.analyzeProblems(); } catch (ValidationException e) { - loadedContributions.remove(ic.getURI()); + loadedContributions.remove(cd.getURI()); throw e; } } @@ -238,10 +238,10 @@ public class NodeImpl implements Node { dc.start(); startedComposites.put(key, dc); } else { - InstalledContribution ic = getInstalledContribution(contributionURI); - Contribution contribution = loadContribution(ic); + ContributionDescription cd = getInstalledContribution(contributionURI); + Contribution contribution = loadContribution(cd); Composite composite = contribution.getArtifactModel(compositeURI); - List<Contribution> dependentContributions = calculateDependentContributions(ic); + List<Contribution> dependentContributions = calculateDependentContributions(cd); dc = new DeployedComposite(composite, contribution, dependentContributions, deployer, compositeActivator, domainRegistry, extensionPointRegistry); dc.start(); startedComposites.put(key, dc); @@ -288,23 +288,23 @@ public class NodeImpl implements Node { return ServiceHelper.getService(interfaze, serviceURI, domainRegistry, extensionPointRegistry, deployer); } - public InstalledContribution getInstalledContribution(String contributionURI) { - InstalledContribution ic = domainRegistry.getInstalledContribution(contributionURI); - if (ic == null) { + public ContributionDescription getInstalledContribution(String contributionURI) { + ContributionDescription cd = domainRegistry.getInstalledContribution(contributionURI); + if (cd == null) { throw new IllegalArgumentException("Contribution not installed: " + contributionURI); } - return ic; + return cd; } - protected Contribution loadContribution(InstalledContribution ic) throws ContributionReadException, ValidationException { - Contribution contribution = loadedContributions.get(ic.getURI()); + protected Contribution loadContribution(ContributionDescription cd) throws ContributionReadException, ValidationException { + Contribution contribution = loadedContributions.get(cd.getURI()); if (contribution == null) { Monitor monitor = deployer.createMonitor(); - contribution = deployer.loadContribution(IOHelper.createURI(ic.getURI()), IOHelper.getLocationAsURL(ic.getURL()), monitor); + contribution = deployer.loadContribution(IOHelper.createURI(cd.getURI()), IOHelper.getLocationAsURL(cd.getURL()), monitor); monitor.analyzeProblems(); - if (ic.getAdditionalDeployables().size() > 0) { - for (String uri : ic.getAdditionalDeployables().keySet()) { - String compositeXML = ic.getAdditionalDeployables().get(uri); + if (cd.getAdditionalDeployables().size() > 0) { + for (String uri : cd.getAdditionalDeployables().keySet()) { + String compositeXML = cd.getAdditionalDeployables().get(uri); Composite composite; try { composite = deployer.loadXMLDocument(new StringReader(compositeXML)); @@ -315,24 +315,24 @@ public class NodeImpl implements Node { contribution.addComposite(composite); } } - loadedContributions.put(ic.getURI(), contribution); + loadedContributions.put(cd.getURI(), contribution); } return contribution; } - protected List<Contribution> calculateDependentContributions(InstalledContribution ic) throws ContributionReadException, ValidationException { + protected List<Contribution> calculateDependentContributions(ContributionDescription cd) throws ContributionReadException, ValidationException { List<Contribution> dependentContributions = new ArrayList<Contribution>(); - if (ic.getDependentContributionURIs() != null && ic.getDependentContributionURIs().size() > 0) { + if (cd.getDependentContributionURIs() != null && cd.getDependentContributionURIs().size() > 0) { // if the install specified dependent uris use just those contributions - for (String uri : ic.getDependentContributionURIs()) { - InstalledContribution dependee = domainRegistry.getInstalledContribution(uri); + for (String uri : cd.getDependentContributionURIs()) { + ContributionDescription dependee = domainRegistry.getInstalledContribution(uri); if (dependee != null) { dependentContributions.add(loadContribution(dependee)); } } } else { - for (Import imprt : loadContribution(ic).getImports()) { - for (InstalledContribution exportingIC : findExportingContributions(imprt)) { + for (Import imprt : loadContribution(cd).getImports()) { + for (ContributionDescription exportingIC : findExportingContributions(imprt)) { dependentContributions.add(loadContribution(exportingIC)); } } @@ -341,20 +341,20 @@ public class NodeImpl implements Node { return dependentContributions; } - private List<InstalledContribution> findExportingContributions(Import imprt) { - List<InstalledContribution> ics = new ArrayList<InstalledContribution>(); + private List<ContributionDescription> findExportingContributions(Import imprt) { + List<ContributionDescription> ics = new ArrayList<ContributionDescription>(); // TODO: Handle Imports in a more extensible way for (String curi : domainRegistry.getInstalledContributionURIs()) { - InstalledContribution ic = domainRegistry.getInstalledContribution(curi); + ContributionDescription cd = domainRegistry.getInstalledContribution(curi); if (imprt instanceof JavaImport) { - for (String s : ic.getJavaExports()) { + for (String s : cd.getJavaExports()) { if (s.startsWith(((JavaImport)imprt).getPackage())) { - ics.add(ic); + ics.add(cd); } } } else if (imprt instanceof NamespaceImport) { - if (ic.getNamespaceExports().contains(((NamespaceImport)imprt).getNamespace())) { - ics.add(ic); + if (cd.getNamespaceExports().contains(((NamespaceImport)imprt).getNamespace())) { + ics.add(cd); } } } diff --git a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java index dccdb051ed..0bffc9fb9e 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java @@ -33,7 +33,7 @@ import org.apache.tuscany.sca.contribution.Contribution; import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import org.apache.tuscany.sca.monitor.ValidationException;
import org.apache.tuscany.sca.runtime.ActivationException;
-import org.apache.tuscany.sca.runtime.InstalledContribution;
+import org.apache.tuscany.sca.runtime.ContributionDescription;
import org.junit.Ignore;
import org.junit.Test;
import org.oasisopen.sca.NoSuchDomainException;
@@ -84,9 +84,9 @@ public class Node2TestCase { Contribution cB = nodeB.getContribution("helloworld");
Assert.assertNotNull(cB);
- InstalledContribution ic = ((NodeImpl)nodeB).getInstalledContribution("export");
- Assert.assertEquals(1, ic.getJavaExports().size());
- Assert.assertEquals("sample", ic.getJavaExports().get(0));
+ ContributionDescription cd = ((NodeImpl)nodeB).getInstalledContribution("export");
+ Assert.assertEquals(1, cd.getJavaExports().size());
+ Assert.assertEquals("sample", cd.getJavaExports().get(0));
} finally {
runtime.stop();
}
@@ -113,9 +113,9 @@ public class Node2TestCase { Assert.assertEquals(1, node.getInstalledContributionURIs().size());
Assert.assertEquals("export", node.getInstalledContributionURIs().get(0));
- InstalledContribution ic = ((NodeImpl)node).getInstalledContribution("export");
- Assert.assertEquals(1, ic.getJavaExports().size());
- Assert.assertEquals("sample", ic.getJavaExports().get(0));
+ ContributionDescription cd = ((NodeImpl)node).getInstalledContribution("export");
+ Assert.assertEquals(1, cd.getJavaExports().size());
+ Assert.assertEquals("sample", cd.getJavaExports().get(0));
}
@Test
diff --git a/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java b/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java index ddf428b7bf..cad513edb8 100644 --- a/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java +++ b/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java @@ -55,7 +55,7 @@ import org.apache.tuscany.sca.endpoint.tribes.MapStore.MapListener; import org.apache.tuscany.sca.runtime.BaseDomainRegistry; import org.apache.tuscany.sca.runtime.DomainRegistryURI; import org.apache.tuscany.sca.runtime.DomainRegistry; -import org.apache.tuscany.sca.runtime.InstalledContribution; +import org.apache.tuscany.sca.runtime.ContributionDescription; import org.apache.tuscany.sca.runtime.RuntimeEndpoint; /** @@ -435,13 +435,13 @@ public class ReplicatedDomainRegistry extends BaseDomainRegistry implements Doma } @Override - public void installContribution(InstalledContribution ic) { + public void installContribution(ContributionDescription cd) { // TODO Auto-generated method stub } @Override - public InstalledContribution getInstalledContribution(String uri) { + public ContributionDescription getInstalledContribution(String uri) { // TODO Auto-generated method stub return null; } @@ -471,7 +471,7 @@ public class ReplicatedDomainRegistry extends BaseDomainRegistry implements Doma } @Override - public void updateInstalledContribution(InstalledContribution ic) { + public void updateInstalledContribution(ContributionDescription cd) { // TODO Auto-generated method stub } diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java index 5fccf32c49..cec7194129 100644 --- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java +++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java @@ -55,7 +55,7 @@ import org.apache.tuscany.sca.impl.NodeImpl; import org.apache.tuscany.sca.monitor.ValidationException;
import org.apache.tuscany.sca.runtime.ActivationException;
import org.apache.tuscany.sca.runtime.DomainRegistry;
-import org.apache.tuscany.sca.runtime.InstalledContribution;
+import org.apache.tuscany.sca.runtime.ContributionDescription;
import org.apache.tuscany.sca.runtime.Version;
import org.apache.tuscany.sca.shell.jline.JLine;
import org.oasisopen.sca.NoSuchServiceException;
@@ -227,36 +227,36 @@ public class Shell { }
if (toks.size() > 1) {
String curi = toks.get(1);
- InstalledContribution ic = getNode().getInstalledContribution(toks.get(1));
- if (ic == null) {
+ ContributionDescription cd = getNode().getInstalledContribution(toks.get(1));
+ if (cd == null) {
out.println("Contribution " + curi + " not installed");
} else {
out.println(curi);
- out.println(" URL: " + ic.getURL());
+ out.println(" URL: " + cd.getURL());
List<String> ims = new ArrayList<String>();
- for (String im : ic.getJavaImports()) {
+ for (String im : cd.getJavaImports()) {
ims.add(im);
}
- for (String im : ic.getNamespaceImports()) {
+ for (String im : cd.getNamespaceImports()) {
ims.add(im);
}
out.println(" Imports: " + ims);
List<String> es = new ArrayList<String>();
- for (String e : ic.getJavaExports()) {
+ for (String e : cd.getJavaExports()) {
es.add(e);
}
- for (String e : ic.getNamespaceExports()) {
+ for (String e : cd.getNamespaceExports()) {
es.add(e);
}
out.println(" Exports: " + es);
List<String> ds = new ArrayList<String>();
- for (String cp : ic.getDeployables()) {
+ for (String cp : cd.getDeployables()) {
ds.add(cp);
}
- for (String cp : ic.getAdditionalDeployables().keySet()) {
+ for (String cp : cd.getAdditionalDeployables().keySet()) {
ds.add(cp);
}
out.println(" Deployables: " + ds);
|