From 3d3b8834b93b98cc7d7534e693e937179067eb58 Mon Sep 17 00:00:00 2001 From: antelder Date: Sat, 16 May 2009 08:44:44 +0000 Subject: Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775435 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/vtest/assembly/component/AService.java | 31 -------- .../sca/vtest/assembly/component/BService.java | 29 -------- .../sca/vtest/assembly/component/CService.java | 28 ------- .../sca/vtest/assembly/component/DService.java | 29 -------- .../sca/vtest/assembly/component/EEService.java | 31 -------- .../sca/vtest/assembly/component/EService.java | 31 -------- .../sca/vtest/assembly/component/FService.java | 31 -------- .../sca/vtest/assembly/component/HService.java | 32 -------- .../assembly/component/callback/MyClient.java | 32 -------- .../assembly/component/callback/MyClientImpl.java | 70 ------------------ .../assembly/component/callback/MyService.java | 36 --------- .../component/callback/MyServiceCallBack.java | 31 -------- .../assembly/component/callback/MyServiceImpl.java | 67 ----------------- .../assembly/component/impl/ABServiceImpl.java | 51 ------------- .../assembly/component/impl/AServiceImpl.java | 49 ------------- .../assembly/component/impl/BServiceImpl.java | 40 ---------- .../assembly/component/impl/CServiceImpl.java | 31 -------- .../assembly/component/impl/DServiceImpl.java | 29 -------- .../assembly/component/impl/EServiceImpl.java | 38 ---------- .../assembly/component/impl/FServiceImpl.java | 31 -------- .../assembly/component/property/ServiceA.java | 32 -------- .../assembly/component/property/ServiceAImpl.java | 51 ------------- .../assembly/component/property/ServiceB.java | 32 -------- .../assembly/component/property/ServiceBImpl.java | 56 -------------- .../assembly/component/property/ServiceC.java | 29 -------- .../assembly/component/property/ServiceCImpl.java | 44 ----------- .../assembly/component/reference/MyClientA.java | 32 -------- .../component/reference/MyClientAImpl.java | 55 -------------- .../assembly/component/reference/MyClientB.java | 34 --------- .../component/reference/MyClientBImpl.java | 68 ----------------- .../assembly/component/reference/MyClientC.java | 29 -------- .../component/reference/MyClientCImpl.java | 85 ---------------------- .../assembly/component/reference/MyClientD.java | 30 -------- .../component/reference/MyClientDImpl.java | 73 ------------------- .../assembly/component/reference/MyClientE.java | 30 -------- .../component/reference/MyClientEImpl.java | 67 ----------------- .../assembly/component/reference/MyService.java | 29 -------- .../component/reference/MyServiceImpl.java | 34 --------- .../component/reference/MyServiceImpl2.java | 34 --------- .../main/resources/binding_resolution.composite | 43 ----------- .../src/main/resources/callback_bindings.composite | 56 -------------- .../src/main/resources/component.composite | 41 ----------- .../component_duplicate_property.composite | 35 --------- .../main/resources/component_property_1.composite | 48 ------------ .../main/resources/component_property_2.composite | 52 ------------- .../main/resources/component_property_3.composite | 38 ---------- .../src/main/resources/nonuniquename.composite | 33 --------- .../nonuniqueservicenameincomponenttype.composite | 29 -------- .../nonuniqueservicenameincomposite.composite | 47 ------------ .../resources/notcompatibleinterface.composite | 38 ---------- .../main/resources/notmatchofservicename.composite | 41 ----------- .../component/impl/ABServiceImpl.componentType | 32 -------- .../component/impl/DServiceImpl.componentType | 31 -------- .../component/impl/EServiceImpl.componentType | 31 -------- .../component/impl/FServiceImpl.componentType | 42 ----------- .../reference_multiplicity_moretargets.composite | 62 ---------------- .../reference_multiplicity_multitargets.composite | 58 --------------- .../reference_multiplicity_ntargets.composite | 59 --------------- .../reference_multiplicity_zerotarget.composite | 51 ------------- .../main/resources/reference_wiredbyimpl.composite | 59 --------------- .../src/main/resources/referencename.composite | 49 ------------- .../src/main/resources/referencename_1.composite | 50 ------------- .../src/main/resources/referencename_2.composite | 51 ------------- .../src/main/resources/referencename_3.composite | 52 ------------- .../src/main/resources/referencename_4.composite | 53 -------------- .../src/main/resources/serviceelement.composite | 42 ----------- .../main/resources/servicewithbinding.composite | 33 --------- .../main/resources/servicewithinterface.composite | 32 -------- .../src/main/resources/zerocomponents.composite | 25 ------- .../src/main/resources/zeroimplelements.composite | 38 ---------- 70 files changed, 2942 deletions(-) delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/binding_resolution.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/callback_bindings.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_duplicate_property.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_1.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_2.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_3.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniquename.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notmatchofservicename.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_1.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_2.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_3.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_4.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/serviceelement.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithbinding.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithinterface.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zerocomponents.composite delete mode 100644 branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zeroimplelements.composite (limited to 'branches/sca-java-1.5/vtest/assembly/component/src/main') diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java deleted file mode 100644 index 592020c180..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.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 org.apache.tuscany.sca.vtest.assembly.component; - -/** - * Simple Remotable Service - */ -public interface AService { - - public String getState(); - public String getBProperty(); - public String getB2Property(); - - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java deleted file mode 100644 index 0d95c8e4b8..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.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.vtest.assembly.component; - -/** - * Simple Service - */ -public interface BService { - - public String getState(); - public String getSomeProperty(); - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java deleted file mode 100644 index c979c57f31..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.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.vtest.assembly.component; - -/** - * - */ -public interface CService { - - public String getState(); - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java deleted file mode 100644 index f5832aa7ce..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.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.vtest.assembly.component; - -/** - * simple service - */ -public interface DService { - - public String sayHello(); - - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java deleted file mode 100644 index 87de618ad3..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.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 org.apache.tuscany.sca.vtest.assembly.component; - -/** - * simple service - * - */ -public interface EEService { - - public String method1() ; - - public String method3() ; - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java deleted file mode 100644 index 5d3bbb26c3..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.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 org.apache.tuscany.sca.vtest.assembly.component; - -/** - * simple service - * - */ -public interface EService { - - public String method1() ; - - public String method2() ; - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java deleted file mode 100644 index 65d97d0ab6..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.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 org.apache.tuscany.sca.vtest.assembly.component; - -import org.osoa.sca.annotations.Remotable; - -/** - * - * - */ -@Remotable -public interface FService { - - public String sayHello() ; -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java deleted file mode 100644 index 214e9c5737..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java +++ /dev/null @@ -1,32 +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.vtest.assembly.component; - -import org.osoa.sca.annotations.Remotable; - -/** - * - * - */ -@Remotable -public interface HService { - - public String sayHelloWorld() ; - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java deleted file mode 100644 index 17df0503d9..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java +++ /dev/null @@ -1,32 +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.vtest.assembly.component.callback; - -import org.osoa.sca.annotations.Remotable; - -/** - * - * - */ -@Remotable -public interface MyClient { - - public void callService() ; - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java deleted file mode 100644 index b36f4f4d75..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java +++ /dev/null @@ -1,70 +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.vtest.assembly.component.callback; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * - * - */ -@Service(MyClient.class) -public class MyClientImpl implements MyClient, MyServiceCallBack{ - - @Reference - private MyService myService ; - - String returnMessage ; - - private static Object monitor = new Object(); - - - public void callService() { - - if (myService == null) { - System.out.println("myService is null."); -// throw new Exception() ; - } else { - System.out.println("myService is not null."); - myService.dosomething() ; - } - - - int count = 0 ; - synchronized (monitor) { - while (returnMessage == null && count++ < 5) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - } - - public void receiveResult(String result) { - this.returnMessage = result ; - System.out.println("returnMessage = " + returnMessage); - } - - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.java deleted file mode 100644 index 7c9ad7a98e..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.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.vtest.assembly.component.callback; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -/** - * - * - */ -//@Callback(MyServiceCallBack.class) -@Remotable -@Callback(MyServiceCallBack.class) -public interface MyService { - -// @OneWay - public abstract void dosomething() ; - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.java deleted file mode 100644 index 78c59048ea..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.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 org.apache.tuscany.sca.vtest.assembly.component.callback; - -import org.osoa.sca.annotations.Remotable; - -/** - * - * - */ -@Remotable -public interface MyServiceCallBack { - - void receiveResult(String result); -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.java deleted file mode 100644 index 07c321d8e4..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.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.vtest.assembly.component.callback; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * - * - */ -@Service(MyService.class) -public class MyServiceImpl implements MyService{ - -// @Context -// protected RequestContext requestContext; - -// @Callback MyServiceCallBack callback ; //we can't use this ! - @Callback protected MyServiceCallBack callback ; //this callback is ok - - public void dosomething() { - - try { - System.out.println("Recved request from client."); -// Thread.sleep(3000) ; -// if (requestContext != null) { -// System.out.println("requestContext is OK!"); -// } -// = requestContext.getCallback() ; - - - if (callback != null) { - System.out.println("callback is OK."); - callback.receiveResult("Message from Service side") ; - } else { - System.out.println("callback is NULL!"); - } - - - } catch (Exception e) { - e.printStackTrace() ; - } - - - - } - - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java deleted file mode 100644 index 98f0291be3..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java +++ /dev/null @@ -1,51 +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.vtest.assembly.component.impl; - -import org.apache.tuscany.sca.vtest.assembly.component.AService; -import org.apache.tuscany.sca.vtest.assembly.component.BService; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * service implementation of AService and BService - * - */ -@Service(interfaces={AService.class, BService.class}) -public class ABServiceImpl implements AService, BService{ - - public String getState() { - return "OK"; - } - - public String getBProperty() { - return ""; - } - - public String getB2Property() { - return ""; - } - - - public String getSomeProperty() { - return "SomeProperty"; - } - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java deleted file mode 100644 index 8c0d08d052..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java +++ /dev/null @@ -1,49 +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.vtest.assembly.component.impl; - -import org.apache.tuscany.sca.vtest.assembly.component.AService; -import org.apache.tuscany.sca.vtest.assembly.component.BService; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(AService.class) -public class AServiceImpl implements AService { - - @Reference - protected BService b; - - @Reference - protected BService b2; - - public String getState() { - return b.getState(); - } - - public String getBProperty() { - return b.getSomeProperty(); - } - - public String getB2Property() { - return b2.getSomeProperty(); - } - -} - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java deleted file mode 100644 index 424e245fea..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java +++ /dev/null @@ -1,40 +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.vtest.assembly.component.impl; - -import org.apache.tuscany.sca.vtest.assembly.component.BService; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; - -@Service(BService.class) -public class BServiceImpl implements BService { - - @Property - protected String someProperty; - - public String getState() { - return "SomeStateFromB"; - } - - public String getSomeProperty() { - return someProperty; - } - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java deleted file mode 100644 index b2b420ed6a..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.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 org.apache.tuscany.sca.vtest.assembly.component.impl; - -public class CServiceImpl { - - private String state = "Some State"; - - public String getState() { - return state; - } - -} - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java deleted file mode 100644 index fce89b7bb9..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.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.vtest.assembly.component.impl; - -public class DServiceImpl { - - public String sayHello() { - return "hello"; - } - -} - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java deleted file mode 100644 index 4adb361ee5..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java +++ /dev/null @@ -1,38 +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.vtest.assembly.component.impl; - -import org.apache.tuscany.sca.vtest.assembly.component.EService; -import org.osoa.sca.annotations.Service; - - -@Service(EService.class) -public class EServiceImpl { - - public String method1() { - - return "method1" ; - } - - public String method2() { - - return "method2" ; - } - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.java deleted file mode 100644 index 2e83612497..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.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 org.apache.tuscany.sca.vtest.assembly.component.impl; - -/** - * - * - */ -public class FServiceImpl { - - public String sayHello() { - return "hello" ; - } - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java deleted file mode 100644 index d29eb41dfb..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java +++ /dev/null @@ -1,32 +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.vtest.assembly.component.property; - -/** - * - * - */ -public interface ServiceA { - - String getServiceName() ; - - String getStrProperty() ; - - Object getObjProperty() ; -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java deleted file mode 100644 index dfd613d798..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java +++ /dev/null @@ -1,51 +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.vtest.assembly.component.property; - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; - -/** - * - * - */ -@Service(ServiceA.class) -public class ServiceAImpl implements ServiceA{ - - @Property - protected String strProperty ; - - @Property - protected Object objProperty ; - - - public String getServiceName() { - return "AService" ; - } - - public String getStrProperty() { - - return strProperty ; - } - - public Object getObjProperty() { - - return objProperty ; - } -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java deleted file mode 100644 index d57894527d..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java +++ /dev/null @@ -1,32 +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.vtest.assembly.component.property; - -import org.osoa.sca.annotations.Property; - -/** - * - * - */ -public interface ServiceB { - - Object getObjProperty() ; - String getStrProperty() ; - int getIntProperty() ; -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java deleted file mode 100644 index f202906d7c..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java +++ /dev/null @@ -1,56 +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.vtest.assembly.component.property; - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; - -/** - * - * - */ -@Service(ServiceB.class) -public class ServiceBImpl implements ServiceB{ - - @Property - protected Object objProperty ; - - @Property - protected String strProperty ; - -// @Property -// protected int intProperty ; - - public Object getObjProperty() { - return objProperty ; - } - - public String getStrProperty() { - - return strProperty ; - } - - public int getIntProperty() { - - return 100 ; -// return intProperty ; - } - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java deleted file mode 100644 index 1eefede818..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.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.vtest.assembly.component.property; - -/** - * - * - */ -public interface ServiceC { - - String getStrProperty() ; - Object getObjProperty() ; -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java deleted file mode 100644 index bfbc1848c2..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java +++ /dev/null @@ -1,44 +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.vtest.assembly.component.property; - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; - -/** - * - * - */ -@Service(ServiceC.class) -public class ServiceCImpl implements ServiceC{ - - @Property - protected String strProperty ; - - @Property(name="objProperty") - protected String objProperty ; - - public String getStrProperty() { - return strProperty ; - } - - public Object getObjProperty() { - return objProperty ; - } -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java deleted file mode 100644 index 85bd9bf22c..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java +++ /dev/null @@ -1,32 +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.vtest.assembly.component.reference; - -/** - * - * - */ -public interface MyClientA { - - String callOtherServices() ; - - String callInvalidReference() ; - - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java deleted file mode 100644 index a1948990a9..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java +++ /dev/null @@ -1,55 +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.vtest.assembly.component.reference; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * - * - */ -@Service(MyClientA.class) -public class MyClientAImpl implements MyClientA{ - - @Reference - protected MyService b ; - - @Reference - protected MyService bService ; - - @Reference - protected MyService cService ; - - public String callOtherServices() { - - String s1 = b.doMyService() ; - String s2 = bService.doMyService() ; - return s1 + ":::" + s2 ; - } - - - public String callInvalidReference() { - - return cService.doMyService() ; - - } - - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java deleted file mode 100644 index 286dcb26c9..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java +++ /dev/null @@ -1,34 +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.vtest.assembly.component.reference; - -/** - * - * - */ -public interface MyClientB { - - String callOtherServices() ; - -// String callZeroTargetReference() ; - - - - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java deleted file mode 100644 index bc60a8253f..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java +++ /dev/null @@ -1,68 +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.vtest.assembly.component.reference; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * - * - */ -@Service(MyClientB.class) -public class MyClientBImpl implements MyClientB{ - - @Reference - protected MyService[] myservices1 ; - - @Reference - protected MyService[] myservices2 ; - - public String callOtherServices() { - - StringBuffer buf = new StringBuffer() ; - String str ; -// for (MyService s: bService) { - for (int i = 0 ; i < myservices1.length ; i ++) { - - buf.append(myservices1[i].doMyService()) ; - buf.append("_") ; -// System.out.println(s.doMyService()); - } - buf.append("_") ; - for (int i = 0 ; i < myservices2.length ; i ++) { - - buf.append(myservices2[i].doMyService()) ; - buf.append("_") ; -// System.out.println(s.doMyService()); - } - - str = buf.toString() ; - if (str.length() > 0) { - str = str.substring(0, str.length() -1) ; - } - System.out.println(str); - - return str ; -// return bService.doMyService() ; - - } - - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.java deleted file mode 100644 index 9ef398dcd0..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.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.vtest.assembly.component.reference; - -/** - * - * - */ -public interface MyClientC { - - String callOtherService() ; - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java deleted file mode 100644 index 67a2ca395c..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java +++ /dev/null @@ -1,85 +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.vtest.assembly.component.reference; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * - * - */ -@Service(MyClientC.class) -public class MyClientCImpl implements MyClientC { - - - @Reference - protected MyService service1 ; - - @Reference - protected MyService service2 ; - - - /** - * In this case , there is no target service defined for service1 and service2, - * so service1 and service2 should be null. - */ - public String callOtherService() { - - String str1 = null ; - String str2 = null ; - if (service1 == null) { - str1 = "MyService" ; - } - if (service2 == null) { - str2 = "MyService" ; - } -// String str1 = service1.doMyService() ; -// String str2 = service2.doMyService() ; - - return str1 + "_" + str2 ; - } -// -// public String callZeroTargetService_2() { -// -// String str1 = null ; -// String str2 = null ; -// if (service1 == null) { -// str1 = "MyService" ; -// } -// if (service2 == null) { -// str2 = "MyService" ; -// } -//// String str1 = service1.doMyService() ; -//// String str2 = service2.doMyService() ; -// -// return str1 + "_" + str2 ; -// } -// -// -// public String callOneTargetService() { -// -// String str1 = service1.doMyService() ; -// String str2 = service2.doMyService() ; -// -// return str1 + "_" + str2 ; -// -// } - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.java deleted file mode 100644 index 9afd505017..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.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 org.apache.tuscany.sca.vtest.assembly.component.reference; - -/** - * - * - */ -public interface MyClientD { - - String callOtherService_1() ; - String callOtherService_2() ; - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java deleted file mode 100644 index e1523ae587..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java +++ /dev/null @@ -1,73 +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.vtest.assembly.component.reference; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * - * - */ -@Service(MyClientD.class) -public class MyClientDImpl implements MyClientD { - - - @Reference - protected MyService service1 ; - - @Reference - protected MyService service2 ; - - @Reference - protected MyService service3 ; - - @Reference - protected MyService service4 ; - - /** - * In this case , there is no target service defined for service1 and service2, - * so service1 and service2 should be null. - */ - public String callOtherService_1() { - - String str1 = null ; - String str2 = null ; - if (service1 == null) { - str1 = "MyService" ; - } - if (service2 == null) { - str2 = "MyService" ; - } -// String str1 = service1.doMyService() ; -// String str2 = service2.doMyService() ; - - return str1 + "_" + str2 ; - } - - public String callOtherService_2() { - - String str1 = service3.doMyService() ; - String str2 = service4.doMyService() ; - - return str1 + "_" + str2 ; - } - - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.java deleted file mode 100644 index 78896eb607..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.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 org.apache.tuscany.sca.vtest.assembly.component.reference; - -/** - * - * - */ -public interface MyClientE { - - String callOtherServices() ; - - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.java deleted file mode 100644 index 199e975017..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.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.vtest.assembly.component.reference; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * - * - */ -@Service(MyClientE.class) -public class MyClientEImpl implements MyClientE { - - - @Reference - protected MyService[] myservices ; - - @Reference - protected MyService myservice ; - - - public String callOtherServices() { - - StringBuffer buf = new StringBuffer() ; - String str ; -// for (MyService s: bService) { - for (int i = 0 ; i < myservices.length ; i ++) { - - buf.append(myservices[i].doMyService()) ; - buf.append("_") ; -// System.out.println(s.doMyService()); - } - buf.append(myservice.doMyService()) ; - buf.append("_") ; - - str = buf.toString() ; - if (str.length() > 0) { - str = str.substring(0, str.length() -1) ; - } - - System.out.println(str); - - return str ; -// return bService.doMyService() ; - - } - - - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.java deleted file mode 100644 index d1ca487168..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.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.vtest.assembly.component.reference; - -/** - * - * - */ -public interface MyService { - - String doMyService() ; - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java deleted file mode 100644 index b6bb38500a..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java +++ /dev/null @@ -1,34 +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.vtest.assembly.component.reference; - -import org.osoa.sca.annotations.Service; - -/** - * - * - */ -@Service(MyService.class) -public class MyServiceImpl implements MyService{ - - public String doMyService() { - - return "MyService" ; - } -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java b/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java deleted file mode 100644 index d3e5881f0a..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java +++ /dev/null @@ -1,34 +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.vtest.assembly.component.reference; - -import org.osoa.sca.annotations.Service; - -/** - * - * - */ -@Service(MyService.class) -public class MyServiceImpl2 implements MyService{ - - public String doMyService() { - - return "MyService2" ; - } -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/binding_resolution.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/binding_resolution.composite deleted file mode 100644 index d113ba26c3..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/binding_resolution.composite +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/callback_bindings.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/callback_bindings.composite deleted file mode 100644 index 29dc96098e..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/callback_bindings.composite +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component.composite deleted file mode 100644 index bb452feac9..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component.composite +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - some b component value - - - - - some b2 component value - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_duplicate_property.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_duplicate_property.composite deleted file mode 100644 index 0886c94a90..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_duplicate_property.composite +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - value1 - value2 - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_1.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_1.composite deleted file mode 100644 index 5e975e5105..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_1.composite +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - I am a string - I am a object - - - - - - - I am a string - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_2.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_2.composite deleted file mode 100644 index 42d7234a1c..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_2.composite +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_3.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_3.composite deleted file mode 100644 index c6b0d2f245..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_3.composite +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - I am a string - - - I am an object - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniquename.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniquename.composite deleted file mode 100644 index 3019542091..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniquename.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite deleted file mode 100644 index 0f859f908f..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite deleted file mode 100644 index 00f3d00a2d..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite deleted file mode 100644 index b4d2abc011..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notmatchofservicename.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notmatchofservicename.composite deleted file mode 100644 index 3f57e56cf5..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notmatchofservicename.composite +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType deleted file mode 100644 index 7cc63afee1..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType deleted file mode 100644 index 899f84b2dd..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType deleted file mode 100644 index 86a7be9cc0..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType deleted file mode 100644 index 09cf5881a2..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite deleted file mode 100644 index 396aa0557c..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite deleted file mode 100644 index 7cf1d0b2e8..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite deleted file mode 100644 index eb4c820ca0..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite deleted file mode 100644 index 0895f2b7ce..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite deleted file mode 100644 index e5e492f34b..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename.composite deleted file mode 100644 index 9544c947d1..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename.composite +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_1.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_1.composite deleted file mode 100644 index e7445c4a2a..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_1.composite +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_2.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_2.composite deleted file mode 100644 index bf39310764..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_2.composite +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_3.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_3.composite deleted file mode 100644 index e2ef1947e8..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_3.composite +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_4.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_4.composite deleted file mode 100644 index 5ef8367193..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_4.composite +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/serviceelement.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/serviceelement.composite deleted file mode 100644 index 9460f5a2e1..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/serviceelement.composite +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - some b component value - - - - - - some b2 component value - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithbinding.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithbinding.composite deleted file mode 100644 index 085d84f40e..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithbinding.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithinterface.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithinterface.composite deleted file mode 100644 index cc915fbde5..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithinterface.composite +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zerocomponents.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zerocomponents.composite deleted file mode 100644 index 9465cedaf9..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zerocomponents.composite +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zeroimplelements.composite b/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zeroimplelements.composite deleted file mode 100644 index 8629f3817a..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zeroimplelements.composite +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - some b component value - - - - - some b2 component value - - - -- cgit v1.2.3