diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-16 08:44:44 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-16 08:44:44 +0000 |
| commit | 3d3b8834b93b98cc7d7534e693e937179067eb58 (patch) | |
| tree | 1c31b939872ea8455118a16009a2abb96179ecf1 /branches/sca-java-1.5/vtest/assembly/component/src | |
| parent | 86101a456fb21b25abc09533769805911efd1c7f (diff) | |
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
Diffstat (limited to 'branches/sca-java-1.5/vtest/assembly/component/src')
74 files changed, 0 insertions, 3960 deletions
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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - name="binding-resolution" targetNamespace="assembly-tests"> - - <component name="FComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.FServiceImpl"/> - - <service name="FService1"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/> - </service> - - <service name="FService2"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/> - - </service> - - <service name="FService3"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/> - <binding.ws uri="http://localhost:8085/FService3"/> - </service> - - - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-callback-bindings"> - - <component name="MyServiceClientComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.callback.MyClientImpl"/> - <reference name="myService" target="MyServiceImplComponent/MyService"> - - <callback> - <binding.sca/> - <binding.jms/> - <binding.ws uri="http://localhost:8087/MyService"/> - <binding.ws uri="http://localhost:8088/MyService"/> - </callback> - - </reference> - - </component> - - <component name="MyServiceImplComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.callback.MyServiceImpl"/> - - <service name="MyService"> - <!--<interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.callback.MyService"/>--> - <callback> - <binding.sca/> - <binding.jms/> - <binding.ws uri="http://localhost:8087/MyService"/> - </callback> - </service> - - </component> - - - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component--Composite"> - - <component name="AComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.AServiceImpl"/> - <reference name="b" target="BComponent"/> - <reference name="b2" target="B2Component"/> - </component> - - <component name="BComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/> - <property name="someProperty">some b component value</property> - </component> - - <component name="B2Component"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/> - <property name="someProperty">some b2 component value</property> - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-Composite"> - - <component name="AComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceAImpl"/> - - <property name="strProperty">value1</property> - <property name="strProperty">value2</property> - - - </component> - - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component--Composite"> - - <component name="AComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceAImpl"/> - - <property name="strProperty">I am a string</property> - <property name="objProperty">I am a object</property> - - </component> - - <component name="BComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceBImpl"/> - <property name="strProperty" type="xsd:string"> - <value>I am a string</value> - </property> - <!-- - <property name="intProperty" value="100" type="xsd:int"/> - --> - - <property name="objProperty" value="I am a object"/> - - </component> - - - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component--Composite"> - - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns="http://www.example.com/Customer" targetNamespace="http://www.example.com/Customer"> - - <xsd:element name="customer" type="Customer"/> - <xsd:complexType name="Customer"> - <xsd:sequence> - <xsd:element name="firstName" type="xsd:string"/> - <xsd:element name="middleName" type="xsd:string"/> - <xsd:element name="lastName" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - </xsd:schema> - - <component name="CComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceCImpl"/> - <!-- - <property name="customerInfo" xsi:type="Customer"> - - <firstName>Ku</firstName> - <middleName>Jun</middleName> - <lastName>Guo</lastName> - - </property> - --> - - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component--Composite"> - - - <component name="CComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceCImpl"/> - - <property name="strProperty"> - I am a string - </property> - <property name="objectProperty"> - I am an object - </property> - - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-non-unique-name--Composite"> - - <component name="AComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.AServiceImpl"/> - </component> - - <component name="AComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/> - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component--Composite"> - - <component name="ABComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.ABServiceImpl"/> - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> - -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-servicewithinterface-Composite"> - - - <component name="CDComponent"> - - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.CServiceImpl"/> - - <service name="CServiceImpl"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.CService"/> - </service> - - - <service name="CServiceImpl"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.DService"/> - - </service> - - - - - - </component> - -</composite>
\ 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-servicewithinterface-Composite"> - - <component name="EEComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.EServiceImpl"/> - - - <service name="EEService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.EEService"/> - - </service> - - - - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-servicewithinterface-Composite"> - - <component name="DComponent1"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.DServiceImpl"/> - - <service name="DService1"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.DService"/> - - </service> - - <service name="DService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.DService"/> - - </service> - - - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"> - - - <service name="AService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.AService"/> - </service> - - <service name="AService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.BService"/> - </service> - - -</componentType>
\ 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"> - - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.DServiceImpl"/> - - <service name="DService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.DService"/> - </service> - - - - -</componentType>
\ 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"> - - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.EServiceImpl"/> - - <service name="EEService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.EService"/> - </service> - - - - -</componentType>
\ 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"> - - - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.FServiceImpl"/> - - <service name="FService1"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/> - <binding.ws uri="http://localhost:8085/FService1"/> - </service> - - <service name="FService2"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/> - - </service> - - <service name="FService3"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.FService"/> - <binding.ws uri="http://localhost:8085/FService4"/> - </service> - - - -</componentType>
\ 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 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component"> - - - <component name="ClientComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientBImpl"/> - - <service name="MyClientB"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientB"/> - </service> - - <reference name="myservices1" target="ServiceComponent1/MyService ServiceComponent2/MyService" - multiplicity="1..1"> - </reference> - - <reference name="myservices2" target="ServiceComponent1/MyService ServiceComponent2/MyService" - multiplicity="0..1"> - </reference> - - </component> - - - - <component name="ServiceComponent1"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/> - <service name="MyService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/> - </service> - </component> - - <component name="ServiceComponent2"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl2"/> - <service name="MyService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/> - </service> - </component> - - -</composite> - 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 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component"> - - <component name="ClientComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientEImpl"/> - - <service name="MyClientE"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientE"/> - </service> - - <reference name="myservices" multiplicity="0..n" target="ServiceComponent/MyService ServiceComponent2/MyService"> - </reference> - - <reference name="myservice" multiplicity="1..n" target="ServiceComponent/MyService"> - </reference> - - </component> - - - <component name="ServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/> - <service name="MyService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/> - </service> - </component> - - <component name="ServiceComponent2"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl2"/> - <service name="MyService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/> - </service> - </component> - - -</composite> - 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 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component"> - - <component name="ClientComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientDImpl"/> - - <service name="MyClientD"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientD"/> - </service> - - <reference name="service1" multiplicity="1..n"> - </reference> - - <reference name="service2" multiplicity="1..1"> - </reference> - - <reference name="service3" multiplicity="1..n" target="ServiceComponent/MyService"> - </reference> - - <reference name="service4" multiplicity="1..1" target="ServiceComponent/MyService"> - </reference> - - </component> - - - - - <component name="ServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/> - <service name="MyService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/> - </service> - </component> - - -</composite> - 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 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component"> - - <component name="ClientComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientCImpl"/> - - <service name="MyClientC"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientC"/> - </service> - - <reference name="service1" multiplicity="0..1"> - </reference> - - <reference name="service2" multiplicity="0..n"> - </reference> - - </component> - - - <component name="ServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/> - <service name="MyService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/> - </service> - </component> - - -</composite> - 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 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component"> - - <component name="ClientComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/> - - <service name="MyClientA"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/> - </service> - - <reference name="b" target="ServiceComponent/MyService" wiredByImpl="true"> - </reference> - - <reference name="bService" target="ServiceComponent/MyService"> - </reference> - - - </component> - - - - - <component name="ServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/> - <service name="MyService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/> - </service> - </component> - - - - - - - - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component"> - - <component name="ClientComponent1"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/> - - <service name="MyClientA"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/> - </service> - - <reference name="b" target="ServiceComponent/MyService"> - </reference> - - <reference name="bService" target="ServiceComponent/MyService"> - </reference> - - </component> - - - <component name="ServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/> - <service name="MyService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/> - </service> - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-reference"> - - <component name="ClientComponent1"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/> - - <service name="MyClientA"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/> - </service> - - <reference name="b" target="ServiceComponent/MyService"> - </reference> - - <reference name="bService" target="ServiceComponent/MyService"> - </reference> - - </component> - - - - <component name="ServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/> - <service name="MyService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/> - </service> - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-reference"> - - - - <component name="ClientComponent2"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/> - - <service name="MyClientA"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/> - </service> - - <reference name="b" target="ServiceComponent/MyService"> - </reference> - - <reference name="b" target="ServiceComponent/MyService"> - </reference> - - </component> - - - <component name="ServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/> - <service name="MyService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/> - </service> - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<!--to test the reference name matched with implementation--> - -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-reference"> - - - <component name="ClientComponent1"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/> - - <service name="MyClientA"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/> - </service> - - <reference name="b" target="ServiceComponent/MyService"> - </reference> - - <reference name="bService" target="ServiceComponent/MyService"> - </reference> - - </component> - - - <component name="ServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/> - <service name="MyService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/> - </service> - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<!--to test the reference name not matched with implementation--> - -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-reference"> - - - <component name="ClientComponent1"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/> - - <service name="MyClientA"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/> - </service> - - <reference name="bb" target="ServiceComponent/MyService"> - </reference> - - <reference name="bService" target="ServiceComponent/MyService"> - </reference> - - </component> - - - - <component name="ServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/> - <service name="MyService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/> - </service> - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component--Composite"> - - <component name="AComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.AServiceImpl"/> - <reference name="b" target="BComponent"/> - <reference name="b2" target="B2Component"/> - </component> - - <component name="BComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/> - <property name="someProperty">some b component value</property> - <service name="BService"/> - </component> - - <component name="B2Component"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/> - <property name="someProperty">some b2 component value</property> - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-servicewithbinding-Composite"> - - <component name="CComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.CServiceImpl"/> - <service name="CServiceImpl"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.CService"/> - <binding.sca/> - </service> - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-servicewithinterface-Composite"> - - <component name="CComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.CServiceImpl"/> - <service name="CServiceImpl"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.CService"/> - </service> - </component> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-zero-components-Composite"> - -</composite> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-zeroimplelements-Composite"> - - <component name="AComponent"> - </component> - - <component name="BComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/> - <property name="someProperty">some b component value</property> - </component> - - <component name="B2Component"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/> - <property name="someProperty">some b2 component value</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java b/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java deleted file mode 100644 index 69b7377986..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java +++ /dev/null @@ -1,363 +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 java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.vtest.assembly.component.callback.MyClient; -import org.apache.tuscany.sca.vtest.utilities.ServiceFinder; -import org.junit.Test; -import org.junit.Ignore; -import org.osoa.sca.ServiceRuntimeException; - -/** - * Test the basic functionalities of the component - * - */ -public class ComponentBasicTestCase { - - - private void initDomain(String compositePath) { - System.out.println("Setting up"); - ServiceFinder.init(compositePath); - } - - private void cleanupDomain() { - System.out.println("Cleaning up"); - ServiceFinder.cleanup(); - } - - /** - * Lines 92-96: - * <p> - * Components are configured instances of implementations. Components - * provide and consume services. More than one component can use and - * configure the same implementation, where each component configures the - * implementation differently. - */ - @Test - public void components1() throws Exception { - initDomain("component.composite"); - AService service = ServiceFinder.getService(AService.class, "AComponent/AService"); - Assert.assertEquals("some b component value", service.getBProperty()); - Assert.assertEquals("some b2 component value", service.getB2Property()); - cleanupDomain(); - } - - /** - * Lines 96-97: - * <p> - * There can be zero or more component elements within a composite. - */ - @Test - public void components2() throws Exception { - initDomain("zerocomponents.composite"); - cleanupDomain(); - } - - /** - * Lines 142-143: - * <p> - * name (required) ?the name of the component. The name must be unique - * across all the components in the composite. - */ - @Test(expected = ServiceRuntimeException.class) - //@Ignore("TUSCANY-2455") - public void components3() throws Exception { - initDomain("nonuniquename.composite"); - cleanupDomain(); - } - - /** - * Lines 154-158: - * <p> - * A component element has zero or one implementation element as its child, - * which points to the implementation used by the component. A component - * with no implementation element is not runnable, but components of this - * kind may be useful during a "top-down" development process as a means of - * defining the characteristics required of the implementation before the - * implementation is written. - */ - @Test - public void components4() throws Exception { - initDomain("zeroimplelements.composite"); - cleanupDomain(); - } - - /** - * Lines 159-160: - * <p> - * The component element can have zero or more service elements as children - * which are used to configure the services of the component. - */ - @Test - public void components5() throws Exception { - initDomain("serviceelement.composite"); - cleanupDomain(); - } - - /** - * Lines 174-179: - * <p> - * A service has zero or one interface, which describes the operations - * provided by the service. The interface is described by an interface - * element which is a child element of the service element. If no interface - * is specified, then the interface specified for the service by the - * implementation is in effect. If an interface is specified it must provide - * a compatible subset of the interface provided by the implementation, i.e. - * provide a subset of the operations defined by the implementation for the - * service. - */ - @Test - public void components6() throws Exception { - initDomain("servicewithinterface.composite"); - CService service = ServiceFinder.getService(CService.class, "CComponent"); - Assert.assertEquals("Some State", service.getState()); - cleanupDomain(); - } - - /** - * Lines 180-182: - * <p> - * A service element has one or more binding elements as children. If no - * bindings are specified, then the bindings specified for the service by - * the implementation are in effect. If bindings are specified, then those - * bindings override the bindings specified by the implementation. - */ - @Test - public void components7() throws Exception { - initDomain("servicewithbinding.composite"); - CService service = ServiceFinder.getService(CService.class, "CComponent"); - Assert.assertEquals("Some State", service.getState()); - cleanupDomain(); - } - - /** - * Lines 142-143: - * <p> - * OSOA: - * the name of the component. The name must be unique across all the - * components in the composite. - * <p> - * ASM50001 - * <p> - * OASIS: - * the name of the component. The name must be unique across all - * the components in the composite. - * - */ - @Test(expected=ServiceRuntimeException.class) - public void testComponentnameUnique() throws Exception { - initDomain("nonuniquename.composite"); - cleanupDomain(); - - } - - /** - * Lines 1498-1499: - * <p> - * OSOA: - * the name of the service, the name MUST BE unique across all the - * composite services in the composite - * <p> - * ASM50002 - * <p> - * OASIS: - * The @name attribute of a service element of a <component/> MUST be unique amongst - * the service elements of that <component/> - * - */ - @Test(expected=ServiceRuntimeException.class) - public void testServicenameUnique() throws Exception { - initDomain("nonuniqueservicenameincomposite.composite"); - DService service = ServiceFinder.getService(DService.class, "CDComponent/CServiceImpl"); - Assert.assertEquals("hello", service.sayHello()); - cleanupDomain(); - } - - /** - * <p> - * Not mentioned in OSOA - * <p> - * ASM50003 - * <p> - * OASIS - * The @name attribute of a service element of a <component/> MUST match the - * @name attribute of a service element of the componentType of the - * <implementation/> child element of the component. - * <p> - * For the service name, OSOA says(1598-1500): - * name (required) - the name of the service, the name MUST BE unique across all the - * composite services in the composite. The name of the composite service can be different - * from the name of the promoted component service. - */ - @Test(expected=ServiceRuntimeException.class) - public void testServicenameNotmatch() throws Exception { - initDomain("notmatchofservicename.composite"); - DService service = ServiceFinder.getService(DService.class, "DComponent1/DService1"); - Assert.assertEquals("hello", service.sayHello()); - cleanupDomain(); - } - - /** - * <p> - * Not mentioned in OSOA - * <p> - * ASM50003 - * <p> - * OASIS - * The @name attribute of a service element of a <component/> MUST match the - * @name attribute of a service element of the componentType of the - * <implementation/> child element of the component. - * - */ - public void testServicenameMatch() throws Exception { - initDomain("notmatchofservicename.composite"); - DService service = ServiceFinder.getService(DService.class, "DComponent1/DService"); - Assert.assertEquals("hello", service.sayHello()); - cleanupDomain(); - } - - - /** - * Lines 177-178: - * <p> - * OSOA: - * If an interface is specified it must provide a compatible subset of the - * interface provided by the implementation - * <p> - * ASM50004 - * <p> - * OASIS: - * If a <service/> element has an interface subelement specified, the interface MUST - * provide a compatible subset of the interface declared on the componentType of the - * implementation. - */ - @Test(expected=ServiceRuntimeException.class) - public void testInterfaceCompatible() throws Exception { - //for this case, if you remove the method3() in the EEService - //the EEService will be a compatible subset of EService. - initDomain("notcompatibleinterface.composite"); - EEService service = ServiceFinder.getService(EEService.class, "EEComponent/EEService"); - Assert.assertEquals("method1", service.method1()); - cleanupDomain(); - } - - /** - * This method helps to check if the binding.ws is working. - * if the http response contains the "wsdl:definitions", - * we can regard it as a wsdl message, then the wsdlURL is valid. - * @param wsdlURL - * @return - */ - private boolean isValidWebService(String wsdlURL) { - - try { - URL url = new URL(wsdlURL) ; - URLConnection conn = url.openConnection() ; - BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream())) ; - String lineStr ; - while ((lineStr = reader.readLine()) != null) { - if (lineStr.indexOf("wsdl:definitions") != -1 ) { - return true ; - } - } - - } catch (Exception e) { - e.printStackTrace() ; - } - - return false ; - } - - /** - * <p> - * No matched OSOA statements found - * <p> - * ASM50005 - * <p> - * OASIS: - * If no binding elements are specified for the service, then the bindings specified for - * the equivalent service in the componentType of the implementation MUST be used, - * but if the componentType also has no bindings specified, then <binding.sca/> - * MUST be used as the binding. If binding elements are specified for the service, then - * those bindings MUST be used and they override any bindings specified for the - * equivalent service in the componentType of the implementation. - */ - @Test - // @Ignore("broken, see TUSCANY-2946") - public void testServiceBinding() throws Exception { - - initDomain("binding_resolution.composite"); - - FService service ; - //test no binding in component - service = ServiceFinder.getService(FService.class, "FComponent/FService1"); - Assert.assertEquals("hello", service.sayHello()); - Assert.assertEquals(true , isValidWebService("http://localhost:8085/FService1?wsdl")) ; - //test no binding in componentType - service = ServiceFinder.getService(FService.class, "FComponent/FService2"); - Assert.assertEquals("hello", service.sayHello()); - //test binding overriding - service = ServiceFinder.getService(FService.class, "FComponent/FService3"); - Assert.assertEquals("hello", service.sayHello()); - Assert.assertEquals(true , isValidWebService("http://localhost:8085/FService3?wsdl")) ; - - cleanupDomain(); - } - - /** - * Line 1526-1529: - * <P> - * OSOA: - * A service element has an optional callback element used if the interface - * has a callback defined, which has one or more binding elements as children. - * The callback and its binding child elements are specified if there is a need - * to have binding details used to handle callbacks. If the callback element is not present, - * the behaviour is runtime implementation dependent. - * <p> - * ASM50006 - * <p> - * If the callback element is present and contains one or more binding - * child elements,then those bindings MUST be used for the callback. - * - */ - @Test - public void testCallbackBindings() throws Exception{ - - initDomain("callback_bindings.composite"); - MyClient client = ServiceFinder.getService(MyClient.class, "MyServiceClientComponent/MyClient"); - client.callService() ; - - cleanupDomain(); - } - - - - - - - - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java b/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java deleted file mode 100644 index 6cf8b49e4f..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java +++ /dev/null @@ -1,166 +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 junit.framework.Assert; - -import org.apache.tuscany.sca.vtest.assembly.component.property.ServiceA; -import org.apache.tuscany.sca.vtest.assembly.component.property.ServiceB; -import org.apache.tuscany.sca.vtest.assembly.component.property.ServiceC; -import org.apache.tuscany.sca.vtest.utilities.ServiceFinder; -import org.junit.Ignore; -import org.junit.Test; - -/** - * This test case covers the main functionalities of component property. - * - */ -public class ComponentPropertyTestCase { - - private void initDomain(String compositePath) { - System.out.println("Setting up"); - ServiceFinder.init(compositePath); - } - - private void cleanupDomain() { - System.out.println("Cleaning up"); - ServiceFinder.cleanup(); - } - - /** - * - * <p> - * OSOA - * The property has no @value attribute now. - * <p> - * ASM50027 - * <p> - * OASIS: - * If the @value attribute of a component property element is declared, the type of the - * property MUST be an XML Schema simple type and the @value attribute MUST - * contain a single value of that type - */ - @Test - @Ignore("It will be implemented in SCA 2.x codebase") - public void testValueAttibuteValid_1() { - - initDomain("component_property_1.composite"); - ServiceA service = ServiceFinder.getService(ServiceA.class , "AComponent/ServiceA") ; - Assert.assertEquals("I am a string" ,service.getStrProperty()) ; - Assert.assertEquals("I am a object" ,service.getObjProperty()) ; - cleanupDomain(); - - } - - /** - * <p> - * OSOA - * The property has no @value attribute now. - * <p> - * ASM50027 - * <p> - * OASIS: - * If the @value attribute of a component property element is declared, the type of the - * property MUST be an XML Schema simple type and the @value attribute MUST - * contain a single value of that type - */ - @Test - @Ignore("It will be implemented in SCA 2.x codebase") - public void testValueAttibuteValid_2() { - - initDomain("component_property_1.composite"); - ServiceB service = ServiceFinder.getService(ServiceB.class , "BComponent/ServiceB") ; -// Assert.assertEquals("I am a object" ,service.getObjProperty()) ; - //It will fail to get the value from composite file, so it will be an empty string - System.out.println("::::" + service.getStrProperty()); -// System.out.println("::::" + service.getIntProperty()); -// Assert.assertEquals("I am a string" ,service.getStrProperty()) ; - - Assert.assertEquals("" ,service.getObjProperty()) ; - cleanupDomain(); - - } - - /** - * <p> - * OSOA - * Not mentioned in OSOA - * <p> - * ASM50030 - * <p> - * OASIS: - * A <component/> element MUST NOT contain two <property/> subelements with the - * same value of the @name attribute - */ - @Test - @Ignore("TUSCANY-2863") - public void testDuplicateProperty() { - - initDomain("component_duplicate_property.composite"); - ServiceA service = ServiceFinder.getService(ServiceA.class , "AComponent/ServiceA") ; -// System.out.println(service.getStrProperty()) ; - Assert.assertEquals("value1", service.getStrProperty()) ; - cleanupDomain(); - - } - - /** - * <p> - * OSOA - * No corresponding statements in OSOA. - * <p> - * ASM50031 - * <p> - * OASIS: - * The name attribute of a component property MUST match the name of a property - * element in the component type of the component implementation. - */ - @Test - public void testPropertyNameMatched() { - - initDomain("component_property_3.composite"); - ServiceC service = ServiceFinder.getService(ServiceC.class , "CComponent/ServiceC") ; - Assert.assertEquals("I am a string" , service.getStrProperty()) ; - cleanupDomain(); - - } - - /** - * <p> - * OSOA - * No corresponding statements in OSOA. - * <p> - * ASM50031 - * <p> - * OASIS: - * The name attribute of a component property MUST match the name of a property - * element in the component type of the component implementation. - */ - @Test - public void testPropertyNameNotMatched() { - - initDomain("component_property_3.composite"); - ServiceC service = ServiceFinder.getService(ServiceC.class , "CComponent/ServiceC") ; - Assert.assertNull(service.getObjProperty()) ; - cleanupDomain(); - - } - - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java b/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java deleted file mode 100644 index d62d10965a..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java +++ /dev/null @@ -1,259 +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 junit.framework.Assert; - -import org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA; -import org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientB; -import org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientC; -import org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientD; -import org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientE; -import org.apache.tuscany.sca.vtest.utilities.ServiceFinder; -import org.junit.Ignore; -import org.junit.Test; -import org.osoa.sca.ServiceRuntimeException; - -/** - * Test the reference name, wire, wireByImpl, autowire and so on. - * - */ -public class ComponentReferenceTestCase { - - private void initDomain(String compositePath) { - System.out.println("Setting up"); - ServiceFinder.init(compositePath); - } - - private void cleanupDomain() { - System.out.println("Cleaning up"); - ServiceFinder.cleanup(); - } - - /** - * Line 1325-1326: - * <p> - * OSOA: - * the name of the reference. The name must be unique across all the - * composite references in the composite. - * <p> - * ASM50007 - * <p> - * OASIS: - * the name of the reference. Has to match a name of a reference defined by the implementation. - * The @name attribute of a reference element of a <component/> MUST be unique amongst the - * reference elements of that <component/> - */ - @Test - public void testReferenceNameUnique() { - - initDomain("referencename_1.composite"); - - MyClientA service = ServiceFinder.getService(MyClientA.class, "ClientComponent1/MyClientA"); - Assert.assertEquals("MyService:::MyService" , service.callOtherServices()) ; - - cleanupDomain(); - } - - /** - * Line 1325-1326: - * <p> - * OSOA: - * the name of the reference. The name must be unique across all the - * composite references in the composite. - * <p> - * ASM50007 - * <p> - * OASIS: - * the name of the reference. Has to match a name of a reference defined by the implementation. - * The @name attribute of a reference element of a <component/> MUST be unique amongst the - * reference elements of that <component/> - */ - @Test - public void testReferenceNameDuplicated() { - //for this case, the reference of "b" in MyClientImpl is null. - try { - initDomain("referencename_2.composite"); - } catch (ServiceRuntimeException ex){ - Assert.assertEquals("Duplicate component reference name: Component = ClientComponent2 Reference = b", ex.getMessage()); - return; - } - Assert.fail(); - cleanupDomain(); - } - - /** - * Line 192-193: - * <p> - * OSOA: - * the name of the reference. Has to match a name of a reference - * defined by the implementation. - * <p> - * ASM50008 - * <p> - * OASIS: - * the name of the reference. Has to match a name of a reference defined by the implementation. - * - */ - @Test - public void testComponentReferenceNameMatched() { - initDomain("referencename_3.composite"); - MyClientA service = ServiceFinder.getService(MyClientA.class, "ClientComponent1/MyClientA"); - Assert.assertEquals("MyService:::MyService" , service.callOtherServices()) ; - cleanupDomain(); - } - - /** - * Line 192-193: - * <p> - * OSOA: - * the name of the reference. Has to match a name of a reference - * defined by the implementation. - * <p> - * ASM50008 - * <p> - * OASIS: - * the name of the reference. Has to match a name of a reference defined by the implementation. - * - */ - @Test - public void testComponentReferenceNameValid() { - - try { - initDomain("referencename_4.composite"); - } catch (ServiceRuntimeException ex){ - Assert.assertEquals("Reference not found for component reference: Component = ClientComponent1 Reference = bb", ex.getMessage()); - return; - } - - Assert.fail(); - cleanupDomain(); - - } - - /** - * - * <p> - * ASM50010 - * <p> - * OASIS: - * If @wiredByImpl="true" is set for a reference, then the reference MUST NOT be - * wired statically within a composite, but left unwired - */ - @Test - @Ignore("Not implemented in SCA 1.x codebase.") - public void testWiredByImpl() { - initDomain("reference_wiredbyimpl.composite"); - MyClientA service = ServiceFinder.getService(MyClientA.class, "ClientComponent/MyClientA"); - Assert.assertEquals("MyService:::MyService" , service.callOtherServices()) ; - cleanupDomain(); - } - - - /** - * Line 208: - * <p> - * OSOA: - * zero or one wire can have the reference as a source - * <p> - * ASM50018 - * <p> - * OASIS - * A reference with multiplicity 0..1 or 0..n MAY have no target - * service defined. - * - */ - @Test - public void testMultiplicity_1() { - - initDomain("reference_multiplicity_zerotarget.composite"); - MyClientC service = ServiceFinder.getService(MyClientC.class, "ClientComponent/MyClientC"); - Assert.assertEquals("MyService_MyService" , service.callOtherService()) ; - cleanupDomain(); - } - - /** - * Line 208: - * OSOA: - * zero or one wire can have the reference as a source - * <p> - * ASM50019 - * <p> - * OASIS: - * A reference with multiplicity 0..1 or 1..1 MUST NOT have more than one target service - * defined. - */ - @Test - @Ignore("TUSCANY-2720") - public void testMultiplicity_2() { - - initDomain("reference_multiplicity_moretargets.composite"); - MyClientB service = ServiceFinder.getService(MyClientB.class, "ClientComponent/MyClientB"); - Assert.assertEquals("MyService_MyService2_MyService_MyService2" , service.callOtherServices()) ; - cleanupDomain(); - } - - /** - * Line 207,209 - * <p> - * OSOA: - * 1..1 – one wire can have the reference as a source - * 1..n – one or more wires can have the reference as a source - * <p> - * ASM50020 - * <p> - * OASIS: - * A reference with multiplicity 1..1 or 1..n MUST have at least one target - * service defined. - */ - @Test - public void testMultiplicity_3() { - - initDomain("reference_multiplicity_ntargets.composite"); - MyClientD service = ServiceFinder.getService(MyClientD.class, "ClientComponent/MyClientD"); - Assert.assertEquals("MyService_MyService" , service.callOtherService_1()) ; - Assert.assertEquals("MyService_MyService" , service.callOtherService_2()) ; - - cleanupDomain(); - } - - /** - * Line 209-210 - * <p> - * OSOA - * 1..n – one or more wires can have the reference as a source - * 0..n - zero or more wires can have the reference as a source - * <p> - * ASM50020 - * <p> - * OASIS: - * A reference with multiplicity 0..n or 1..n MAY have one or more - * target services defined. - */ - @Test - public void testMultiplicity_4() { - - initDomain("reference_multiplicity_multitargets.composite"); - MyClientE service = ServiceFinder.getService(MyClientE.class, "ClientComponent/MyClientE"); - Assert.assertEquals("MyService_MyService2_MyService" , service.callOtherServices()) ; - - cleanupDomain(); - } - -} diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java b/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java deleted file mode 100644 index 2d245d10a8..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java +++ /dev/null @@ -1,230 +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 junit.framework.Assert; - -import org.apache.tuscany.sca.vtest.utilities.ServiceFinder; -import org.junit.Ignore; -import org.junit.Test; -import org.osoa.sca.ServiceRuntimeException; - -/** - * - */ -public class ComponentTestCase { - - private void initDomain(String compositePath) { - System.out.println("Setting up"); - - ServiceFinder.init(compositePath); - } - - private void cleanupDomain() { - System.out.println("Cleaning up"); - ServiceFinder.cleanup(); - } - - - - /** - * Lines 92-96: - * <p> - * Components are configured instances of implementations. Components - * provide and consume services. More than one component can use and - * configure the same implementation, where each component configures the - * implementation differently. - */ - @Test - public void components1() throws Exception { - initDomain("component.composite"); - AService service = ServiceFinder.getService(AService.class, "AComponent/AService"); - Assert.assertEquals("some b component value", service.getBProperty()); - Assert.assertEquals("some b2 component value", service.getB2Property()); - cleanupDomain(); - } - - /** - * Lines 96-97: - * <p> - * There can be zero or more component elements within a composite. - */ - @Test - public void components2() throws Exception { - initDomain("zerocomponents.composite"); - cleanupDomain(); - } - - /** - * Lines 142-143: - * <p> - * name (required) ?the name of the component. The name must be unique - * across all the components in the composite. - */ - @Test(expected = ServiceRuntimeException.class) - //@Ignore("TUSCANY-2455") - public void components3() throws Exception { - initDomain("nonuniquename.composite"); - cleanupDomain(); - } - - /** - * Lines 154-158: - * <p> - * A component element has zero or one implementation element as its child, - * which points to the implementation used by the component. A component - * with no implementation element is not runnable, but components of this - * kind may be useful during a "top-down" development process as a means of - * defining the characteristics required of the implementation before the - * implementation is written. - */ - @Test - public void components4() throws Exception { - initDomain("zeroimplelements.composite"); - cleanupDomain(); - } - - /** - * Lines 159-160: - * <p> - * The component element can have zero or more service elements as children - * which are used to configure the services of the component. - */ - @Test - public void components5() throws Exception { - initDomain("serviceelement.composite"); - cleanupDomain(); - } - - /** - * Lines 174-179: - * <p> - * A service has zero or one interface, which describes the operations - * provided by the service. The interface is described by an interface - * element which is a child element of the service element. If no interface - * is specified, then the interface specified for the service by the - * implementation is in effect. If an interface is specified it must provide - * a compatible subset of the interface provided by the implementation, i.e. - * provide a subset of the operations defined by the implementation for the - * service. - */ - @Test - public void components6() throws Exception { - initDomain("servicewithinterface.composite"); - CService service = ServiceFinder.getService(CService.class, "CComponent"); - Assert.assertEquals("Some State", service.getState()); - cleanupDomain(); - } - - /** - * Lines 180-182: - * <p> - * A service element has one or more binding elements as children. If no - * bindings are specified, then the bindings specified for the service by - * the implementation are in effect. If bindings are specified, then those - * bindings override the bindings specified by the implementation. - */ - @Test - public void components7() throws Exception { - initDomain("servicewithbinding.composite"); - CService service = ServiceFinder.getService(CService.class, "CComponent"); - Assert.assertEquals("Some State", service.getState()); - cleanupDomain(); - } - - /** - * Lines 599-601: - * <p> - * ASM50001 - * <p> - * The @name attribute of a <service/> child element of a <componentType/> MUST - * be unique amongst the service elements of that <componentType/> - * - */ - @Test(expected=ServiceRuntimeException.class) - @Ignore("TUSCANY-2675") - public void ASM50001() throws Exception { - initDomain("nonuniqueservicenameincomponenttype.composite"); - AService service = ServiceFinder.getService(AService.class, "ABComponent/AService"); - Assert.assertEquals("OK", service.getState()); - cleanupDomain(); - } - - /** - * Lines 695-697: - * <p> - * ASM50002 - * <p> - * The @name attribute of a service element of a <component/> MUST be unique amongst - * the service elements of that <component/> - * - */ - @Test(expected=ServiceRuntimeException.class) - public void ASM50002() throws Exception { - initDomain("nonuniqueservicenameincomposite.composite"); - DService service = ServiceFinder.getService(DService.class, "CDComponent/CServiceImpl"); - Assert.assertEquals("hello", service.sayHello()); - cleanupDomain(); - } - - /** - * Lines 697-699: - * <p> - * ASM50003 - * <p> - * OSOA - * The @name attribute of a service element of a <component/> MUST match the - * @name attribute of a service element of the componentType of the <implementation/> child element of the component. - * <p> - * OASIS - * the name of the service has to match a name of a service defined by the implementation - * - */ - @Test(expected=ServiceRuntimeException.class) - public void ASM50003() throws Exception { - initDomain("notmatchofservicename.composite"); - DService service = ServiceFinder.getService(DService.class, "DComponent1/DService1"); - Assert.assertEquals("hello", service.sayHello()); - cleanupDomain(); - } - - /** - * Lines 709-715: - * <p> - * ASM50004 - * <p> - * If a <service/> element has an interface subelement specified, the interface MUST - * provide a compatible subset of the interface declared on the componentType of the - * implementation. - */ - @Test(expected=ServiceRuntimeException.class) - public void ASM50004() throws Exception { - //for this case, if you remove the method3() in the EEService - //the EEService will be a compatible subset of EService. - initDomain("notcompatibleinterface.composite"); - EEService service = ServiceFinder.getService(EEService.class, "EEComponent/EEService"); - Assert.assertEquals("method1", service.method1()); - cleanupDomain(); - } - - - - -} |