summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.5.2/vtest/java-api/annotations/destroy')
-rw-r--r--branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/pom.xml44
-rw-r--r--branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java29
-rw-r--r--branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java39
-rw-r--r--branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java39
-rw-r--r--branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java40
-rw-r--r--branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java39
-rw-r--r--branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java38
-rw-r--r--branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite28
-rw-r--r--branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite28
-rw-r--r--branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite28
-rw-r--r--branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite28
-rw-r--r--branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite28
-rw-r--r--branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java159
13 files changed, 0 insertions, 567 deletions
diff --git a/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/pom.xml b/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/pom.xml
deleted file mode 100644
index 8cd0b81078..0000000000
--- a/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>java-api-annotations</artifactId>
- <version>1.5.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>vtest-java-api-annotations-destroy</artifactId>
- <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Annotations - @Destroy</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>1.5.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5.2-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java b/branches/sca-java-1.5.2/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/branches/sca-java-1.5.2/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/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java b/branches/sca-java-1.5.2/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/branches/sca-java-1.5.2/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/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java b/branches/sca-java-1.5.2/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/branches/sca-java-1.5.2/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/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java b/branches/sca-java-1.5.2/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/branches/sca-java-1.5.2/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/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java b/branches/sca-java-1.5.2/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/branches/sca-java-1.5.2/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/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java b/branches/sca-java-1.5.2/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/branches/sca-java-1.5.2/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/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite b/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
deleted file mode 100644
index b03a0defe5..0000000000
--- a/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
+++ /dev/null
@@ -1,28 +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"
- targetNamespace="http://vtest"
- xmlns:vtest="http://vtest"
- name="AServiceErr1">
-
- <component name="AComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceErr1Impl"/>
- </component>
-</composite>
diff --git a/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite b/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
deleted file mode 100644
index 93aafdd971..0000000000
--- a/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
+++ /dev/null
@@ -1,28 +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"
- targetNamespace="http://vtest"
- xmlns:vtest="http://vtest"
- name="AServiceErr2">
-
- <component name="AComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceErr2Impl"/>
- </component>
-</composite>
diff --git a/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite b/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
deleted file mode 100644
index eb8f6e59ca..0000000000
--- a/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
+++ /dev/null
@@ -1,28 +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"
- targetNamespace="http://vtest"
- xmlns:vtest="http://vtest"
- name="AServiceErr3">
-
- <component name="AComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceErr3Impl"/>
- </component>
-</composite>
diff --git a/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite b/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
deleted file mode 100644
index 296a386876..0000000000
--- a/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
+++ /dev/null
@@ -1,28 +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"
- targetNamespace="http://vtest"
- xmlns:vtest="http://vtest"
- name="AServiceErr4">
-
- <component name="AComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceErr4Impl"/>
- </component>
-</composite>
diff --git a/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite b/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
deleted file mode 100644
index 4373bc2558..0000000000
--- a/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
+++ /dev/null
@@ -1,28 +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"
- targetNamespace="http://vtest"
- xmlns:vtest="http://vtest"
- name="AService">
-
- <component name="AComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceImpl"/>
- </component>
-</composite>
diff --git a/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java b/branches/sca-java-1.5.2/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
deleted file mode 100644
index f3b2f28200..0000000000
--- a/branches/sca-java-1.5.2/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.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-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<br>
- * 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.
- * <p>
- * This method tests a proper destroy method. i.e., public, no arguments and
- * with void return type.
- */
- @Test
- public void atDestroyProper() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
- SCANode 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<br>
- * 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.
- * <p>
- * This method tests that an exception is thrown when a protected method is
- * annotated with "@Destroy".
- */
- @Test
- public void atDestroyProtectedMethod() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
- try {
- SCANode 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<br>
- * 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.
- * <p>
- * This method tests that an exception is thrown when a private method is
- * annotated with "@Destroy".
- */
- @Test
- public void atDestroyPrivateMethod() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
- try {
- SCANode 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<br>
- * 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.
- * <p>
- * 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 {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
- try {
- SCANode 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<br>
- * 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.
- * <p>
- * This method tests that an exception is thrown when a method with arguments is
- * annotated with "@Destroy".
- */
- @Test
- public void atDestroyMethodWithArgs() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
- try {
- SCANode 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"));
- }
- }
-}