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/14 09:55:02 UTC
svn commit: r1102971 - in
/tuscany/sca-java-2.x/trunk/modules/domain-node/src:
main/java/org/apache/tuscany/sca/impl/NodeImpl2.java
test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
Author: antelder
Date: Sat May 14 07:55:02 2011
New Revision: 1102971
URL: http://svn.apache.org/viewvc?rev=1102971&view=rev
Log:
Update for the Contribution and ServiceHelper chnages and to add a few more methods from the old NodeImpl
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl2.java
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl2.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl2.java?rev=1102971&r1=1102970&r2=1102971&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl2.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl2.java Sat May 14 07:55:02 2011
@@ -28,9 +28,10 @@ import java.util.Map;
import javax.xml.namespace.QName;
import org.apache.tuscany.sca.TuscanyRuntime;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Base;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.common.java.io.IOHelper;
-import org.apache.tuscany.sca.contribution.Artifact;
import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.contribution.Export;
import org.apache.tuscany.sca.contribution.Import;
@@ -40,6 +41,7 @@ import org.apache.tuscany.sca.contributi
import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.deployment.Deployer;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.ValidationException;
@@ -47,6 +49,7 @@ import org.apache.tuscany.sca.runtime.Ac
import org.apache.tuscany.sca.runtime.CompositeActivator;
import org.apache.tuscany.sca.runtime.EndpointRegistry;
import org.apache.tuscany.sca.runtime.InstalledContribution;
+import org.oasisopen.sca.NoSuchServiceException;
public class NodeImpl2 {
@@ -76,6 +79,11 @@ public class NodeImpl2 {
this.tuscanyRuntime = tuscanyRuntime;
}
+ public void uninstallContribution(String contributionURI) {
+ loadedContributions.remove(contributionURI);
+ endpointRegistry.uninstallContribution(contributionURI);
+ }
+
public String installContribution(String contributionURL) throws ContributionReadException, ActivationException, ValidationException {
return installContribution(null, contributionURL);
}
@@ -99,7 +107,7 @@ public class NodeImpl2 {
/**
* Peek into the contribution to find its attributes.
* ASM12032 and ASM12033 say no error checking should be done during install and that should happen later, but
- * we would still like to know about deployables and exports so peek into the contribution to try to get those,
+ * 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) throws ContributionReadException, ValidationException {
@@ -121,7 +129,7 @@ public class NodeImpl2 {
}
- public List<String> getDeployableComposites(String contributionURI) {
+ public List<String> getDeployableCompositeURIs(String contributionURI) {
InstalledContribution ic = endpointRegistry.getInstalledContribution(contributionURI);
return new ArrayList<String>(ic.getDeployables());
}
@@ -171,7 +179,7 @@ public class NodeImpl2 {
} else {
InstalledContribution ic = getInstalledContribution(contributionURI);
Contribution contribution = loadContribution(ic);
- Composite composite = getComposite(contribution, compositeURI);
+ Composite composite = contribution.getArtifactModel(compositeURI);
List<Contribution> dependentContributions = calculateDependentContributions(ic);
dc = new DeployedComposite(composite, contribution, dependentContributions, deployer, compositeActivator, endpointRegistry, extensionPointRegistry);
dc.start();
@@ -189,6 +197,31 @@ public class NodeImpl2 {
stoppedComposites.put(key, dc);
}
+ public String getDomainName() {
+ return domainName;
+ }
+
+ public Composite getDomainComposite() {
+ FactoryExtensionPoint factories = extensionPointRegistry.getExtensionPoint(FactoryExtensionPoint.class);
+ AssemblyFactory assemblyFactory = factories.getFactory(AssemblyFactory.class);
+ Composite domainComposite = assemblyFactory.createComposite();
+ domainComposite.setName(new QName(Base.SCA11_TUSCANY_NS, domainName));
+ domainComposite.setAutowire(false);
+ domainComposite.setLocal(false);
+ List<Composite> domainIncludes = domainComposite.getIncludes();
+ Map<String, List<QName>> runningComposites = endpointRegistry.getRunningCompositeNames();
+ for (String curi : runningComposites.keySet()) {
+ for (QName name : runningComposites.get(curi)) {
+ domainIncludes.add(endpointRegistry.getRunningComposite(curi, name));
+ }
+ }
+ return domainComposite;
+ }
+
+ public <T> T getService(Class<T> interfaze, String serviceURI) throws NoSuchServiceException {
+ return ServiceHelper.getService(interfaze, serviceURI, endpointRegistry, extensionPointRegistry, deployer);
+ }
+
protected InstalledContribution getInstalledContribution(String contributionURI) {
InstalledContribution ic = endpointRegistry.getInstalledContribution(contributionURI);
if (ic == null) {
@@ -204,7 +237,6 @@ public class NodeImpl2 {
contribution = deployer.loadContribution(IOHelper.createURI(ic.getURI()), IOHelper.getLocationAsURL(ic.getURL()), monitor);
monitor.analyzeProblems();
loadedContributions.put(ic.getURI(), contribution);
- fixDeployedCompositeURIs(contribution);
}
return contribution;
}
@@ -222,8 +254,7 @@ public class NodeImpl2 {
}
} else {
for (Import imprt : c.getImports()) {
- InstalledContribution exportingIC = findExportingContribution(imprt);
- if (exportingIC != null) {
+ for (InstalledContribution exportingIC : findExportingContributions(imprt)) {
dependentContributions.add(loadContribution(exportingIC));
}
}
@@ -232,60 +263,28 @@ public class NodeImpl2 {
return dependentContributions;
}
- private InstalledContribution findExportingContribution(Import imprt) {
+ private List<InstalledContribution> findExportingContributions(Import imprt) {
+ List<InstalledContribution> ics = new ArrayList<InstalledContribution>();
// TODO: Handle Imports in a more extensible way
for (String curi : endpointRegistry.getInstalledContributionURIs()) {
InstalledContribution ic = endpointRegistry.getInstalledContribution(curi);
if (imprt instanceof JavaImport) {
for (String s : ic.getJavaExports()) {
if (s.startsWith(((JavaImport)imprt).getPackage())) {
- return ic;
+ ics.add(ic);
}
}
} else if (imprt instanceof NamespaceImport) {
if (ic.getNamespaceExports().contains(((NamespaceImport)imprt).getNamespace())) {
- return ic;
+ ics.add(ic);
}
}
}
- return null;
- }
-
- protected Composite getComposite(Contribution contribution, String compositeURI) {
- for (Artifact a : contribution.getArtifacts()) {
- if (a.getURI().equals(compositeURI)) {
- return (Composite) a.getModel();
- }
- }
- throw new IllegalArgumentException("composite not found: " + compositeURI);
- }
-
- /**
- * 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 void fixDeployedCompositeURIs(Contribution contribution) {
- int i = contribution.getDependencies().size();
- for (Artifact a : contribution.getArtifacts()) {
- if (a.getModel() != null) {
- if (a.getModel() instanceof Composite) {
- Composite cm = a.getModel();
- for (Composite c : contribution.getDeployables()) {
- if (c.getName().equals(cm.getName())) {
- c.setURI(cm.getURI());
- i = i-1;
- if (i < 1) {
- return;
- }
- }
- }
- }
- }
- }
+ return ics;
}
/**
- * Returns a default URI for a contribution based on the contribution URL
+ * Derives a URI for a contribution based on the contribution URL
*/
protected String getDefaultContributionURI(String contributionURL) {
String uri = null;
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=1102971&r1=1102970&r2=1102971&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 Sat May 14 07:55:02 2011
@@ -19,6 +19,9 @@
package org.apache.tuscany.sca.impl;
import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
import junit.framework.Assert;
@@ -87,7 +90,7 @@ public class Node2TestCase {
Assert.assertEquals(1, node.getInstalledContributionURIs().size());
Assert.assertEquals("import", node.getInstalledContributionURIs().get(0));
- List<String> ds = node.getDeployableComposites("import");
+ List<String> ds = node.getDeployableCompositeURIs("import");
Assert.assertEquals(1, ds.size());
Assert.assertEquals("helloworld.composite", ds.get(0));
@@ -136,6 +139,8 @@ public class Node2TestCase {
node.installContribution("src/test/resources/export.jar");
node.validateContribution("import");
node.startComposite("import", "helloworld.composite");
+ Map<String, List<QName>> scs = node.getStartedComposites();
+ Assert.assertEquals(1, scs.size());
}
@Test
@@ -151,6 +156,8 @@ public class Node2TestCase {
nodeB.installContribution("src/test/resources/export.jar");
nodeA.validateContribution("import");
nodeA.startComposite("import", "helloworld.composite");
+ Map<String, List<QName>> scs = nodeB.getStartedComposites();
+ Assert.assertEquals(1, scs.size());
}
@Test