summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.0.1/itest/admin
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.0.1/itest/admin')
-rw-r--r--branches/sca-java-1.0.1/itest/admin/DISCLAIMER8
-rw-r--r--branches/sca-java-1.0.1/itest/admin/LICENSE205
-rw-r--r--branches/sca-java-1.0.1/itest/admin/NOTICE6
-rw-r--r--branches/sca-java-1.0.1/itest/admin/README28
-rw-r--r--branches/sca-java-1.0.1/itest/admin/pom.xml60
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java28
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java27
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java88
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java36
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java28
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java29
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java132
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java25
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java93
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java28
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java80
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java76
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java67
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/test/resources/Iteration1Composite.composite43
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/test/resources/Iteration3Composite.composite68
-rw-r--r--branches/sca-java-1.0.1/itest/admin/src/test/resources/MySimpleService.composite59
21 files changed, 0 insertions, 1214 deletions
diff --git a/branches/sca-java-1.0.1/itest/admin/DISCLAIMER b/branches/sca-java-1.0.1/itest/admin/DISCLAIMER
deleted file mode 100644
index d68a410903..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/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.0.1/itest/admin/LICENSE b/branches/sca-java-1.0.1/itest/admin/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/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.0.1/itest/admin/NOTICE b/branches/sca-java-1.0.1/itest/admin/NOTICE
deleted file mode 100644
index 94481d6cfa..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-1.0.1/itest/admin/README b/branches/sca-java-1.0.1/itest/admin/README
deleted file mode 100644
index c4e96d7af0..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/README
+++ /dev/null
@@ -1,28 +0,0 @@
-This is a simple test compiled to test simple features of SCA
-
-There are interfaces to different services that have been included
-
-1. MyListService
-2. MyListServiceByYear
-3. MyService
-4. MyServiceByDate
-5. MyTotalservice
-
-The service that has been used in the tests primarily is MyService/MyTotalService.
-in the test cases.
-
-There are three test cases and three composites (MySimppleService,Iteration1,Iteration3).
-
-1. MySimpleServiceTestCase - Checks if the components in MySimpleService.composite are initialized properly.
- It tries to call simple functions implemented in MySimpleServiceImpl.
-
-2. MyTotalServiceTestCase - Initializes the components in the Iteration3Composite.composite file.
- tries to call simple functions implemented in MyTotalServiceImpl.
-
-3. MySimpleServiceInRecursiveTestCase - Initializes the components in the Iteration1Composite.composite file.
- It initializes its components using implementation:composite tag in the
- composite file which points to MySimpleService.composite.
- The test case recursively calls functions initialized in MySimpleService.composite.
-
-
-
diff --git a/branches/sca-java-1.0.1/itest/admin/pom.xml b/branches/sca-java-1.0.1/itest/admin/pom.xml
deleted file mode 100644
index 7d1a294006..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>1.0.1-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-itest-admin</artifactId>
- <name>Apache Tuscany Admin Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.0.1-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.0.1-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-databinding</artifactId>
- <version>1.0.1-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-sdo</artifactId>
- <version>1.0.1-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java b/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
deleted file mode 100644
index af9234b9bc..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.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 org.apache.tuscany.sca.itest.admin;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface MyListService {
- String[] getHolidays();
- String getYear();
-}
diff --git a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java b/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
deleted file mode 100644
index 4197007519..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.itest.admin;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface MyListServiceByYear {
- String[] getHolidays(int year);
-}
diff --git a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java b/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
deleted file mode 100644
index 21b38e734a..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
+++ /dev/null
@@ -1,88 +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.itest.admin;
-
-
-import java.util.List;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import org.apache.tuscany.sca.itest.admin.MyListService;
-import org.apache.tuscany.sca.itest.admin.MyListServiceByYear;
-
-@Service(interfaces={MyListService.class,MyListServiceByYear.class})
-
-public class MyListServiceImpl implements MyListService,MyListServiceByYear
-{
-
- // This is multiplicity=1:n
- @Reference(name="myListServiceList",required=true)
- public List<MyListService> myListServicesList;
-
- // This is multiplicity=0:n
- @Reference(name="myListServiceArray",required=false)
- public MyListService[] myListServicesArray;
-
- @Property(name="serviceYear")
- protected String year = "2006";
-
- public String[] getHolidays()
- {
- return getHolidays(new Integer(year).intValue());
- }
-
- public String[] getHolidays(int year)
- {
- MyListService myService;
- if (myListServicesList!=null)
- {
- for (int i=0; i<myListServicesList.size(); i++)
- {
- myService=myListServicesList.get(i);
- if(new Integer(myService.getYear()).intValue()==year)
- {
- return myService.getHolidays();
- }
- }
- }
- if (myListServicesArray!=null)
- {
- for (int i=0; i<myListServicesArray.length; i++)
- {
- myService=myListServicesArray[i];
- if(new Integer(myService.getYear()).intValue()==year)
- {
- return myService.getHolidays();
- }
- }
- }
- return null;
- }
-
- public String getYear()
- {
- return year;
- }
-
-
-
-}
diff --git a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java b/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
deleted file mode 100644
index 2ef4129f5e..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
+++ /dev/null
@@ -1,36 +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.itest.admin;
-
-import java.io.PrintStream;
-
-public class MyLogger {
-
- private PrintStream outStream;
-
- public MyLogger(PrintStream out) {
- this.outStream = out;
- }
-
- public void println(String text) {
- outStream.println("MyLog: " + text);
- }
-
-}
diff --git a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java b/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
deleted file mode 100644
index c7acf62989..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.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 org.apache.tuscany.sca.itest.admin;
-
-import java.util.Date;
-
-public interface MyService extends SCAComponentService{
- Date nextHoliday();
- String getLocation();
- String getYear();
-}
diff --git a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java b/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
deleted file mode 100644
index 38c779ce29..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.itest.admin;
-
-import java.util.Date;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface MyServiceByDate {
- Date nextHoliday(Date date);
-}
diff --git a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java b/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
deleted file mode 100644
index 48be2cbe8f..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
+++ /dev/null
@@ -1,132 +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.itest.admin;
-
-import java.util.Date;
-
-import org.osoa.sca.annotations.ComponentName;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-import org.apache.tuscany.sca.itest.admin.MyListService;
-import org.apache.tuscany.sca.itest.admin.MyListServiceByYear;
-import org.apache.tuscany.sca.itest.admin.MyLogger;
-import org.apache.tuscany.sca.itest.admin.MyService;
-import org.apache.tuscany.sca.itest.admin.MyServiceByDate;
-
-
-@Service(interfaces={MyService.class, MyServiceByDate.class, MyListService.class, MyListServiceByYear.class})
-
-public class MyServiceImpl implements MyService, MyServiceByDate, MyListService, MyListServiceByYear{
- static String[][] holidays = {{"2006/01/02","2006/05/29","2006/07/03","2006/07/04","2006/09/04","2006/11/23",
- "2006/11/23","2006/11/24", "2006/12/25"},{"2007/01/01","2007/05/28","2007/07/04","2007/09/03","2007/11/22",
- "2007/11/23","2007/12/25"},{"2006/01/02","2006/05/29","2006/07/03","2006/07/04","2006/09/04","2006/11/23",
- "2006/11/23","2006/11/24", "2006/12/25"},{"2007/01/01","2007/05/28","2007/07/04","2007/09/03","2007/11/22",
- "2007/11/23","2007/12/25"}};
-
- @Property(name="location")
- protected String location = "RTP";
-
- @Property(name="year")
- protected String year = "2006";
-
-
- private String componentName;
-
-
- private MyLogger logger;
-
- public MyServiceImpl()
- {
- logger = new MyLogger(System.out);
- logger.println("creating service instance...");
- }
-
- public Date nextHoliday() {
-
- return nextHoliday(new Date());
- }
-
-
- public Date nextHoliday(Date today)
- {
- Date d1;
- String[] days = getHolidays();
- for (int j=0; j<days.length; j++)
- {
- d1 = new Date(days[j]);
- if (d1.after(today))
- return d1;
- }
- return null;
- }
-
-
- public String[] getHolidays(int year)
- {
- int index = year -2006;
- if (index>=0 && index<holidays.length)
- return holidays[index];
- return null;
- }
-
- public String[] getHolidays()
- {
-
- Integer theYear;
- if (year ==null || year.length()==0)
- theYear = new Integer("2006");
- else
- theYear = new Integer(year);
-
- return getHolidays(theYear.intValue());
- }
-
- @Init
- public void start()
- {
- logger.println("Start service..");
- }
-
- @Destroy
- public void stop()
- {
- logger.println("Stop service..");
-
- }
-
- public String getComponentName()
- {
- return componentName;
- }
-
-
- public String getLocation()
- {
- return location;
- }
-
- public String getYear()
- {
- return year;
- }
-
-}
diff --git a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java b/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
deleted file mode 100644
index c2db7e921f..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
+++ /dev/null
@@ -1,25 +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.itest.admin;
-
-public interface MyTotalService extends MyListService, MyListServiceByYear, MyService, MyServiceByDate
-{
-
-}
diff --git a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java b/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
deleted file mode 100644
index d3c1ae901d..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.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.itest.admin;
-
-import java.util.Date;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.ComponentName;
-import org.apache.tuscany.sca.itest.admin.MyListService;
-import org.apache.tuscany.sca.itest.admin.MyListServiceByYear;
-import org.apache.tuscany.sca.itest.admin.MyService;
-import org.apache.tuscany.sca.itest.admin.MyServiceByDate;
-import org.apache.tuscany.sca.itest.admin.MyTotalService;
-
-@Service(MyTotalService.class)
-
-public class MyTotalServiceImpl implements MyTotalService
-{
-
- // This is multiplicity=1:1
- @Reference(required=true)
- public MyListService myListService;
-
- // default required==true so it is 1:1
- @Reference (required=false)
- public MyListServiceByYear myListServiceByYear = new MyServiceImpl();
-
- // default required==true so it is 1:1
- @Reference
- public MyService myService;
-
- // This is multiplicity=0:1
- @Reference(required=false)
- public MyServiceByDate myServiceByDate = new MyServiceImpl();
-
- @ComponentName
- private String componentName;
-
- public String[] getHolidays()
- {
- return myListService.getHolidays();
- }
-
- public String[] getHolidays(int year)
- {
- return myListServiceByYear.getHolidays(year);
- }
-
-
- public Date nextHoliday(Date date)
- {
- return myServiceByDate.nextHoliday(date);
- }
-
- public String getLocation()
- {
- return myService.getLocation();
- }
-
- public String getYear()
- {
- return myService.getYear();
- }
-
- public String getComponentName()
- {
- return componentName;
- }
-
- public Date nextHoliday()
- {
- return myService.nextHoliday();
- }
-}
diff --git a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java b/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
deleted file mode 100644
index e39427f43c..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.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 org.apache.tuscany.sca.itest.admin;
-
-
-
-public interface SCAComponentService
-{
- String getComponentName();
-
-}
diff --git a/branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java b/branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
deleted file mode 100644
index a07727399e..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.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.itest.admin;
-
-import static junit.framework.Assert.assertEquals;
-
-import org.apache.tuscany.sca.itest.admin.MyService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-
-
-public class MySimpleServiceInRecursiveTestCase
-{
- private static MyService myServiceOrg;
- private static MyService myServiceAnother;
- private static MyService myServiceCary;
-
- private static SCADomain domain;
-
-
- @Test
- public void testPropertyDefault()
- {
- assertEquals("RTP",myServiceOrg.getLocation());
- assertEquals("2006",myServiceOrg.getYear());
- }
-
-
- @Test
- public void testPropertyOverrideValue()
- {
- assertEquals("CARY",myServiceCary.getLocation());
- assertEquals("2007",myServiceCary.getYear());
- }
-
-
- @Test
- public void testPropertyOverrideVariable()
- {
- assertEquals("Durham",myServiceAnother.getLocation());
- assertEquals("2009",myServiceAnother.getYear());
- }
-
-
- @BeforeClass
- public static void init() throws Exception {
- try {
- domain = SCADomain.newInstance("Iteration1Composite.composite");
- } catch ( Exception e ) { e.printStackTrace(); }
-
- myServiceOrg = domain.getService(MyService.class, "MySimpleServiceInRecursive/MyServiceOrig1");
- myServiceCary = domain.getService(MyService.class, "MySimpleServiceInRecursive/MyServiceCary1");
- myServiceAnother = domain.getService(MyService.class, "MySimpleServiceInRecursiveAnother/MyServiceNew1");
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java b/branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
deleted file mode 100644
index b55a985d7f..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
+++ /dev/null
@@ -1,76 +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.itest.admin;
-
-import static junit.framework.Assert.assertEquals;
-
-import org.apache.tuscany.sca.itest.admin.MyService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class MySimpleServiceTestCase
-{
- private static SCADomain domain;
- private static MyService myServiceOrg;
- private static MyService myServiceNew;
- private static MyService myServiceCary;
-
- @Test
- public void testPropertyDefault()
- {
- assertEquals("RTP",myServiceOrg.getLocation());
- assertEquals("2006",myServiceOrg.getYear());
- }
-
-
- @Test
- public void testPropertyOverrideWithValue()
- {
- assertEquals("CARY",myServiceCary.getLocation());
- assertEquals("2007",myServiceCary.getYear());
- }
-
-
- @Test
- public void testPropertyOverrideWithVariable()
- {
- assertEquals("Raleigh",myServiceNew.getLocation());
- assertEquals("2008",myServiceNew.getYear());
- }
-
-
- @BeforeClass
- public static void init() throws Exception {
- try {
- domain = SCADomain.newInstance("MySimpleService.composite");
- } catch ( Exception e ) { System.out.println("Could not initialize " + e.toString());
- e.printStackTrace(); }
- myServiceOrg = domain.getService(MyService.class, "MyServiceComponentOrig/MyService");
- myServiceCary = domain.getService(MyService.class, "MyServiceComponentCary2007/MyService");
- myServiceNew = domain.getService(MyService.class, "MyServiceComponentNew/MyService");
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java b/branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
deleted file mode 100644
index a16f74175b..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.itest.admin;
-
-import static junit.framework.Assert.assertEquals;
-
-import org.apache.tuscany.sca.itest.admin.MyTotalService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class MyTotalServiceTestCase
-{
- private static MyTotalService myTotalServiceOrg;
- private static MyTotalService myTotalServiceNew;
-
- private static SCADomain domain;
-
- @Test
- public void testPropertyDefault()
- {
- assertEquals("RTP",myTotalServiceOrg.getLocation());
- assertEquals("2006",myTotalServiceOrg.getYear());
- }
-
-
- @Test
- public void testPropertyOverrideVariable()
- {
- assertEquals("Raleigh",myTotalServiceNew.getLocation());
- assertEquals("2008",myTotalServiceNew.getYear());
- }
-
-
- @BeforeClass
- public static void init() throws Exception {
- try {
- domain = SCADomain.newInstance("Iteration3Composite.composite");
- } catch ( Exception e ) { e.printStackTrace(); }
-
- myTotalServiceOrg =domain.getService(MyTotalService.class, "MyTotalServiceComponent");
- myTotalServiceNew=domain.getService(MyTotalService.class, "MyTotalServiceNewComponent");
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-java-1.0.1/itest/admin/src/test/resources/Iteration1Composite.composite b/branches/sca-java-1.0.1/itest/admin/src/test/resources/Iteration1Composite.composite
deleted file mode 100644
index 95dbbf0124..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/test/resources/Iteration1Composite.composite
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:foo="http://foo"
- xmlns:cust="http://www.example.com/Customer"
- xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
- targetNamespace="http://foo"
- name="Iteration1Composite" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <property name="newLocation" type="xs:anyURI">Raleigh</property>
- <property name="newYear" type="xs:anyURI">2008</property>
-
- <property name="anotherLocation" type="xs:anyURI">Durham</property>
- <property name="anotherYear" type="xs:anyURI">2009</property>
-
- <component name="MySimpleServiceInRecursive">
- <implementation.composite name="foo:MySimpleService"/>
- </component>
-
- <component name="MySimpleServiceInRecursiveAnother">
- <implementation.composite name="foo:MySimpleService"/>
- <property name="newLocation">Durham</property>
- <property name="newYear">2009</property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.0.1/itest/admin/src/test/resources/Iteration3Composite.composite b/branches/sca-java-1.0.1/itest/admin/src/test/resources/Iteration3Composite.composite
deleted file mode 100644
index dd06d030d6..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/test/resources/Iteration3Composite.composite
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" name="Iteration3Composite"
- targetNamespace="http://foo" local="true" autowire="false" requires="cns:confidentiality"
- policySets="sns:secure">
- <property name="newLocation" type="anyURI">Raleigh</property>
- <property name="newYear" type="anyURI">2008</property>
-
- <component name="MyServiceComponentOrig">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>
- </component>
-
- <component name="MyServiceComponentCary2007">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>
- <property name="location">CARY</property>
- <property name="year">2007</property>
- </component>
-
- <component name="MyServiceComponentNew">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>
- <property name="location" source="$newLocation"/>
- <property name="year" source="$newYear"/>
- </component>
-
- <component name="MyTotalServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyTotalServiceImpl"/>
- <reference name="myService" target="MyServiceComponentOrig/MyService"/>
- <reference name="myListService" target="MyServiceComponentOrig/MyListService"/>
- </component>
-
- <component name="MyTotalServiceNewComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyTotalServiceImpl"/>
- <reference name="myService" target="MyServiceComponentNew/MyService"/>
- <reference name="myListService" target="MyServiceComponentNew/MyListService"/>
- </component>
-
- <property name="anotherLocation" type="anyURI">Durham</property>
- <property name="anotherYear" type="anyURI">2009</property>
-
- <component name="MySimpleServiceInRecursive">
- <implementation.composite name="foo:MySimpleService"/>
- </component>
-
- <component name="MySimpleServiceInRecursiveAnother">
- <implementation.composite name="foo:MySimpleService"/>
- <property name="newLocation">Durham</property>
- <property name="newYear">2009</property>
- </component>
-</composite>
diff --git a/branches/sca-java-1.0.1/itest/admin/src/test/resources/MySimpleService.composite b/branches/sca-java-1.0.1/itest/admin/src/test/resources/MySimpleService.composite
deleted file mode 100644
index a1f8abb8da..0000000000
--- a/branches/sca-java-1.0.1/itest/admin/src/test/resources/MySimpleService.composite
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:foo="http://foo"
- xmlns:cust="http://www.example.com/Customer"
- xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
- targetNamespace="http://foo"
- name="MySimpleService" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <service name="MyServiceCary1" promote="MyServiceComponentCary2007/MyService">
- <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>
- </service>
-
- <service name="MyServiceOrig1" promote="MyServiceComponentOrig/MyService">
- <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>
- </service>
-
- <service name="MyServiceNew1" promote="MyServiceComponentNew/MyService">
- <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>
- </service>
-
- <property name="newLocation" type="anyURI">Raleigh</property>
- <property name="newYear" type="anyURI">2008</property>
-
- <component name="MyServiceComponentOrig">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>
- </component>
-
- <component name="MyServiceComponentCary2007">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>
- <property name="location">CARY</property>
- <property name="year">2007</property>
- </component>
-
- <component name="MyServiceComponentNew">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>
- <property name="location" source="$newLocation"/>
- <property name="year" source="$newYear"/>
- </component>
-
-</composite>