From 4e13586bc791d71c41760cf4d0a5cc908973de3e Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:09:18 +0000 Subject: Moving 2.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835134 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/vtest/assembly/composite/AService.java | 31 ------------ .../sca/vtest/assembly/composite/BService.java | 29 ----------- .../sca/vtest/assembly/composite/CService.java | 28 ----------- .../assembly/composite/impl/AServiceImpl.java | 49 ------------------- .../assembly/composite/impl/BServiceImpl.java | 40 ---------------- .../assembly/composite/impl/CServiceImpl.java | 31 ------------ .../src/main/resources/composite.composite | 41 ---------------- .../assembly/composite/CompositeTestCase.java | 56 ---------------------- 8 files changed, 305 deletions(-) delete mode 100644 branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java delete mode 100644 branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java delete mode 100644 branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java delete mode 100644 branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java delete mode 100644 branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java delete mode 100644 branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java delete mode 100644 branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/resources/composite.composite delete mode 100644 branches/sca-java-2.0-M2/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java (limited to 'branches/sca-java-2.0-M2/vtest/assembly/composite/src') diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java b/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java deleted file mode 100644 index a5cff3972b..0000000000 --- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/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.composite; - -/** - * Simple Remotable Service - */ -public interface AService { - - public String getState(); - public String getBProperty(); - public String getB2Property(); - - -} diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java b/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java deleted file mode 100644 index 39d879e745..0000000000 --- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/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.composite; - -/** - * Simple Service - */ -public interface BService { - - public String getState(); - public String getSomeProperty(); - -} diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java b/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java deleted file mode 100644 index dd80c4dc6a..0000000000 --- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/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.composite; - -/** - * - */ -public interface CService { - - public String getState(); - -} diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java b/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java deleted file mode 100644 index 4a4aa965ce..0000000000 --- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/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.composite.impl; - -import org.apache.tuscany.sca.vtest.assembly.composite.AService; -import org.apache.tuscany.sca.vtest.assembly.composite.BService; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.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-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java b/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java deleted file mode 100644 index c71e2bcc16..0000000000 --- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/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.composite.impl; - -import org.apache.tuscany.sca.vtest.assembly.composite.BService; -import org.oasisopen.sca.annotation.Property; -import org.oasisopen.sca.annotation.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-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java b/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java deleted file mode 100644 index 2f091a8ef2..0000000000 --- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/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.composite.impl; - -public class CServiceImpl { - - private String state = "Some State"; - - public String getState() { - return state; - } - -} - diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/resources/composite.composite b/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/resources/composite.composite deleted file mode 100644 index d533cb8dcf..0000000000 --- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/main/resources/composite.composite +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - some b component value - - - - - some b2 component value - - - diff --git a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java b/branches/sca-java-2.0-M2/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java deleted file mode 100644 index 03f44e449c..0000000000 --- a/branches/sca-java-2.0-M2/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.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.composite; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.vtest.utilities.ServiceFinder; -import org.junit.Ignore; -import org.junit.Test; -import org.oasisopen.sca.ServiceRuntimeException; - -/** - * - */ -public class CompositeTestCase { - - private void initDomain(String compositePath) { - System.out.println("Setting up"); - ServiceFinder.init(compositePath); - } - - private void cleanupDomain() { - System.out.println("Cleaning up"); - ServiceFinder.cleanup(); - } - - - /** - * Lines nn-n: - *

- * spec - */ - @Test - public void composite1() throws Exception { - initDomain("composite.composite"); - - cleanupDomain(); - } -} -- cgit v1.2.3