From 07b7dfd1a70ba222b899d9813f8c449dbf3b785f Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:07:28 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835124 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca-java-1.1/modules/domain-impl/DISCLAIMER | 8 - branches/sca-java-1.1/modules/domain-impl/LICENSE | 205 ---- branches/sca-java-1.1/modules/domain-impl/NOTICE | 12 - branches/sca-java-1.1/modules/domain-impl/pom.xml | 146 --- .../sca/domain/impl/SCADomainFactoryImpl.java | 54 - .../tuscany/sca/domain/impl/SCADomainImpl.java | 1297 -------------------- .../tuscany/sca/domain/impl/SCADummyNodeImpl.java | 80 -- .../domain/launch/SCADomainControllerLauncher.java | 63 - .../management/impl/ContributionInfoImpl.java | 89 -- .../sca/domain/management/impl/DomainInfoImpl.java | 93 -- .../sca/domain/management/impl/NodeInfoImpl.java | 93 -- .../impl/SCADomainManagerServiceImpl.java | 228 ---- .../sca/domain/model/impl/CompositeModelImpl.java | 75 -- .../domain/model/impl/ContributionModelImpl.java | 110 -- .../domain/model/impl/DomainModelFactoryImpl.java | 80 -- .../sca/domain/model/impl/DomainModelImpl.java | 115 -- .../sca/domain/model/impl/NodeModelImpl.java | 144 --- .../sca/domain/model/impl/ServiceModelImpl.java | 89 -- .../src/main/resources/domain.composite | 52 - .../src/main/resources/webroot/binding-jsonrpc.js | 492 -------- .../src/main/resources/webroot/domain.png | Bin 718 -> 0 bytes .../src/main/resources/webroot/index.html | 139 --- .../src/main/resources/webroot/node.png | Bin 296 -> 0 bytes .../src/main/resources/webroot/style.css | 176 --- .../src/test/java/calculator/AddService.java | 31 - .../src/test/java/calculator/AddServiceImpl.java | 31 - .../test/java/calculator/CalculatorService.java | 35 - .../java/calculator/CalculatorServiceImpl.java | 74 -- .../src/test/java/calculator/DivideService.java | 28 - .../test/java/calculator/DivideServiceImpl.java | 30 - .../src/test/java/calculator/MultiplyService.java | 28 - .../test/java/calculator/MultiplyServiceImpl.java | 30 - .../src/test/java/calculator/SubtractService.java | 31 - .../test/java/calculator/SubtractServiceImpl.java | 31 - .../sca/domain/impl/DomainImplTestCase.java | 137 --- .../sca/domain/impl/TestCallableReferenceImpl.java | 107 -- .../domain/impl/TestNodeManagerServiceImpl.java | 86 -- .../src/test/resources/nodeA/Calculator.composite | 41 - .../resources/nodeA/META-INF/sca-contribution.xml | 24 - .../src/test/resources/nodeB/Calculator.composite | 29 - 40 files changed, 4613 deletions(-) delete mode 100644 branches/sca-java-1.1/modules/domain-impl/DISCLAIMER delete mode 100644 branches/sca-java-1.1/modules/domain-impl/LICENSE delete mode 100644 branches/sca-java-1.1/modules/domain-impl/NOTICE delete mode 100644 branches/sca-java-1.1/modules/domain-impl/pom.xml delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainFactoryImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADummyNodeImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/launch/SCADomainControllerLauncher.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/ContributionInfoImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/DomainInfoImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/NodeInfoImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/CompositeModelImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ContributionModelImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelFactoryImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/NodeModelImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ServiceModelImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/resources/domain.composite delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/domain.png delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/index.html delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/node.png delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/style.css delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/AddService.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/AddServiceImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/CalculatorService.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/CalculatorServiceImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/DivideService.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/DivideServiceImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/MultiplyService.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/MultiplyServiceImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/SubtractService.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/SubtractServiceImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestCallableReferenceImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/resources/nodeA/Calculator.composite delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.1/modules/domain-impl/src/test/resources/nodeB/Calculator.composite (limited to 'branches/sca-java-1.1/modules/domain-impl') diff --git a/branches/sca-java-1.1/modules/domain-impl/DISCLAIMER b/branches/sca-java-1.1/modules/domain-impl/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.1/modules/domain-impl/LICENSE b/branches/sca-java-1.1/modules/domain-impl/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/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/branches/sca-java-1.1/modules/domain-impl/NOTICE b/branches/sca-java-1.1/modules/domain-impl/NOTICE deleted file mode 100644 index c1e97841c6..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/NOTICE +++ /dev/null @@ -1,12 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2008 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - -This product includes software under the Apache License Version 2.0 -with the following copyright: - -Copyright (c) 2003-2004 Jan-Klaas Kollhof -Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd - diff --git a/branches/sca-java-1.1/modules/domain-impl/pom.xml b/branches/sca-java-1.1/modules/domain-impl/pom.xml deleted file mode 100644 index 6a6ad5b25a..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/pom.xml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 1.1-incubating-SNAPSHOT - ../pom.xml - - - tuscany-domain-impl - Apache Tuscany SCA Domain Implementation - - - - - org.apache.tuscany.sca - tuscany-assembly - 1.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-assembly-xml - 1.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-contribution-impl - 1.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-host-http - 1.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-core-spi - 1.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-domain - 1.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node - 1.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node-api - 1.1-incubating-SNAPSHOT - - - - org.apache.axis2 - axis2-adb - 1.3 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-binding-sca-axis2 - 1.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-binding-jsonrpc - 1.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-binding-http - 1.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-implementation-resource - 1.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.1-incubating-SNAPSHOT - test - - - - - diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainFactoryImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainFactoryImpl.java deleted file mode 100644 index 8f741d7ea9..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainFactoryImpl.java +++ /dev/null @@ -1,54 +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.impl; - -import org.apache.tuscany.sca.domain.DomainException; -import org.apache.tuscany.sca.domain.SCADomain; -import org.apache.tuscany.sca.domain.SCADomainFactory; - -/** - * A finder for SCA domains. - * - * @version $Rev: 580520 $ $Date: 2007-09-29 00:50:25 +0100 (Sat, 29 Sep 2007) $ - */ -public class SCADomainFactoryImpl extends SCADomainFactory { - - - /** - * Returns a new SCA domain finder instance. - * - * @return a new SCA domain finder - */ - public SCADomainFactoryImpl() { - - } - - /** - * Finds an existing SCA domain. - * - * @param domainURI the URI of the domain, this is the endpoint - * URI of the domain administration service - * @return the SCA domain - */ - public SCADomain createSCADomain(String domainURI) throws DomainException { - return new SCADomainImpl(domainURI); - } - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java deleted file mode 100644 index f3464570d3..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java +++ /dev/null @@ -1,1297 +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.impl; - -import java.io.ByteArrayOutputStream; -import java.io.Externalizable; -import java.net.URI; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.XMLStreamWriter; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.ComponentService; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.CompositeService; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.assembly.SCABindingFactory; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.DomainBuilder; -import org.apache.tuscany.sca.assembly.xml.Constants; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.DeployedArtifact; -import org.apache.tuscany.sca.contribution.Export; -import org.apache.tuscany.sca.contribution.Import; -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.assembly.ActivationException; -import org.apache.tuscany.sca.core.context.ServiceReferenceImpl; -import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary; -import org.apache.tuscany.sca.domain.DomainException; -import org.apache.tuscany.sca.domain.SCADomain; -import org.apache.tuscany.sca.domain.SCADomainEventService; -import org.apache.tuscany.sca.domain.SCADomainSPI; -import org.apache.tuscany.sca.domain.management.SCADomainManagerInitService; -import org.apache.tuscany.sca.domain.model.CompositeModel; -import org.apache.tuscany.sca.domain.model.ContributionModel; -import org.apache.tuscany.sca.domain.model.DomainModel; -import org.apache.tuscany.sca.domain.model.DomainModelFactory; -import org.apache.tuscany.sca.domain.model.NodeModel; -import org.apache.tuscany.sca.domain.model.ServiceModel; -import org.apache.tuscany.sca.domain.model.NodeModel.LifecyleState; -import org.apache.tuscany.sca.domain.model.impl.DomainModelFactoryImpl; -import org.apache.tuscany.sca.domain.model.impl.NodeModelImpl; -import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; -import org.apache.tuscany.sca.node.NodeException; -import org.apache.tuscany.sca.node.NodeFactoryImpl; -import org.apache.tuscany.sca.node.util.SCAContributionUtil; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentContext; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.ServiceRuntimeException; - -/** - * The SCA domain implementation. In Tuscany we currently have a model of the - * SCA Domain that relies on a central domain manager this class provides that - * central manager. - * - * @version $Rev: 552343 $ $Date: 2007-09-09 23:54:46 +0100 (Sun, 09 Sep 2007) $ - */ -public class SCADomainImpl implements SCADomain, SCADomainEventService, SCADomainSPI { - - private final static Logger logger = Logger.getLogger(SCADomainImpl.class.getName()); - - // class loader used to get the runtime going - protected ClassLoader domainClassLoader; - - // domain management application runtime - protected ReallySmallRuntime domainManagementRuntime; - protected ContributionService domainManagementContributionService; - protected Contribution domainManagementContribution; - protected Composite domainManagementComposite; - - // domain application runtime - protected Composite domainComposite; - - // the logic for wiring up references and services at the domain level - protected DomainBuilder domainBuilder; - - // Used to pipe dummy node information into the domain management runtime - // primarily so that the sca binding can resolve endpoints. - protected NodeFactoryImpl nodeFactory; - - // The domain model - protected DomainModelFactory domainModelFactory = new DomainModelFactoryImpl(); - protected DomainModel domainModel; - - // management services - private SCADomainManagerInitService domainManagerInitService; - - - // Implementation methods - - /** - * Create a domain giving the URI for the domain. - * - * @param domainUri - identifies what host and port the domain service is running on, e.g. http://localhost:8081 - * @throws ActivationException - */ - public SCADomainImpl(String domainURI) throws DomainException { - this.domainModel = domainModelFactory.createDomain(); - this.domainModel.setDomainURI(domainURI); - this.domainClassLoader = SCADomainImpl.class.getClassLoader(); - init(); - } - - /** - * Create the domain management runtime etc - */ - protected void init() throws DomainException { - try { - // check whether domain uri is a url - URI tmpURI; - try { - tmpURI = new URI(domainModel.getDomainURI()); - domainModel.setDomainURL(tmpURI.toURL().toExternalForm()); - } catch(Exception ex) { - throw new ActivationException("domain uri " + - domainModel.getDomainURI() + - " must be a valid url"); - } - - // create a runtime for the domain management services to run on - domainManagementRuntime = new ReallySmallRuntime(domainClassLoader); - domainManagementRuntime.start(); - - // Configure the default server port and path - int port = URI.create(domainModel.getDomainURI()).getPort(); - String path = URI.create(domainModel.getDomainURI()).getPath(); - if (port != -1) { - ServletHostExtensionPoint servletHosts = domainManagementRuntime.getExtensionPointRegistry().getExtensionPoint(ServletHostExtensionPoint.class); - for (ServletHost servletHost: servletHosts.getServletHosts()) { - servletHost.setDefaultPort(port); - if (path != null && path.length() > 0 && !path.equals("/")) { - servletHost.setContextPath(path); - } - } - } - - // Create an in-memory domain level management composite - AssemblyFactory assemblyFactory = domainManagementRuntime.getAssemblyFactory(); - domainManagementComposite = assemblyFactory.createComposite(); - domainManagementComposite.setName(new QName(Constants.SCA10_NS, "domainManagement")); - domainManagementComposite.setURI(domainModel.getDomainURI() + "/management"); - - // Create an in-memory domain level composite - domainComposite = assemblyFactory.createComposite(); - domainComposite.setName(new QName(Constants.SCA10_NS, "domain")); - domainComposite.setURI(domainModel.getDomainURI() + "/domain"); - - domainModel.setDomainLeveComposite(domainComposite); - - // Set up the domain so that local callable references can find - // service out there in the domain - SCADummyNodeImpl node = new SCADummyNodeImpl(this); - ModelFactoryExtensionPoint factories = domainManagementRuntime.getExtensionPointRegistry().getExtensionPoint(ModelFactoryExtensionPoint.class); - nodeFactory = new NodeFactoryImpl(node); - factories.addFactory(nodeFactory); - - // Find the composite that will configure the domain - String domainCompositeName = "domain.composite"; - URL contributionURL = SCAContributionUtil.findContributionFromResource(domainClassLoader, domainCompositeName); - - if ( contributionURL != null ){ - logger.log(Level.INFO, "Domain management configured from " + contributionURL); - - // add node composite to the management domain - domainManagementContributionService = domainManagementRuntime.getContributionService(); - Contribution contribution = null; - contribution = domainManagementContributionService.contribute(domainModel.getDomainURI(), - contributionURL, - false); - - //update the runtime for all SCA Definitions processed from the contribution.. - //so that the policyset determination done during 'build' has the all the defined - //intents and policysets - domainManagementRuntime.updateSCADefinitions(domainManagementContributionService.getContributionSCADefinitions()); - - - //get the domain builder - domainBuilder = domainManagementRuntime.getDomainBuilder(); - - - Composite composite = null; - for (DeployedArtifact artifact: contribution.getArtifacts()) { - if (domainCompositeName.equals(artifact.getURI())) { - composite = (Composite)artifact.getModel(); - } - } - - if (composite != null) { - - domainManagementComposite.getIncludes().add(composite); - domainManagementRuntime.buildComposite(composite); - domainManagementRuntime.getCompositeActivator().activate(composite); - domainManagementRuntime.getCompositeActivator().start(composite); - - // get the management components out of the domain so that they - // can be configured/used. - domainManagerInitService = getService(SCADomainManagerInitService.class, - "SCADomainManagerComponent/SCADomainManagerInitService", - domainManagementRuntime, - domainManagementComposite); - domainManagerInitService.setDomain(this); - domainManagerInitService.setDomainSPI((SCADomainSPI)this); - domainManagerInitService.setDomainEventService((SCADomainEventService)this); - - - } else { - throw new ActivationException("Domain management contribution " + - contributionURL + - " found but could not be loaded"); - } - } else { - throw new ActivationException("Domain management contribution " + - domainCompositeName + - " not found on the classpath"); - } - - - } catch(Exception ex) { - throw new DomainException(ex); - } - } - - private void notifyDomainChange() throws DomainException { - List changedComposites = domainBuilder.wireDomain(domainComposite); - - // notify nodes that have composites that the composites have changed - for (Composite composite : changedComposites){ - String compositeXML = getComposite(composite.getName()); - - for (NodeModel node : domainModel.getNodes().values()){ - if (node.getDeployedComposites().containsKey(composite.getName())){ - try { - if (((NodeModelImpl)node).getSCANodeManagerService() != null) { - - logger.log(Level.FINE, "Updating node: " + - node.getNodeURI() + - " with composite: " + - compositeXML); - - // notify node - ((NodeModelImpl)node).getSCANodeManagerService().updateComposite(composite.getName().toString(), - Base64Binary.encode(compositeXML.getBytes())); - } - } catch (Exception ex) { - throw new DomainException(ex); - } - } - } - } - } - - private ContributionModel findContributionFromComposite(QName compositeQName){ - ContributionModel returnContributionModel = null; - - for(ContributionModel contributionModel : domainModel.getContributions().values()){ - if (contributionModel.getComposites().containsKey(compositeQName)){ - returnContributionModel = contributionModel; - } - } - - return returnContributionModel; - } - - private CompositeModel findComposite(QName compositeQName){ - CompositeModel returnCompositeModel = null; - - for(ContributionModel contributionModel : domainModel.getContributions().values()){ - returnCompositeModel = contributionModel.getComposites().get(compositeQName); - - if (returnCompositeModel != null){ - break; - } - } - - return returnCompositeModel; - } - - // Recursively look for contributions that contain included artifacts. Deepest dependencies - // appear first in the list - // This function should be moved to the contribution package. - private void findDependentContributions(Contribution contribution, List dependentContributions){ - - for (Import contribImport : contribution.getImports()) { - for (Contribution tmpContribution : contribImport.getExportContributions()) { - for (Export export : tmpContribution.getExports()) { - if (contribImport.match(export)) { - if (tmpContribution.getImports().isEmpty()) { - dependentContributions.add(tmpContribution); - } else { - findDependentContributions(tmpContribution, dependentContributions); - } - } - } - } - } - - dependentContributions.add(contribution); - } - - private ContributionModel parseContribution(String contributionURI, String contributionURL) throws DomainException { - // add the contribution information to the domain model - ContributionModel contributionModel = domainModelFactory.createContribution(); - contributionModel.setContributionURI(contributionURI); - contributionModel.setContributionURL(contributionURL); - domainModel.getContributions().put(contributionURI, contributionModel); - - // read the assembly model objects. - try { - // Create a local model from the contribution. Using the contribution - // processor from the domain management runtime just because we already have it - Contribution contribution = domainManagementContributionService.contribute(contributionURI, - new URL(contributionURL), - false); - - contributionModel.setContribution(contribution); - - // add the composites into the domain model - for (DeployedArtifact artifact : contribution.getArtifacts()) { - if (artifact.getModel() instanceof Composite) { - Composite composite = (Composite)artifact.getModel(); - CompositeModel compositeModel = domainModelFactory.createComposite(); - compositeModel.setCompositeQName(composite.getName()); - compositeModel.setComposite(composite); - contributionModel.getComposites().put(compositeModel.getCompositeQName(), compositeModel); - } - } - - // add the deployable composite info to the domain model - for (Composite composite : contribution.getDeployables()) { - CompositeModel compositeModel = contributionModel.getComposites().get(composite.getName()); - - if (compositeModel != null){ - contributionModel.getDeployableComposites().put(compositeModel.getCompositeQName(), compositeModel); - } else { - throw new DomainException("Deployable composite name " + - composite.getName() + - " doesn't match a composite in the contribution " + - contributionURI ); - } - } - } catch(DomainException ex) { - throw ex; - } catch(Exception ex) { - throw new DomainException(ex); - } - - return contributionModel; - } - - - // SCADomainSPI methods - - public DomainModel getDomainModel(){ - return domainModel; - } - - public String getComposite(QName compositeQName){ - CompositeModel compositeModel = domainModel.getDeployedComposites().get(compositeQName); - Composite composite = compositeModel.getComposite(); - - ExtensionPointRegistry registry = domainManagementRuntime.getExtensionPointRegistry(); - - StAXArtifactProcessorExtensionPoint staxProcessors = - registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); - - StAXArtifactProcessor processor = staxProcessors.getProcessor(Composite.class); - - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - try { - XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); - //outputFactory.setProperty("javax.xml.stream.isPrefixDefaulting",Boolean.TRUE); - XMLStreamWriter writer = outputFactory.createXMLStreamWriter(bos); - - processor.write(composite, writer); - writer.flush(); - writer.close(); - } catch (Exception ex) { - System.out.println(ex.toString()); - } - - String compositeString = bos.toString(); - - return compositeString; - } - - public String getComponent(QName compositeQName, String componentName){ - - String componentString = null; - - return componentString; - } - - - // SCADomainEventService methods - - public void registerNode(String nodeURI, String nodeURL, Externalizable nodeManagerReference) throws DomainException { - // try and remove it first just in case it's already registered - unregisterNode(nodeURI); - - NodeModel node = domainModelFactory.createNode(); - node.setNodeURI(nodeURI); - node.setNodeURL(nodeURL); - node.setNodeManagerReference(nodeManagerReference); - node.setLifecycleState(LifecyleState.AVAILABLE); - domainModel.getNodes().put(nodeURI, node); - - logger.log(Level.INFO, "Registered node: " + - nodeURI + - " at endpoint " + - nodeURL); - } - - public void unregisterNode(String nodeURI) throws DomainException{ - - domainModel.getNodes().remove(nodeURI); - - logger.log(Level.FINE, "Removed node: " + nodeURI); - } - - public void registerNodeStart(String nodeURI) throws DomainException{ -/* TODO - no longer used - NodeModel node = domainModel.getNodes().get(nodeURI); - - if (node != null) { - // if the node was started by the domain we already know it's running - if (node.getLifecycleState() != LifecyleState.RUNNING){ - node.setLifecycleState(LifecyleState.RUNNING); - - // run the update in a separate thread so that the caller doesn't block - scheduler.execute(domainUpdateProcessor); - } - } else { - logger.log(Level.WARNING, "trying to start node: " + - nodeURI + - " that isn't registered " ); - } -*/ - } - - public void registerNodeStop(String nodeURI) throws DomainException{ -/* TODO - no longer used - NodeModel node = domainModel.getNodes().get(nodeURI); - - if (node != null) { - // if the node was stopped by the domain we already know it's running - if (node.getLifecycleState() == LifecyleState.RUNNING){ - node.setLifecycleState(LifecyleState.DEPLOYED); - - // run the update in a separate thread so that the caller doesn't block - scheduler.execute(domainUpdateProcessor); - } - } else { - logger.log(Level.WARNING, "trying to stop node: " + - nodeURI + - " that isn't registered " ); - } -*/ - } - - public void registerContribution(String nodeURI, String contributionURI, String contributionURL) throws DomainException{ - try { - ContributionModel contributionModel = null; - - if ( domainModel.getContributions().containsKey(contributionURI) == false ){ - contributionModel = parseContribution(contributionURI, contributionURL); - - // assign the contribution to the referenced node - NodeModel node = domainModel.getNodes().get(nodeURI); - - if ((node != null) && (contributionModel != null)) { - node.getContributions().put(contributionURI, contributionModel); - } - } else { - // TODO - throw an exception here ? - } - - } catch (Exception ex) { - logger.log(Level.SEVERE, "Exception when registering contribution " + - contributionURI + - ex.toString() ); - } - } - - public void unregisterContribution(String nodeURI, String contributionURI) throws DomainException { - try { - - if ( domainModel.getContributions().containsKey(contributionURI) == true ){ - // get the contribution model - ContributionModel contributionModel = domainModel.getContributions().get(contributionURI); - - // remove deployed composites - for (QName compositeQName : contributionModel.getDeployedComposites().keySet()){ - domainModel.getDomainLevelComposite().getIncludes().remove(contributionModel.getDeployedComposites().get(compositeQName)); - domainModel.getDeployedComposites().remove(compositeQName); - } - - // remove contribution from the domain - domainModel.getContributions().remove(contributionURI); - - // remove the contribution from the referenced node - NodeModel nodeModel = domainModel.getNodes().get(nodeURI); - - if ((nodeModel != null)) { - nodeModel.getContributions().remove(contributionURI); - - // remove deployed composites - for (QName compositeQName : contributionModel.getDeployedComposites().keySet()){ - nodeModel.getDeployedComposites().remove(compositeQName); - } - } - } - - } catch (Exception ex) { - logger.log(Level.SEVERE, "Exception when removing contribution " + - contributionURI + - ex.toString() ); - } - } - - public void registerDomainLevelComposite(String nodeURI, String compositeQNameString) throws DomainException{ - try { - QName compositeQName = QName.valueOf(compositeQNameString); - - if (!domainModel.getDeployedComposites().containsKey(compositeQName)){ - // get the composite from the node - NodeModel node = domainModel.getNodes().get(nodeURI); - - if (node != null) { - if (node.getLifecycleState() != LifecyleState.AVAILABLE){ - throw new DomainException("Node " + nodeURI + " is already marked as active"); - } else { - for (ContributionModel contributionModel : node.getContributions().values()){ - CompositeModel compositeModel = contributionModel.getComposites().get(compositeQName); - - if (compositeModel != null){ - contributionModel.getDeployedComposites().put(compositeQName, compositeModel); - node.getDeployedComposites().put(compositeQName, compositeModel); - domainModel.getDeployedComposites().put(compositeQName, compositeModel); - domainManagementRuntime.getCompositeBuilder().build(compositeModel.getComposite()); - domainModel.getDomainLevelComposite().getIncludes().add(compositeModel.getComposite()); - - - } - } - } - } - } else { - throw new DomainException("Composite " + compositeQNameString + - " is already marked as deployed on node " + nodeURI); - } - } catch (Exception ex) { - logger.log(Level.SEVERE, "Exception when registering domain level composite " + - nodeURI + " " + - compositeQNameString + - ex.toString() ); - } - } - - public void registerServiceEndpoint(String domainURI, String nodeURI, String targetServiceName, String bindingClassName, String URL)throws DomainException { - - // the target service name is the component/service name combination - String componentName = null; - String serviceName = null; - - // if the service name ends in a "/" remove it - if (targetServiceName.endsWith("/")) { - targetServiceName = targetServiceName.substring(0, targetServiceName.length() - 1); - } - - // if the service name starts with a "/" remove it - if (targetServiceName.startsWith("/")) { - targetServiceName = targetServiceName.substring(1, targetServiceName.length()); - } - - // TODO - only interested if multiplicity is <= 1 - componentName = domainBuilder.getComponentNameFromReference(targetServiceName); - serviceName = domainBuilder.getServiceNameFromReference(targetServiceName); - - domainBuilder.updateDomainLevelServiceURI(domainComposite, targetServiceName, bindingClassName, URL); - - // find the node with the service - NodeModel node = domainModel.getNodes().get(nodeURI); - - if (node != null){ - - // collect the service info - ServiceModel serviceModel = domainModelFactory.createService(); - serviceModel.setServiceURI(targetServiceName); - serviceModel.setServiceURL(URL); - serviceModel.setServiceBinding(bindingClassName); - - //store the service - node.getServices().put(targetServiceName+bindingClassName, serviceModel); - - if (componentName != null){ - node.getServices().put(componentName+bindingClassName, serviceModel); - } - logger.log(Level.INFO, "Registering service: [" + - domainURI + " " + - targetServiceName + " " + - URL + " " + - bindingClassName + "]"); - } else { - logger.log(Level.WARNING, "Trying to register service: " + - targetServiceName + - " for a node " + - nodeURI + - "that isn't registered"); - } - - } - - public void unregisterServiceEndpoint(String domainURI, String nodeURI, String serviceName, String bindingClassName) throws DomainException{ - NodeModel node = domainModel.getNodes().get(nodeURI); - node.getServices().remove(serviceName + bindingClassName); - - // extract the short name from the long name - String shortServiceName = null; - if (serviceName.indexOf("/") >= 0 ) { - shortServiceName = serviceName.substring(0, serviceName.indexOf("/")); - } - - node.getServices().remove(shortServiceName + bindingClassName); - - logger.log(Level.FINE, "Removed service: " + serviceName ); - - } - - public String findServiceEndpoint(String domainURI, String serviceName, String bindingName) throws DomainException{ - logger.log(Level.INFO, "Finding service: [" + - domainURI + " " + - serviceName + " " + - bindingName + - "]"); - - String url = SERVICE_NOT_REGISTERED; - String serviceKey = serviceName + bindingName; - - for (NodeModel node : domainModel.getNodes().values()){ - ServiceModel service = node.getServices().get(serviceKey); - - if (service != null){ - url = service.getServiceURL(); - // uncomment for debugging - //url = url.replace("8085", "8086"); - logger.log(Level.INFO, "Found service " + serviceName + " url: " + url); - break; - } - } - - return url; - } - - public String findServiceNode(String domainURI, String serviceName, String bindingName) throws DomainException{ - logger.log(Level.FINE, "Finding service node: [" + - domainURI + " " + - serviceName + " " + - bindingName + - "]"); - - String nodeURI = SERVICE_NOT_KNOWN; - - for (NodeModel node : domainModel.getNodes().values()){ - Service service = null; - for (CompositeModel compositeModel : node.getDeployedComposites().values()){ - service = domainBuilder.findServiceForReference(compositeModel.getComposite(), serviceName); - if (service != null) { - nodeURI = node.getNodeURI(); - break; - } - } - } - - return nodeURI; - } - - - - // SCADomain API methods - - public void start() throws DomainException { - - // notify any top level domain changes before composites are started - notifyDomainChange(); - - // call start on all nodes with deployed composites - for(NodeModel node : domainModel.getNodes().values()) { - if ( !node.getDeployedComposites().isEmpty()){ - try { - if (node.getLifecycleState() != LifecyleState.RUNNING) { - ((NodeModelImpl)node).getSCANodeManagerService().start(); - node.setLifecycleState(LifecyleState.RUNNING); - } - } catch (Exception ex) { - // TODO - collate errors and report - ex.printStackTrace(); - } - } - } - } - - public void stop() throws DomainException { - // call stop on all nodes - for(NodeModel node : domainModel.getNodes().values()) { - try { - if (node.getLifecycleState() == LifecyleState.RUNNING) { - ((NodeModelImpl)node).getSCANodeManagerService().stop(); - node.setLifecycleState(LifecyleState.DEPLOYED); - } - } catch (Exception ex) { - // TODO - collate errors and report - ex.printStackTrace(); - } - } - } - - public void destroy() throws DomainException { - try { - - // unregister all nodes - domainModel.getNodes().clear(); - - // remove all management components - Composite composite = domainManagementComposite.getIncludes().get(0); - - domainManagementRuntime.getCompositeActivator().stop(composite); - domainManagementRuntime.getCompositeActivator().deactivate(composite); - - // remove the node factory - ModelFactoryExtensionPoint factories = domainManagementRuntime.getExtensionPointRegistry().getExtensionPoint(ModelFactoryExtensionPoint.class); - factories.removeFactory(nodeFactory); - nodeFactory.setNode(null); - - // Stop the SCA runtime that the domain is using - domainManagementRuntime.stop(); - - - } catch(ActivationException ex) { - throw new DomainException(ex); - } - } - - public String getURI(){ - return domainModel.getDomainURI(); - } - - public void addContribution(String contributionURI, URL contributionURL) throws DomainException { - // add the contribution information to the domain model - org.apache.tuscany.sca.domain.model.ContributionModel contributionModel = - parseContribution(contributionURI, contributionURL.toExternalForm()); - } - - public void updateContribution(String contributionURI, URL contributionURL) throws DomainException { - if ( domainModel.getContributions().containsKey(contributionURI) == true ){ - - List deployedCompositeNames = new ArrayList(); - - // record the names of composites that must be restarted after the - // contribution has been removed - for ( NodeModel node : domainModel.getNodes().values()){ - if ((node.getLifecycleState() == LifecyleState.RUNNING) && (node.getContributions().containsKey(contributionURI))) { - for (CompositeModel tmpCompositeModel : node.getDeployedComposites().values()){ - deployedCompositeNames.add(tmpCompositeModel.getCompositeQName()); - } - } - } - - // remove the old version of the contribution - removeContribution(contributionURI); - - // Add the updated contribution back into the domain model - // TODO - there is a problem here with dependent contributions - // as it doesn't look like the contribution listeners - // are working quite right - addContribution(contributionURI, contributionURL); - - // add the deployed composites back into the domain if they still exist - // if they don't then the user will have to add and start any new composites manually - for (QName compositeQName : deployedCompositeNames) { - // make sure the composite still exists - CompositeModel compositeModel = findComposite(compositeQName); - - if (compositeModel != null){ - addToDomainLevelComposite(compositeModel.getCompositeQName()); - } else { - // the composite has been removed from the contribution - // by the update - } - } - - // automatically start all the composites - for (QName compositeName : deployedCompositeNames) { - startComposite(compositeName); - } - } else { - throw new DomainException("Contribution " + contributionURI + " not found in domain contributions"); - } - } - - public void removeContribution(String contributionURI) throws DomainException { - if ( domainModel.getContributions().containsKey(contributionURI) == true ){ - - // get the contribution model - ContributionModel contributionModel = domainModel.getContributions().get(contributionURI); - - // remove potentially deployed composites - for (QName compositeQName : contributionModel.getDeployableComposites().keySet()){ - domainModel.getDeployedComposites().remove(compositeQName); - domainModel.getDomainLevelComposite().getIncludes().remove(contributionModel.getDeployableComposites().get(compositeQName)); - } - - // remove contribution from the domain model - domainModel.getContributions().remove(contributionURI); - - // remove contribution from the contribution processor - try { - domainManagementContributionService.remove(contributionURI); - } catch (Exception ex){ - throw new DomainException(ex); - } - - // stop and tidy any nodes running this contribution - for ( NodeModel node : domainModel.getNodes().values()){ - if (node.getContributions().containsKey(contributionURI)) { - try { - if (node.getLifecycleState() == LifecyleState.RUNNING) { - ((NodeModelImpl)node).getSCANodeManagerService().stop(); - node.setLifecycleState(LifecyleState.DEPLOYED); - } - - // remove all contributions from this node including the - // one that is specifically being removed. - for (ContributionModel tmpContributionModel : node.getContributions().values()){ - ((NodeModelImpl)node).getSCANodeManagerService().removeContribution(tmpContributionModel.getContributionURI()); - } - - node.getContributions().clear(); - node.getDeployedComposites().clear(); - node.setLifecycleState(LifecyleState.AVAILABLE); - node.getServices().clear(); - } catch (Exception ex) { - // TODO - collate errors and report - ex.printStackTrace(); - } - } - } - } else { - throw new DomainException("Contribution " + contributionURI + " not found in domain contributions"); - } - } - - public void addDeploymentComposite(String contributionURI, String compositeXML) throws DomainException { - // TODO - throw new DomainException("Not yet implemented"); - } - - public void updateDeploymentComposite(String contributionURI, String compositeXML) throws DomainException { - // TODO - throw new DomainException("Not yet implemented"); - } - - public void addToDomainLevelComposite(QName compositeQName) throws DomainException { - addToDomainLevelComposite(compositeQName, null); - } - - public void addToDomainLevelComposite(QName compositeQName, String nodeURI) throws DomainException { - - try { - // check to see if this composite has already been added - if (domainModel.getDeployedComposites().containsKey(compositeQName) ){ - throw new DomainException("Composite " + compositeQName.toString() + - " had already been added to the domain level composite"); - } - - // find the contribution that has this composite - ContributionModel contributionModel = findContributionFromComposite(compositeQName); - - if (contributionModel == null){ - throw new DomainException("Can't find contribution for composite " + compositeQName.toString()); - } - - // find the composite object from the contribution - CompositeModel compositeModel = contributionModel.getComposites().get(compositeQName); - - if (compositeModel == null){ - throw new DomainException("Can't find composite model " + compositeQName.toString() + - " in contribution " + contributionModel.getContributionURI()); - } - - // build the contribution to create the services and references - domainModel.getDeployedComposites().put(compositeQName, compositeModel); - domainManagementRuntime.getCompositeBuilder().build(compositeModel.getComposite()); - domainModel.getDomainLevelComposite().getIncludes().add(compositeModel.getComposite()); - - NodeModel node = null; - - // find the node for the composite to run on - if (nodeURI != null) { - // find the named node - node = domainModel.getNodes().get(nodeURI); - - if (node == null){ - throw new DomainException("Node " + nodeURI + " not found in domain"); - } - } else { - // noddy algorithm to find a free node - // TODO - do something better - for(NodeModel tmpNode : domainModel.getNodes().values()) { - if (tmpNode.getLifecycleState() == LifecyleState.AVAILABLE){ - node = tmpNode; - } - } - - if (node == null){ - throw new DomainException("No free node available to run composite " + compositeQName.toString()); - } - } - - // find all the composites that the node must know about - List dependentContributions = new ArrayList(); - findDependentContributions(contributionModel.getContribution(), dependentContributions); - - // assign the set of contributions to the node model - for (Contribution tmpContribution : dependentContributions){ - node.getContributions().put(tmpContribution.getURI(), - domainModel.getContributions().get(tmpContribution.getURI())); - } - - // assign the composite to the node model - node.getDeployedComposites().put(compositeQName, compositeModel); - - node.setLifecycleState(LifecyleState.DEPLOYED); - - // now pass this information over to the real node - - - // add contributions. Use the dependent contribution list here rather than the - // one built up in the node model to ensure that contributions are added in the correct order - // I.e. the top most in the dependency tree last. - for (Contribution tmpContribution : dependentContributions){ - ((NodeModelImpl)node).getSCANodeManagerService().addContribution(tmpContribution.getURI(), - domainModel.getContributions().get(tmpContribution.getURI()).getContributionURL()); - } - - // deploy composite - ((NodeModelImpl)node).getSCANodeManagerService().addToDomainLevelComposite(compositeQName.toString()); - - // spray all of the service endpoints from this composite out to interested nodes - notifyDomainChange(); - } catch (DomainException ex) { - throw ex; - } catch (Exception ex) { - throw new DomainException(ex); - } - - } - - public void removeFromDomainLevelComposite(QName compositeQName) throws DomainException { - - domainModel.getDomainLevelComposite().getIncludes().remove(domainModel.getDeployedComposites().get(compositeQName).getComposite()); - domainModel.getDeployedComposites().remove(compositeQName); - - ContributionModel contributionModel = findContributionFromComposite(compositeQName); - - if (contributionModel != null){ - contributionModel.getDeployedComposites().remove(compositeQName); - - for(NodeModel node : domainModel.getNodes().values()) { - if ( node.getDeployedComposites().containsKey(compositeQName)){ - try { - if (node.getLifecycleState() == LifecyleState.RUNNING) { - ((NodeModelImpl)node).getSCANodeManagerService().stop(); - node.setLifecycleState(LifecyleState.DEPLOYED); - } - // TODO - how to remove it from the node. Remove all contributions??? - - node.getDeployedComposites().remove(compositeQName); - } catch (Exception ex) { - // TODO - collate errors and report - ex.printStackTrace(); - } - } - } - } else { - throw new DomainException("Composite " + compositeQName.toString() + " not found in domain contributions"); - } - } - - public String getDomainLevelComposite() throws DomainException { - - String domainLevelComposite = ""; - - includeCount = 0; - for (CompositeModel compositeModel : domainModel.getDeployedComposites().values()){ - domainLevelComposite = domainLevelComposite + ""; - includeCount++; - } - - domainLevelComposite = domainLevelComposite + ""; - - return domainLevelComposite; - } - - public String getQNameDefinition(QName artifact) throws DomainException { - // TODO - no absolutely sure what is intended here as I don't have - // an explicit scenario but here is some code to get me thinking about it - String artifactString = null; - - // find the composite that matches and return its XML - CompositeModel compositeModel = domainModel.getDeployedComposites().get(artifact); - - if (compositeModel != null){ - // convert the composite to XML - } - - return artifactString; - } - - public void startComposite(QName compositeQName) throws DomainException { - try { - // find the composite object from the list of deployed composites - CompositeModel compositeModel = domainModel.getDeployedComposites().get(compositeQName); - - if (compositeModel == null){ - throw new DomainException("Can't start composite " + compositeQName.toString() + - " as it hasn't been added to the domain level composite"); - } - - // find the contribution that has this composite - ContributionModel contributionModel = findContributionFromComposite(compositeQName); - - if (contributionModel == null){ - throw new DomainException("Can't find contribution for composite " + compositeQName.toString()); - } - - NodeModel node = null; - - // find the node that has this composite - for(NodeModel tmpNode : domainModel.getNodes().values()) { - if (tmpNode.getDeployedComposites().containsKey(compositeQName)){ - node = tmpNode; - break; - } - } - - if (node != null){ - if (node.getLifecycleState() == LifecyleState.DEPLOYED){ - // start the node - ((NodeModelImpl)node).getSCANodeManagerService().start(); - node.setLifecycleState(LifecyleState.RUNNING); - } - - } else { - // composite not assigned to node for some reason - throw new DomainException("Composite " + compositeQName.toString() + - " is not associated with a node and cannot be started"); - } - } catch (NodeException ex){ - throw new DomainException(ex); - } - - } - - public void stopComposite(QName compositeName) throws DomainException { - // find the composite object from the list of deployed composites - CompositeModel composite = domainModel.getDeployedComposites().get(compositeName); - - if (composite == null){ - throw new DomainException("Can't stop composite " + compositeName.toString() + - " as it hasn't been added to the domain level composite"); - } - - // stop all the nodes running this composite - for(NodeModel node : domainModel.getNodes().values()) { - if ( node.getDeployedComposites().containsKey(compositeName)){ - try { - if (node.getLifecycleState() == LifecyleState.RUNNING) { - node.setLifecycleState(LifecyleState.DEPLOYED); - ((NodeModelImpl)node).getSCANodeManagerService().stop(); - } - } catch (Exception ex) { - // TODO - how to report this? - } - } - } - } - - public > R cast(B target) throws IllegalArgumentException { - return (R)cast(target, domainManagementRuntime); - } - - protected > R cast(B target, ReallySmallRuntime runtime) throws IllegalArgumentException { - return (R)runtime.getProxyFactory().cast(target); - } - - public B getService(Class businessInterface, String serviceName) { - return getService( businessInterface, serviceName, domainManagementRuntime, null); - } - - protected B getService(Class businessInterface, String serviceName, ReallySmallRuntime runtime, Composite domainComposite) { - - ServiceReference serviceReference = getServiceReference(businessInterface, serviceName, runtime, domainComposite); - if (serviceReference == null) { - throw new ServiceRuntimeException("Service not found: " + serviceName); - } - return serviceReference.getService(); - } - - protected ServiceReference createServiceReference(Class businessInterface, String targetURI) { - return createServiceReference(businessInterface, targetURI, domainManagementRuntime, null); - } - - - protected ServiceReference createServiceReference(Class businessInterface, String targetURI, ReallySmallRuntime runtime, Composite domainComposite) { - try { - - AssemblyFactory assemblyFactory = runtime.getAssemblyFactory(); - Composite composite = assemblyFactory.createComposite(); - composite.setName(new QName(Constants.SCA10_TUSCANY_NS, "default")); - RuntimeComponent component = (RuntimeComponent)assemblyFactory.createComponent(); - component.setName("default"); - component.setURI("default"); - runtime.getCompositeActivator().configureComponentContext(component); - composite.getComponents().add(component); - RuntimeComponentReference reference = (RuntimeComponentReference)assemblyFactory.createComponentReference(); - reference.setName("default"); - ModelFactoryExtensionPoint factories = - runtime.getExtensionPointRegistry().getExtensionPoint(ModelFactoryExtensionPoint.class); - JavaInterfaceFactory javaInterfaceFactory = factories.getFactory(JavaInterfaceFactory.class); - InterfaceContract interfaceContract = javaInterfaceFactory.createJavaInterfaceContract(); - interfaceContract.setInterface(javaInterfaceFactory.createJavaInterface(businessInterface)); - reference.setInterfaceContract(interfaceContract); - component.getReferences().add(reference); - reference.setComponent(component); - SCABindingFactory scaBindingFactory = factories.getFactory(SCABindingFactory.class); - SCABinding binding = scaBindingFactory.createSCABinding(); - - // find the service endpoint somewhere else in the domain - try { - String endpointURL = findServiceEndpoint(domainModel.getDomainURI(), - targetURI, - binding.getClass().getName()); - - if (endpointURL.equals(SERVICE_NOT_REGISTERED)){ - logger.log(Level.WARNING, "Created a sevice reference for service that is not yet started: Service " + targetURI); - } else { - targetURI = endpointURL; - } - } catch (DomainException ex){ - throw new ServiceRuntimeException(ex); - } - - binding.setURI(targetURI); - reference.getBindings().add(binding); - return new ServiceReferenceImpl(businessInterface, component, reference, binding, runtime - .getProxyFactory(), runtime.getCompositeActivator()); - } catch (Exception e) { - throw new ServiceRuntimeException(e); - } - } - - public ServiceReference getServiceReference(Class businessInterface, String name) { - return getServiceReference(businessInterface, name, domainManagementRuntime, null); - } - - - protected ServiceReference getServiceReference(Class businessInterface, String name, ReallySmallRuntime runtime, Composite domainComposite) { - - // Extract the component name - String componentName; - String serviceName; - int i = name.indexOf('/'); - if (i != -1) { - componentName = name.substring(0, i); - serviceName = name.substring(i + 1); - - } else { - componentName = name; - serviceName = null; - } - - // Lookup the component - Component component = null; - - if ( domainComposite != null ) { - for (Composite composite: domainComposite.getIncludes()) { - for (Component compositeComponent: composite.getComponents()) { - if (compositeComponent.getName().equals(componentName)) { - component = compositeComponent; - } - } - } - } - - if (component == null) { - // look to see of the service exists somewhere else in the domain - try { - String nodeName = findServiceNode(domainModel.getDomainURI(), - name, - "org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl"); - - if (nodeName.equals(SERVICE_NOT_KNOWN)){ - throw new ServiceRuntimeException("The service " + name + " has not been contributed to the domain"); - } - } catch (DomainException ex){ - throw new ServiceRuntimeException(ex); - } - - // now create a service reference - return createServiceReference(businessInterface, name, runtime, domainComposite); - } - RuntimeComponentContext componentContext = null; - - // If the component is a composite, then we need to find the - // non-composite component that provides the requested service - if (component.getImplementation() instanceof Composite) { - for (ComponentService componentService : component.getServices()) { - if (serviceName == null || serviceName.equals(componentService.getName())) { - CompositeService compositeService = (CompositeService)componentService.getService(); - if (compositeService != null) { - if (serviceName != null) { - serviceName = "$promoted$." + serviceName; - } - componentContext = - ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext(); - return componentContext.createSelfReference(businessInterface, compositeService - .getPromotedService()); - } - break; - } - } - // No matching service is found - throw new ServiceRuntimeException("Composite service not found: " + name); - } else { - componentContext = ((RuntimeComponent)component).getComponentContext(); - if (serviceName != null) { - return componentContext.createSelfReference(businessInterface, serviceName); - } else { - return componentContext.createSelfReference(businessInterface); - } - } - } - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADummyNodeImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADummyNodeImpl.java deleted file mode 100644 index 189f313267..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADummyNodeImpl.java +++ /dev/null @@ -1,80 +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.impl; - -import java.net.URL; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.domain.SCADomain; -import org.apache.tuscany.sca.node.NodeException; -import org.apache.tuscany.sca.node.SCANode; - -/** - * A dummy representation of and SCA Node used simply to allow - * callable references in the JVM where the domain is being run - * to be looked up - * - * @version $Rev: 552343 $ $Date: 2007-09-09 23:54:46 +0100 (Sun, 09 Sep 2007) $ - */ -public class SCADummyNodeImpl implements SCANode { - - private SCADomain scaDomain = null; - - public SCADummyNodeImpl(SCADomain scaDomain) { - this.scaDomain = scaDomain; - } - - // API methods - - public void start() throws NodeException { - } - - public void stop() throws NodeException { - - } - - public void destroy() throws NodeException { - } - - public String getURI(){ - return null; - } - - public SCADomain getDomain(){ - return scaDomain; - } - - public void addContribution(String contributionURI, URL contributionURL) throws NodeException { - } - - public void removeContribution(String contributionURI) throws NodeException { - } - - public void addToDomainLevelComposite(QName compositeName) throws NodeException { - } - - public void addToDomainLevelComposite(String compositePath) throws NodeException { - } - - public void startContribution(String contributionURI) throws NodeException { - } - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/launch/SCADomainControllerLauncher.java b/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/launch/SCADomainControllerLauncher.java deleted file mode 100644 index dadf05a49b..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/launch/SCADomainControllerLauncher.java +++ /dev/null @@ -1,63 +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.launch; - -import java.io.IOException; - -import org.apache.tuscany.sca.domain.SCADomain; -import org.apache.tuscany.sca.domain.SCADomainFactory; - -public class SCADomainControllerLauncher { - - /** - * @param args - */ - public static void main(String[] args) { - System.out.println("Tuscany Domain Controller starting..."); - - SCADomain domain = null; - try { - SCADomainFactory domainFactory = SCADomainFactory.newInstance(); - domain = domainFactory.createSCADomain("http://localhost:9999"); - - } catch (Exception e) { - System.err.println("Exception starting domain controller"); - e.printStackTrace(); - System.exit(0); - } - - System.out.println("Domain controller ready..."); - System.out.println("Press enter to shutdown"); - try { - System.in.read(); - } catch (IOException e) { - } - - try { - domain.destroy(); - } catch (Exception e) { - System.err.println("Exception stopping domain controller"); - e.printStackTrace(); - } - - System.exit(0); - } - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/ContributionInfoImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/ContributionInfoImpl.java deleted file mode 100644 index 090bf21fc1..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/ContributionInfoImpl.java +++ /dev/null @@ -1,89 +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.management.impl; - -import java.io.Serializable; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.domain.management.ContributionInfo; -/** - * Information relating to an exposed service - * - * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $ - */ -public class ContributionInfoImpl implements ContributionInfo, Serializable { - - static final long serialVersionUID = 7669181086005969428L; - - private String contributionURI; - private URL contributionURL; - private List composites = new ArrayList(); - private List deployableComposites = new ArrayList(); - - - /** - * Retrieve the contribution uri - * - * @return contribution uri - */ - public String getContributionURI() { - return contributionURI; - } - - /** - * Set the contribution uri - * - * @param contributionURI - */ - public void setContributionURI(String contributionURI){ - this.contributionURI = contributionURI; - } - - /** - * Retrieve the contribution url - * - * @return contribution url - */ - public URL getContributionURL(){ - return contributionURL; - } - - /** - * Set the contribution url - * - * @param contributionURL - */ - public void setContributionURL(URL contributionURL){ - this.contributionURL = contributionURL; - } - - public List getComposites(){ - return composites; - } - - public List getDeployableComposites(){ - return deployableComposites; - } - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/DomainInfoImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/DomainInfoImpl.java deleted file mode 100644 index 0d851094b9..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/DomainInfoImpl.java +++ /dev/null @@ -1,93 +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.management.impl; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.domain.management.DomainInfo; - -/** - * A data transport object for the management interface - * - * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $ - */ -public class DomainInfoImpl implements DomainInfo, Serializable { - - static final long serialVersionUID = 7669181086005969428L; - - private String domainURI; - private String domainURL; - private List nodes = new ArrayList(); - private List contributions = new ArrayList(); - private List composites = new ArrayList(); - - /** - * Retrieve the domain uri - * - * @return domain uri - */ - public String getDomainURI(){ - return domainURI; - } - - /** - * Set the domain uri - * - * @param domainURI - */ - public void setDomainURI(String domainURI){ - this.domainURI = domainURI; - } - - /** - * Retrieve the domain url - * - * @return domain url - */ - public String getDomainURL(){ - return domainURL; - } - - /** - * Set the domain url - * - * @param domainURL - */ - public void setDomainURL(String domainURL){ - this.domainURL = domainURL; - } - - public List getNodes(){ - return nodes; - } - - public List getContributions(){ - return contributions; - } - - public List getDeployedComposites(){ - return composites; - } - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/NodeInfoImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/NodeInfoImpl.java deleted file mode 100644 index f24d9fabb9..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/NodeInfoImpl.java +++ /dev/null @@ -1,93 +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.management.impl; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.domain.management.NodeInfo; - -/** - * Information relating to an exposed service - * - * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $ - */ -public class NodeInfoImpl implements NodeInfo, Serializable { - - static final long serialVersionUID = 7669181086005969428L; - - private String nodeURI; - private String nodeURL; - private List contributions = new ArrayList(); - private List composites = new ArrayList(); - private List services = new ArrayList(); - - /** - * Retrieve the node uri - * - * @return node uri - */ - public String getNodeURI(){ - return nodeURI; - } - - /** - * Set the node uri - * - * @param nodeURI - */ - public void setNodeURI(String nodeURI){ - this.nodeURI = nodeURI; - } - - /** - * Retrieve the node url - * - * @return node url - */ - public String getNodeURL() { - return nodeURL; - } - - /** - * Set the node url - * - * @param nodeURL - */ - public void setNodeURL(String nodeURL){ - this.nodeURL = nodeURL; - } - - public List getContributions(){ - return contributions; - } - - public List getDeployedComposites(){ - return composites; - } - - public List getServices(){ - return services; - } - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java deleted file mode 100644 index 0adf9b147e..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java +++ /dev/null @@ -1,228 +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.management.impl; - -import java.io.Externalizable; -import java.net.URL; -import java.util.logging.Logger; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.domain.DomainException; -import org.apache.tuscany.sca.domain.SCADomain; -import org.apache.tuscany.sca.domain.SCADomainAPIService; -import org.apache.tuscany.sca.domain.SCADomainEventService; -import org.apache.tuscany.sca.domain.SCADomainSPI; -import org.apache.tuscany.sca.domain.management.DomainInfo; -import org.apache.tuscany.sca.domain.management.NodeInfo; -import org.apache.tuscany.sca.domain.management.SCADomainManagerInitService; -import org.apache.tuscany.sca.domain.management.SCADomainManagerService; -import org.apache.tuscany.sca.domain.model.DomainModel; -import org.apache.tuscany.sca.domain.model.NodeModel; -import org.apache.tuscany.sca.node.management.SCANodeManagerService; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - - -/** - * Stores details of services exposed and retrieves details of remote services - * - * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $ - */ -@Scope("COMPOSITE") -@Service(interfaces = {SCADomainEventService.class, SCADomainManagerInitService.class, SCADomainManagerService.class, SCADomainAPIService.class}) -public class SCADomainManagerServiceImpl implements SCADomainEventService, SCADomainManagerInitService, SCADomainManagerService, SCADomainAPIService { - - private final static Logger logger = Logger.getLogger(SCADomainManagerServiceImpl.class.getName()); - - private SCADomain domain; - private SCADomainSPI domainSPI; - private SCADomainEventService domainEventService; - - // DomainManagerInitService methods - - public void setDomain(SCADomain domain) { - this.domain = domain; - } - - public void setDomainSPI(SCADomainSPI domainSPI) { - this.domainSPI = domainSPI; - } - - public void setDomainEventService(SCADomainEventService domainEventService) { - this.domainEventService = domainEventService; - } - - // DomainEventService methods - - public void registerNode(String nodeURI, String nodeURL, Externalizable nodeManagerReference) throws DomainException{ - // get a reference to the node manager here so that the callable reference - // the right context to construct itself. Don't actually have to do - // anything with the result as the context is cached inside the callable - // reference - ((CallableReference)nodeManagerReference).getService(); - - // pass on to the domain - domainEventService.registerNode(nodeURI, nodeURL, nodeManagerReference); - } - - public void unregisterNode(String nodeURI) throws DomainException { - domainEventService.unregisterNode(nodeURI); - } - - public void registerNodeStart(String nodeURI) throws DomainException { - domainEventService.registerNodeStart(nodeURI); - } - - public void registerNodeStop(String nodeURI) throws DomainException { - domainEventService.registerNodeStop(nodeURI); - } - - public void registerContribution(String nodeURI, String contributionURI, String contributionURL) throws DomainException { - domainEventService.registerContribution(nodeURI, contributionURI, contributionURL); - } - - public void unregisterContribution(String nodeURI,String contributionURI)throws DomainException { - domainEventService.unregisterContribution(nodeURI, contributionURI); - } - - public void registerDomainLevelComposite(String nodeURI, String compositeQNameString) throws DomainException{ - domainEventService.registerDomainLevelComposite(nodeURI, compositeQNameString); - } - - public void registerServiceEndpoint(String domainURI, String nodeUri, String serviceName, String bindingName, String URL) throws DomainException { - domainEventService.registerServiceEndpoint(domainURI, nodeUri, serviceName, bindingName, URL); - } - - public void unregisterServiceEndpoint(String domainURI, String nodeUri, String serviceName, String bindingName) throws DomainException{ - domainEventService.unregisterServiceEndpoint(domainURI, nodeUri, serviceName, bindingName); - } - - - public String findServiceEndpoint(String domainURI, String serviceName, String bindingName) throws DomainException{ - return domainEventService.findServiceEndpoint(domainURI, serviceName, bindingName); - } - - public String findServiceNode(String domainURI, String serviceName, String bindingName) throws DomainException { - return domainEventService.findServiceNode(domainURI, serviceName, bindingName); - } - - // DomainAPIService methods - - public void start() throws DomainException { - domain.start(); - } - - public void stop() throws DomainException { - domain.stop(); - } - - public void destroyDomain() throws DomainException { - domain.destroy(); - } - - public String getURI() { - return domain.getURI(); - } - - public void addContribution(String contributionURI, String contributionURL) throws DomainException { - try { - domain.addContribution(contributionURI, new URL(contributionURL)); - } catch (Exception ex) { - throw new DomainException (ex); - } - } - - public void updateContribution(String contributionURI, String contributionURL) throws DomainException { - try { - domain.updateContribution(contributionURI, new URL(contributionURL)); - } catch (Exception ex) { - throw new DomainException (ex); - } - } - - public void removeContribution(String contributionURI) throws DomainException { - domain.removeContribution(contributionURI); - } - - public void addDeploymentComposite(String contributionURI, String compositeXML) throws DomainException { - domain.addDeploymentComposite(contributionURI, compositeXML); - } - - public void updateDeploymentComposite(String contributionURI, String compositeXML) throws DomainException { - domain.updateDeploymentComposite(contributionURI, compositeXML); - } - - public void addToDomainLevelComposite(String compositeQName) throws DomainException { - domain.addToDomainLevelComposite(QName.valueOf(compositeQName)); - } - - public void removeFromDomainLevelComposite(String compositeQName) throws DomainException { - domain.removeFromDomainLevelComposite(QName.valueOf(compositeQName)); - } - - public String getDomainLevelComposite() throws DomainException { - return domain.getDomainLevelComposite(); - } - - public String getQNameDefinition(String artifact) throws DomainException { - return domain.getQNameDefinition(QName.valueOf(artifact)); - } - - public void startComposite(String compositeQName) throws DomainException { - domain.startComposite(QName.valueOf(compositeQName)); - } - - public void stopComposite(String compositeQName) throws DomainException { - domain.stopComposite(QName.valueOf(compositeQName)); - } - - // DomainManagementService methods - - public DomainInfo getDomainDescription(){ - - DomainInfo domainInfo = new DomainInfoImpl(); - DomainModel domain = domainSPI.getDomainModel(); - - domainInfo.setDomainURI(domain.getDomainURI()); - domainInfo.setDomainURL(domain.getDomainURL()); - domainInfo.getNodes().addAll(domain.getNodes().keySet()); - domainInfo.getContributions().addAll(domain.getContributions().keySet()); - domainInfo.getDeployedComposites().addAll(domain.getDeployedComposites().keySet()); - - return domainInfo; - } - - public NodeInfo getNodeDescription(String nodeURI){ - - NodeInfo nodeInfo = new NodeInfoImpl(); - DomainModel domain = domainSPI.getDomainModel(); - NodeModel node = domain.getNodes().get(nodeURI); - - nodeInfo.setNodeURI(nodeURI); - nodeInfo.setNodeURL(node.getNodeURL()); - nodeInfo.getContributions().addAll(node.getContributions().keySet()); - nodeInfo.getDeployedComposites().addAll(node.getDeployedComposites().keySet()); - nodeInfo.getServices().addAll(node.getServices().keySet()); - - return nodeInfo; - } -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/CompositeModelImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/CompositeModelImpl.java deleted file mode 100644 index 368314d45d..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/CompositeModelImpl.java +++ /dev/null @@ -1,75 +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.model.impl; - - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.domain.model.CompositeModel; - - -/** - * A wrapper for the assembly model composite - * - * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $ - */ -public class CompositeModelImpl implements CompositeModel { - - private QName compositeQName; - private Composite composite; - - /** - * Retrieve the composite qname - * - * @return composite qname - */ - public QName getCompositeQName(){ - return compositeQName; - } - - /** - * Set the composite qname - * - * @param compositeQName - */ - public void setCompositeQName(QName compositeQName) { - this.compositeQName = compositeQName; - } - - /** - * Retrieve the assembly composite object - * - * @return composite - */ - public Composite getComposite(){ - return composite; - } - - /** - * Set the assembly composite object - * - * @param composite - */ - public void setComposite(Composite composite){ - this.composite = composite; - } -} - diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ContributionModelImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ContributionModelImpl.java deleted file mode 100644 index c56dbe1bfe..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ContributionModelImpl.java +++ /dev/null @@ -1,110 +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.model.impl; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.domain.model.CompositeModel; -import org.apache.tuscany.sca.domain.model.ContributionModel; - -/** - * A wrapper for the contribution - * - * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $ - */ -public class ContributionModelImpl implements ContributionModel { - - private Contribution contribution; - private String contributionURI; - private String contributionURL; - private Map composites = new HashMap(); - private Map deployableComposites = new HashMap(); - private Map deployedComposites = new HashMap(); - - /** - * Retrieve the contribution object - * - * @return contribution - */ - public Contribution getContribution(){ - return contribution; - } - - /** - * Set the contribution object - * - * @param contribution - */ - public void setContribution(Contribution contribution){ - this.contribution = contribution; - } - - /** - * Retrieve the contribution uri - * - * @return contribution uri - */ - public String getContributionURI() { - return contributionURI; - } - - /** - * Set the contribution uri - * - * @param contributionURI - */ - public void setContributionURI(String contributionURI){ - this.contributionURI = contributionURI; - } - - /** - * Retrieve the contribution url - * - * @return contribution url - */ - public String getContributionURL(){ - return contributionURL; - } - - /** - * Set the contribution url - * - * @param contributionURL - */ - public void setContributionURL(String contributionURL){ - this.contributionURL = contributionURL; - } - - public Map getComposites(){ - return composites; - } - - public Map getDeployableComposites(){ - return deployableComposites; - } - - public Map getDeployedComposites(){ - return deployedComposites; - } -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelFactoryImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelFactoryImpl.java deleted file mode 100644 index 90c1b47e48..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelFactoryImpl.java +++ /dev/null @@ -1,80 +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.model.impl; - -import org.apache.tuscany.sca.domain.model.CompositeModel; -import org.apache.tuscany.sca.domain.model.ContributionModel; -import org.apache.tuscany.sca.domain.model.DomainModel; -import org.apache.tuscany.sca.domain.model.DomainModelFactory; -import org.apache.tuscany.sca.domain.model.NodeModel; -import org.apache.tuscany.sca.domain.model.ServiceModel; - -/** - * The factory used to create model elements - * - * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $ - */ -public class DomainModelFactoryImpl implements DomainModelFactory { - - /** - * Create a new domain model - * - * @return new domain model - */ - public DomainModel createDomain(){ - return new DomainModelImpl(); - } - /** - * Create a new node model - * - * @return new node model - */ - public NodeModel createNode(){ - return new NodeModelImpl(); - } - - /** - * Create a new contribution model - * - * @return new contribution model - */ - public ContributionModel createContribution(){ - return new ContributionModelImpl(); - } - - /** - * Create a new composite model - * - * @return new composite model - */ - public CompositeModel createComposite(){ - return new CompositeModelImpl(); - } - - /** - * Create a new service model - * - * @return new service model - */ - public ServiceModel createService(){ - return new ServiceModelImpl(); - } - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelImpl.java deleted file mode 100644 index 670a4e60fb..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelImpl.java +++ /dev/null @@ -1,115 +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.model.impl; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.domain.model.CompositeModel; -import org.apache.tuscany.sca.domain.model.ContributionModel; -import org.apache.tuscany.sca.domain.model.NodeModel; -import org.apache.tuscany.sca.domain.model.DomainModel; - - -/** - * A model of the domain and the artifacts that it managers. Acts as a holder for the - * various other tuscany models involved - * - * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $ - */ -public class DomainModelImpl implements DomainModel { - - private String domainURI; - private String domainURL; - private Map nodes = new HashMap(); - private Map contributions = new HashMap(); - private Map deployedComposites = new HashMap(); - private Composite domainLevelComposite; - - - /** - * Retrieve the domain uri - * - * @return domain uri - */ - public String getDomainURI(){ - return domainURI; - } - - /** - * Set the domain uri - * - * @param domainURI - */ - public void setDomainURI(String domainURI){ - this.domainURI = domainURI; - } - - /** - * Retrieve the domain url - * - * @return domain url - */ - public String getDomainURL(){ - return domainURL; - } - - /** - * Set the domain level composite - * - * @param domainLevelComposite - */ - public void setDomainLeveComposite(Composite domainLevelComposite){ - this.domainLevelComposite = domainLevelComposite; - } - - /** - * Retrieve the domain level composite - * - * @return domainLevelComposite - */ - public Composite getDomainLevelComposite(){ - return domainLevelComposite; - } - - /** - * Set the domain url - * - * @param domainURL - */ - public void setDomainURL(String domainURL){ - this.domainURL = domainURL; - } - - public Map getNodes(){ - return nodes; - } - - public Map getContributions(){ - return contributions; - } - - public Map getDeployedComposites(){ - return deployedComposites; - } -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/NodeModelImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/NodeModelImpl.java deleted file mode 100644 index 40e2f95568..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/NodeModelImpl.java +++ /dev/null @@ -1,144 +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.model.impl; - -import java.io.Externalizable; -import java.util.HashMap; -import java.util.Map; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.domain.model.CompositeModel; -import org.apache.tuscany.sca.domain.model.ContributionModel; -import org.apache.tuscany.sca.domain.model.NodeModel; -import org.apache.tuscany.sca.domain.model.ServiceModel; -import org.apache.tuscany.sca.domain.model.NodeModel.LifecyleState; -import org.apache.tuscany.sca.node.management.SCANodeManagerService; -import org.osoa.sca.CallableReference; - - -/** - * A node. Runs SCA composites - * - * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $ - */ -public class NodeModelImpl implements NodeModel { - - private LifecyleState state = LifecyleState.AVAILABLE; - private String nodeURI; - private String nodeURL; - private Externalizable nodeManagerReference; - private Map contributions = new HashMap(); - private Map deployedComposites = new HashMap(); - private Map services = new HashMap(); - - /** - * Retrieve the node uri - * - * @return node uri - */ - public String getNodeURI(){ - return nodeURI; - } - - /** - * Set the node uri - * - * @param nodeURI - */ - public void setNodeURI(String nodeURI){ - this.nodeURI = nodeURI; - } - - /** - * Retrieve the node url - * - * @return node url - */ - public String getNodeURL() { - return nodeURL; - } - - /** - * Set the node url - * - * @param nodeURL - */ - public void setNodeURL(String nodeURL){ - this.nodeURL = nodeURL; - } - - /** - * Returns the state of the node - * - * @return state - */ - public LifecyleState getLifecycleState(){ - return state; - } - - /** - * Set the state of the node - * - * @param state - */ - public void setLifecycleState(LifecyleState state){ - this.state = state; - } - - /** - * Retrieve the node manager reference - * - * @return node manager reference - */ - public Externalizable getNodeManagerReference(){ - return nodeManagerReference; - } - - /** - * Set the node url - * - * @param nodeURL - */ - public void setNodeManagerReference(Externalizable nodeManagerReference){ - this.nodeManagerReference = nodeManagerReference; - } - - /** - * Get the service proxy for the node mamager - * - * @return node manager service proxy - */ - public SCANodeManagerService getSCANodeManagerService(){ - return ((CallableReference)nodeManagerReference).getService(); - } - - public Map getContributions(){ - return contributions; - } - - public Map getDeployedComposites(){ - return deployedComposites; - } - - public Map getServices(){ - return services; - } -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ServiceModelImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ServiceModelImpl.java deleted file mode 100644 index 11b9a178e7..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ServiceModelImpl.java +++ /dev/null @@ -1,89 +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.model.impl; - -import org.apache.tuscany.sca.domain.model.ServiceModel; - -/** - * A service. - * - * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $ - */ -public class ServiceModelImpl implements ServiceModel { - - private String serviceURI; - private String serviceURL; - private String serviceBinding; - - /** - * Retrieve the service uri - * - * @return service uri - */ - public String getServiceURI(){ - return serviceURI; - } - - /** - * Set the service uri - * - * @param serviceURI - */ - public void setServiceURI(String serviceURI){ - this.serviceURI = serviceURI; - } - - /** - * Retrieve the service url - * - * @return service url - */ - public String getServiceURL(){ - return serviceURL; - } - - /** - * Set the service url - * - * @param serviceURL - */ - public void setServiceURL(String serviceURL){ - this.serviceURL = serviceURL; - } - - - /** - * Retrieve the service binding - * - * @return service binding - */ - public String getServiceBinding(){ - return serviceBinding; - } - - /** - * Set the service binding - * - * @param serviceBinding - */ - public void setServiceBinding(String serviceBinding){ - this.serviceBinding = serviceBinding; - } -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/resources/domain.composite b/branches/sca-java-1.1/modules/domain-impl/src/main/resources/domain.composite deleted file mode 100644 index 29fe2815d9..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/resources/domain.composite +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js b/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js deleted file mode 100644 index ca3c2a8605..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js +++ /dev/null @@ -1,492 +0,0 @@ -/* - * JSON-RPC JavaScript client - * - * $Id: jsonrpc.js,v 1.36.2.3 2006/03/08 15:09:37 mclark Exp $ - * - * Copyright (c) 2003-2004 Jan-Klaas Kollhof - * Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd - * - * This code is based on Jan-Klaas' JavaScript o lait library (jsolait). - * - * 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. - * - */ - -/* - * Modifications for Apache Tuscany: - * - JSONRpcClient_createMethod changed so callback is last arg - */ - -/* escape a character */ - -escapeJSONChar = -function escapeJSONChar(c) -{ - if(c == "\"" || c == "\\") return "\\" + c; - else if (c == "\b") return "\\b"; - else if (c == "\f") return "\\f"; - else if (c == "\n") return "\\n"; - else if (c == "\r") return "\\r"; - else if (c == "\t") return "\\t"; - var hex = c.charCodeAt(0).toString(16); - if(hex.length == 1) return "\\u000" + hex; - else if(hex.length == 2) return "\\u00" + hex; - else if(hex.length == 3) return "\\u0" + hex; - else return "\\u" + hex; -}; - - -/* encode a string into JSON format */ - -escapeJSONString = -function escapeJSONString(s) -{ - /* The following should suffice but Safari's regex is b0rken - (doesn't support callback substitutions) - return "\"" + s.replace(/([^\u0020-\u007f]|[\\\"])/g, - escapeJSONChar) + "\""; - */ - - /* Rather inefficient way to do it */ - var parts = s.split(""); - for(var i=0; i < parts.length; i++) { - var c =parts[i]; - if(c == '"' || - c == '\\' || - c.charCodeAt(0) < 32 || - c.charCodeAt(0) >= 128) - parts[i] = escapeJSONChar(parts[i]); - } - return "\"" + parts.join("") + "\""; -}; - - -/* Marshall objects to JSON format */ - -toJSON = function toJSON(o) -{ - if(o == null) { - return "null"; - } else if(o.constructor == String) { - return escapeJSONString(o); - } else if(o.constructor == Number) { - return o.toString(); - } else if(o.constructor == Boolean) { - return o.toString(); - } else if(o.constructor == Date) { - return '{javaClass: "java.util.Date", time: ' + o.valueOf() +'}'; - } else if(o.constructor == Array) { - var v = []; - for(var i = 0; i < o.length; i++) v.push(toJSON(o[i])); - return "[" + v.join(", ") + "]"; - } else { - var v = []; - for(attr in o) { - if(o[attr] == null) v.push("\"" + attr + "\": null"); - else if(typeof o[attr] == "function"); /* skip */ - else v.push(escapeJSONString(attr) + ": " + toJSON(o[attr])); - } - return "{" + v.join(", ") + "}"; - } -}; - - -/* JSONRpcClient constructor */ - -JSONRpcClient = -function JSONRpcClient_ctor(serverURL, user, pass, objectID) -{ - this.serverURL = serverURL; - this.user = user; - this.pass = pass; - this.objectID = objectID; - - /* Add standard methods */ - if(this.objectID) { - this._addMethods(["listMethods"]); - var req = this._makeRequest("listMethods", []); - } else { - this._addMethods(["system.listMethods"]); - var req = this._makeRequest("system.listMethods", []); - } - var m = this._sendRequest(req); - this._addMethods(m); -}; - - -/* JSONRpcCLient.Exception */ - -JSONRpcClient.Exception = -function JSONRpcClient_Exception_ctor(code, message, javaStack) -{ - this.code = code; - var name; - if(javaStack) { - this.javaStack = javaStack; - var m = javaStack.match(/^([^:]*)/); - if(m) name = m[0]; - } - if(name) this.name = name; - else this.name = "JSONRpcClientException"; - this.message = message; -}; - -JSONRpcClient.Exception.CODE_REMOTE_EXCEPTION = 490; -JSONRpcClient.Exception.CODE_ERR_CLIENT = 550; -JSONRpcClient.Exception.CODE_ERR_PARSE = 590; -JSONRpcClient.Exception.CODE_ERR_NOMETHOD = 591; -JSONRpcClient.Exception.CODE_ERR_UNMARSHALL = 592; -JSONRpcClient.Exception.CODE_ERR_MARSHALL = 593; - -JSONRpcClient.Exception.prototype = new Error(); - -JSONRpcClient.Exception.prototype.toString = -function JSONRpcClient_Exception_toString(code, msg) -{ - return this.name + ": " + this.message; -}; - - -/* Default top level exception handler */ - -JSONRpcClient.default_ex_handler = -function JSONRpcClient_default_ex_handler(e) { alert(e); }; - - -/* Client settable variables */ - -JSONRpcClient.toplevel_ex_handler = JSONRpcClient.default_ex_handler; -JSONRpcClient.profile_async = false; -JSONRpcClient.max_req_active = 1; -JSONRpcClient.requestId = 1; - - -/* JSONRpcClient implementation */ - -JSONRpcClient.prototype._createMethod = -function JSONRpcClient_createMethod(methodName) -{ - var fn=function() - { - var args = []; - var callback = null; - for(var i=0;i 0) { - var res = JSONRpcClient.async_responses.shift(); - if(res.canceled) continue; - if(res.profile) res.profile.dispatch = new Date(); - try { - res.cb(res.result, res.ex, res.profile); - } catch(e) { - JSONRpcClient.toplevel_ex_handler(e); - } - } - - while(JSONRpcClient.async_requests.length > 0 && - JSONRpcClient.num_req_active < JSONRpcClient.max_req_active) { - var req = JSONRpcClient.async_requests.shift(); - if(req.canceled) continue; - req.client._sendRequest.call(req.client, req); - } -}; - -JSONRpcClient.kick_async = -function JSONRpcClient_kick_async() -{ - if(JSONRpcClient.async_timeout == null) - JSONRpcClient.async_timeout = - setTimeout(JSONRpcClient._async_handler, 0); -}; - -JSONRpcClient.cancelRequest = -function JSONRpcClient_cancelRequest(requestId) -{ - /* If it is in flight then mark it as canceled in the inflight map - and the XMLHttpRequest callback will discard the reply. */ - if(JSONRpcClient.async_inflight[requestId]) { - JSONRpcClient.async_inflight[requestId].canceled = true; - return true; - } - - /* If its not in flight yet then we can just mark it as canceled in - the the request queue and it will get discarded before being sent. */ - for(var i in JSONRpcClient.async_requests) { - if(JSONRpcClient.async_requests[i].requestId == requestId) { - JSONRpcClient.async_requests[i].canceled = true; - return true; - } - } - - /* It may have returned from the network and be waiting for its callback - to be dispatched, so mark it as canceled in the response queue - and the response will get discarded before calling the callback. */ - for(var i in JSONRpcClient.async_responses) { - if(JSONRpcClient.async_responses[i].requestId == requestId) { - JSONRpcClient.async_responses[i].canceled = true; - return true; - } - } - - return false; -}; - -JSONRpcClient.prototype._makeRequest = -function JSONRpcClient_makeRequest(methodName, args, cb) -{ - var req = {}; - req.client = this; - req.requestId = JSONRpcClient.requestId++; - - var obj = {}; - obj.id = req.requestId; - if (this.objectID) - obj.method = ".obj#" + this.objectID + "." + methodName; - else - obj.method = methodName; - obj.params = args; - - if (cb) req.cb = cb; - if (JSONRpcClient.profile_async) - req.profile = { "submit": new Date() }; - req.data = toJSON(obj); - - return req; -}; - -JSONRpcClient.prototype._sendRequest = -function JSONRpcClient_sendRequest(req) -{ - if(req.profile) req.profile.start = new Date(); - - /* Get free http object from the pool */ - var http = JSONRpcClient.poolGetHTTPRequest(); - JSONRpcClient.num_req_active++; - - /* Send the request */ - if (typeof(this.user) == "undefined") { - http.open("POST", this.serverURL, (req.cb != null)); - } else { - http.open("POST", this.serverURL, (req.cb != null), this.user, this.pass); - } - - /* setRequestHeader is missing in Opera 8 Beta */ - try { http.setRequestHeader("Content-type", "text/plain"); } catch(e) {} - - /* Construct call back if we have one */ - if(req.cb) { - var self = this; - http.onreadystatechange = function() { - if(http.readyState == 4) { - http.onreadystatechange = function () {}; - var res = { "cb": req.cb, "result": null, "ex": null}; - if (req.profile) { - res.profile = req.profile; - res.profile.end = new Date(); - } - try { res.result = self._handleResponse(http); } - catch(e) { res.ex = e; } - if(!JSONRpcClient.async_inflight[req.requestId].canceled) - JSONRpcClient.async_responses.push(res); - delete JSONRpcClient.async_inflight[req.requestId]; - JSONRpcClient.kick_async(); - } - }; - } else { - http.onreadystatechange = function() {}; - } - - JSONRpcClient.async_inflight[req.requestId] = req; - - try { - http.send(req.data); - } catch(e) { - JSONRpcClient.poolReturnHTTPRequest(http); - JSONRpcClient.num_req_active--; - throw new JSONRpcClient.Exception - (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed"); - } - - if(!req.cb) return this._handleResponse(http); -}; - -JSONRpcClient.prototype._handleResponse = -function JSONRpcClient_handleResponse(http) -{ - /* Get the charset */ - if(!this.charset) { - this.charset = JSONRpcClient._getCharsetFromHeaders(http); - } - - /* Get request results */ - var status, statusText, data; - try { - status = http.status; - statusText = http.statusText; - data = http.responseText; - } catch(e) { - JSONRpcClient.poolReturnHTTPRequest(http); - JSONRpcClient.num_req_active--; - JSONRpcClient.kick_async(); - throw new JSONRpcClient.Exception - (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed"); - } - - /* Return http object to the pool; */ - JSONRpcClient.poolReturnHTTPRequest(http); - JSONRpcClient.num_req_active--; - - /* Unmarshall the response */ - if(status != 200) { - throw new JSONRpcClient.Exception(status, statusText); - } - var obj; - try { - eval("obj = " + data); - } catch(e) { - throw new JSONRpcClient.Exception(550, "error parsing result"); - } - if(obj.error) - throw new JSONRpcClient.Exception(obj.error.code, obj.error.msg, - obj.error.trace); - var res = obj.result; - - /* Handle CallableProxy */ - if(res && res.objectID && res.JSONRPCType == "CallableReference") - return new JSONRpcClient(this.serverURL, this.user, - this.pass, res.objectID); - - return res; -}; - - -/* XMLHttpRequest wrapper code */ - -/* XMLHttpRequest pool globals */ -JSONRpcClient.http_spare = []; -JSONRpcClient.http_max_spare = 8; - -JSONRpcClient.poolGetHTTPRequest = -function JSONRpcClient_pool_getHTTPRequest() -{ - if(JSONRpcClient.http_spare.length > 0) { - return JSONRpcClient.http_spare.pop(); - } - return JSONRpcClient.getHTTPRequest(); -}; - -JSONRpcClient.poolReturnHTTPRequest = -function JSONRpcClient_poolReturnHTTPRequest(http) -{ - if(JSONRpcClient.http_spare.length >= JSONRpcClient.http_max_spare) - delete http; - else - JSONRpcClient.http_spare.push(http); -}; - -JSONRpcClient.msxmlNames = [ "MSXML2.XMLHTTP.5.0", - "MSXML2.XMLHTTP.4.0", - "MSXML2.XMLHTTP.3.0", - "MSXML2.XMLHTTP", - "Microsoft.XMLHTTP" ]; - -JSONRpcClient.getHTTPRequest = -function JSONRpcClient_getHTTPRequest() -{ - /* Mozilla XMLHttpRequest */ - try { - JSONRpcClient.httpObjectName = "XMLHttpRequest"; - return new XMLHttpRequest(); - } catch(e) {} - - /* Microsoft MSXML ActiveX */ - for (var i=0;i < JSONRpcClient.msxmlNames.length; i++) { - try { - JSONRpcClient.httpObjectName = JSONRpcClient.msxmlNames[i]; - return new ActiveXObject(JSONRpcClient.msxmlNames[i]); - } catch (e) {} - } - - /* None found */ - JSONRpcClient.httpObjectName = null; - throw new JSONRpcClient.Exception(0, "Can't create XMLHttpRequest object"); -}; diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/domain.png b/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/domain.png deleted file mode 100644 index e88c4f882a..0000000000 Binary files a/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/domain.png and /dev/null differ diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/index.html b/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/index.html deleted file mode 100644 index 4320a52b4c..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/index.html +++ /dev/null @@ -1,139 +0,0 @@ - - - -Apache Tuscany Domain Debug - - - - - - - - - - -

Apache Tuscany Domain Debug

-
- - - - - -
-
-
- -
- -

- - - diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/node.png b/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/node.png deleted file mode 100644 index fa01e64272..0000000000 Binary files a/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/node.png and /dev/null differ diff --git a/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/style.css b/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/style.css deleted file mode 100644 index 28a4d4540c..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/main/resources/webroot/style.css +++ /dev/null @@ -1,176 +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. - */ - -p,table,li,h1,h2,h3 -{ -font-family: verdana, arial, 'sans serif'; -} - -p, h1, h2, h3, table, li, hr -{ -margin-left: 10pt; -} - -table -{ -border-color: black; -border-collapse: separate; -border-spacing: 0px 1px; - -margin-right: 10pt; -margin-left: 10pt; -width: 800px; -} - -.sourceDetailsTable -{ -width: 600px; -} - -tr, td -{ -margin-left: 0pt; -margin-right: 0pt; -padding-left: 10pt; -font-size: 90%; -} - -p,li,th -{ -font-size: 90%; -margin-left: 10pt; -} - -pre -{ -margin-left: 10pt; -} - -body -{ -#ffffff; -} - -h1,h2,h3,hr -{ -color: firebrick; -} - -a:link {COLOR: firebrick;} -a:visited {COLOR: firebrick;} -a:active {COLOR: navy;} - -.link -{ -COLOR: firebrick; -text-decoration: underline; -} - -.clickable -{ -cursor: pointer -} - -.unread_title -{ -font-weight: bold; -} - -.read_title -{ -font-weight: normal; -} - -.summary -{ -color: DimGrey; -} - -.hidden -{ -display: none; -} - -.source_name -{ -width: 600px; -} - -.alert_text -{ -width: 600px; -} - -.alert_data -{ -margin-left: 10px; -width: 800px; -height: 800px; -} - -.source_0 -{ -background-color: LightGreen; -} - -.source_1 -{ -background-color: LightSkyBlue; -} - -.source_2 -{ -background-color: Khaki; -} - -.source_3 -{ -background-color: LightPink; -} - -.source_4 -{ -background-color: Orange; -} - -.source_5 -{ -background-color: LightCoral; -} - -.source_6 -{ -background-color: Orchid; -} - -.source_7 -{ -background-color: Peru; -} - -.source_8 -{ -background-color: SpringGreen; -} - -.source_9 -{ -background-color: LightGrey; -} - diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/AddService.java b/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/AddService.java deleted file mode 100644 index 797ebb4024..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/AddService.java +++ /dev/null @@ -1,31 +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 calculator; - -import org.osoa.sca.annotations.Remotable; - -/** - * The Add service interface - */ -@Remotable -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/AddServiceImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/AddServiceImpl.java deleted file mode 100644 index 1a63d4ff77..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,31 +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 calculator; - -/** - * An implementation of the Add service - */ -public class AddServiceImpl implements AddService { - - public double add(double n1, double n2) { - System.out.println("AddService - add " + n1 + " and " + n2); - return n1 + n2; - } - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/CalculatorService.java b/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/CalculatorService.java deleted file mode 100644 index ad87375529..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/CalculatorService.java +++ /dev/null @@ -1,35 +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 calculator; - - -/** - * The Calculator service interface. - */ -public interface CalculatorService { - - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index 8ee640ed6b..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,74 +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 calculator; - -import org.osoa.sca.annotations.Reference; - - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceImpl implements CalculatorService { - - private AddService addService; - private SubtractService subtractService; - private MultiplyService multiplyService; - private DivideService divideService; - - @Reference - public void setAddService(AddService addService) { - this.addService = addService; - } - - @Reference - public void setSubtractService(SubtractService subtractService) { - this.subtractService = subtractService; - } - - @Reference - public void setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - @Reference - public void setDivideService(DivideService divideService) { - this.divideService = divideService; - } - - public double add(double n1, double n2) { - System.out.println("CalculatorService - add " + n1 + " and " + n2); - return addService.add(n1, n2); - } - - public double subtract(double n1, double n2) { - System.out.println("CalculatorService - subtract " + n1 + " and " + n2); - return subtractService.subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - System.out.println("CalculatorService - multiply " + n1 + " and " + n2); - return multiplyService.multiply(n1, n2); - } - - public double divide(double n1, double n2) { - System.out.println("CalculatorService - divide " + n1 + " and " + n2); - return divideService.divide(n1, n2); - } - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/DivideService.java b/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/DivideService.java deleted file mode 100644 index ef6a8b375b..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +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 calculator; - -/** - * The divide service interface - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/DivideServiceImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/DivideServiceImpl.java deleted file mode 100644 index 8c33862f6d..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/DivideServiceImpl.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 calculator; - -/** - * An implementation of the Divide service. - */ -public class DivideServiceImpl implements DivideService { - - public double divide(double n1, double n2) { - return n1 / n2; - } - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/MultiplyService.java b/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/MultiplyService.java deleted file mode 100644 index db568cc762..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +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 calculator; - -/** - * The interface for the multiply service - */ -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index c7fbc73c00..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/MultiplyServiceImpl.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 calculator; - -/** - * An implementation of the Multiply service. - */ -public class MultiplyServiceImpl implements MultiplyService { - - public double multiply(double n1, double n2) { - return n1 * n2; - } - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/SubtractService.java b/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/SubtractService.java deleted file mode 100644 index 615320e670..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/SubtractService.java +++ /dev/null @@ -1,31 +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 calculator; - -import org.osoa.sca.annotations.Remotable; - -/** - * The interface for the multiply service - */ -@Remotable -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/SubtractServiceImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index abf2777c7d..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/java/calculator/SubtractServiceImpl.java +++ /dev/null @@ -1,31 +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 calculator; - -/** - * An implementation of the subtract service. - */ -public class SubtractServiceImpl implements SubtractService { - - public double subtract(double n1, double n2) { - System.out.println("SubtractService - subtract " + n1 + " and " + n2); - return n1 - n2; - } - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java b/branches/sca-java-1.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java deleted file mode 100644 index 229af12397..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java +++ /dev/null @@ -1,137 +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.impl; - -import java.io.Externalizable; -import java.net.URL; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.domain.SCADomain; -import org.apache.tuscany.sca.domain.SCADomainEventService; -import org.apache.tuscany.sca.domain.SCADomainFactory; -import org.apache.tuscany.sca.domain.SCADomainSPI; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.management.SCANodeManagerService; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.osoa.sca.CallableReference; - -import calculator.AddService; -import calculator.CalculatorService; - - -/** - * This server program that loads a composite to provide simple registry function. - * This server can be replaced with any registry that is appropriate but the components - * in each node that talk to the registry should be replaced also. - */ -public class DomainImplTestCase { - - private static SCADomain domain; - private static SCADomainEventService domainEventService; - private static ClassLoader cl; - - @BeforeClass - public static void init() throws Exception { - - try { - cl = DomainImplTestCase.class.getClassLoader(); - SCADomainFactory domainFactory = SCADomainFactory.newInstance(); - domain = domainFactory.createSCADomain("http://localhost:9999"); - domainEventService = (SCADomainEventService)domain; - - } catch (Exception e) { - e.printStackTrace(); - } - - System.out.println("Domain started"); - } - - @AfterClass - public static void destroy() throws Exception { - // stop the domain - domain.destroy(); - System.out.println("Domain stopped"); - } - - @Test - public void testRegisterNodes() throws Exception { - CallableReference node1Ref = new TestCallableReferenceImpl(); - domainEventService.registerNode("http://localhost:8100/mynode1", "http://localhost:9999", (Externalizable)node1Ref); - - CallableReference node2Ref = new TestCallableReferenceImpl(); - domainEventService.registerNode("http://localhost:8200/mynode2", "http://localhost:9999", (Externalizable)node2Ref); - } - - @Test - public void testAddContributionWithMetaData() throws Exception { - domain.addContribution("contributionNodeA", cl.getResource("nodeA/")); - } - - @Test - public void testAddContributionWithoutMetaData() throws Exception { - domain.addContribution("contributionNodeB", cl.getResource("nodeB/")); - } - - @Test - public void testAddToDomainLevelComposite() throws Exception { - domain.addToDomainLevelComposite(new QName("http://sample", "CalculatorA")); - } - - @Test - public void testGetDomainLevelComposite() throws Exception { - System.out.println(domain.getDomainLevelComposite()); - } - - @Test - public void testGetComposite() throws Exception { - System.out.println(((SCADomainImpl)domain).getComposite(new QName("http://sample", "CalculatorA"))); - } - - @Test - public void testStartComposite() throws Exception { - domain.startComposite(new QName("http://sample", "CalculatorA")); - } - - @Test - public void testStopComposite() throws Exception { - domain.stopComposite(new QName("http://sample", "CalculatorA")); - } - - @Test - public void testRemoveContributions() throws Exception { - domain.removeContribution("contributionNodeA"); - domain.removeContribution("contributionNodeB"); - } - - @Test - public void testUnregisterNodes() throws Exception { - domainEventService.unregisterNode("http://localhost:8100/mynode1"); - domainEventService.unregisterNode("http://localhost:8200/mynode2"); - } - - //@Test - public void testKeepServerRunning() throws Exception { - System.out.println("press enter to continue"); - System.in.read(); - } - -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestCallableReferenceImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestCallableReferenceImpl.java deleted file mode 100644 index 6067a37c1e..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestCallableReferenceImpl.java +++ /dev/null @@ -1,107 +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.impl; - -import java.io.Externalizable; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import java.util.UUID; - -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.ComponentService; -import org.apache.tuscany.sca.assembly.OptimizableBinding; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.core.assembly.CompositeActivator; -import org.apache.tuscany.sca.core.assembly.CompositeActivatorImpl; -import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl; -import org.apache.tuscany.sca.core.assembly.ReferenceParametersImpl; -import org.apache.tuscany.sca.core.conversation.ConversationManager; -import org.apache.tuscany.sca.core.conversation.ConversationState; -import org.apache.tuscany.sca.core.conversation.ExtendedConversation; -import org.apache.tuscany.sca.core.factory.ObjectCreationException; -import org.apache.tuscany.sca.core.invocation.ProxyFactory; -import org.apache.tuscany.sca.interfacedef.Interface; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.interfacedef.java.JavaInterface; -import org.apache.tuscany.sca.runtime.EndpointReference; -import org.apache.tuscany.sca.runtime.ReferenceParameters; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.CallableReference; -import org.osoa.sca.Conversation; -import org.osoa.sca.ServiceRuntimeException; - -/** - * Test callable reference used to test the domain when no nodes are running - * - * @version $Rev: 597679 $ $Date: 2007-11-23 15:21:29 +0000 (Fri, 23 Nov 2007) $ - * @param the type of the business interface - */ -public class TestCallableReferenceImpl implements CallableReference, Externalizable { - - protected TestCallableReferenceImpl() { - super(); - } - - public RuntimeWire getRuntimeWire() { - return null; - } - - public B getProxy() throws ObjectCreationException { - return null; - } - - public B getService() { - return (B) new TestNodeManagerServiceImpl(); - } - - public Class getBusinessInterface() { - return null; - } - - public boolean isConversational() { - return false; - } - - public Conversation getConversation() { - return null; - } - - public Object getCallbackID() { - return null; - } - - /** - * @see java.io.Externalizable#readExternal(java.io.ObjectInput) - */ - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - } - - - /** - * @see java.io.Externalizable#writeExternal(java.io.ObjectOutput) - */ - public void writeExternal(ObjectOutput out) throws IOException { - - } -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java b/branches/sca-java-1.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java deleted file mode 100644 index 750fc85fee..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java +++ /dev/null @@ -1,86 +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.impl; - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.core.assembly.RuntimeComponentImpl; -import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary; -import org.apache.tuscany.sca.domain.SCADomain; -import org.apache.tuscany.sca.node.ComponentInfo; -import org.apache.tuscany.sca.node.ComponentManagerService; -import org.apache.tuscany.sca.node.NodeException; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.management.SCANodeManagerInitService; -import org.apache.tuscany.sca.node.management.SCANodeManagerService; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * A dummy interface for the domain to talk to when testing the domain and no nodes are running - * - * @version $Rev: 552343 $ $Date: 2007-09-11 18:45:36 +0100 (Tue, 11 Sep 2007) $ - */ -public class TestNodeManagerServiceImpl implements SCANodeManagerService { - - - - // SCANodeManagerService methods - - public String getURI() { - return null; - } - - public void addContribution(String contributionURI, String contributionURL) throws NodeException { - System.out.println("addContribution " + contributionURI + " " + contributionURL); - } - - public void removeContribution(String contributionURI) throws NodeException { - System.out.println("addContribution " + contributionURI); - } - - public void addToDomainLevelComposite(String compositeName) throws NodeException { - System.out.println("addToDomainLevelComposite " + compositeName); - } - - public void start() throws NodeException { - System.out.println("start"); - } - - public void stop() throws NodeException { - System.out.println("stop"); - } - - public void destroyNode() throws NodeException { - System.out.println("destroy"); - } - - public void updateComposite(String compositeQName, String compositeXMLBase64) throws NodeException { - System.out.println("updateComposite " + compositeQName + " " + Base64Binary.decode(compositeXMLBase64).toString()); - } -} diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/resources/nodeA/Calculator.composite b/branches/sca-java-1.1/modules/domain-impl/src/test/resources/nodeA/Calculator.composite deleted file mode 100644 index 172676a3c7..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/resources/nodeA/Calculator.composite +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml b/branches/sca-java-1.1/modules/domain-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml deleted file mode 100644 index 1b1c0291e2..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.1/modules/domain-impl/src/test/resources/nodeB/Calculator.composite b/branches/sca-java-1.1/modules/domain-impl/src/test/resources/nodeB/Calculator.composite deleted file mode 100644 index b770dbe8d4..0000000000 --- a/branches/sca-java-1.1/modules/domain-impl/src/test/resources/nodeB/Calculator.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - -- cgit v1.2.3