diff options
Diffstat (limited to 'sca-java-2.x/branches/2.0-Beta3/modules/deployment')
15 files changed, 0 insertions, 2019 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/LICENSE b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. - - - diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/META-INF/MANIFEST.MF b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/META-INF/MANIFEST.MF deleted file mode 100644 index ff37b7e5a3..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/META-INF/MANIFEST.MF +++ /dev/null @@ -1,53 +0,0 @@ -Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.deployment;version="2.0.0";
- uses:="javax.xml.stream,
- org.apache.tuscany.sca.assembly,
- org.apache.tuscany.sca.contribution.processor,
- org.apache.tuscany.sca.core,
- org.apache.tuscany.sca.contribution,
- org.apache.tuscany.sca.monitor,
- org.apache.tuscany.sca.assembly.builder",
- org.apache.tuscany.sca.deployment.impl;version="2.0.0";
- uses:="org.apache.tuscany.sca.assembly,
- org.apache.tuscany.sca.definitions,
- org.apache.tuscany.sca.common.xml.stax,
- org.apache.tuscany.sca.contribution,
- org.apache.tuscany.sca.core,
- org.apache.tuscany.sca.deployment,
- org.apache.tuscany.sca.monitor,
- javax.xml.stream,
- org.apache.tuscany.sca.contribution.resolver,
- org.apache.tuscany.sca.contribution.processor,
- org.apache.tuscany.sca.assembly.builder"
-SCA-Version: 1.1
-Bundle-Name: Apache Tuscany SCA Deployment
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 2.0.0
-Bundle-ManifestVersion: 2
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Apache Tuscany SCA Node Implementation
-Import-Package: javax.xml.namespace,
- javax.xml.stream,
- org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.assembly.builder;version="2.0.0",
- org.apache.tuscany.sca.assembly.xsd;version="2.0.0",
- org.apache.tuscany.sca.common.java.io;version="2.0.0",
- org.apache.tuscany.sca.common.xml.stax;version="2.0.0",
- org.apache.tuscany.sca.contribution;version="2.0.0",
- org.apache.tuscany.sca.contribution.java;version="2.0.0",
- org.apache.tuscany.sca.contribution.namespace;version="2.0.0",
- org.apache.tuscany.sca.contribution.processor;version="2.0.0",
- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
- org.apache.tuscany.sca.core;version="2.0.0",
- org.apache.tuscany.sca.core.assembly.impl;version="2.0.0",
- org.apache.tuscany.sca.definitions;version="2.0.0",
- org.apache.tuscany.sca.definitions.util;version="2.0.0",
- org.apache.tuscany.sca.definitions.xml;version="2.0.0",
- org.apache.tuscany.sca.deployment;version="2.0.0",
- org.apache.tuscany.sca.monitor;version="2.0.0",
- org.apache.tuscany.sca.xsd;version="2.0.0",
- org.apache.tuscany.sca.runtime;version="2.0.0",
- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional
-Bundle-SymbolicName: org.apache.tuscany.sca.deployment
-Bundle-DocURL: http://www.apache.org/
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/NOTICE b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/NOTICE deleted file mode 100644 index d69e595698..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2011 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/pom.xml b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/pom.xml deleted file mode 100644 index af8008a4b9..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/pom.xml +++ /dev/null @@ -1,80 +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. ---> -<project> - - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-modules</artifactId> - <version>2.0-Beta3-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>tuscany-deployment</artifactId> - <name>Apache Tuscany SCA Deployment</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly</artifactId> - <version>2.0-Beta3-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly-xml</artifactId> - <version>2.0-Beta3-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly-xsd</artifactId> - <version>2.0-Beta3-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-contribution</artifactId> - <version>2.0-Beta3-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core</artifactId> - <version>2.0-Beta3-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-xsd</artifactId> - <version>2.0-Beta3-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-builder</artifactId> - <version>2.0-Beta3-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - </dependencies> - -</project> diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/DefaultDeployer.java b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/DefaultDeployer.java deleted file mode 100644 index 42c7596b15..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/DefaultDeployer.java +++ /dev/null @@ -1,42 +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.deployment; - -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.deployment.impl.DeployerImpl; - -/** - * Default implementation of Deployer - */ -public class DefaultDeployer extends DeployerImpl { - - public DefaultDeployer() { - super(new DefaultExtensionPointRegistry()); - } - - /** - * @param registry - */ - public DefaultDeployer(ExtensionPointRegistry registry) { - super(registry); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java deleted file mode 100644 index f2af30b145..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java +++ /dev/null @@ -1,233 +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.deployment; - -import java.io.Reader; -import java.io.Writer; -import java.net.URI; -import java.net.URL; -import java.util.List; -import java.util.Map; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.builder.BuilderContext; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException; -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.contribution.processor.ContributionResolveException; -import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.LifeCycleListener; -import org.apache.tuscany.sca.definitions.Definitions; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.ValidationException; - -/** - * A utility that provides system functions to handle Tuscany SCA application deployment - */ -public interface Deployer extends LifeCycleListener { - /** - * Check if Schema Validation for XML Documents is enabled - * @return - */ - boolean isSchemaValidationEnabled(); - - /** - * Sets Schema Validation for XML Documents flag - * @param schemaValidationEnabled - */ - void setSchemaValidationEnabled(boolean schemaValidationEnabled); - - /** - * Attach a deployment composite to the given contribution - * @param contribution The target contribution - * @param composite The deployment composite - * @param appending A flag to indicate if existing deployable composites in the contribution should be appended or replaced - * @return uri of attached composite - */ - String attachDeploymentComposite(Contribution contribution, Composite composite, boolean appending); - - /** - * Configure a list of contributions to create a composite representing a view of the domain - * @param contributions - * @param allContributions - * @param bindingBaseURIs - * @param monitor - * @return - * @throws ContributionResolveException - * @throws CompositeBuilderException - */ - Composite build(List<Contribution> contributions, List<Contribution> allContributions, Map<QName, List<String>> bindingBaseURIs, Monitor monitor) - throws ContributionResolveException, CompositeBuilderException; - - Composite build(List<Contribution> contributions, List<Contribution> allContributions, Contribution systemContribution, Map<QName, List<String>> bindingBaseURIs, Monitor monitor) - throws ContributionResolveException, CompositeBuilderException; - - /** - * Load an artifact from the given location - * @param uri - * @param location - * @param monitor - * @return - * @throws ContributionReadException - */ - Artifact loadArtifact(URI uri, URL location, Monitor monitor) throws ContributionReadException; - - /** - * Load a contribution from the given location - * @param uri - * @param location - * @param monitor - * @return - * @throws ContributionReadException - */ - Contribution loadContribution(URI uri, URL location, Monitor monitor) throws ContributionReadException; - - /** - * @param <T> - * @param uri - * @param location - * @param monitor - * @return - * @throws ContributionReadException - */ - <T> T loadDocument(URI uri, URL location, Monitor monitor) throws ContributionReadException; - - /** - * @param <T> - * @param reader - * @param monitor - * @return - * @throws XMLStreamException - * @throws ContributionReadException - */ - <T> T loadXMLDocument(Reader reader, Monitor monitor) throws XMLStreamException, ContributionReadException; - - /** - * @param <T> - * @param reader - * @return - * @throws XMLStreamException - * @throws ContributionReadException - * @throws ValidationException - */ - <T> T loadXMLDocument(Reader reader) throws XMLStreamException, ContributionReadException, ValidationException; - - /** - * @param <T> - * @param location - * @param monitor - * @return - * @throws XMLStreamException - * @throws ContributionReadException - */ - <T> T loadXMLDocument(URL location, Monitor monitor) throws XMLStreamException, ContributionReadException; - - /** - * @param <T> - * @param reader - * @param monitor - * @return - * @throws ContributionReadException - * @throws XMLStreamException - */ - <T> T loadXMLElement(XMLStreamReader reader, Monitor monitor) throws ContributionReadException, XMLStreamException; - - /** - * Save the model as XML - * @param model - * @param writer - * @param monitor - * @throws XMLStreamException - * @throws ContributionWriteException - */ - void saveXMLDocument(Object model, Writer writer, Monitor monitor) throws XMLStreamException, - ContributionWriteException; - - /** - * Save the model as XML - * @param model - * @param writer - * @param monitor - * @throws XMLStreamException - * @throws ContributionWriteException - */ - void saveXMLElement(Object model, XMLStreamWriter writer, Monitor monitor) throws XMLStreamException, - ContributionWriteException; - - /** - * - * @return - */ - Monitor createMonitor(); - - /** - * Create an instance of {@link BuilderContext} - * @return - */ - BuilderContext createBuilderContext(); - - /** - * Create an instance of {@link ProcessorContext} - * @return - */ - ProcessorContext createProcessorContext(); - - /** - * Get the {@link ExtensionPointRegistry} - * @return - */ - ExtensionPointRegistry getExtensionPointRegistry(); - - /** - * Get the system definitions - */ - Definitions getSystemDefinitions(); - - /** - * Resolve a contributions dependencies - * - * @param c - * @param allContributions - * @param monitor - * @throws ContributionResolveException - * @throws CompositeBuilderException - */ - void resolve(Contribution c, List<Contribution> dependentContributions, Monitor monitor) throws ContributionResolveException, CompositeBuilderException; - - public Contribution cloneSystemContribution(Monitor monitor); - - /** - * Get a contributions dependencies from meta data without having to load a Contribution - * @param possibles a Map with key contributionURI and value the contribution metaData - * @param targetURI the contributionURI to find the dependencies of - * @param monitor - * @return the list of contribution URIs - */ - public List<String> getDependencies(Map<String, ContributionMetadata> possibles, String targetURI, Monitor monitor); -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java deleted file mode 100644 index 5a2e15e828..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java +++ /dev/null @@ -1,178 +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.deployment.impl; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Extension; -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.Export; -import org.apache.tuscany.sca.contribution.Import; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; - -/** - * A Contribution impl wrapping multiple other contributions - * Currently the sole reason for this is so - */ -public class Contributions implements Contribution { - - private List<Contribution> contributions = new ArrayList<Contribution>(); - private String location; - private String uri; - private Object model; - private byte[] contents; - private boolean unresolved; - private ModelResolver modelResolver; - private List<Contribution> dependencies = new ArrayList<Contribution>(); - - public Contributions(List<Contribution> contributions) { - this.contributions = contributions; - } - - public String getLocation() { - return location; - } - - public Object getModel() { - return model; - } - - public String getURI() { - return uri; - } - - public void setLocation(String location) { - this.location = location; - } - - public void setModel(Object model) { - this.model = model; - } - - public byte[] getContents() { - return contents; - } - - public void setContents(byte[] contents) { - this.contents = contents; - } - - public void setURI(String uri) { - this.uri = uri; - } - - public boolean isUnresolved() { - return unresolved; - } - - public void setUnresolved(boolean unresolved) { - this.unresolved = unresolved; - } - - public List<Contribution> getContributions() { - return contributions; - } - - public List<Artifact> getArtifacts() { - return (List<Artifact>)(Object)contributions; - } - - public List<Contribution> getDependencies() { - return dependencies; - } - - public ClassLoader getClassLoader() { - //FIXME Remove later - return null; - } - - public void setClassLoader(ClassLoader classLoader) { - //FIXME Remove later - } - - public List<Composite> getDeployables() { - List<Composite> deployables = new ArrayList<Composite>(); - for (Contribution contribution: contributions) { - deployables.addAll(contribution.getDeployables()); - } - return deployables; - } - - public List<Export> getExports() { - List<Export> exports = new ArrayList<Export>(); - for (Contribution contribution: contributions) { - exports.addAll(contribution.getExports()); - } - return exports; - } - - public List<Import> getImports() { - List<Import> imports = new ArrayList<Import>(); - for (Contribution contribution: contributions) { - imports.addAll(contribution.getImports()); - } - return imports; - } - - public ModelResolver getModelResolver() { - return modelResolver; - } - - public void setModelResolver(ModelResolver modelResolver) { - this.modelResolver = modelResolver; - } - - public List<Extension> getAttributeExtensions() { - // TODO Auto-generated method stub - return null; - } - - public List<Object> getExtensions() { - // TODO Auto-generated method stub - return null; - } - - public Set<String> getTypes() { - return Collections.emptySet(); - } - - @Override - public <T> T getArtifactModel(String URI) { - // TODO Auto-generated method stub - return null; - } - - @Override - public void mergeMetaData(ContributionMetadata metaData) { - // TODO Auto-generated method stub - } - - @Override - public void addComposite(Composite composite) { - // TODO Auto-generated method stub - - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java deleted file mode 100644 index 920177e597..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java +++ /dev/null @@ -1,934 +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.deployment.impl; - -import java.io.Reader; -import java.io.Writer; -import java.net.URI; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.Callable; -import java.util.logging.Logger; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.Base; -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.Implementation; -import org.apache.tuscany.sca.assembly.builder.BuilderContext; -import org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException; -import org.apache.tuscany.sca.assembly.xsd.Constants; -import org.apache.tuscany.sca.common.java.io.IOHelper; -import org.apache.tuscany.sca.common.xml.stax.StAXHelper; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.ContributionFactory; -import org.apache.tuscany.sca.contribution.ContributionMetadata; -import org.apache.tuscany.sca.contribution.DefaultImport; -import org.apache.tuscany.sca.contribution.Export; -import org.apache.tuscany.sca.contribution.Import; -import org.apache.tuscany.sca.contribution.java.JavaImport; -import org.apache.tuscany.sca.contribution.namespace.NamespaceImport; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; -import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; -import org.apache.tuscany.sca.contribution.processor.ExtendedURLArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory; -import org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint; -import org.apache.tuscany.sca.contribution.resolver.DefaultImportModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -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.definitions.Definitions; -import org.apache.tuscany.sca.definitions.DefinitionsFactory; -import org.apache.tuscany.sca.definitions.util.DefinitionsUtil; -import org.apache.tuscany.sca.definitions.xml.DefinitionsExtensionPoint; -import org.apache.tuscany.sca.deployment.Deployer; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.MonitorFactory; -import org.apache.tuscany.sca.monitor.ValidationException; -import org.apache.tuscany.sca.runtime.BaseDomainRegistry; -import org.apache.tuscany.sca.runtime.ContributionDescription; -import org.apache.tuscany.sca.runtime.DomainRegistry; -import org.apache.tuscany.sca.runtime.EndpointReferenceBinder; -import org.apache.tuscany.sca.xsd.XSDFactory; -import org.apache.tuscany.sca.xsd.XSDefinition; - -/** - * - */ -public class DeployerImpl implements Deployer { - protected static final Logger logger = Logger.getLogger(DeployerImpl.class.getName()); - - protected boolean inited; - protected boolean schemaValidationEnabled; - protected StAXHelper staxHelper; - protected AssemblyFactory assemblyFactory; - protected CompositeBuilder compositeBuilder; - protected ContributionFactory contributionFactory; - protected ExtendedURLArtifactProcessor<Contribution> contributionProcessor; - protected ExtensionPointRegistry registry; - protected FactoryExtensionPoint modelFactories; - protected ModelResolverExtensionPoint modelResolvers; - protected Contribution systemContribution; - protected Definitions systemDefinitions; - protected ExtensibleURLArtifactProcessor artifactProcessor; - protected ExtensibleStAXArtifactProcessor staxProcessor; - protected ValidationSchemaExtensionPoint validationSchema; - protected EndpointReferenceBinder endpointReferenceBinder; - - protected MonitorFactory monitorFactory; - - protected static final String DEPLOYER_IMPL_VALIDATION_MESSAGES = - "org.apache.tuscany.sca.deployment.impl.deployer-impl-validation-messages"; - - public static final QName XSD = new QName("http://www.w3.org/2001/XMLSchema", "schema"); - - /** - * @param registry - */ - public DeployerImpl(ExtensionPointRegistry registry) { - super(); - this.registry = registry; - } - - public Monitor createMonitor() { - init(); - return monitorFactory.createMonitor(); - } - - public synchronized void stop() { - if (inited) { - staxHelper = null; - assemblyFactory = null; - compositeBuilder = null; - contributionFactory = null; - contributionProcessor = null; - modelFactories = null; - modelResolvers = null; - systemContribution = null; - systemDefinitions = null; - artifactProcessor = null; - staxProcessor = null; - monitorFactory = null; - inited = false; - } - } - - /** - * Analyze a contribution and add its dependencies to the given dependency set. - */ - protected void addContributionDependencies(Contribution contribution, - List<Contribution> contributions, - List<Contribution> dependencies, - Set<Contribution> set, - Monitor monitor) { - - // Go through the contribution imports - for (Import import_ : contribution.getImports()) { - boolean resolved = false; - - // Go through all contribution candidates and their exports - List<Export> matchingExports = new ArrayList<Export>(); - for (Contribution dependency : contributions) { - if (dependency == contribution) { - // Do not self import - continue; - } - - // When a contribution contains a reference to an artifact from a namespace that - // is declared in an import statement of the contribution, if the SCA artifact - // resolution mechanism is used to resolve the artifact, the SCA runtime MUST resolve - // artifacts from the locations identified by the import statement(s) for the namespace. - if (import_ instanceof NamespaceImport) { - NamespaceImport namespaceImport = (NamespaceImport)import_; - if (namespaceImport.getLocation() != null) - if (!namespaceImport.getLocation().equals(dependency.getURI())) - continue; - } - if (import_ instanceof JavaImport) { - JavaImport javaImport = (JavaImport)import_; - if (javaImport.getLocation() != null) - if (!javaImport.getLocation().equals(dependency.getURI())) - continue; - } - - for (Export export : dependency.getExports()) { - - // If an export from a contribution matches the import in hand - // add that contribution to the dependency set - if (import_.match(export)) { - resolved = true; - matchingExports.add(export); - - if (!set.contains(dependency)) { - set.add(dependency); - dependencies.add(dependency); - - // Now add the dependencies of that contribution - addContributionDependencies(dependency, contributions, dependencies, set, monitor); - } // end if - } // end if - } // end for - } // end for - - if (resolved) { - // Initialize the import's model resolver with a delegating model - // resolver which will delegate to the matching exports - import_.setModelResolver(new DefaultImportModelResolver(matchingExports)); - - } else { - // Record import resolution issue - if (!(import_ instanceof DefaultImport)) { - // Add the (empty) matchingExports List and report a warning - import_.setModelResolver(new DefaultImportModelResolver(matchingExports)); - - // push context here as the "stack" in this case is a list of nexted contributions - // through which imports have been chased which may not make much sense to the - // user so just report the contribution in error - monitor.pushContext("Contribution: " + contribution.getURI()); - Monitor.error(monitor, this, DEPLOYER_IMPL_VALIDATION_MESSAGES, "UnresolvedImport", import_); - monitor.popContext(); - } - } // end if - } - } - - protected void buildDependencies(Contribution contribution, List<Contribution> contributions, Monitor monitor) { - contribution.getDependencies().clear(); - - List<Contribution> dependencies = new ArrayList<Contribution>(); - Set<Contribution> set = new HashSet<Contribution>(); - - dependencies.add(contribution); - set.add(contribution); - addContributionDependencies(contribution, contributions, dependencies, set, monitor); - - Collections.reverse(dependencies); - - contribution.getDependencies().addAll(dependencies); - } - - public List<String> getDependencies(Map<String, ContributionMetadata> possibles, String targetURI, Monitor monitor) { - Map<String, Contribution> contributions = new HashMap<String, Contribution>(); - for (String curi : possibles.keySet()) { - Contribution c = contributionFactory.createContribution(); - c.setURI(curi); - c.mergeMetaData(possibles.get(curi)); - contributions.put(curi, c); - } - - Contribution tc = contributions.remove(targetURI); - buildDependencies(tc, new ArrayList<Contribution>(contributions.values()), monitor); - - List<String> dcuris = new ArrayList<String>(); - for (Contribution dc : tc.getDependencies()) { - dcuris.add(dc.getURI()); - } - dcuris.remove(targetURI); - return dcuris; - } - - - /** - * Pre-resolve phase for contributions, to set up handling of imports and exports prior to full resolution - * @param contributions - the contributions to preresolve - * @param resolver - the ModelResolver to use - * @throws ContributionResolveException - */ - protected void contributionsPreresolve(List<Contribution> contributions, - ModelResolver resolver, - ProcessorContext context) throws ContributionResolveException { - - for (Contribution contribution : contributions) { - contributionProcessor.preResolve(contribution, resolver, context); - } // end for - } // end method contributionsPreresolve - - public ExtensionPointRegistry getExtensionPointRegistry() { - return registry; - } - - public void start() { - // Defer to the init() method - } - - public synchronized void init() { - if (inited) { - return; - } - - // Enable schema validation only of the logger level is FINE or higher - if (isSchemaValidationEnabled()) { - ValidationSchemaExtensionPoint schemas = registry.getExtensionPoint(ValidationSchemaExtensionPoint.class); - if (schemas != null) { - schemas.setEnabled(true); - } - } - - // Use the runtime-enabled assembly factory - modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class); - assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); - - // Create a monitor - UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); - staxHelper = utilities.getUtility(StAXHelper.class); - - monitorFactory = utilities.getUtility(MonitorFactory.class); - - // Initialize the Tuscany module activators - // The module activators will be started - registry.getExtensionPoint(ModuleActivatorExtensionPoint.class); - - // Get contribution workspace and assembly model factories - contributionFactory = modelFactories.getFactory(ContributionFactory.class); - - // Create XML artifact processors - staxProcessor = new ExtensibleStAXArtifactProcessor(registry); - - // Create contribution content processor - URLArtifactProcessorExtensionPoint docProcessorExtensions = - registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - artifactProcessor = new ExtensibleURLArtifactProcessor(docProcessorExtensions); - - contributionProcessor = - (ExtendedURLArtifactProcessor<Contribution>)docProcessorExtensions.getProcessor(Contribution.class); - - // Get the model resolvers - modelResolvers = registry.getExtensionPoint(ModelResolverExtensionPoint.class); - - // Get composite builders - BuilderExtensionPoint compositeBuilders = registry.getExtensionPoint(BuilderExtensionPoint.class); - compositeBuilder = - compositeBuilders.getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder"); - - // get the validation schema - validationSchema = registry.getExtensionPoint(ValidationSchemaExtensionPoint.class); - - // Get the reference binder - endpointReferenceBinder = registry.getExtensionPoint(EndpointReferenceBinder.class); - - loadSystemContribution(new ProcessorContext(monitorFactory.createMonitor())); - - inited = true; - } - - protected void loadSystemContribution(ProcessorContext context) { - DefinitionsFactory definitionsFactory = modelFactories.getFactory(DefinitionsFactory.class); - systemDefinitions = definitionsFactory.createDefinitions(); - - DefinitionsExtensionPoint definitionsExtensionPoint = - registry.getExtensionPoint(DefinitionsExtensionPoint.class); - - Monitor monitor = context.getMonitor(); - monitor.pushContext("Extension points definitions"); - try { - for (Definitions defs : definitionsExtensionPoint.getDefinitions()) { - DefinitionsUtil.aggregate(defs, systemDefinitions, monitor); - } - } finally { - monitor.popContext(); - } - - // create a system contribution to hold the definitions. The contribution - // will be extended later with definitions from application contributions - systemContribution = contributionFactory.createContribution(); - systemContribution.setURI("http://tuscany.apache.org/SystemContribution"); - systemContribution.setLocation("http://tuscany.apache.org/SystemContribution"); - ModelResolver modelResolver = new ExtensibleModelResolver(systemContribution, modelResolvers, modelFactories); - systemContribution.setModelResolver(modelResolver); - systemContribution.setUnresolved(true); - - // create an artifact to represent the system defintions and - // add it to the contribution - List<Artifact> artifacts = systemContribution.getArtifacts(); - Artifact artifact = contributionFactory.createArtifact(); - artifact.setURI("http://tuscany.apache.org/SystemContribution/Definitions"); - artifact.setLocation("Derived"); - artifact.setModel(systemDefinitions); - artifacts.add(artifact); - - // now resolve and add the system contribution - try { - contributionProcessor.resolve(systemContribution, modelResolver, context); - } catch (ContributionResolveException e) { - throw new IllegalStateException(e); - } - } - - public Contribution cloneSystemContribution(Monitor monitor) { - init(); - Contribution contribution = contributionFactory.createContribution(); - contribution.setURI(systemContribution.getURI()); - contribution.setLocation(systemContribution.getLocation()); - - ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories); - contribution.setModelResolver(modelResolver); - contribution.setUnresolved(true); - - DefinitionsFactory definitionsFactory = modelFactories.getFactory(DefinitionsFactory.class); - Definitions definitions = definitionsFactory.createDefinitions(); - DefinitionsUtil.aggregate(systemDefinitions, definitions, monitor); - - // create an artifact to represent the system defintions and - // add it to the contribution - List<Artifact> artifacts = contribution.getArtifacts(); - Artifact artifact = contributionFactory.createArtifact(); - artifact.setURI("http://tuscany.apache.org/SystemContribution/Definitions"); - artifact.setLocation("Derived"); - artifact.setModel(definitions); - artifacts.add(artifact); - - // create resolver entries to represent the SCA schema. We don't create artifacts - // in the contribution as the XSD schema are only actually loaded on demand - // so as long as they are in the model resolver we are set. We do it on the clone - // so that every copy of the system contribution has the schema - ProcessorContext context = new ProcessorContext(monitor); - XSDFactory xsdFactory = modelFactories.getFactory(XSDFactory.class); - List<String> scaSchemas = validationSchema.getSchemas(); - for (String scaSchemaLocation : scaSchemas){ - try { - URL scaSchemaURL = new URL(scaSchemaLocation); - String namespace = staxHelper.readAttribute(scaSchemaURL, XSD, "targetNamespace"); - - // if this is the SCA schema store it in the system contribution - if (namespace.equals(Constants.SCA11_TUSCANY_NS)){ - - // add the schema to the model resolver under the Tuscany namespace - XSDefinition scaSchema = xsdFactory.createXSDefinition(); - scaSchema.setUnresolved(true); - scaSchema.setNamespace(namespace); - scaSchema.setLocation(IOHelper.toURI(scaSchemaURL)); - scaSchema.setUnresolved(false); -// modelResolver.addModel(scaSchema, context); - } else if (namespace.equals(Constants.SCA11_NS)) { - // we know that the SCA schema's are referenced form the Tuscany schemas so - // register the schema under the SCA namespace too - XSDefinition scaSchema = xsdFactory.createXSDefinition(); - scaSchema.setUnresolved(true); - scaSchema.setNamespace(Constants.SCA11_NS); - scaSchema.setLocation(IOHelper.toURI(scaSchemaURL)); - scaSchema.setUnresolved(false); - modelResolver.addModel(scaSchema, context); - } - } catch (Exception ex) { - throw new IllegalStateException(ex); - } - } - - return contribution; - } - - public String attachDeploymentComposite(Contribution contribution, Composite composite, boolean appending) { - init(); - - String compositeArtifactURI = composite.getName().getLocalPart() + ".composite"; - - if (appending) { - // check its not already there - for (Artifact a : contribution.getArtifacts()) { - if (compositeArtifactURI.equals(a.getURI())) { - throw new IllegalStateException("artifact '" + compositeArtifactURI + "' already exists in contribution: " + contribution.getURI()); - } - } - } - - // Create an artifact for the deployment composite - Artifact artifact = contributionFactory.createArtifact(); - artifact.setURI(compositeArtifactURI); - - artifact.setLocation(compositeArtifactURI); - artifact.setModel(composite); - artifact.setUnresolved(false); - // Add it to the contribution - contribution.getArtifacts().add(artifact); - - // Replace the deployable composites with the deployment composites - // Clear the deployable composites if it's the first deployment composite - if (!appending) { - contribution.getDeployables().clear(); - } - contribution.getDeployables().add(composite); - return compositeArtifactURI; - } - - public Composite build(List<Contribution> contributions, List<Contribution> allContributions, Map<QName, List<String>> bindingMap, Monitor monitor) - throws ContributionResolveException, CompositeBuilderException { - return build(contributions, allContributions, null, bindingMap, monitor); - } - - public Composite build(List<Contribution> contributions, List<Contribution> allContributions, Contribution systemContribution, Map<QName, List<String>> bindingMap, Monitor monitor) - throws ContributionResolveException, CompositeBuilderException { - init(); - List<Contribution> contributionList = new ArrayList<Contribution>(contributions); - - if (systemContribution == null) { - systemContribution = cloneSystemContribution(monitor); - } - Definitions systemDefinitions = systemContribution.getArtifacts().get(0).getModel(); - // Build an aggregated SCA definitions model. Must be done before we try and - // resolve any contributions or composites as they may depend on the full - // definitions.xml picture - - // get all definitions.xml artifacts from contributions and aggregate - // into the system contribution. In turn add a default import into - // each contribution so that, for unresolved items, the resolution - // processing will look in the system contribution - ProcessorContext context = new ProcessorContext(monitor); - for (Contribution contribution : contributionList) { - monitor.pushContext("Contribution: " + contribution.getURI()); - try { - // aggregate definitions - for (Artifact artifact : contribution.getArtifacts()) { - if (!"META-INF/definitions.xml".equals(artifact.getURI())) { - continue; - } - Object model = artifact.getModel(); - // FIXME: Should we check the artifact URI is META-INF/definitions.xml? - if (model instanceof Definitions) { - try { - monitor.pushContext("Definitions: " + artifact.getLocation()); - DefinitionsUtil.aggregate((Definitions)model, systemDefinitions, monitor); - } finally { - monitor.popContext(); - } - } - } - - // create a default import and wire it up to the system contribution - // model resolver. This is the trick that makes the resolution processing - // skip over to the system contribution if resolution is unsuccessful - // in the current contribution - DefaultImport defaultImport = contributionFactory.createDefaultImport(); - defaultImport.setModelResolver(systemContribution.getModelResolver()); - contribution.getImports().add(defaultImport); - } finally { - monitor.popContext(); - } - } - - ExtensibleModelResolver modelResolver = - new ExtensibleModelResolver(new Contributions(contributionList), modelResolvers, modelFactories); - - // now resolve and add the system contribution - contributionProcessor.resolve(systemContribution, modelResolver, context); - contributionList.add(systemContribution); - - // pre-resolve the contributions - contributionsPreresolve(contributionList, modelResolver, context); - - // Build the contribution dependencies - Set<Contribution> resolved = new HashSet<Contribution>(); - - for (Contribution contribution : contributionList) { - buildDependencies(contribution, allContributions, monitor); - - // Resolve contributions - for (Contribution dependency : contribution.getDependencies()) { - if (!resolved.contains(dependency)) { - resolved.add(dependency); - contributionProcessor.resolve(dependency, modelResolver, context); - } - } - } - - // Create a top level composite to host our composite - // This is temporary to make the activator happy - Composite domainComposite = assemblyFactory.createComposite(); - domainComposite.setName(Composite.DOMAIN_COMPOSITE); - domainComposite.setURI(Base.SCA11_NS); - - for (Contribution contribution : contributionList) { - for (Composite composite : contribution.getDeployables()) { - // Include the node composite in the top-level composite - domainComposite.getIncludes().add(composite); - } - } - - // build the top level composite - BuilderContext builderContext = new BuilderContext(systemDefinitions, bindingMap, monitor); - compositeBuilder.build(domainComposite, builderContext); - // analyzeProblems(monitor); - - // do build time reference binding - buildTimeReferenceBind(domainComposite, builderContext); - - return domainComposite; - } - - public void resolve(Contribution c, List<Contribution> dependentContributions, Monitor monitor) throws ContributionResolveException, CompositeBuilderException { - init(); - List<Contribution> contributionList = new ArrayList<Contribution>(); - contributionList.add(c); - - Contribution systemContribution = cloneSystemContribution(monitor); - Definitions systemDefinitions = systemContribution.getArtifacts().get(0).getModel(); - // Build an aggregated SCA definitions model. Must be done before we try and - // resolve any contributions or composites as they may depend on the full - // definitions.xml picture - - // get all definitions.xml artifacts from contributions and aggregate - // into the system contribution. In turn add a default import into - // each contribution so that, for unresolved items, the resolution - // processing will look in the system contribution - ProcessorContext context = new ProcessorContext(monitor); - for (Contribution contribution : contributionList) { - monitor.pushContext("Contribution: " + contribution.getURI()); - try { - // aggregate definitions - for (Artifact artifact : contribution.getArtifacts()) { - if (!"META-INF/definitions.xml".equals(artifact.getURI())) { - continue; - } - Object model = artifact.getModel(); - if (model instanceof Definitions) { - try { - monitor.pushContext("Definitions: " + artifact.getLocation()); - DefinitionsUtil.aggregate((Definitions)model, systemDefinitions, monitor); - } finally { - monitor.popContext(); - } - } - } - - // create a default import and wire it up to the system contribution - // model resolver. This is the trick that makes the resolution processing - // skip over to the system contribution if resolution is unsuccessful - // in the current contribution - DefaultImport defaultImport = contributionFactory.createDefaultImport(); - defaultImport.setModelResolver(systemContribution.getModelResolver()); - contribution.getImports().add(defaultImport); - } finally { - monitor.popContext(); - } - } - - ExtensibleModelResolver modelResolver = - new ExtensibleModelResolver(new Contributions(contributionList), modelResolvers, modelFactories); - - // now resolve and add the system contribution - contributionProcessor.resolve(systemContribution, modelResolver, context); - contributionList.add(systemContribution); - - // pre-resolve the contributions - contributionsPreresolve(contributionList, modelResolver, context); - - // Build the contribution dependencies - Set<Contribution> resolved = new HashSet<Contribution>(); - - for (Contribution contribution : contributionList) { - buildDependencies(contribution, dependentContributions, monitor); - - // Resolve contributions - for (Contribution dependency : contribution.getDependencies()) { - if (!resolved.contains(dependency)) { - resolved.add(dependency); - contributionProcessor.resolve(dependency, modelResolver, context); - } - } - } - } - - public Artifact loadArtifact(URI uri, URL location, Monitor monitor) throws ContributionReadException { - init(); - Artifact artifact = contributionFactory.createArtifact(); - artifact.setLocation(location.toString()); - artifact.setURI(uri.toString()); - URLArtifactProcessorExtensionPoint artifactProcessors = - registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - ExtensibleURLArtifactProcessor processor = new ExtensibleURLArtifactProcessor(artifactProcessors); - Object model = processor.read(null, uri, location, new ProcessorContext(monitor)); - artifact.setModel(model); - return artifact; - } - - @SuppressWarnings("unchecked") - public <T> T loadDocument(URI uri, URL location, Monitor monitor) throws ContributionReadException { - init(); - Object model = artifactProcessor.read(null, uri, location, new ProcessorContext(monitor)); - return (T)model; - } - - public Object loadXMLDocument(URL document, Monitor monitor) throws XMLStreamException, ContributionReadException { - init(); - XMLStreamReader reader = staxHelper.createXMLStreamReader(document); - reader.nextTag(); - ValidatingXMLInputFactory.setMonitor(reader, monitor); - try { - return loadXMLElement(reader, monitor); - } finally { - reader.close(); - } - } - - public void saveXMLDocument(Object model, Writer writer, Monitor monitor) throws XMLStreamException, - ContributionWriteException { - init(); - XMLStreamWriter streamWriter = staxHelper.createXMLStreamWriter(writer); - staxProcessor.write(model, streamWriter, new ProcessorContext(monitor)); - } - - public void saveXMLElement(Object model, XMLStreamWriter writer, Monitor monitor) throws XMLStreamException, - ContributionWriteException { - init(); - staxProcessor.write(model, writer, new ProcessorContext(monitor)); - } - - @SuppressWarnings("unchecked") - public Object loadXMLElement(XMLStreamReader reader, Monitor monitor) throws ContributionReadException, - XMLStreamException { - init(); - return staxProcessor.read(reader, new ProcessorContext(monitor)); - } - - public Object loadXMLDocument(Reader document) throws XMLStreamException, ContributionReadException, ValidationException { - Monitor monitor = createMonitor(); - Object model = loadXMLDocument(document, monitor); - monitor.analyzeProblems(); - return model; - } - - public Object loadXMLDocument(Reader document, Monitor monitor) throws XMLStreamException, ContributionReadException { - init(); - XMLStreamReader reader = staxHelper.createXMLStreamReader(document); - ValidatingXMLInputFactory.setMonitor(reader, monitor); - reader.nextTag(); - try { - return loadXMLElement(reader, monitor); - } finally { - reader.close(); - } - } - - public Contribution loadContribution(URI uri, URL location, Monitor monitor) throws ContributionReadException { - init(); - ProcessorContext context = new ProcessorContext(monitor); - // Load the contribution - Contribution contribution = contributionProcessor.read(null, uri, location, context); - return contribution; - } - - public ProcessorContext createProcessorContext() { - init(); - return new ProcessorContext(monitorFactory.createMonitor()); - } - - public BuilderContext createBuilderContext() { - init(); - return new BuilderContext(monitorFactory.createMonitor()); - } - - public boolean isSchemaValidationEnabled() { - return schemaValidationEnabled; - } - - public void setSchemaValidationEnabled(boolean schemaValidationEnabled) { - this.schemaValidationEnabled = schemaValidationEnabled; - } - - public Definitions getSystemDefinitions() { - init(); - return systemDefinitions; - } - - // The following operations gives references a chance to bind to - // services at deployment time. - - private void buildTimeReferenceBind(Composite domainComposite, BuilderContext context){ - // create temporary local registry for all available local endpoints - DomainRegistry domainRegistry = new LocalEndpointRegistry(registry); - - // populate the registry with all the endpoints that are present in the model - populateLocalRegistry(domainComposite, domainRegistry, context); - - // match all local services against the endpoint references - // we've just created - matchEndpointReferences(domainComposite, domainRegistry, context); - } - - private void populateLocalRegistry(Composite composite, DomainRegistry registry, BuilderContext context){ - for (Component component : composite.getComponents()) { - // recurse for composite implementations - Implementation implementation = component.getImplementation(); - if (implementation instanceof Composite) { - populateLocalRegistry((Composite)implementation, registry, context); - } - - // add all endpoints to the local registry - for (ComponentService service : component.getServices()) { - for (Endpoint endpoint : service.getEndpoints()){ - registry.addEndpoint(endpoint); - } - } - - // add endpoint references that we want to match to the registry - for (ComponentReference reference : component.getReferences()) { - for (EndpointReference epr : reference.getEndpointReferences()){ - if (epr.getStatus().equals(EndpointReference.Status.WIRED_TARGET_NOT_FOUND)|| - epr.getStatus().equals(EndpointReference.Status.WIRED_TARGET_IN_BINDING_URI)){ - registry.addEndpointReference(epr); - } - } - } - } - } - - private void matchEndpointReferences(Composite composite, DomainRegistry registry, BuilderContext builderContext){ - - // look at all the endpoint references and try to match them to - // endpoints - for (EndpointReference endpointReference : registry.getEndpointReferences()){ - endpointReferenceBinder.bindBuildTime(registry, endpointReference, builderContext); - } - } - - // A minimal endpoint registry implementation used to store the Endpoints/EndpointReferences - // for build time local reference resolution. We don't rely on the endpoint registry - // factory here as we specifically just want to do simple local resolution - class LocalEndpointRegistry extends BaseDomainRegistry { - - private List<Endpoint> endpoints = new ArrayList<Endpoint>(); - - public LocalEndpointRegistry(ExtensionPointRegistry registry){ - super(registry, null, "", ""); - } - - public void addEndpoint(Endpoint endpoint) { - endpoints.add(endpoint); - endpointAdded(endpoint); - } - - public void removeEndpoint(Endpoint endpoint) { - } - - public Collection<Endpoint> getEndpoints() { - return endpoints; - } - - public Endpoint getEndpoint(String uri) { - return null; - } - - public List<Endpoint> findEndpoint(String uri) { - List<Endpoint> foundEndpoints = new ArrayList<Endpoint>(); - for (Endpoint endpoint : endpoints) { - if (endpoint.matches(uri)) { - foundEndpoints.add(endpoint); - logger.fine("Found endpoint with matching service - " + endpoint); - } - // else the service name doesn't match - } - return foundEndpoints; - } - - public void start() { - } - - public void stop() { - } - - public List<String> getInstalledContributionURIs() { - return null; - } - - public void uninstallContribution(String uri) { - } - - public void installContribution(ContributionDescription cd) { - } - - public ContributionDescription getInstalledContribution(String uri) { - return null; - } - - public void addRunningComposite(String contributionURI, Composite composite) { - } - - public void removeRunningComposite(String contributionURI, String compositeURI) { - } - - public Composite getRunningComposite(String contributionURI, String compositeURI) { - return null; - } - - public Map<String, List<String>> getRunningCompositeURIs() { - return null; - } - - public void updateInstalledContribution(ContributionDescription cd) { - } - - @Override - public List<String> getNodeNames() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getLocalNodeName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRunningNodeName(String contributionURI, String compositeURI) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String remoteCommand(String memberName, Callable<String> command) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getContainingCompositesContributionURI(String componentName) { - // TODO Auto-generated method stub - return null; - } - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer deleted file mode 100644 index 46e6eba7f7..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer +++ /dev/null @@ -1,18 +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.
-org.apache.tuscany.sca.deployment.DefaultDeployer
-
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/resources/org/apache/tuscany/sca/deployment/impl/deployer-impl-validation-messages.properties b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/resources/org/apache/tuscany/sca/deployment/impl/deployer-impl-validation-messages.properties deleted file mode 100644 index 0c07a3a30f..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/main/resources/org/apache/tuscany/sca/deployment/impl/deployer-impl-validation-messages.properties +++ /dev/null @@ -1,22 +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. -# -# - -UnresolvedImport = Unresolved import: Import = {0} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/java/hello/deployer/HelloWorld.java b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/java/hello/deployer/HelloWorld.java deleted file mode 100644 index 2480a5e4d9..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/java/hello/deployer/HelloWorld.java +++ /dev/null @@ -1,30 +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 hello.deployer; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * HelloWorld interface - */ -@Remotable -public interface HelloWorld { - String hello(String name); -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.java b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.java deleted file mode 100644 index fc81dc2167..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.java +++ /dev/null @@ -1,30 +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 hello.deployer; - -/** - * HelloWorldImpl - */ -public class HelloWorldImpl implements HelloWorld { - public String hello(String name) { - System.out.println("Hello: " + name); - return "Hello, " + name; - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java deleted file mode 100644 index e5c0a499a8..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java +++ /dev/null @@ -1,135 +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.deployment.impl; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.StringWriter; -import java.io.Writer; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.Arrays; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.deployment.Deployer; -import org.apache.tuscany.sca.monitor.Monitor; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * - */ -public class DeployerImplTestCase { - private static ExtensionPointRegistry registry; - private static Deployer deployer; - - private static URL contributionURL; - private static URL compositeURL; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUpBeforeClass() throws Exception { - compositeURL = DeployerImplTestCase.class.getResource("HelloWorld.composite"); - contributionURL = new URL(compositeURL, "../"); - registry = new DefaultExtensionPointRegistry(); - deployer = new DeployerImpl(registry); - deployer.start(); - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDownAfterClass() throws Exception { - deployer.stop(); - } - - /** - * Test method for {@link org.apache.tuscany.sca.deployment.impl.DeployerImpl#build(java.util.List, java.util.Map, org.apache.tuscany.sca.monitor.Monitor)}. - */ - @Test - public void testBuild() throws Exception { - Monitor monitor = deployer.createMonitor(); - Contribution contribution = deployer.loadContribution(contributionURL.toURI(), contributionURL, monitor); - Composite composite = deployer.build(Arrays.asList(contribution), Arrays.asList(contribution), null, monitor); - assertTrue(composite != null); - } - - /** - * Test method for {@link org.apache.tuscany.sca.deployment.impl.DeployerImpl#loadArtifact(java.net.URI, java.net.URL, org.apache.tuscany.sca.monitor.Monitor)}. - */ - @Test - public void testLoadArtifact() throws Exception { - Monitor monitor = deployer.createMonitor(); - Artifact artifact = deployer.loadArtifact(compositeURL.toURI(), compositeURL, monitor); - assertTrue(artifact.getModel() instanceof Composite); - Composite composite = artifact.getModel(); - assertEquals(composite.getName(), new QName("http://sample/composite", "HelloWorld1")); - } - - /** - * Test method for {@link org.apache.tuscany.sca.deployment.impl.DeployerImpl#loadDocument(java.net.URI, java.net.URL, org.apache.tuscany.sca.monitor.Monitor)}. - */ - @Test - public void testLoadDocument() throws Exception { - Monitor monitor = deployer.createMonitor(); - Composite composite = deployer.loadDocument(compositeURL.toURI(), compositeURL, monitor); - assertEquals(composite.getName(), new QName("http://sample/composite", "HelloWorld1")); - } - - /** - * Test method for {@link org.apache.tuscany.sca.deployment.impl.DeployerImpl#loadXMLDocument(java.net.URL, org.apache.tuscany.sca.monitor.Monitor)}. - */ - @Test - public void testLoadXMLDocumentURLMonitor() throws Exception { - Monitor monitor = deployer.createMonitor(); - Composite composite = deployer.loadXMLDocument(compositeURL, monitor); - assertEquals(composite.getName(), new QName("http://sample/composite", "HelloWorld1")); - Writer sw = new StringWriter(); - deployer.saveXMLDocument(composite, sw, monitor); - assertTrue(sw.toString() != null); - } - - /** - * Test method for {@link org.apache.tuscany.sca.deployment.impl.DeployerImpl#loadContribution(java.net.URI, java.net.URL, org.apache.tuscany.sca.monitor.Monitor)}. - * @throws URISyntaxException - * @throws ContributionReadException - */ - @Test - public void testLoadContribution() throws Exception { - Monitor monitor = deployer.createMonitor(); - Contribution contribution = deployer.loadContribution(contributionURL.toURI(), contributionURL, monitor); - Composite composite = contribution.getDeployables().get(0); - assertEquals(composite.getName(), new QName("http://sample/composite", "HelloWorld1")); - assertTrue(contribution.getArtifacts().size() >= 2); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 5dc99a46a7..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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:sc="http://sample/composite"> - <deployable composite="sc:HelloWorld1" /> -</contribution> diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite deleted file mode 100644 index 23555ea491..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.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/composite" - name="HelloWorld1"> - - <component name="HelloWorld1"> - <implementation.java class="hello.deployer.HelloWorldImpl"/> - </component> - -</composite> |