Author: antelder
Date: Wed May 25 13:48:17 2011
New Revision: 1127531
URL: http://svn.apache.org/viewvc?rev=1127531&view=rev
Log:
Rename InstalledContribution to ContributionDescription
Added:
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionDescription.java
- copied, changed from r1126892,
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/InstalledContribution.java
Removed:
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/InstalledContribution.java
Modified:
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
Copied:
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionDescription.java
(from r1126892,
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/InstalledContribution.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionDescription.java?p2=tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionDescription.java&p1=tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/InstalledContribution.java&r1=1126892&r2=1127531&rev=1127531&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/InstalledContribution.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ContributionDescription.java
Wed May 25 13:48:17 2011
@@ -35,7 +35,7 @@ import org.apache.tuscany.sca.contributi
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 imple
// 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) {
Modified:
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java?rev=1127531&r1=1127530&r2=1127531&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java
Wed May 25 13:48:17 2011
@@ -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);
Modified:
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java?rev=1127531&r1=1127530&r2=1127531&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java
Wed May 25 13:48:17 2011
@@ -40,7 +40,7 @@ import org.apache.tuscany.sca.runtime.Ba
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
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
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());
}
}
Modified:
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java?rev=1127531&r1=1127530&r2=1127531&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
Wed May 25 13:48:17 2011
@@ -91,7 +91,7 @@ import org.apache.tuscany.sca.monitor.Va
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 Dep
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 Dep
return null;
}
- public void updateInstalledContribution(InstalledContribution ic) {
+ public void updateInstalledContribution(ContributionDescription cd) {
}
@Override
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java?rev=1127531&r1=1127530&r2=1127531&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java
Wed May 25 13:48:17 2011
@@ -64,7 +64,7 @@ import org.apache.tuscany.sca.interfaced
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 ext
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 ext
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 ext
}
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
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java?rev=1127531&r1=1127530&r2=1127531&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java
Wed May 25 13:48:17 2011
@@ -31,7 +31,7 @@ import org.apache.tuscany.sca.contributi
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;
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java?rev=1127531&r1=1127530&r2=1127531&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
Wed May 25 13:48:17 2011
@@ -52,7 +52,7 @@ import org.apache.tuscany.sca.runtime.Ac
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);
}
}
}
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java?rev=1127531&r1=1127530&r2=1127531&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
Wed May 25 13:48:17 2011
@@ -33,7 +33,7 @@ import org.apache.tuscany.sca.contributi
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
Modified:
tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java?rev=1127531&r1=1127530&r2=1127531&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java
Wed May 25 13:48:17 2011
@@ -55,7 +55,7 @@ import org.apache.tuscany.sca.endpoint.t
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 ex
}
@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 ex
}
@Override
- public void updateInstalledContribution(InstalledContribution ic) {
+ public void updateInstalledContribution(ContributionDescription cd) {
// TODO Auto-generated method stub
}
Modified:
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java?rev=1127531&r1=1127530&r2=1127531&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
Wed May 25 13:48:17 2011
@@ -55,7 +55,7 @@ import org.apache.tuscany.sca.impl.NodeI
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);
