From a40e527938d76ba71f211da7e327adb50384ba69 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:26:33 +0000 Subject: Moving 1.x tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835157 13f79535-47bb-0310-9956-ffa450edef68 --- .../javaapi/annotations/destroy/AService.java | 29 ---- .../annotations/destroy/impl/AServiceErr1Impl.java | 39 ----- .../annotations/destroy/impl/AServiceErr2Impl.java | 39 ----- .../annotations/destroy/impl/AServiceErr3Impl.java | 40 ------ .../annotations/destroy/impl/AServiceErr4Impl.java | 39 ----- .../annotations/destroy/impl/AServiceImpl.java | 38 ----- .../src/main/resources/err1/AServiceErr1.composite | 28 ---- .../src/main/resources/err2/AServiceErr2.composite | 28 ---- .../src/main/resources/err3/AServiceErr3.composite | 28 ---- .../src/main/resources/err4/AServiceErr4.composite | 28 ---- .../src/main/resources/proper/AService.composite | 28 ---- .../destroy/DestroyAnnotationTestCase.java | 159 --------------------- 12 files changed, 523 deletions(-) delete mode 100644 tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java delete mode 100644 tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java delete mode 100644 tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java delete mode 100644 tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java delete mode 100644 tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java delete mode 100644 tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java delete mode 100644 tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite delete mode 100644 tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite delete mode 100644 tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite delete mode 100644 tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite delete mode 100644 tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite delete mode 100644 tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java (limited to 'tags/java/sca/1.3/vtest/java-api/annotations/destroy/src') diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java deleted file mode 100644 index 039689805c..0000000000 --- a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.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.javaapi.annotations.destroy; - -import org.osoa.sca.annotations.Remotable; - -/** - * The interface for AService - */ -@Remotable -public interface AService { - public String getGreetings(String name); -} diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java deleted file mode 100644 index 0b30bb8644..0000000000 --- a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java +++ /dev/null @@ -1,39 +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.javaapi.annotations.destroy.impl; - -import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Service; - -/** - * This class implements AService. The implementation has an error since it annotates a protected - * method with "@Destroy". - */ -@Service(AService.class) -public class AServiceErr1Impl implements AService { - - @Destroy - protected void destroy() { - } - - public String getGreetings(String name) { - return "Hello " + name; - } -} diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java deleted file mode 100644 index 33b2e01bcb..0000000000 --- a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java +++ /dev/null @@ -1,39 +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.javaapi.annotations.destroy.impl; - -import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Service; - -/** - * This class implements AService. The implementation has an error since it annotates a private - * method with "@Destroy". - */ -@Service(AService.class) -public class AServiceErr2Impl implements AService { - - @Destroy - private void destroy() { - } - - public String getGreetings(String name) { - return "Hello " + name; - } -} diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java deleted file mode 100644 index d5630e859e..0000000000 --- a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.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.javaapi.annotations.destroy.impl; - -import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Service; - -/** - * This class implements AService. The implementation has an error since it annotates a - * method with non-void return type with "@Destroy". - */ -@Service(AService.class) -public class AServiceErr3Impl implements AService { - - @Destroy - public String destroy() { - return null; - } - - public String getGreetings(String name) { - return "Hello " + name; - } -} diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java deleted file mode 100644 index b8f384704a..0000000000 --- a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java +++ /dev/null @@ -1,39 +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.javaapi.annotations.destroy.impl; - -import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Service; - -/** - * This class implements AService. The implementation has an error since it annotates a - * method with arguments with "@Destroy". - */ -@Service(AService.class) -public class AServiceErr4Impl implements AService { - - @Destroy - public void destroy(int x) { - } - - public String getGreetings(String name) { - return "Hello " + name; - } -} diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java deleted file mode 100644 index 75a00447f3..0000000000 --- a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.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.javaapi.annotations.destroy.impl; - -import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Service; - -/** - * This class implements AService. - */ -@Service(AService.class) -public class AServiceImpl implements AService { - - @Destroy - public void destroy() { - } - - public String getGreetings(String name) { - return "Hello " + name; - } -} diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite deleted file mode 100644 index b03a0defe5..0000000000 --- a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite deleted file mode 100644 index 93aafdd971..0000000000 --- a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite deleted file mode 100644 index eb8f6e59ca..0000000000 --- a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite deleted file mode 100644 index 296a386876..0000000000 --- a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite deleted file mode 100644 index 4373bc2558..0000000000 --- a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java deleted file mode 100644 index 1d10679a8c..0000000000 --- a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java +++ /dev/null @@ -1,159 +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.javaapi.annotations.destroy; - -import java.io.File; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode2; -import org.apache.tuscany.sca.node.SCANode2Factory; -import org.junit.Test; -import org.osoa.sca.ServiceRuntimeException; - -/** - * This test class tests the "@Destroy" annotation described in section 1.8.8. - */ -public class DestroyAnnotationTestCase { - - /** - * Lines 1225, 1226, 1227
- * The "@Destroy" annotation type is used to annotate a Java class method - * that will be called when the scope defined for the local service - * implemented by the class ends. The method must have a void return value - * and no arguments. The annotated method must be public. - *

- * This method tests a proper destroy method. i.e., public, no arguments and - * with void return type. - */ - @Test - public void atDestroyProper() throws Exception { - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); - SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/proper/AService.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/proper").toURL().toString())); - node.start(); - AService aService = ((SCAClient)node).getService(AService.class, "AComponent"); - Assert.assertEquals("Hello Pandu", aService.getGreetings("Pandu")); - node.stop(); - } - - /** - * Lines 1225, 1226, 1227
- * The "@Destroy" annotation type is used to annotate a Java class method - * that will be called when the scope defined for the local service - * implemented by the class ends. The method must have a void return value - * and no arguments. The annotated method must be public. - *

- * This method tests that an exception is thrown when a protected method is - * annotated with "@Destroy". - */ - @Test - public void atDestroyProtectedMethod() throws Exception { - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); - try { - SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/err1").toURL().toString())); - Assert.fail(); - node.stop(); - } catch(ServiceRuntimeException e) { - //expected - Assert.assertNotSame(-1, e.getMessage().indexOf("Destructor must be a public method.")); - } - } - - /** - * Lines 1225, 1226, 1227
- * The "@Destroy" annotation type is used to annotate a Java class method - * that will be called when the scope defined for the local service - * implemented by the class ends. The method must have a void return value - * and no arguments. The annotated method must be public. - *

- * This method tests that an exception is thrown when a private method is - * annotated with "@Destroy". - */ - @Test - public void atDestroyPrivateMethod() throws Exception { - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); - try { - SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/err2").toURL().toString())); - Assert.fail(); - node.stop(); - } catch(ServiceRuntimeException e) { - //expected - Assert.assertNotSame(-1, e.getMessage().indexOf("Destructor must be a public method.")); - } - } - - /** - * Lines 1225, 1226, 1227
- * The "@Destroy" annotation type is used to annotate a Java class method - * that will be called when the scope defined for the local service - * implemented by the class ends. The method must have a void return value - * and no arguments. The annotated method must be public. - *

- * This method tests that an exception is thrown when a method with non-void - * return type is annotated with "@Destroy". - */ - @Test - public void atDestroyNonVoidReturnType() throws Exception { - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); - try { - SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err3/AServiceErr3.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/err3").toURL().toString())); - Assert.fail(); - node.stop(); - } catch(ServiceRuntimeException e) { - //expected - Assert.assertNotSame(-1, e.getMessage().indexOf("Destructor must return void.")); - } - } - - /** - * Lines 1225, 1226, 1227
- * The "@Destroy" annotation type is used to annotate a Java class method - * that will be called when the scope defined for the local service - * implemented by the class ends. The method must have a void return value - * and no arguments. The annotated method must be public. - *

- * This method tests that an exception is thrown when a method with arguments is - * annotated with "@Destroy". - */ - @Test - public void atDestroyMethodWithArgs() throws Exception { - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); - try { - SCANode2 node = nodeFactory.createSCANode(new File("src/main/resources/err4/AServiceErr4.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/err4").toURL().toString())); - Assert.fail(); - node.stop(); - } catch(ServiceRuntimeException e) { - //expected - Assert.assertNotSame(-1, e.getMessage().indexOf("Destructor must not have argments")); - } - } -} -- cgit v1.2.3