diff options
Diffstat (limited to 'sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src')
24 files changed, 0 insertions, 2308 deletions
diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java deleted file mode 100644 index efe4c2d27b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/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; - -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<String> 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<String> 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<String> 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 <composite> definition that has an <include> 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> T getService(Class<T> 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<String> getStartedCompositeURIs(String contributionURI); - - /** - * Get the URIs of all the contributions installed on this Node - * @return the list of installed contribution URIs - */ - List<String> 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 (<export/> 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/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java deleted file mode 100644 index 97e82809f5..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java +++ /dev/null @@ -1,240 +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; - -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.impl.NodeImpl; -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.work.WorkScheduler; -import org.oasisopen.sca.ServiceRuntimeException; - -public class TuscanyRuntime { - - private Deployer deployer; - private ExtensionPointRegistry extensionPointRegistry; - private CompositeActivator compositeActivator; - private ExtensibleDomainRegistryFactory domainRegistryFactory; - private RuntimeAssemblyFactory assemblyFactory; - - public static TuscanyRuntime newInstance() { - return new TuscanyRuntime(null); - } - public static TuscanyRuntime newInstance(Properties config) { - return new TuscanyRuntime(config); - } - - /** - * A helper method to run a standalone SCA composite - * @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 runComposite(String compositeURI, String contributionURL, String... dependentContributionURLs) { - return runComposite(null, compositeURI, contributionURL, dependentContributionURLs); - } - - /** - * A helper method to run a standalone SCA composite - * @param runtime a TuscanyRuntime instance which will be used to run the composite - * this allows sharing a runtime instance to run multiple composites - * @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 runComposite(TuscanyRuntime runtime, String compositeURI, String contributionURL, String... dependentContributionURLs) { - try { - boolean sharedRuntime = runtime != null; - if (runtime == null) { - runtime = newInstance(); - } - EndpointRegistry endpointRegistry = new EndpointRegistryImpl(runtime.extensionPointRegistry, null, null); - NodeImpl node = new NodeImpl("default", runtime.deployer, runtime.compositeActivator, endpointRegistry, runtime.extensionPointRegistry, sharedRuntime? null : runtime); - - 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 TuscanyRuntime(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() { - 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 ExtensionPointRegistry used by this runtime - * @return extensionPointRegistry - */ - public ExtensionPointRegistry getExtensionPointRegistry() { - return 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/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java deleted file mode 100644 index 8a30cf2f71..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java +++ /dev/null @@ -1,179 +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.domain.node; - -import java.net.URI; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.configuration.NodeConfiguration; -import org.apache.tuscany.sca.node.impl.NodeImpl; -import org.apache.tuscany.sca.runtime.DomainRegistryFactory; -import org.apache.tuscany.sca.runtime.EndpointRegistry; -import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; -import org.oasisopen.sca.client.SCAClientFactory; - -public class DomainNode { - - private static final String DEFAULT_DOMAIN_SCHEME = "vm"; - private static final String DEFAULT_DOMAIN_NAME = "defaultDomain"; - private static final String DEFAULT_CONFIG_URI = DEFAULT_DOMAIN_SCHEME + "://" + DEFAULT_DOMAIN_NAME; - - private String domainName; - private String domainRegistryURI; - - private Map<String, Node> nodes = new HashMap<String, Node>(); - - public DomainNode() { - this(DEFAULT_CONFIG_URI, new String[]{}); - } - - public DomainNode(String... contributionLocations) { - this(DEFAULT_CONFIG_URI, contributionLocations); - } - - public DomainNode(String configURI, String[] contributionLocations) { - this.domainRegistryURI = configURI; - initDomainName(configURI); - if (contributionLocations == null || contributionLocations.length == 0) { - addContribution(null, "_null"); - } else { - for (String loc : contributionLocations) { - addContribution(loc); - } - } - } - - public void stop() { - for (Node node : nodes.values()) { - node.stop(); - } - } - - public String addContribution(String location) { - String uri = location; - addContribution(uri, location); - return uri; - } - - public void addContribution(String location, String uri) { - if (nodes.containsKey(uri)) { - throw new IllegalArgumentException("contribution already added: " + uri); - } - NodeConfiguration configuration = NodeFactory.getInstance().createNodeConfiguration(); - if (location != null) { - configuration.addContribution(uri, location); - } - configuration.setDomainRegistryURI(domainRegistryURI); - configuration.setDomainURI(domainName); - configuration.setURI(uri); //??? - Node node = NodeFactory.getInstance().createNode(configuration).start(); - nodes.put(uri, node); - } - - public void removeContribution(String uri) { - if (!nodes.containsKey(uri)) { - throw new IllegalArgumentException("contribution not found: " + uri); - } - Node node = nodes.remove(uri); - node.stop(); - } - - public String getDomainName() { - return domainName; - } - - public String getDomainConfigURI() { - return domainRegistryURI; - } - - public List<String> getServiceNames() { - List<String> serviceNames = new ArrayList<String>(); - if (nodes.size() > 0) { - ExtensionPointRegistry extensionsRegistry = ((NodeImpl)nodes.values().iterator().next()).getExtensionPointRegistry(); - DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionsRegistry); - EndpointRegistry endpointRegistry = domainRegistryFactory.getEndpointRegistry(getDomainConfigURI(), getDomainName()); - for (Endpoint endpoint : endpointRegistry.getEndpoints()) { - // Would be nice if Endpoint.getURI() returned this: - String name = endpoint.getComponent().getName() + "/" + endpoint.getService().getName(); - if (endpoint.getBinding() != null) { - // TODO: shouldn't the binding name be null if its not explicitly specified? - // For now don't include it if the same as the default - if (!endpoint.getService().getName().equals(endpoint.getBinding().getName())) { - name += "/" + endpoint.getBinding().getName(); - } - } - serviceNames.add(name); - } - } - return serviceNames; - } - - public <T> T getService(Class<T> interfaze, String uri) throws NoSuchServiceException { - try { - return SCAClientFactory.newInstance(URI.create(getDomainName())).getService(interfaze, uri); - } catch (NoSuchDomainException e) { - throw new IllegalStateException(e); - } - } - - protected void initDomainName(String configURI) { -// URI uri = URI.create(fixScheme(configURI)); -// String dn = uri.getHost(); -// if (dn == null || dn.length() < 1) { -// dn = DEFAULT_DOMAIN_NAME; -// } - if (configURI.startsWith("tuscany:vm:")) { - domainName = configURI.substring("tuscany:vm:".length()); - } else if (configURI.startsWith("tuscany:")) { - int i = configURI.indexOf('?'); - if (i == -1) { - domainName = configURI.substring("tuscany:".length()); - } else{ - domainName = configURI.substring("tuscany:".length(), i); - } - } else { - domainName = configURI; - } - } - - /** - * I keep typing the scheme part with just a colon instead of colon slash slash - * which URI doesn't parse properly which irritates me so fix it up here - */ - protected String fixScheme(String uri) { - int i = uri.indexOf(":"); - if (i > -1 && uri.charAt(i+1) != '/') { - uri = uri.replaceFirst(":", ":/"); - } - if (i > -1 && uri.charAt(i+2) != '/') { - uri = uri.replaceFirst(":/", "://"); - } - return uri; - } -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java deleted file mode 100644 index 0d9f4172f2..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java +++ /dev/null @@ -1,67 +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.domain.node; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -public class DomainNodeMain { - - /** - * Start an SCA domain node - * @param args a list of contribution jars for the node to run - */ - public static void main(String[] args) throws Exception { - - String configURI = "uri:default"; - - List<String> contributions = new ArrayList<String>(); - for (int i = 0; i < args.length; i++) { - if (args[i].startsWith("vm:") || args[i].startsWith("tribes:") || args[i].startsWith("tuscany:") || args[i].startsWith("uri:") || args[i].startsWith("properties:")) { - configURI = args[i]; - } else{ - File f = new File(args[i]); - if (!f.exists()) { - System.err.println("contribution not found: " + f); - System.exit(1); - } - contributions.add(f.toURI().toString()); - } - } - - Node node = NodeFactory.newInstance(configURI).createNode((String)null, contributions.toArray(new String[contributions.size()])); - node.start(); - - System.out.println("Hit enter to stop node..."); - if (System.in.read() == -1) { - // no sysin so wait for ever letting caller do the terminate - Object lock = new Object(); - synchronized (lock) { - lock.wait(); - } - } - - node.stop(); - } -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java deleted file mode 100644 index 6788f29ca5..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/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.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<Contribution> 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<Contribution> 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> contribution = new ArrayList<Contribution>(); - 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<QName, List<String>>(), 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/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/InstalledContribution.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/InstalledContribution.java deleted file mode 100644 index 5137605067..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/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.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<Composite> defaultDeployables = new ArrayList<Composite>(); - private List<DeployedComposite> deployedComposites = new ArrayList<DeployedComposite>(); - private List<String> dependentContributionURIs; - - public InstalledContribution(String uri, String url, Contribution contribution, List<String> dependentContributionURIs) { - this.uri = uri; - this.url = url; - this.contribution = contribution; - this.defaultDeployables = new ArrayList<Composite>(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<Composite> getDefaultDeployables() { - return defaultDeployables; - } - public List<DeployedComposite> getDeployedComposites() { - return deployedComposites; - } - public List<String> getDependentContributionURIs() { - return dependentContributionURIs; - } -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java deleted file mode 100644 index c3b6739ca8..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java +++ /dev/null @@ -1,504 +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.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.Node; -import org.apache.tuscany.sca.TuscanyRuntime; -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.ComponentReference; -import org.apache.tuscany.sca.assembly.ComponentService; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.EndpointReference; -import org.apache.tuscany.sca.assembly.Multiplicity; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.common.java.io.IOHelper; -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.ContributionMetadata; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory; -import org.apache.tuscany.sca.core.invocation.ProxyFactory; -import org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint; -import org.apache.tuscany.sca.deployment.Deployer; -import org.apache.tuscany.sca.interfacedef.Interface; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; -import org.apache.tuscany.sca.interfacedef.java.JavaInterface; -import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; -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.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; -import org.oasisopen.sca.NoSuchServiceException; -import org.oasisopen.sca.ServiceRuntimeException; - -public class NodeImpl implements Node { - - private String domainName; - private Deployer deployer; - private Map<String, InstalledContribution> installedContributions = new HashMap<String, InstalledContribution>(); - private CompositeActivator compositeActivator; - private EndpointRegistry endpointRegistry; - private ExtensionPointRegistry extensionPointRegistry; - private TuscanyRuntime tuscanyRuntime; - - private static Map<String, Node> allNodes = new HashMap<String, Node>(); - - public NodeImpl(String domainName, Deployer deployer, CompositeActivator compositeActivator, EndpointRegistry endpointRegistry, ExtensionPointRegistry extensionPointRegistry, TuscanyRuntime tuscanyRuntime) { - this.domainName = domainName; - this.deployer = deployer; - this.compositeActivator = compositeActivator; - this.endpointRegistry = endpointRegistry; - this.extensionPointRegistry = extensionPointRegistry; - this.tuscanyRuntime = tuscanyRuntime; - 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<String> 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<String> 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<Contribution> 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<Contribution> calculateDependentContributions(InstalledContribution ic) { - List<Contribution> dependentContributions = new ArrayList<Contribution>(); - 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<String> removeContribution(String contributionURI) throws ActivationException { - List<String> removedContributionURIs = new ArrayList<String>(); - 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<String> ics = new ArrayList<String>(installedContributions.keySet()); - for (String uri : ics) { - try { - removeContribution(uri); - } catch (Exception e) { - // TODO: log - e.printStackTrace(); - } - } - if (tuscanyRuntime != null) { - tuscanyRuntime.stop(); - } - allNodes.remove(this.domainName); - } - - public <T> T getService(Class<T> interfaze, String serviceURI) throws NoSuchServiceException { - - List<Endpoint> 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); - } - } - - Endpoint ep = endpoints.get(0); - if (((RuntimeComponent)ep.getComponent()).getComponentContext() != null) { - return ((RuntimeComponent)ep.getComponent()).getServiceReference(interfaze, serviceName).getService(); - } else { - return getRemoteProxy(interfaze, ep); - } - } - - private <T> T getRemoteProxy(Class<T> serviceInterface, Endpoint endpoint) throws NoSuchServiceException { - FactoryExtensionPoint factories = extensionPointRegistry.getExtensionPoint(FactoryExtensionPoint.class); - AssemblyFactory assemblyFactory = factories.getFactory(AssemblyFactory.class); - JavaInterfaceFactory javaInterfaceFactory = factories.getFactory(JavaInterfaceFactory.class); - ProxyFactory proxyFactory = - new ExtensibleProxyFactory(extensionPointRegistry.getExtensionPoint(ProxyFactoryExtensionPoint.class)); - - CompositeContext compositeContext = - new CompositeContext(extensionPointRegistry, endpointRegistry, null, null, null, - deployer.getSystemDefinitions()); - - RuntimeEndpointReference epr; - try { - epr = - createEndpointReference(javaInterfaceFactory, - compositeContext, - assemblyFactory, - endpoint, - serviceInterface); - } catch (Exception e) { - throw new ServiceRuntimeException(e); - } - - return proxyFactory.createProxy(serviceInterface, epr); - } - - private RuntimeEndpointReference createEndpointReference(JavaInterfaceFactory javaInterfaceFactory, - CompositeContext compositeContext, - AssemblyFactory assemblyFactory, - Endpoint endpoint, - Class<?> businessInterface) - throws CloneNotSupportedException, InvalidInterfaceException { - Component component = endpoint.getComponent(); - ComponentService service = endpoint.getService(); - ComponentReference componentReference = assemblyFactory.createComponentReference(); - componentReference.setName("sca.client." + service.getName()); - - componentReference.setCallback(service.getCallback()); - componentReference.getTargets().add(service); - componentReference.getPolicySets().addAll(service.getPolicySets()); - componentReference.getRequiredIntents().addAll(service.getRequiredIntents()); - componentReference.getBindings().add(endpoint.getBinding()); - - InterfaceContract interfaceContract = service.getInterfaceContract(); - Service componentTypeService = service.getService(); - if (componentTypeService != null && componentTypeService.getInterfaceContract() != null) { - interfaceContract = componentTypeService.getInterfaceContract(); - } - interfaceContract = getInterfaceContract(javaInterfaceFactory, interfaceContract, businessInterface); - componentReference.setInterfaceContract(interfaceContract); - componentReference.setMultiplicity(Multiplicity.ONE_ONE); - // component.getReferences().add(componentReference); - - // create endpoint reference - EndpointReference endpointReference = assemblyFactory.createEndpointReference(); - endpointReference.setComponent(component); - endpointReference.setReference(componentReference); - endpointReference.setBinding(endpoint.getBinding()); - endpointReference.setUnresolved(false); - endpointReference.setStatus(EndpointReference.Status.WIRED_TARGET_FOUND_AND_MATCHED); - - endpointReference.setTargetEndpoint(endpoint); - - componentReference.getEndpointReferences().add(endpointReference); - ((RuntimeComponentReference)componentReference).setComponent((RuntimeComponent)component); - ((RuntimeEndpointReference)endpointReference).bind(compositeContext); - - return (RuntimeEndpointReference)endpointReference; - } - - private InterfaceContract getInterfaceContract(JavaInterfaceFactory javaInterfaceFactory, - InterfaceContract interfaceContract, - Class<?> businessInterface) throws CloneNotSupportedException, - InvalidInterfaceException { - if (businessInterface == null) { - return interfaceContract; - } - boolean compatible = false; - if (interfaceContract != null && interfaceContract.getInterface() != null) { - Interface interfaze = interfaceContract.getInterface(); - if (interfaze instanceof JavaInterface) { - Class<?> cls = ((JavaInterface)interfaze).getJavaClass(); - if (cls != null && businessInterface.isAssignableFrom(cls)) { - compatible = true; - } - } - } - - if (!compatible) { - // The interface is not assignable from the interface contract - interfaceContract = javaInterfaceFactory.createJavaInterfaceContract(); - JavaInterface callInterface = javaInterfaceFactory.createJavaInterface(businessInterface); - interfaceContract.setInterface(callInterface); - if (callInterface.getCallbackClass() != null) { - interfaceContract.setCallbackInterface(javaInterfaceFactory.createJavaInterface(callInterface - .getCallbackClass())); - } - } - - return interfaceContract; - } - - public String getDomainName() { - return domainName; - } - - public List<String> getStartedCompositeURIs(String contributionURI) { - ArrayList<String> compositeURIs = new ArrayList<String>(); - 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<String> getInstalledContributionURIs() { - return new ArrayList<String>(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<Contribution> dependentContributions = calculateDependentContributions(ic); - - DeployedComposite dc = new DeployedComposite(c, ic, dependentContributions, deployer, compositeActivator, endpointRegistry, extensionPointRegistry); - ic.getDeployedComposites().add(dc); - } - - public Set<String> getDependentContributions(String contributionURI) { - InstalledContribution ic = installedContributions.get(contributionURI); - if (ic == null) { - throw new IllegalArgumentException("Contribution not installed: " + contributionURI); - } - Set<String> dependentContributionURIs = new HashSet<String>(); - for (InstalledContribution icx : installedContributions.values()) { - if (ic != icx) { - List<Contribution> 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); - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/itest/nodes/Helloworld.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/itest/nodes/Helloworld.java deleted file mode 100644 index 76f8d4400d..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/itest/nodes/Helloworld.java +++ /dev/null @@ -1,29 +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 itest.nodes; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Helloworld { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java deleted file mode 100644 index 0a5d99ae7c..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java +++ /dev/null @@ -1,84 +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.domain.node; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import itest.nodes.Helloworld; - -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; -import org.oasisopen.sca.ServiceRuntimeException; - -/** - * This shows how to test the Calculator service component. - */ -@Ignore("TUSCANY-3391") -public class GetServiceTestCase{ - - private static DomainNode clientNode; - private static DomainNode serviceNode; - - @Test - public void testTwoNodesSameDomain() throws Exception { - serviceNode = new DomainNode("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - clientNode = new DomainNode("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); - - Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @Test - public void testTwoNodesDifferentDomains() throws Exception { - serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"}); - Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - clientNode = new DomainNode("vm://barDomain", new String[] {"target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"}); - Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - - try { - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - fail(); - } catch (ServiceRuntimeException e) { - // FIXME: this gives an SCARuntimeException, would be better to be something like ServiceNotFoundException? - // expected - } - } - - @After - public void tearDownAfterClass() throws Exception { - if (clientNode != null) { - clientNode.stop(); - } - if (serviceNode != null) { - serviceNode.stop(); - } - } -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java deleted file mode 100644 index 617876586b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java +++ /dev/null @@ -1,87 +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.domain.node; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import itest.nodes.Helloworld; - -import java.net.URI; - -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; -import org.oasisopen.sca.ServiceRuntimeException; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * This shows how to test the Calculator service component. - */ -@Ignore("TUSCANY-3391") -public class MultipleNodesPerJVMTestCase{ - - private static DomainNode clientNode; - private static DomainNode serviceNode; - - @Test - public void testTwoNodesSameDomain() throws Exception { - serviceNode = new DomainNode("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - clientNode = new DomainNode("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); - - Helloworld service = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @Test - public void testTwoNodesDifferentDomains() throws Exception { - serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"}); - Helloworld service = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - clientNode = new DomainNode("vm://barDomain", new String[]{"target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"}); - Helloworld client = SCAClientFactory.newInstance(URI.create("vm://barDomain")).getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - - try { - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - fail(); - } catch (ServiceRuntimeException e) { - // FIXME: this gives an SCARuntimeException, would be better to be something like ServiceNotFoundException? - // expected - } - } - - @After - public void tearDownAfterClass() throws Exception { - if (clientNode != null) { - clientNode.stop(); - } - if (serviceNode != null) { - serviceNode.stop(); - } - } -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java deleted file mode 100644 index 10803cd880..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java +++ /dev/null @@ -1,105 +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.domain.node; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import itest.nodes.Helloworld; - -import java.net.URI; - -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * This shows how to test the Calculator service component. - */ -@Ignore("TUSCANY-3391") -public class OneNodeTestCase{ - - private static DomainNode domain; - private static String serviceContributionUri; - - @Before - public void setUpBeforeClass() throws Exception { - domain = new DomainNode(); - serviceContributionUri = domain.addContribution("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - domain.addContribution("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); - } - - @Test - public void testService() throws Exception { - Helloworld service = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - } - - @Test - public void testClient() throws Exception { - Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @Test - public void testRemovingServiceContribution() throws Exception { - domain.removeContribution(serviceContributionUri); - try { - SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService"); - // FIXME: should this be NoSuchServiceException or ServiceNotFoundException? - } catch (NoSuchServiceException e) { - // expected - } - - Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - try { - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - fail(); - } catch (Exception e) { - // FIXME: this gives an NPE, would be better to be something like ServiceNotFoundException - // expected - } - } - - @Test - public void testStoppingDomainNode() throws Exception { - domain.stop(); - try { - SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient"); - fail(); - } catch (NoSuchDomainException e) { - // expected - } - } - - @After - public void tearDownAfterClass() throws Exception { - if (domain != null) { - domain.stop(); - } - } -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java deleted file mode 100644 index 4a29822069..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java +++ /dev/null @@ -1,82 +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.domain.node; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import itest.nodes.Helloworld; - -import java.net.URI; - -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * This shows how to test the Calculator service component. - */ -@Ignore("TUSCANY-3391") -public class StopStartNodesTestCase{ - - private static DomainNode clientNode; - private static DomainNode serviceNode; - - @Test - public void testTwoNodesSameDomain() throws Exception { - serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"}); - clientNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"}); - - Helloworld service = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - - serviceNode.stop(); - - client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - try { - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - fail(); - } catch (Exception e) { - // expected - } - - serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"}); - client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @After - public void tearDownAfterClass() throws Exception { - if (clientNode != null) { - clientNode.stop(); - } - if (serviceNode != null) { - serviceNode.stop(); - } - } -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/DeployerTestCase.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/DeployerTestCase.java deleted file mode 100644 index 12204883f8..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/DeployerTestCase.java +++ /dev/null @@ -1,78 +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.runtime; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URI; -import java.util.List; - -import javax.xml.stream.XMLStreamException; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.Node; -import org.apache.tuscany.sca.TuscanyRuntime; -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.deployment.Deployer; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.ValidationException; -import org.junit.Test; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; - -public class DeployerTestCase { - - @Test - public void testInstalledContribution() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException, MalformedURLException { - TuscanyRuntime tuscanyRuntime = TuscanyRuntime.newInstance(); - Node node = tuscanyRuntime.createNode("myDomain"); - - Deployer deployer = tuscanyRuntime.getDeployer(); - Monitor monitor = deployer.createMonitor(); - Contribution contribution = deployer.loadContribution(URI.create("foo"), new File("src/test/resources/sample-helloworld-nodeployable.jar").toURI().toURL(), monitor); - monitor.analyzeProblems(); - - node.installContribution(contribution, null, true); - List<String> ics = node.getInstalledContributionURIs(); - Assert.assertEquals(1, ics.size()); - Assert.assertEquals("foo", ics.get(0)); - } - - @Test - public void testAddDeploymentComposite() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException, MalformedURLException, XMLStreamException { - TuscanyRuntime tuscanyRuntime = TuscanyRuntime.newInstance(); - Node node = tuscanyRuntime.createNode("myDomain"); - - node.installContribution("foo", "src/test/resources/sample-helloworld-nodeployable.jar", null, null, true); - - Deployer deployer = tuscanyRuntime.getDeployer(); - Monitor monitor = deployer.createMonitor(); - Composite composite = deployer.loadXMLDocument(new File("src/test/resources/helloworld2.composite").toURI().toURL(), monitor); - monitor.analyzeProblems(); - composite.setURI("helloworld2.composite"); - node.start("foo", composite); - List<String> dcs = node.getStartedCompositeURIs("foo"); - Assert.assertEquals(1, dcs.size()); - Assert.assertEquals("helloworld2.composite", dcs.get(0)); - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/NodeXMLTestCase.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/NodeXMLTestCase.java deleted file mode 100644 index d245ea2ec6..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/NodeXMLTestCase.java +++ /dev/null @@ -1,45 +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.runtime; - -import java.util.List; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.Node; -import org.apache.tuscany.sca.TuscanyRuntime; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.monitor.ValidationException; -import org.junit.Test; - -public class NodeXMLTestCase { - - @Test - public void testHelloworldXML() throws ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNodeFromXML("src/test/resources/helloworldNode.xml"); - Assert.assertEquals("helloworld", node.getDomainName()); - List<String> cs = node.getInstalledContributionURIs(); - Assert.assertEquals(1, cs.size()); - Assert.assertEquals("sample-helloworld", cs.get(0)); - List<String> compsoites = node.getStartedCompositeURIs("sample-helloworld"); - Assert.assertEquals(1, compsoites.size()); - Assert.assertEquals("helloworld.composite", compsoites.get(0)); - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/TuscanyRuntimeTestCase.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/TuscanyRuntimeTestCase.java deleted file mode 100644 index d588f91d6a..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/TuscanyRuntimeTestCase.java +++ /dev/null @@ -1,188 +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.runtime; - -import java.net.MalformedURLException; -import java.util.List; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.Node; -import org.apache.tuscany.sca.TuscanyRuntime; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.impl.NodeImpl; -import org.apache.tuscany.sca.monitor.ValidationException; -import org.junit.Ignore; -import org.junit.Test; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; - -import sample.Helloworld; - -public class TuscanyRuntimeTestCase { - - @Test - public void testInstallDeployable() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("default"); - node.installContribution("helloworld", "src/test/resources/sample-helloworld.jar", null, null, true); - - Helloworld helloworldService = node.getService(Helloworld.class, "HelloworldComponent"); - Assert.assertEquals("Hello petra", helloworldService.sayHello("petra")); - } - - @Test - public void testStopStart() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("default"); - node.installContribution("helloworld", "src/test/resources/sample-helloworld.jar", null, null, true); - String ci = node.getStartedCompositeURIs("helloworld").get(0); - - Helloworld helloworldService = node.getService(Helloworld.class, "HelloworldComponent"); - Assert.assertEquals("Hello petra", helloworldService.sayHello("petra")); - - node.stop("helloworld", ci); - try { - node.getService(Helloworld.class, "HelloworldComponent"); - Assert.fail(); - } catch (NoSuchServiceException e) { - // expected as there is no deployables - } - - node.start("helloworld", ci); - helloworldService = node.getService(Helloworld.class, "HelloworldComponent"); - Assert.assertEquals("Hello petra", helloworldService.sayHello("petra")); - } - - @Test - @Ignore("Depdends on itest/T3558 which isn't in the build?") - public void testInstallWithDependent() throws NoSuchServiceException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("default"); - node.installContribution("store", "../../itest/T3558/src/test/resources/sample-store.jar", null, null, true); - node.installContribution("store-client", "../../itest/T3558/src/test/resources/sample-store-client.jar", null, null, true); - - Helloworld helloworldService = node.getService(Helloworld.class, "HelloworldComponent"); - Assert.assertEquals("Hello petra", helloworldService.sayHello("petra")); - } - - @Test - public void testInstallNoDeployable() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("default"); - node.installContribution("helloworld", "src/test/resources/sample-helloworld-nodeployable.jar", null, null, true); - - try { - node.getService(Helloworld.class, "HelloworldComponent"); - Assert.fail(); - } catch (NoSuchServiceException e) { - // expected as there is no deployables - } - - node.start("helloworld", "helloworld.composite"); - Helloworld helloworldService = node.getService(Helloworld.class, "HelloworldComponent"); - Assert.assertEquals("Hello petra", helloworldService.sayHello("petra")); - } - - @Test - public void testGetInstalledContributions() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("default"); - node.installContribution("foo", "src/test/resources/sample-helloworld-nodeployable.jar", null, null, true); - List<String> ics = node.getInstalledContributionURIs(); - Assert.assertEquals(1, ics.size()); - Assert.assertEquals("foo", ics.get(0)); - } - - @Test - public void testGetDeployedCompostes() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, MalformedURLException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("default"); - node.installContribution("foo", "src/test/resources/sample-helloworld.jar", null, null, true); - List<String> dcs = node.getStartedCompositeURIs("foo"); - Assert.assertEquals(1, dcs.size()); - Assert.assertEquals("helloworld.composite", dcs.get(0)); - } - - @Test - public void testRemoveComposte() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, MalformedURLException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("default"); - node.installContribution("foo", "src/test/resources/sample-helloworld.jar", null, null, true); - node.stop("foo", "helloworld.composite"); - List<String> dcs = node.getStartedCompositeURIs("foo"); - Assert.assertEquals(0, dcs.size()); - } - - @Test - public void testInstallWithMetaData() throws ContributionReadException, ActivationException, ValidationException, NoSuchServiceException { - Node node = TuscanyRuntime.newInstance().createNode("default"); - ((NodeImpl)node).installContribution("helloworld", "src/test/resources/sample-helloworld-nodeployable.jar", "src/test/resources/sca-contribution-generated.xml", null, true); - - List<String> dcs = node.getStartedCompositeURIs("helloworld"); - Assert.assertEquals(1, dcs.size()); - Assert.assertEquals("helloworld.composite", dcs.get(0)); - - Helloworld helloworldService = node.getService(Helloworld.class, "HelloworldComponent"); - Assert.assertEquals("Hello petra", helloworldService.sayHello("petra")); - } - - @Test - public void testURI() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("default"); - String uri = node.installContribution("src/test/resources/sample-helloworld.jar"); - Assert.assertEquals("sample-helloworld", uri); - } - - @Test - public void testStaticCreate() { - Node node = TuscanyRuntime.runComposite("helloworld.composite", "src/test/resources/sample-helloworld.jar"); - List<String> cs = node.getInstalledContributionURIs(); - Assert.assertEquals(1, cs.size()); - List<String> dcs = node.getStartedCompositeURIs(cs.get(0)); - Assert.assertEquals(1, dcs.size()); - Assert.assertEquals("helloworld.composite", dcs.get(0)); - } - - @Test - public void testStaticCreateWithNullComposite() { - Node node = TuscanyRuntime.runComposite(null, "src/test/resources/sample-helloworld.jar"); - List<String> cs = node.getInstalledContributionURIs(); - Assert.assertEquals(1, cs.size()); - List<String> dcs = node.getStartedCompositeURIs(cs.get(0)); - Assert.assertEquals(1, dcs.size()); - Assert.assertEquals("helloworld.composite", dcs.get(0)); - } - @Test - public void testRunComposite() throws NoSuchServiceException { - Node node = TuscanyRuntime.runComposite("helloworld.composite", "src/test/resources/sample-helloworld.jar"); - try { - Helloworld helloworldService = node.getService(Helloworld.class, "HelloworldComponent"); - Assert.assertEquals("Hello petra", helloworldService.sayHello("petra")); - } finally { - node.stop(); - } - } - - @Test - public void testRunCompositeSharedRuntime() throws NoSuchServiceException { - TuscanyRuntime runtime = TuscanyRuntime.newInstance(); - Node node = TuscanyRuntime.runComposite(runtime, "helloworld.composite", "src/test/resources/sample-helloworld.jar"); - try { - Helloworld helloworldService = node.getService(Helloworld.class, "HelloworldComponent"); - Assert.assertEquals("Hello petra", helloworldService.sayHello("petra")); - } finally { - node.stop(); - } - runtime.stop(); - } -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/TwoNodesTestCase.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/TwoNodesTestCase.java deleted file mode 100644 index 6205b26a8a..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/TwoNodesTestCase.java +++ /dev/null @@ -1,46 +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.runtime; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.Node; -import org.apache.tuscany.sca.TuscanyRuntime; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.monitor.ValidationException; -import org.junit.Test; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; - -import sample.Helloworld; - -public class TwoNodesTestCase { - - @Test - public void testInstallDeployable() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node1 = TuscanyRuntime.newInstance().createNode("uri:TwoNodesTestCase?multicast=off&bind=127.0.0.1:44331"); - node1.installContribution("helloworld", "src/test/resources/sample-helloworld.jar", null, null, true); - - Node node2 = TuscanyRuntime.newInstance().createNode("uri:TwoNodesTestCase?multicast=off&bind=127.0.0.1:44332&wka=127.0.0.1:44331"); - - Helloworld helloworldService = node2.getService(Helloworld.class, "HelloworldComponent"); - Assert.assertEquals("Hello petra", helloworldService.sayHello("petra")); - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/sample/Helloworld.java b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/sample/Helloworld.java deleted file mode 100644 index b67efbb485..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/java/sample/Helloworld.java +++ /dev/null @@ -1,27 +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 sample; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Helloworld { - String sayHello(String name); -} diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/helloworld2.composite b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/helloworld2.composite deleted file mode 100644 index 8c7a789380..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/helloworld2.composite +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://sample"
- name="helloworld2">
-
- <component name="Helloworld2Component">
- <implementation.java class="sample.HelloworldImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/helloworldNode.xml b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/helloworldNode.xml deleted file mode 100644 index ea2f577139..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/helloworldNode.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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. ---> -<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - domain="helloworld"> - - <contribution location="sample-helloworld.jar" startDeployables="true" /> - -</node>
\ No newline at end of file diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar Binary files differdeleted file mode 100644 index 7f6073ce7f..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar +++ /dev/null diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar Binary files differdeleted file mode 100644 index 2306ce4d1a..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar +++ /dev/null diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/sample-helloworld-nodeployable.jar b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/sample-helloworld-nodeployable.jar Binary files differdeleted file mode 100644 index 16dde03858..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/sample-helloworld-nodeployable.jar +++ /dev/null diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/sample-helloworld.jar b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/sample-helloworld.jar Binary files differdeleted file mode 100644 index 50e732d50b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/sample-helloworld.jar +++ /dev/null diff --git a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/sca-contribution-generated.xml b/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/sca-contribution-generated.xml deleted file mode 100644 index 8e20561dc3..0000000000 --- a/sca-java-2.x/tags/2.0-Beta2-RC2/modules/domain-node/src/test/resources/sca-contribution-generated.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:helloworld"/> -</contribution> |