From 9a4d83faf250efb00160c20c05fb727ad92c555c Mon Sep 17 00:00:00 2001 From: antelder Date: Wed, 12 Jan 2011 08:56:52 +0000 Subject: Update to create a service proxy directly instead of using the sca client factory api and update testcases for that, and rename package git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1058025 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/tuscany/sca/node2/Node.java | 265 --------------- .../org/apache/tuscany/sca/node2/NodeFactory.java | 215 ------------ .../tuscany/sca/node2/impl/DeployedComposite.java | 138 -------- .../sca/node2/impl/InstalledContribution.java | 65 ---- .../apache/tuscany/sca/node2/impl/NodeImpl.java | 361 -------------------- .../java/org/apache/tuscany/sca/runtime/Node.java | 265 +++++++++++++++ .../apache/tuscany/sca/runtime/NodeFactory.java | 215 ++++++++++++ .../sca/runtime/impl/DeployedComposite.java | 138 ++++++++ .../sca/runtime/impl/InstalledContribution.java | 65 ++++ .../apache/tuscany/sca/runtime/impl/NodeImpl.java | 377 +++++++++++++++++++++ 10 files changed, 1060 insertions(+), 1044 deletions(-) delete mode 100644 sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/Node.java delete mode 100644 sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java delete mode 100644 sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/DeployedComposite.java delete mode 100644 sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/InstalledContribution.java delete mode 100644 sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java create mode 100644 sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/Node.java create mode 100644 sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/NodeFactory.java create mode 100644 sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/impl/DeployedComposite.java create mode 100644 sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/impl/InstalledContribution.java create mode 100644 sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/impl/NodeImpl.java (limited to 'sca-java-2.x/trunk/modules/domain-node/src/main/java') diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/Node.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/Node.java deleted file mode 100644 index 9a82997a33..0000000000 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/Node.java +++ /dev/null @@ -1,265 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.node2; - -import java.io.Reader; -import java.util.List; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; - -import org.apache.tuscany.sca.assembly.Composite; -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.oasisopen.sca.NoSuchServiceException; - -public interface Node { - - /** - * Creates an installed contribution from a supplied root contribution and installed at a supplied base URI. - * See section 10.5.1 of the Assembly Specification. - * - * @param uri the base uri of where to install the contribution. May be null in which case a URI is derived from the contribution URL - * @param contributionURL the URL where the contribution is located - * @param metaDataURL the location of an optional generated Contribution Metadata Document. See section 10.2.2 - * of the Assembly Specification. May be null. - * @param dependentContributionURIs specifies the contributions that are used to resolve the dependencies of the - * root contribution and other dependent contributions. May be null. - * @param startDeployables true if the composites defined as deployable in the contribution's sca-contribution.xml - * file or supplied metaData file should be started, false if they should not be. - * @return the URI of the installed contribution - * - * @throws ContributionReadException - * @throws ActivationException - * @throws ValidationException - */ - String installContribution(String uri, String contributionURL, String metaDataURL, List dependentContributionURIs, boolean startDeployables) throws ContributionReadException, ActivationException, ValidationException; - - /** - * Creates an installed contribution from a supplied Contribution object. - * See section 10.5.1 of the Assembly Specification. - * - * @param contribution the Contribution object - * @param dependentContributionURIs specifies the contributions that are used to resolve the dependencies of the - * root contribution and other dependent contributions. May be null. - * @param startDeployables true if the composites defined as deployable in the contribution's sca-contribution.xml - * file or supplied metaData file should be started, false if they should not be. - * @return the URI of the installed contribution - * - * @throws ContributionReadException - * @throws ActivationException - * @throws ValidationException - */ - String installContribution(Contribution contribution, List dependentContributionURIs, boolean startDeployables) throws ContributionReadException, ActivationException, ValidationException; - - /** - * Creates an installed contribution from a supplied root contribution URL. - * See section 10.5.1 of the Assembly Specification. This method is the same - * as calling installContribution(null, contributionURL, null, null, true) - * - * @param contributionURL the URL where the contribution is located - * @return the URI of the installed contribution - * - * @throws ContributionReadException - * @throws ActivationException - * @throws ValidationException - */ - String installContribution(String contributionURL) throws ContributionReadException, ActivationException, ValidationException; - - /** - * 4599 10.5.2 add Deployment Composite & update Deployment Composite - * 4600 Adds or updates a deployment composite using a supplied composite ("composite by value" - a data - * 4601 structure, not an existing resource in the Domain) to the contribution identified by a supplied contribution - * 4602 URI. The added or updated deployment composite is given a relative URI that matches the @name - * 4603 attribute of the composite, with a ".composite" suffix. Since all composites run within the context of a - * 4604 installed contribution (any component implementations or other definitions are resolved within that - * 4605 contribution), this functionality makes it possible for the deployer to create a composite with final - * 4606 configuration and wiring decisions and add it to an installed contribution without having to modify the - * 4607 contents of the root contribution. - * 4608 Also, in some use cases, a contribution might include only implementation code (e.g. PHP scripts). It is - * 4609 then possible for those to be given component names by a (possibly generated) composite that is added - * 4610 into the installed contribution, without having to modify the packaging. * - * - * @param contributionURI the URI of the installed contribution to add the composite to - * @param compositeXML the composite to add to the contribution - * @return - * @throws XMLStreamException - * @throws ContributionReadException - * @throws ActivationException - * @throws ValidationException - */ - String start(String contributionURI, Reader compositeXML) throws ContributionReadException, XMLStreamException, ActivationException, ValidationException; - String start(String contributionURI, Composite composite) throws ActivationException, ValidationException; - - /** - * 4611 11.4.310.5.3 remove Contribution - * 4612 Removes the deployed contribution identified by a supplied contribution URI. - * - * @param contributionURI - * @return List of contribution URIs (includes dependent contributions) which were removed - * @throws ActivationException - */ - List removeContribution(String contributionURI) throws ActivationException; - - /** - * 4677 10.7.1 add To Domain-Level Composite - * 4678 This functionality adds the composite identified by a supplied URI to the Domain Level Composite. The - * 4679 supplied composite URI refers to a composite within an installed contribution. The composite's installed - * 4680 contribution determines how the composite's artifacts are resolved (directly and indirectly). The supplied - * 4681 composite is added to the domain composite with semantics that correspond to the domain-level - * 4683 components become top-level components and the component services become externally visible - * 4684 services (eg. they would be present in a WSDL description of the Domain). The meaning of any promoted - * 4685 services and references in the supplied composite is not defined; since there is no composite scope - * 4686 outside the domain composite, the usual idea of promotion has no utility. - * - * @param cotributionURI - * @param compositeURI - * @throws ActivationException - * @throws ValidationException - */ - void start(String contributionURI, String compositeURI) throws ActivationException, ValidationException; - - /** - * 4687 10.7.2 remove From Domain-Level Composite - * 4688 Removes from the Domain Level composite the elements corresponding to the composite identified by a - * 4689 supplied composite URI. This means that the removal of the components, wires, services and references - * 4690 originally added to the domain level composite by the identified composite. - * @param contributionURI - * @param compositeURI - * @throws ActivationException - */ - void stop(String contributionURI, String compositeURI) throws ActivationException; - - /** - * 10.7.3 get Domain-Level Composite - * Returns a definition that has an line for each composite that had been added to - * the domain level composite. It is important to note that, in dereferencing the included composites, any - * referenced artifacts are resolved in terms of that installed composite. - * - * @return - */ - Composite getDomainLevelComposite(); - - /* that previous one returns a Composte object but not sure what would be most appropriate, and having one return a string seems convenient: */ - String getDomainLevelCompositeAsString(); - - /** - * 4695 10.7.4 get QName Definition - * 4696 In order to make sense of the domain-level composite (as returned by get Domain-Level Composite), it - * 4697 needs to be possible to get the definitions for named artifacts in the included composites. This - * 4698 functionality takes the supplied URI of an installed contribution (which provides the context), a supplied - * 4699 qualified name of a definition to look up, and a supplied symbol space (as a QName, e.g. - * 4700 wsdl:PortTypeportType). The result is a single definition, in whatever form is appropriate for that - * 4701 definition type. - * 4702 Note that this, like all the other domain-level operations, is a conceptual operation. Its capabilities need to - * 4703 exist in some form, but not necessarily as a service operation with exactly this signature. - * @param contributionURI - * @param definition - * @param symbolSpace - * @return - */ - Object getQNameDefinition(String contributionURI, QName definition, QName symbolSpace); - - /** - * Probably want to be able to stop it all at once so a method called stop or shutdown or destroy - */ - void stop(); - - /** - * Would also be convenient to get service proxys as from SCAClientFactory - */ - T getService(Class interfaze, String serviceURI) throws NoSuchServiceException; - - /** - * Get the URIs of any composites that have been started for a contribution - * @param contributionURI the contribution URI - * @return the List of started composite URIs - */ - List getStartedCompositeURIs(String contributionURI); - - /** - * Get the URIs of all the contributions installed on this Node - * @return the list of installed contribution URIs - */ - List getInstalledContributionURIs(); - - /** - * Get an installed Contribution - * @param uri the URI of the contribution - * @return the Contribution - */ - Contribution getInstalledContribution(String uri); - - String getDomainName(); - -// TODO: the spec is unclear if update is different from remove/install, leave it out for now -// /** -// * 4577 10.5.1 install Contribution & update Contribution -// * 4578 Creates or updates an installed contribution with a supplied root contribution, and installed at a supplied -// * 4579 base URI. A supplied dependent contribution list ( elements) specifies the contributions that are -// * 4580 used to resolve the dependencies of the root contribution and other dependent contributions. These -// * 4581 override any dependent contributions explicitly listed via the @location attribute in the import statements -// * 4582 of the contribution. -// * 4583 SCA follows the simplifying assumption that the use of a contribution for resolving anything also means -// * 4584 that all other exported artifacts can be used from that contribution. Because of this, the dependent -// * 4585 contribution list is just a list of installed contribution URIs. There is no need to specify what is being used -// * 4586 from each one. -// * 4587 Each dependent contribution is also an installed contribution, with its own dependent contributions. By -// * 4588 default these dependent contributions of the dependent contributions (which we will call indirect -// * 4589 dependent contributions) are included as dependent contributions of the installed contribution. However, -// * 4590 if a contribution in the dependent contribution list exports any conflicting definitions with an indirect -// * 4591 dependent contribution, then the indirect dependent contribution is not included (i.e. the explicit list -// * 4592 overrides the default inclusion of indirect dependent contributions). Also, if there is ever a conflict -// * 4593 between two indirect dependent contributions, then the conflict MUST be resolved by an explicit entry in -// * 4594 the dependent contribution list. -// * 4595 [ASM12009] -// * 4596 Note that in many cases, the dependent contribution list can be generated. In particular, if the creator of -// * 4597 a Domain is careful to avoid creating duplicate definitions for the same qualified name, then it is easy for -// * 4598 this list to be generated by tooling. -// * -// * @param uri -// * @param contributionURL -// */ -// void updateContribution(String uri, String contributionURL); -// void updateContribution(Contribution contribution); -// /** -// * 4599 10.5.2 add Deployment Composite & update Deployment Composite -// * 4600 Adds or updates a deployment composite using a supplied composite ("composite by value" - a data -// * 4601 structure, not an existing resource in the Domain) to the contribution identified by a supplied contribution -// * 4602 URI. The added or updated deployment composite is given a relative URI that matches the @name -// * 4603 attribute of the composite, with a ".composite" suffix. Since all composites run within the context of a -// * 4604 installed contribution (any component implementations or other definitions are resolved within that -// * 4605 contribution), this functionality makes it possible for the deployer to create a composite with final -// * 4606 configuration and wiring decisions and add it to an installed contribution without having to modify the -// * 4607 contents of the root contribution. -// * 4608 Also, in some use cases, a contribution might include only implementation code (e.g. PHP scripts). It is -// * 4609 then possible for those to be given component names by a (possibly generated) composite that is added -// * 4610 into the installed contribution, without having to modify the packaging. * -// * -// * @param uri -// * @param compositeXML -// * @return -// */ -// String updateDeploymentComposite(String uri, Reader compositeXML); -// String updateDeploymentComposite(String uri, Composite composite); - -} diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java deleted file mode 100644 index 999311b05d..0000000000 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java +++ /dev/null @@ -1,215 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.node2; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; -import java.util.Properties; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.common.java.io.IOHelper; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory; -import org.apache.tuscany.sca.core.assembly.impl.EndpointRegistryImpl; -import org.apache.tuscany.sca.deployment.Deployer; -import org.apache.tuscany.sca.monitor.ValidationException; -import org.apache.tuscany.sca.node.configuration.ContributionConfiguration; -import org.apache.tuscany.sca.node.configuration.NodeConfiguration; -import org.apache.tuscany.sca.node2.impl.NodeImpl; -import org.apache.tuscany.sca.runtime.ActivationException; -import org.apache.tuscany.sca.runtime.CompositeActivator; -import org.apache.tuscany.sca.runtime.EndpointRegistry; -import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory; -import org.apache.tuscany.sca.runtime.RuntimeProperties; -import org.apache.tuscany.sca.work.WorkScheduler; -import org.oasisopen.sca.ServiceRuntimeException; - -public class NodeFactory { - - private Deployer deployer; - private ExtensionPointRegistry extensionPointRegistry; - private CompositeActivator compositeActivator; - private ExtensibleDomainRegistryFactory domainRegistryFactory; - private RuntimeAssemblyFactory assemblyFactory; - - public static NodeFactory newInstance() { - return new NodeFactory(null); - } - public static NodeFactory newInstance(Properties config) { - return new NodeFactory(config); - } - - /** - * A helper method to simplify creating a standalone Node - * @param compositeURI URI within the contribution of a composite to run - * if compositeURI is null then all deployable composites in the contribution will be run - * @param contributionURL URL of the contribution - * @param dependentContributionURLs optional URLs of dependent contributions - * @return a Node with installed contributions - */ - public static Node newStandaloneNode(String compositeURI, String contributionURL, String... dependentContributionURLs) { - try { - NodeFactory nodeFactory = newInstance(); - EndpointRegistry endpointRegistry = new EndpointRegistryImpl(nodeFactory.extensionPointRegistry, null, null); - NodeImpl node = new NodeImpl("default", nodeFactory.deployer, nodeFactory.compositeActivator, endpointRegistry, nodeFactory.extensionPointRegistry, nodeFactory); - - if (dependentContributionURLs != null) { - for (int i=dependentContributionURLs.length-1; i>-1; i--) { - node.installContribution(null, dependentContributionURLs[i], null, null, false); - } - } - - String curi = node.installContribution(null, contributionURL, null, null, compositeURI == null); - if (compositeURI != null) { - node.start(curi, compositeURI); - } - return node; - - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - protected NodeFactory(Properties config) { - init(config); - } - - public Node createNode() { - return createNode(null); - } - - public Node createNode(String domainURI) { - String domainName = "default"; - if (domainURI != null){ - domainName = getDomainName(domainURI); - } - EndpointRegistry endpointRegistry = domainRegistryFactory.getEndpointRegistry(domainURI, domainName); - return new NodeImpl(domainName, deployer, compositeActivator, endpointRegistry, extensionPointRegistry, null); - } - - public Node createNodeFromXML(String configURL) throws ContributionReadException, ActivationException, ValidationException { - NodeConfiguration configuration = loadConfiguration(configURL); - Node node = createNode(configuration.getDomainURI()); - for ( ContributionConfiguration c : configuration.getContributions()) { - node.installContribution(c.getURI(), c.getLocation(), c.getMetaDataURL(), c.getDependentContributionURIs(), c.isStartDeployables()); - } - return node; - } - - public void stop() { - deployer.stop(); - extensionPointRegistry.stop(); - } - - protected void init(Properties config) { - if (config == null) { - config = new Properties(); - config.setProperty("defaultScheme", "vm"); - config.setProperty("defaultDomainName", "default"); - } - this.extensionPointRegistry = new DefaultExtensionPointRegistry(); - extensionPointRegistry.start(); - - FactoryExtensionPoint modelFactories = extensionPointRegistry.getExtensionPoint(FactoryExtensionPoint.class); - this.assemblyFactory = new RuntimeAssemblyFactory(extensionPointRegistry); - modelFactories.addFactory(assemblyFactory); - - UtilityExtensionPoint utilities = extensionPointRegistry.getExtensionPoint(UtilityExtensionPoint.class); - this.compositeActivator = utilities.getUtility(CompositeActivator.class); - this.deployer = utilities.getUtility(Deployer.class); - utilities.getUtility(RuntimeProperties.class).setProperties(config); - utilities.getUtility(WorkScheduler.class); - - // Initialize the Tuscany module activators - // The module activators will be started - extensionPointRegistry.getExtensionPoint(ModuleActivatorExtensionPoint.class); - - this.domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionPointRegistry); - - } - /** - * Get the Deployer. The Deployer can be used to create contribution artifacts - * when configuring a Node programatically. - * @return the Deployer - */ - public Deployer getDeployer() { - return deployer; - } - - /** - * Get the AssemblyFactory. The AssemblyFactory can be used to create contribution - * artifact contents when configuring a Node programatically. - * @return the AssemblyFactory - */ - public AssemblyFactory getAssemblyFactory() { - return assemblyFactory; - } - - private String getDomainName(String domainURI) { - int scheme = domainURI.indexOf(':'); - int qm = domainURI.indexOf('?'); - if (qm == -1) { - return domainURI.substring(scheme+1); - } else { - return domainURI.substring(scheme+1, qm); - } - } - - protected NodeConfiguration loadConfiguration(String configURL) { - InputStream xml =null; - try { - URL base = IOHelper.getLocationAsURL(configURL); - xml = IOHelper.openStream(base); - InputStreamReader reader = new InputStreamReader(xml, "UTF-8"); - ProcessorContext context = deployer.createProcessorContext(); - NodeConfiguration config = deployer.loadXMLDocument(reader, context.getMonitor()); - if (base != null && config != null) { - // Resolve the contribution location against the node.xml - // TODO: absolute locations? - for (ContributionConfiguration c : config.getContributions()) { - String location = c.getLocation(); - if (location != null) { - URL url = new URL(base, location); - url = IOHelper.normalize(url); - c.setLocation(url.toString()); - } - } - } - return config; - } catch (Throwable e) { - throw new ServiceRuntimeException(e); - } finally { - try { - if (xml != null) xml.close(); - } catch (IOException e) { - throw new ServiceRuntimeException(e); - } - } - } - -} diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/DeployedComposite.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/DeployedComposite.java deleted file mode 100644 index 6e31f283ee..0000000000 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/DeployedComposite.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.node2.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -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; -import org.apache.tuscany.sca.deployment.Deployer; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.ValidationException; -import org.apache.tuscany.sca.runtime.ActivationException; -import org.apache.tuscany.sca.runtime.CompositeActivator; -import org.apache.tuscany.sca.runtime.EndpointRegistry; - -public class DeployedComposite { - - private String uri; - private Composite composite; - private InstalledContribution installedContribution; - private List dependedOnContributions; - private Composite domainComposite; // TODO: this is misleadingly named - - private CompositeActivator compositeActivator; - private CompositeContext compositeContext; - private Deployer deployer; - private EndpointRegistry endpointRegistry; - private ExtensionPointRegistry extensionPointRegistry; - - public DeployedComposite(Composite composite, - InstalledContribution ic, - List dependedOnContributions, - Deployer deployer, - CompositeActivator compositeActivator, - EndpointRegistry endpointRegistry, - ExtensionPointRegistry extensionPointRegistry) throws ValidationException, ActivationException { - this.composite = composite; - this.installedContribution = ic; - this.dependedOnContributions = dependedOnContributions; - this.deployer = deployer; - this.compositeActivator = compositeActivator; - this.endpointRegistry = endpointRegistry; - this.extensionPointRegistry = extensionPointRegistry; - try { - init(); - } catch (ContributionResolveException e) { - throw new ActivationException(e); - } catch (CompositeBuilderException e) { - throw new ActivationException(e); - } - } - - protected void init() throws ValidationException, ActivationException, ContributionResolveException, CompositeBuilderException { - - List contribution = new ArrayList(); - contribution.add(installedContribution.getContribution()); - contribution.get(0).getDeployables().clear(); - contribution.get(0).getDeployables().add(composite); - - Monitor monitor = deployer.createMonitor(); -// TODO: is the ContextMonitor neccessary here? -// Monitor tcm = monitorFactory.setContextMonitor(monitor); -// try { - - domainComposite = deployer.build(contribution, dependedOnContributions, new HashMap>(), monitor); - monitor.analyzeProblems(); - -// } finally { -// monitorFactory.setContextMonitor(tcm); -// } - - compositeContext = new CompositeContext(extensionPointRegistry, - endpointRegistry, - domainComposite, - null, // nothing appears to use the domain name in CompositeContext - null, // don't need node uri - deployer.getSystemDefinitions()); - - compositeActivator.activate(compositeContext, domainComposite); - compositeActivator.start(compositeContext, domainComposite); - - this.uri = getCompositeURI(composite, installedContribution); - } - - public void unDeploy() throws ActivationException { - compositeActivator.stop(compositeContext, domainComposite); - compositeActivator.deactivate(domainComposite); - } - - 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 - */ - protected String getCompositeURI(Composite c, InstalledContribution ic) { - for (Artifact a : ic.getContribution().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"); - } -} diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/InstalledContribution.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/InstalledContribution.java deleted file mode 100644 index d847c8d199..0000000000 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/InstalledContribution.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.node2.impl; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; - -public class InstalledContribution { - - private String uri; - private String url; - private Contribution contribution; - private List defaultDeployables = new ArrayList(); - private List deployedComposites = new ArrayList(); - private List dependentContributionURIs; - - public InstalledContribution(String uri, String url, Contribution contribution, List dependentContributionURIs) { - this.uri = uri; - this.url = url; - this.contribution = contribution; - this.defaultDeployables = new ArrayList(contribution.getDeployables()); - this.dependentContributionURIs = dependentContributionURIs; - } - public Contribution getContribution() { - return contribution; - } - public void setContribution(Contribution contribution) { - this.contribution = contribution; - } - public String getURI() { - return uri; - } - public String getURL() { - return url; - } - public List getDefaultDeployables() { - return defaultDeployables; - } - public List getDeployedComposites() { - return deployedComposites; - } - public List getDependentContributionURIs() { - return dependentContributionURIs; - } -} diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java deleted file mode 100644 index 15f5e2b18e..0000000000 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java +++ /dev/null @@ -1,361 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.node2.impl; - -import java.io.File; -import java.io.Reader; -import java.net.URI; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; - -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.ContributionMetadata; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.deployment.Deployer; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.ValidationException; -import org.apache.tuscany.sca.node2.Node; -import org.apache.tuscany.sca.node2.NodeFactory; -import org.apache.tuscany.sca.runtime.ActivationException; -import org.apache.tuscany.sca.runtime.CompositeActivator; -import org.apache.tuscany.sca.runtime.EndpointRegistry; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; -import org.oasisopen.sca.client.SCAClientFactory; - -public class NodeImpl implements Node { - - private String domainName; - private Deployer deployer; - private Map installedContributions = new HashMap(); - private CompositeActivator compositeActivator; - private EndpointRegistry endpointRegistry; - private ExtensionPointRegistry extensionPointRegistry; - private NodeFactory nodeFactory; - - public NodeImpl(String domainName, Deployer deployer, CompositeActivator compositeActivator, EndpointRegistry endpointRegistry, ExtensionPointRegistry extensionPointRegistry, NodeFactory nodeFactory) { - this.domainName = domainName; - this.deployer = deployer; - this.compositeActivator = compositeActivator; - this.endpointRegistry = endpointRegistry; - this.extensionPointRegistry = extensionPointRegistry; - this.nodeFactory = nodeFactory; - } - - public String installContribution(String contributionURL) throws ContributionReadException, ActivationException, ValidationException { - return installContribution(null, contributionURL, null, null, true); - } - - public String installContribution(String uri, String contributionURL, String metaDataURL, List dependentContributionURIs, boolean startDeployables) throws ContributionReadException, ActivationException, ValidationException { - if (uri == null) { - uri = getDefaultContributionURI(contributionURL); - } - Monitor monitor = deployer.createMonitor(); - Contribution contribution = deployer.loadContribution(IOHelper.createURI(uri), IOHelper.getLocationAsURL(contributionURL), monitor); - monitor.analyzeProblems(); - if (metaDataURL != null) { - mergeContributionMetaData(metaDataURL, contribution); - } - installContribution(contribution, dependentContributionURIs, startDeployables); - return uri; - } - - private void mergeContributionMetaData(String metaDataURL, Contribution contribution) throws ValidationException { - ContributionMetadata metaData; - Monitor monitor = deployer.createMonitor(); - try { - metaData = deployer.loadXMLDocument(IOHelper.getLocationAsURL(metaDataURL), monitor); - } catch (Exception e) { - throw new ValidationException(e); - } - monitor.analyzeProblems(); - contribution.getDeployables().addAll(metaData.getDeployables()); - contribution.getImports().addAll(metaData.getImports()); - contribution.getExports().addAll(metaData.getExports()); - } - - public String installContribution(Contribution contribution, List dependentContributionURIs, boolean startDeployables) throws ContributionReadException, ActivationException, ValidationException { - InstalledContribution ic = new InstalledContribution(contribution.getURI(), contribution.getLocation(), contribution, dependentContributionURIs); - installedContributions.put(contribution.getURI(), ic); - if (startDeployables) { - for (Composite c : ic.getDefaultDeployables()) { - startComposite(c, ic); - } - } else { - contribution.getDeployables().clear(); - - List dependentContributions = calculateDependentContributions(ic); - - Monitor monitor = deployer.createMonitor(); - try { - deployer.resolve(contribution, dependentContributions, monitor); - } catch (Exception e) { - throw new RuntimeException(e); - } - monitor.analyzeProblems(); - } - return ic.getURI(); - } - - protected List calculateDependentContributions(InstalledContribution ic) { - List dependentContributions = new ArrayList(); - if (ic.getDependentContributionURIs() != null) { - // if the install specified dependent uris use just those contributions - for (String uri : ic.getDependentContributionURIs()) { - InstalledContribution dependee = installedContributions.get(uri); - if (dependee != null) { - dependentContributions.add(dependee.getContribution()); - } - } - } else { - // otherwise use all available contributions for dependents - for (InstalledContribution ics : installedContributions.values()) { - dependentContributions.add(ics.getContribution()); - } - } - return dependentContributions; - } - - public String start(String contributionURI, Reader compositeXML) throws ContributionReadException, XMLStreamException, ActivationException, ValidationException { - Monitor monitor = deployer.createMonitor(); - Composite composite = deployer.loadXMLDocument(compositeXML, monitor); - monitor.analyzeProblems(); - return start(contributionURI, composite); - } - - public String start(String contributionURI, Composite composite) throws ActivationException, ValidationException { - InstalledContribution ic = installedContributions.get(contributionURI); - if (ic == null) { - throw new IllegalArgumentException("contribution not installed: " + contributionURI); - } - String compositeArtifcatURI = deployer.attachDeploymentComposite(ic.getContribution(), composite, true); - startComposite(composite, ic); - return compositeArtifcatURI; - } - - public void start(String contributionURI, String compositeURI) throws ActivationException, ValidationException { - InstalledContribution ic = installedContributions.get(contributionURI); - if (ic == null) { - throw new IllegalArgumentException("Contribution not installed: " + contributionURI); - } - for (Artifact a : ic.getContribution().getArtifacts()) { - if (a.getURI().equals(compositeURI)) { - startComposite((Composite) a.getModel(), ic); - return; - } - } - throw new IllegalArgumentException("composite not found: " + compositeURI); - } - - @Override - public void stop(String contributionURI, String compositeURI) throws ActivationException { - InstalledContribution ic = installedContributions.get(contributionURI); - if (ic == null) { - throw new IllegalArgumentException("Contribution not installed: " + contributionURI); - } - for (DeployedComposite dc : ic.getDeployedComposites()) { - if (compositeURI.equals(dc.getURI())) { - ic.getDeployedComposites().remove(dc); - dc.unDeploy(); - return; - } - } - throw new IllegalStateException("composite not deployed: " + compositeURI); - } - - public Composite getDomainLevelComposite() { - // TODO Auto-generated method stub - return null; - } - - public String getDomainLevelCompositeAsString() { - // TODO Auto-generated method stub - return null; - } - - public Object getQNameDefinition(String contributionURI, QName definition, QName symbolSpace) { - // TODO Auto-generated method stub - return null; - } - - public List removeContribution(String contributionURI) throws ActivationException { - List removedContributionURIs = new ArrayList(); - InstalledContribution ic = installedContributions.get(contributionURI); - if (ic != null) { - removedContributionURIs.add(ic.getURI()); - for (String dependent : getDependentContributions(contributionURI)) { - removedContributionURIs.addAll(removeContribution(dependent)); - } - installedContributions.remove(contributionURI); - for (DeployedComposite dc : ic.getDeployedComposites()) { - dc.unDeploy(); - } - ic.getDeployedComposites().clear(); - } - return removedContributionURIs; - } - - public void updateContribution(String uri, String contributionURL) { - // TODO Auto-generated method stub - // is this just removeContribution/installContribution? - } - public void updateContribution(Contribution contribution) { - // TODO Auto-generated method stub - } - - public String updateDeploymentComposite(String uri, Reader compositeXML) { - // TODO Auto-generated method stub - // is this removeFromDomainLevelComposite/addDeploymentComposite - return null; - } - public String updateDeploymentComposite(String uri, Composite composite) { - // TODO Auto-generated method stub - return null; - } - - public void stop() { - ArrayList ics = new ArrayList(installedContributions.keySet()); - for (String uri : ics) { - try { - removeContribution(uri); - } catch (Exception e) { - // TODO: log - e.printStackTrace(); - } - } - if (nodeFactory != null) { - nodeFactory.stop(); - } - } - - public T getService(Class interfaze, String serviceURI) throws NoSuchServiceException { - try { - return SCAClientFactory.newInstance(URI.create(getDomainName())).getService(interfaze, serviceURI); - } catch (NoSuchDomainException e) { - // shouldn't ever happen as we know this is the domain so it must exist - throw new IllegalStateException(e); - } - } - - public String getDomainName() { - return domainName; - } - - public List getStartedCompositeURIs(String contributionURI) { - ArrayList compositeURIs = new ArrayList(); - InstalledContribution ic = installedContributions.get(contributionURI); - if (ic == null) { - throw new IllegalArgumentException("no contribution found for: " + contributionURI); - } - for (DeployedComposite dc : ic.getDeployedComposites()) { - compositeURIs.add(dc.getURI()); - } - return compositeURIs; - } - - public List getInstalledContributionURIs() { - return new ArrayList(installedContributions.keySet()); - } - - public Contribution getInstalledContribution(String uri) { - if (installedContributions.containsKey(uri)) { - return installedContributions.get(uri).getContribution(); - } - throw new IllegalArgumentException("no contribution found for: " + uri); - } - - protected String getContributionUriForArtifact(String artifactURI) { - String contributionURI = null; - for (String uri : installedContributions.keySet()) { - if (artifactURI.startsWith(uri)) { - contributionURI = uri; - break; - } - } - if (contributionURI == null) { - throw new IllegalArgumentException("no contribution found for: " + artifactURI); - } - return contributionURI; - } - - protected void startComposite(Composite c, InstalledContribution ic) throws ActivationException, ValidationException { - List dependentContributions = calculateDependentContributions(ic); - - DeployedComposite dc = new DeployedComposite(c, ic, dependentContributions, deployer, compositeActivator, endpointRegistry, extensionPointRegistry); - ic.getDeployedComposites().add(dc); - } - - public Set getDependentContributions(String contributionURI) { - InstalledContribution ic = installedContributions.get(contributionURI); - if (ic == null) { - throw new IllegalArgumentException("Contribution not installed: " + contributionURI); - } - Set dependentContributionURIs = new HashSet(); - for (InstalledContribution icx : installedContributions.values()) { - if (ic != icx) { - List dependencies = icx.getContribution().getDependencies(); - if (dependencies != null && dependencies.contains(ic.getContribution())) { - dependentContributionURIs.addAll(getDependentContributions(icx.getURI())); - } - } - } - return dependentContributionURIs; - } - - /** - * Returns a default URI for a contribution based on the contribution URL - */ - protected String getDefaultContributionURI(String contributionURL) { - String uri = null; - try { - File f = new File(contributionURL); - if ("classes".equals(f.getName()) && "target".equals(f.getParentFile().getName())) { - uri = f.getParentFile().getParentFile().getName(); - } else { - uri = f.getName(); - } - } catch (Exception e) { - // ignore - } - if (uri == null) { - uri = contributionURL; - } - if (uri.endsWith(".zip") || uri.endsWith(".jar")) { - uri = uri.substring(0, uri.length()-4); - } - return uri; - } - - public EndpointRegistry getEndpointRegistry() { - return endpointRegistry; - } - -} diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/Node.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/Node.java new file mode 100644 index 0000000000..5e9d9973c3 --- /dev/null +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/Node.java @@ -0,0 +1,265 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.runtime; + +import java.io.Reader; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +import org.apache.tuscany.sca.assembly.Composite; +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.oasisopen.sca.NoSuchServiceException; + +public interface Node { + + /** + * Creates an installed contribution from a supplied root contribution and installed at a supplied base URI. + * See section 10.5.1 of the Assembly Specification. + * + * @param uri the base uri of where to install the contribution. May be null in which case a URI is derived from the contribution URL + * @param contributionURL the URL where the contribution is located + * @param metaDataURL the location of an optional generated Contribution Metadata Document. See section 10.2.2 + * of the Assembly Specification. May be null. + * @param dependentContributionURIs specifies the contributions that are used to resolve the dependencies of the + * root contribution and other dependent contributions. May be null. + * @param startDeployables true if the composites defined as deployable in the contribution's sca-contribution.xml + * file or supplied metaData file should be started, false if they should not be. + * @return the URI of the installed contribution + * + * @throws ContributionReadException + * @throws ActivationException + * @throws ValidationException + */ + String installContribution(String uri, String contributionURL, String metaDataURL, List dependentContributionURIs, boolean startDeployables) throws ContributionReadException, ActivationException, ValidationException; + + /** + * Creates an installed contribution from a supplied Contribution object. + * See section 10.5.1 of the Assembly Specification. + * + * @param contribution the Contribution object + * @param dependentContributionURIs specifies the contributions that are used to resolve the dependencies of the + * root contribution and other dependent contributions. May be null. + * @param startDeployables true if the composites defined as deployable in the contribution's sca-contribution.xml + * file or supplied metaData file should be started, false if they should not be. + * @return the URI of the installed contribution + * + * @throws ContributionReadException + * @throws ActivationException + * @throws ValidationException + */ + String installContribution(Contribution contribution, List dependentContributionURIs, boolean startDeployables) throws ContributionReadException, ActivationException, ValidationException; + + /** + * Creates an installed contribution from a supplied root contribution URL. + * See section 10.5.1 of the Assembly Specification. This method is the same + * as calling installContribution(null, contributionURL, null, null, true) + * + * @param contributionURL the URL where the contribution is located + * @return the URI of the installed contribution + * + * @throws ContributionReadException + * @throws ActivationException + * @throws ValidationException + */ + String installContribution(String contributionURL) throws ContributionReadException, ActivationException, ValidationException; + + /** + * 4599 10.5.2 add Deployment Composite & update Deployment Composite + * 4600 Adds or updates a deployment composite using a supplied composite ("composite by value" - a data + * 4601 structure, not an existing resource in the Domain) to the contribution identified by a supplied contribution + * 4602 URI. The added or updated deployment composite is given a relative URI that matches the @name + * 4603 attribute of the composite, with a ".composite" suffix. Since all composites run within the context of a + * 4604 installed contribution (any component implementations or other definitions are resolved within that + * 4605 contribution), this functionality makes it possible for the deployer to create a composite with final + * 4606 configuration and wiring decisions and add it to an installed contribution without having to modify the + * 4607 contents of the root contribution. + * 4608 Also, in some use cases, a contribution might include only implementation code (e.g. PHP scripts). It is + * 4609 then possible for those to be given component names by a (possibly generated) composite that is added + * 4610 into the installed contribution, without having to modify the packaging. * + * + * @param contributionURI the URI of the installed contribution to add the composite to + * @param compositeXML the composite to add to the contribution + * @return + * @throws XMLStreamException + * @throws ContributionReadException + * @throws ActivationException + * @throws ValidationException + */ + String start(String contributionURI, Reader compositeXML) throws ContributionReadException, XMLStreamException, ActivationException, ValidationException; + String start(String contributionURI, Composite composite) throws ActivationException, ValidationException; + + /** + * 4611 11.4.310.5.3 remove Contribution + * 4612 Removes the deployed contribution identified by a supplied contribution URI. + * + * @param contributionURI + * @return List of contribution URIs (includes dependent contributions) which were removed + * @throws ActivationException + */ + List removeContribution(String contributionURI) throws ActivationException; + + /** + * 4677 10.7.1 add To Domain-Level Composite + * 4678 This functionality adds the composite identified by a supplied URI to the Domain Level Composite. The + * 4679 supplied composite URI refers to a composite within an installed contribution. The composite's installed + * 4680 contribution determines how the composite's artifacts are resolved (directly and indirectly). The supplied + * 4681 composite is added to the domain composite with semantics that correspond to the domain-level + * 4683 components become top-level components and the component services become externally visible + * 4684 services (eg. they would be present in a WSDL description of the Domain). The meaning of any promoted + * 4685 services and references in the supplied composite is not defined; since there is no composite scope + * 4686 outside the domain composite, the usual idea of promotion has no utility. + * + * @param cotributionURI + * @param compositeURI + * @throws ActivationException + * @throws ValidationException + */ + void start(String contributionURI, String compositeURI) throws ActivationException, ValidationException; + + /** + * 4687 10.7.2 remove From Domain-Level Composite + * 4688 Removes from the Domain Level composite the elements corresponding to the composite identified by a + * 4689 supplied composite URI. This means that the removal of the components, wires, services and references + * 4690 originally added to the domain level composite by the identified composite. + * @param contributionURI + * @param compositeURI + * @throws ActivationException + */ + void stop(String contributionURI, String compositeURI) throws ActivationException; + + /** + * 10.7.3 get Domain-Level Composite + * Returns a definition that has an line for each composite that had been added to + * the domain level composite. It is important to note that, in dereferencing the included composites, any + * referenced artifacts are resolved in terms of that installed composite. + * + * @return + */ + Composite getDomainLevelComposite(); + + /* that previous one returns a Composte object but not sure what would be most appropriate, and having one return a string seems convenient: */ + String getDomainLevelCompositeAsString(); + + /** + * 4695 10.7.4 get QName Definition + * 4696 In order to make sense of the domain-level composite (as returned by get Domain-Level Composite), it + * 4697 needs to be possible to get the definitions for named artifacts in the included composites. This + * 4698 functionality takes the supplied URI of an installed contribution (which provides the context), a supplied + * 4699 qualified name of a definition to look up, and a supplied symbol space (as a QName, e.g. + * 4700 wsdl:PortTypeportType). The result is a single definition, in whatever form is appropriate for that + * 4701 definition type. + * 4702 Note that this, like all the other domain-level operations, is a conceptual operation. Its capabilities need to + * 4703 exist in some form, but not necessarily as a service operation with exactly this signature. + * @param contributionURI + * @param definition + * @param symbolSpace + * @return + */ + Object getQNameDefinition(String contributionURI, QName definition, QName symbolSpace); + + /** + * Probably want to be able to stop it all at once so a method called stop or shutdown or destroy + */ + void stop(); + + /** + * Would also be convenient to get service proxys as from SCAClientFactory + */ + T getService(Class interfaze, String serviceURI) throws NoSuchServiceException; + + /** + * Get the URIs of any composites that have been started for a contribution + * @param contributionURI the contribution URI + * @return the List of started composite URIs + */ + List getStartedCompositeURIs(String contributionURI); + + /** + * Get the URIs of all the contributions installed on this Node + * @return the list of installed contribution URIs + */ + List getInstalledContributionURIs(); + + /** + * Get an installed Contribution + * @param uri the URI of the contribution + * @return the Contribution + */ + Contribution getInstalledContribution(String uri); + + String getDomainName(); + +// TODO: the spec is unclear if update is different from remove/install, leave it out for now +// /** +// * 4577 10.5.1 install Contribution & update Contribution +// * 4578 Creates or updates an installed contribution with a supplied root contribution, and installed at a supplied +// * 4579 base URI. A supplied dependent contribution list ( elements) specifies the contributions that are +// * 4580 used to resolve the dependencies of the root contribution and other dependent contributions. These +// * 4581 override any dependent contributions explicitly listed via the @location attribute in the import statements +// * 4582 of the contribution. +// * 4583 SCA follows the simplifying assumption that the use of a contribution for resolving anything also means +// * 4584 that all other exported artifacts can be used from that contribution. Because of this, the dependent +// * 4585 contribution list is just a list of installed contribution URIs. There is no need to specify what is being used +// * 4586 from each one. +// * 4587 Each dependent contribution is also an installed contribution, with its own dependent contributions. By +// * 4588 default these dependent contributions of the dependent contributions (which we will call indirect +// * 4589 dependent contributions) are included as dependent contributions of the installed contribution. However, +// * 4590 if a contribution in the dependent contribution list exports any conflicting definitions with an indirect +// * 4591 dependent contribution, then the indirect dependent contribution is not included (i.e. the explicit list +// * 4592 overrides the default inclusion of indirect dependent contributions). Also, if there is ever a conflict +// * 4593 between two indirect dependent contributions, then the conflict MUST be resolved by an explicit entry in +// * 4594 the dependent contribution list. +// * 4595 [ASM12009] +// * 4596 Note that in many cases, the dependent contribution list can be generated. In particular, if the creator of +// * 4597 a Domain is careful to avoid creating duplicate definitions for the same qualified name, then it is easy for +// * 4598 this list to be generated by tooling. +// * +// * @param uri +// * @param contributionURL +// */ +// void updateContribution(String uri, String contributionURL); +// void updateContribution(Contribution contribution); +// /** +// * 4599 10.5.2 add Deployment Composite & update Deployment Composite +// * 4600 Adds or updates a deployment composite using a supplied composite ("composite by value" - a data +// * 4601 structure, not an existing resource in the Domain) to the contribution identified by a supplied contribution +// * 4602 URI. The added or updated deployment composite is given a relative URI that matches the @name +// * 4603 attribute of the composite, with a ".composite" suffix. Since all composites run within the context of a +// * 4604 installed contribution (any component implementations or other definitions are resolved within that +// * 4605 contribution), this functionality makes it possible for the deployer to create a composite with final +// * 4606 configuration and wiring decisions and add it to an installed contribution without having to modify the +// * 4607 contents of the root contribution. +// * 4608 Also, in some use cases, a contribution might include only implementation code (e.g. PHP scripts). It is +// * 4609 then possible for those to be given component names by a (possibly generated) composite that is added +// * 4610 into the installed contribution, without having to modify the packaging. * +// * +// * @param uri +// * @param compositeXML +// * @return +// */ +// String updateDeploymentComposite(String uri, Reader compositeXML); +// String updateDeploymentComposite(String uri, Composite composite); + +} diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/NodeFactory.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/NodeFactory.java new file mode 100644 index 0000000000..2e8e29a05b --- /dev/null +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/NodeFactory.java @@ -0,0 +1,215 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.runtime; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.Properties; + +import org.apache.tuscany.sca.assembly.AssemblyFactory; +import org.apache.tuscany.sca.common.java.io.IOHelper; +import org.apache.tuscany.sca.contribution.processor.ContributionReadException; +import org.apache.tuscany.sca.contribution.processor.ProcessorContext; +import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.core.FactoryExtensionPoint; +import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint; +import org.apache.tuscany.sca.core.UtilityExtensionPoint; +import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory; +import org.apache.tuscany.sca.core.assembly.impl.EndpointRegistryImpl; +import org.apache.tuscany.sca.deployment.Deployer; +import org.apache.tuscany.sca.monitor.ValidationException; +import org.apache.tuscany.sca.node.configuration.ContributionConfiguration; +import org.apache.tuscany.sca.node.configuration.NodeConfiguration; +import org.apache.tuscany.sca.runtime.ActivationException; +import org.apache.tuscany.sca.runtime.CompositeActivator; +import org.apache.tuscany.sca.runtime.EndpointRegistry; +import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory; +import org.apache.tuscany.sca.runtime.RuntimeProperties; +import org.apache.tuscany.sca.runtime.impl.NodeImpl; +import org.apache.tuscany.sca.work.WorkScheduler; +import org.oasisopen.sca.ServiceRuntimeException; + +public class NodeFactory { + + private Deployer deployer; + private ExtensionPointRegistry extensionPointRegistry; + private CompositeActivator compositeActivator; + private ExtensibleDomainRegistryFactory domainRegistryFactory; + private RuntimeAssemblyFactory assemblyFactory; + + public static NodeFactory newInstance() { + return new NodeFactory(null); + } + public static NodeFactory newInstance(Properties config) { + return new NodeFactory(config); + } + + /** + * A helper method to simplify creating a standalone Node + * @param compositeURI URI within the contribution of a composite to run + * if compositeURI is null then all deployable composites in the contribution will be run + * @param contributionURL URL of the contribution + * @param dependentContributionURLs optional URLs of dependent contributions + * @return a Node with installed contributions + */ + public static Node createStandaloneNode(String compositeURI, String contributionURL, String... dependentContributionURLs) { + try { + NodeFactory nodeFactory = newInstance(); + EndpointRegistry endpointRegistry = new EndpointRegistryImpl(nodeFactory.extensionPointRegistry, null, null); + NodeImpl node = new NodeImpl("default", nodeFactory.deployer, nodeFactory.compositeActivator, endpointRegistry, nodeFactory.extensionPointRegistry, nodeFactory); + + if (dependentContributionURLs != null) { + for (int i=dependentContributionURLs.length-1; i>-1; i--) { + node.installContribution(null, dependentContributionURLs[i], null, null, false); + } + } + + String curi = node.installContribution(null, contributionURL, null, null, compositeURI == null); + if (compositeURI != null) { + node.start(curi, compositeURI); + } + return node; + + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + protected NodeFactory(Properties config) { + init(config); + } + + public Node createNode() { + return createNode(null); + } + + public Node createNode(String domainURI) { + String domainName = "default"; + if (domainURI != null){ + domainName = getDomainName(domainURI); + } + EndpointRegistry endpointRegistry = domainRegistryFactory.getEndpointRegistry(domainURI, domainName); + return new NodeImpl(domainName, deployer, compositeActivator, endpointRegistry, extensionPointRegistry, null); + } + + public Node createNodeFromXML(String configURL) throws ContributionReadException, ActivationException, ValidationException { + NodeConfiguration configuration = loadConfiguration(configURL); + Node node = createNode(configuration.getDomainURI()); + for ( ContributionConfiguration c : configuration.getContributions()) { + node.installContribution(c.getURI(), c.getLocation(), c.getMetaDataURL(), c.getDependentContributionURIs(), c.isStartDeployables()); + } + return node; + } + + public void stop() { + deployer.stop(); + extensionPointRegistry.stop(); + } + + protected void init(Properties config) { + if (config == null) { + config = new Properties(); + config.setProperty("defaultScheme", "vm"); + config.setProperty("defaultDomainName", "default"); + } + this.extensionPointRegistry = new DefaultExtensionPointRegistry(); + extensionPointRegistry.start(); + + FactoryExtensionPoint modelFactories = extensionPointRegistry.getExtensionPoint(FactoryExtensionPoint.class); + this.assemblyFactory = new RuntimeAssemblyFactory(extensionPointRegistry); + modelFactories.addFactory(assemblyFactory); + + UtilityExtensionPoint utilities = extensionPointRegistry.getExtensionPoint(UtilityExtensionPoint.class); + this.compositeActivator = utilities.getUtility(CompositeActivator.class); + this.deployer = utilities.getUtility(Deployer.class); + utilities.getUtility(RuntimeProperties.class).setProperties(config); + utilities.getUtility(WorkScheduler.class); + + // Initialize the Tuscany module activators + // The module activators will be started + extensionPointRegistry.getExtensionPoint(ModuleActivatorExtensionPoint.class); + + this.domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionPointRegistry); + + } + /** + * Get the Deployer. The Deployer can be used to create contribution artifacts + * when configuring a Node programatically. + * @return the Deployer + */ + public Deployer getDeployer() { + return deployer; + } + + /** + * Get the AssemblyFactory. The AssemblyFactory can be used to create contribution + * artifact contents when configuring a Node programatically. + * @return the AssemblyFactory + */ + public AssemblyFactory getAssemblyFactory() { + return assemblyFactory; + } + + private String getDomainName(String domainURI) { + int scheme = domainURI.indexOf(':'); + int qm = domainURI.indexOf('?'); + if (qm == -1) { + return domainURI.substring(scheme+1); + } else { + return domainURI.substring(scheme+1, qm); + } + } + + protected NodeConfiguration loadConfiguration(String configURL) { + InputStream xml =null; + try { + URL base = IOHelper.getLocationAsURL(configURL); + xml = IOHelper.openStream(base); + InputStreamReader reader = new InputStreamReader(xml, "UTF-8"); + ProcessorContext context = deployer.createProcessorContext(); + NodeConfiguration config = deployer.loadXMLDocument(reader, context.getMonitor()); + if (base != null && config != null) { + // Resolve the contribution location against the node.xml + // TODO: absolute locations? + for (ContributionConfiguration c : config.getContributions()) { + String location = c.getLocation(); + if (location != null) { + URL url = new URL(base, location); + url = IOHelper.normalize(url); + c.setLocation(url.toString()); + } + } + } + return config; + } catch (Throwable e) { + throw new ServiceRuntimeException(e); + } finally { + try { + if (xml != null) xml.close(); + } catch (IOException e) { + throw new ServiceRuntimeException(e); + } + } + } + +} diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/impl/DeployedComposite.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/impl/DeployedComposite.java new file mode 100644 index 0000000000..dab3309bfd --- /dev/null +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/impl/DeployedComposite.java @@ -0,0 +1,138 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.runtime.impl; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +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; +import org.apache.tuscany.sca.deployment.Deployer; +import org.apache.tuscany.sca.monitor.Monitor; +import org.apache.tuscany.sca.monitor.ValidationException; +import org.apache.tuscany.sca.runtime.ActivationException; +import org.apache.tuscany.sca.runtime.CompositeActivator; +import org.apache.tuscany.sca.runtime.EndpointRegistry; + +public class DeployedComposite { + + private String uri; + private Composite composite; + private InstalledContribution installedContribution; + private List dependedOnContributions; + private Composite domainComposite; // TODO: this is misleadingly named + + private CompositeActivator compositeActivator; + private CompositeContext compositeContext; + private Deployer deployer; + private EndpointRegistry endpointRegistry; + private ExtensionPointRegistry extensionPointRegistry; + + public DeployedComposite(Composite composite, + InstalledContribution ic, + List dependedOnContributions, + Deployer deployer, + CompositeActivator compositeActivator, + EndpointRegistry endpointRegistry, + ExtensionPointRegistry extensionPointRegistry) throws ValidationException, ActivationException { + this.composite = composite; + this.installedContribution = ic; + this.dependedOnContributions = dependedOnContributions; + this.deployer = deployer; + this.compositeActivator = compositeActivator; + this.endpointRegistry = endpointRegistry; + this.extensionPointRegistry = extensionPointRegistry; + try { + init(); + } catch (ContributionResolveException e) { + throw new ActivationException(e); + } catch (CompositeBuilderException e) { + throw new ActivationException(e); + } + } + + protected void init() throws ValidationException, ActivationException, ContributionResolveException, CompositeBuilderException { + + List contribution = new ArrayList(); + contribution.add(installedContribution.getContribution()); + contribution.get(0).getDeployables().clear(); + contribution.get(0).getDeployables().add(composite); + + Monitor monitor = deployer.createMonitor(); +// TODO: is the ContextMonitor neccessary here? +// Monitor tcm = monitorFactory.setContextMonitor(monitor); +// try { + + domainComposite = deployer.build(contribution, dependedOnContributions, new HashMap>(), monitor); + monitor.analyzeProblems(); + +// } finally { +// monitorFactory.setContextMonitor(tcm); +// } + + compositeContext = new CompositeContext(extensionPointRegistry, + endpointRegistry, + domainComposite, + null, // nothing appears to use the domain name in CompositeContext + null, // don't need node uri + deployer.getSystemDefinitions()); + + compositeActivator.activate(compositeContext, domainComposite); + compositeActivator.start(compositeContext, domainComposite); + + this.uri = getCompositeURI(composite, installedContribution); + } + + public void unDeploy() throws ActivationException { + compositeActivator.stop(compositeContext, domainComposite); + compositeActivator.deactivate(domainComposite); + } + + 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 + */ + protected String getCompositeURI(Composite c, InstalledContribution ic) { + for (Artifact a : ic.getContribution().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"); + } +} diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/impl/InstalledContribution.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/impl/InstalledContribution.java new file mode 100644 index 0000000000..4a8e600c76 --- /dev/null +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/impl/InstalledContribution.java @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.runtime.impl; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.contribution.Contribution; + +public class InstalledContribution { + + private String uri; + private String url; + private Contribution contribution; + private List defaultDeployables = new ArrayList(); + private List deployedComposites = new ArrayList(); + private List dependentContributionURIs; + + public InstalledContribution(String uri, String url, Contribution contribution, List dependentContributionURIs) { + this.uri = uri; + this.url = url; + this.contribution = contribution; + this.defaultDeployables = new ArrayList(contribution.getDeployables()); + this.dependentContributionURIs = dependentContributionURIs; + } + public Contribution getContribution() { + return contribution; + } + public void setContribution(Contribution contribution) { + this.contribution = contribution; + } + public String getURI() { + return uri; + } + public String getURL() { + return url; + } + public List getDefaultDeployables() { + return defaultDeployables; + } + public List getDeployedComposites() { + return deployedComposites; + } + public List getDependentContributionURIs() { + return dependentContributionURIs; + } +} diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/impl/NodeImpl.java new file mode 100644 index 0000000000..2721bf4496 --- /dev/null +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/runtime/impl/NodeImpl.java @@ -0,0 +1,377 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.runtime.impl; + +import java.io.File; +import java.io.Reader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.Endpoint; +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.ContributionMetadata; +import org.apache.tuscany.sca.contribution.processor.ContributionReadException; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.deployment.Deployer; +import org.apache.tuscany.sca.monitor.Monitor; +import org.apache.tuscany.sca.monitor.ValidationException; +import org.apache.tuscany.sca.runtime.ActivationException; +import org.apache.tuscany.sca.runtime.CompositeActivator; +import org.apache.tuscany.sca.runtime.EndpointRegistry; +import org.apache.tuscany.sca.runtime.Node; +import org.apache.tuscany.sca.runtime.NodeFactory; +import org.apache.tuscany.sca.runtime.RuntimeComponent; +import org.oasisopen.sca.NoSuchServiceException; + +public class NodeImpl implements Node { + + private String domainName; + private Deployer deployer; + private Map installedContributions = new HashMap(); + private CompositeActivator compositeActivator; + private EndpointRegistry endpointRegistry; + private ExtensionPointRegistry extensionPointRegistry; + private NodeFactory nodeFactory; + + private static Map allNodes = new HashMap(); + + public NodeImpl(String domainName, Deployer deployer, CompositeActivator compositeActivator, EndpointRegistry endpointRegistry, ExtensionPointRegistry extensionPointRegistry, NodeFactory nodeFactory) { + this.domainName = domainName; + this.deployer = deployer; + this.compositeActivator = compositeActivator; + this.endpointRegistry = endpointRegistry; + this.extensionPointRegistry = extensionPointRegistry; + this.nodeFactory = nodeFactory; + allNodes.put(domainName, this); + } + + public String installContribution(String contributionURL) throws ContributionReadException, ActivationException, ValidationException { + return installContribution(null, contributionURL, null, null, true); + } + + public String installContribution(String uri, String contributionURL, String metaDataURL, List dependentContributionURIs, boolean startDeployables) throws ContributionReadException, ActivationException, ValidationException { + if (uri == null) { + uri = getDefaultContributionURI(contributionURL); + } + Monitor monitor = deployer.createMonitor(); + Contribution contribution = deployer.loadContribution(IOHelper.createURI(uri), IOHelper.getLocationAsURL(contributionURL), monitor); + monitor.analyzeProblems(); + if (metaDataURL != null) { + mergeContributionMetaData(metaDataURL, contribution); + } + installContribution(contribution, dependentContributionURIs, startDeployables); + return uri; + } + + private void mergeContributionMetaData(String metaDataURL, Contribution contribution) throws ValidationException { + ContributionMetadata metaData; + Monitor monitor = deployer.createMonitor(); + try { + metaData = deployer.loadXMLDocument(IOHelper.getLocationAsURL(metaDataURL), monitor); + } catch (Exception e) { + throw new ValidationException(e); + } + monitor.analyzeProblems(); + contribution.getDeployables().addAll(metaData.getDeployables()); + contribution.getImports().addAll(metaData.getImports()); + contribution.getExports().addAll(metaData.getExports()); + } + + public String installContribution(Contribution contribution, List dependentContributionURIs, boolean startDeployables) throws ContributionReadException, ActivationException, ValidationException { + InstalledContribution ic = new InstalledContribution(contribution.getURI(), contribution.getLocation(), contribution, dependentContributionURIs); + installedContributions.put(contribution.getURI(), ic); + if (startDeployables) { + for (Composite c : ic.getDefaultDeployables()) { + startComposite(c, ic); + } + } else { + contribution.getDeployables().clear(); + + List dependentContributions = calculateDependentContributions(ic); + + Monitor monitor = deployer.createMonitor(); + try { + deployer.resolve(contribution, dependentContributions, monitor); + } catch (Exception e) { + throw new RuntimeException(e); + } + monitor.analyzeProblems(); + } + return ic.getURI(); + } + + protected List calculateDependentContributions(InstalledContribution ic) { + List dependentContributions = new ArrayList(); + if (ic.getDependentContributionURIs() != null) { + // if the install specified dependent uris use just those contributions + for (String uri : ic.getDependentContributionURIs()) { + InstalledContribution dependee = installedContributions.get(uri); + if (dependee != null) { + dependentContributions.add(dependee.getContribution()); + } + } + } else { + // otherwise use all available contributions for dependents + for (InstalledContribution ics : installedContributions.values()) { + dependentContributions.add(ics.getContribution()); + } + } + return dependentContributions; + } + + public String start(String contributionURI, Reader compositeXML) throws ContributionReadException, XMLStreamException, ActivationException, ValidationException { + Monitor monitor = deployer.createMonitor(); + Composite composite = deployer.loadXMLDocument(compositeXML, monitor); + monitor.analyzeProblems(); + return start(contributionURI, composite); + } + + public String start(String contributionURI, Composite composite) throws ActivationException, ValidationException { + InstalledContribution ic = installedContributions.get(contributionURI); + if (ic == null) { + throw new IllegalArgumentException("contribution not installed: " + contributionURI); + } + String compositeArtifcatURI = deployer.attachDeploymentComposite(ic.getContribution(), composite, true); + startComposite(composite, ic); + return compositeArtifcatURI; + } + + public void start(String contributionURI, String compositeURI) throws ActivationException, ValidationException { + InstalledContribution ic = installedContributions.get(contributionURI); + if (ic == null) { + throw new IllegalArgumentException("Contribution not installed: " + contributionURI); + } + for (Artifact a : ic.getContribution().getArtifacts()) { + if (a.getURI().equals(compositeURI)) { + startComposite((Composite) a.getModel(), ic); + return; + } + } + throw new IllegalArgumentException("composite not found: " + compositeURI); + } + + @Override + public void stop(String contributionURI, String compositeURI) throws ActivationException { + InstalledContribution ic = installedContributions.get(contributionURI); + if (ic == null) { + throw new IllegalArgumentException("Contribution not installed: " + contributionURI); + } + for (DeployedComposite dc : ic.getDeployedComposites()) { + if (compositeURI.equals(dc.getURI())) { + ic.getDeployedComposites().remove(dc); + dc.unDeploy(); + return; + } + } + throw new IllegalStateException("composite not deployed: " + compositeURI); + } + + public Composite getDomainLevelComposite() { + // TODO Auto-generated method stub + return null; + } + + public String getDomainLevelCompositeAsString() { + // TODO Auto-generated method stub + return null; + } + + public Object getQNameDefinition(String contributionURI, QName definition, QName symbolSpace) { + // TODO Auto-generated method stub + return null; + } + + public List removeContribution(String contributionURI) throws ActivationException { + List removedContributionURIs = new ArrayList(); + InstalledContribution ic = installedContributions.get(contributionURI); + if (ic != null) { + removedContributionURIs.add(ic.getURI()); + for (String dependent : getDependentContributions(contributionURI)) { + removedContributionURIs.addAll(removeContribution(dependent)); + } + installedContributions.remove(contributionURI); + for (DeployedComposite dc : ic.getDeployedComposites()) { + dc.unDeploy(); + } + ic.getDeployedComposites().clear(); + } + return removedContributionURIs; + } + + public void updateContribution(String uri, String contributionURL) { + // TODO Auto-generated method stub + // is this just removeContribution/installContribution? + } + public void updateContribution(Contribution contribution) { + // TODO Auto-generated method stub + } + + public String updateDeploymentComposite(String uri, Reader compositeXML) { + // TODO Auto-generated method stub + // is this removeFromDomainLevelComposite/addDeploymentComposite + return null; + } + public String updateDeploymentComposite(String uri, Composite composite) { + // TODO Auto-generated method stub + return null; + } + + public void stop() { + ArrayList ics = new ArrayList(installedContributions.keySet()); + for (String uri : ics) { + try { + removeContribution(uri); + } catch (Exception e) { + // TODO: log + e.printStackTrace(); + } + } + if (nodeFactory != null) { + nodeFactory.stop(); + } + allNodes.remove(this.domainName); + } + + public T getService(Class interfaze, String serviceURI) throws NoSuchServiceException { + + List endpoints = endpointRegistry.findEndpoint(serviceURI); + if (endpoints.size() < 1) { + throw new NoSuchServiceException(serviceURI); + } + + String serviceName = null; + if (serviceURI.contains("/")) { + int i = serviceURI.indexOf("/"); + if (i < serviceURI.length()-1) { + serviceName = serviceURI.substring(i+1); + } + } + + return ((RuntimeComponent)endpoints.get(0).getComponent()).getServiceReference(interfaze, serviceName).getService(); + } + + public String getDomainName() { + return domainName; + } + + public List getStartedCompositeURIs(String contributionURI) { + ArrayList compositeURIs = new ArrayList(); + InstalledContribution ic = installedContributions.get(contributionURI); + if (ic == null) { + throw new IllegalArgumentException("no contribution found for: " + contributionURI); + } + for (DeployedComposite dc : ic.getDeployedComposites()) { + compositeURIs.add(dc.getURI()); + } + return compositeURIs; + } + + public List getInstalledContributionURIs() { + return new ArrayList(installedContributions.keySet()); + } + + public Contribution getInstalledContribution(String uri) { + if (installedContributions.containsKey(uri)) { + return installedContributions.get(uri).getContribution(); + } + throw new IllegalArgumentException("no contribution found for: " + uri); + } + + protected String getContributionUriForArtifact(String artifactURI) { + String contributionURI = null; + for (String uri : installedContributions.keySet()) { + if (artifactURI.startsWith(uri)) { + contributionURI = uri; + break; + } + } + if (contributionURI == null) { + throw new IllegalArgumentException("no contribution found for: " + artifactURI); + } + return contributionURI; + } + + protected void startComposite(Composite c, InstalledContribution ic) throws ActivationException, ValidationException { + List dependentContributions = calculateDependentContributions(ic); + + DeployedComposite dc = new DeployedComposite(c, ic, dependentContributions, deployer, compositeActivator, endpointRegistry, extensionPointRegistry); + ic.getDeployedComposites().add(dc); + } + + public Set getDependentContributions(String contributionURI) { + InstalledContribution ic = installedContributions.get(contributionURI); + if (ic == null) { + throw new IllegalArgumentException("Contribution not installed: " + contributionURI); + } + Set dependentContributionURIs = new HashSet(); + for (InstalledContribution icx : installedContributions.values()) { + if (ic != icx) { + List dependencies = icx.getContribution().getDependencies(); + if (dependencies != null && dependencies.contains(ic.getContribution())) { + dependentContributionURIs.addAll(getDependentContributions(icx.getURI())); + } + } + } + return dependentContributionURIs; + } + + /** + * Returns a default URI for a contribution based on the contribution URL + */ + protected String getDefaultContributionURI(String contributionURL) { + String uri = null; + try { + File f = new File(contributionURL); + if ("classes".equals(f.getName()) && "target".equals(f.getParentFile().getName())) { + uri = f.getParentFile().getParentFile().getName(); + } else { + uri = f.getName(); + } + } catch (Exception e) { + // ignore + } + if (uri == null) { + uri = contributionURL; + } + if (uri.endsWith(".zip") || uri.endsWith(".jar")) { + uri = uri.substring(0, uri.length()-4); + } + return uri; + } + + public EndpointRegistry getEndpointRegistry() { + return endpointRegistry; + } + + public static Node nodeExists(String domainName) { + return allNodes.get(domainName); + } + +} -- cgit v1.2.3