Author: kwilliams
Date: Mon May 5 15:05:41 2008
New Revision: 653615
URL: http://svn.apache.org/viewvc?rev=653615&view=rev
Log:
Applying vamsi's comtribution for @Destroy testing, TUSCANY-2287
Added:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/pom.xml
(with props)
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
(with props)
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
(with props)
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
(with props)
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
(with props)
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
(with props)
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
(with props)
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err1/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
(with props)
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err2/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
(with props)
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err3/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
(with props)
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err4/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
(with props)
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/proper/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
(with props)
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
(with props)
Modified:
incubator/tuscany/java/sca/vtest/java-api/annotations/pom.xml
Added: incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/pom.xml?rev=653615&view=auto
==============================================================================
--- incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/pom.xml
(added)
+++ incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/pom.xml Mon
May 5 15:05:41 2008
@@ -0,0 +1,45 @@
+<?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>2.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>vtest-java-api-annotations-destroy</artifactId>
+
+ <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests -
Annotations - @Destroy</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node2-impl</artifactId>
+ <version>2.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>2.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java?rev=653615&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
Mon May 5 15:05:41 2008
@@ -0,0 +1,29 @@
+/*
+ * 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
+ */
[EMAIL PROTECTED]
+public interface AService {
+ public String getGreetings(String name);
+}
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java?rev=653615&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
Mon May 5 15:05:41 2008
@@ -0,0 +1,39 @@
+/*
+ * 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".
+ */
[EMAIL PROTECTED](AService.class)
+public class AServiceErr1Impl implements AService {
+
+ @Destroy
+ protected void destroy() {
+ }
+
+ public String getGreetings(String name) {
+ return "Hello " + name;
+ }
+}
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java?rev=653615&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
Mon May 5 15:05:41 2008
@@ -0,0 +1,39 @@
+/*
+ * 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".
+ */
[EMAIL PROTECTED](AService.class)
+public class AServiceErr2Impl implements AService {
+
+ @Destroy
+ private void destroy() {
+ }
+
+ public String getGreetings(String name) {
+ return "Hello " + name;
+ }
+}
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java?rev=653615&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
Mon May 5 15:05:41 2008
@@ -0,0 +1,40 @@
+/*
+ * 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".
+ */
[EMAIL PROTECTED](AService.class)
+public class AServiceErr3Impl implements AService {
+
+ @Destroy
+ public String destroy() {
+ return null;
+ }
+
+ public String getGreetings(String name) {
+ return "Hello " + name;
+ }
+}
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java?rev=653615&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
Mon May 5 15:05:41 2008
@@ -0,0 +1,39 @@
+/*
+ * 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".
+ */
[EMAIL PROTECTED](AService.class)
+public class AServiceErr4Impl implements AService {
+
+ @Destroy
+ public void destroy(int x) {
+ }
+
+ public String getGreetings(String name) {
+ return "Hello " + name;
+ }
+}
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java?rev=653615&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
Mon May 5 15:05:41 2008
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
[EMAIL PROTECTED](AService.class)
+public class AServiceImpl implements AService {
+
+ @Destroy
+ public void destroy() {
+ }
+
+ public String getGreetings(String name) {
+ return "Hello " + name;
+ }
+}
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite?rev=653615&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
Mon May 5 15:05:41 2008
@@ -0,0 +1,28 @@
+<?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>
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite?rev=653615&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
Mon May 5 15:05:41 2008
@@ -0,0 +1,28 @@
+<?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>
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite?rev=653615&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
Mon May 5 15:05:41 2008
@@ -0,0 +1,28 @@
+<?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>
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite?rev=653615&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
Mon May 5 15:05:41 2008
@@ -0,0 +1,28 @@
+<?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>
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite?rev=653615&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
Mon May 5 15:05:41 2008
@@ -0,0 +1,28 @@
+<?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>
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java?rev=653615&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
Mon May 5 15:05:41 2008
@@ -0,0 +1,159 @@
+/*
+ * 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.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
+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 {
+ 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<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 {
+ 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<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 {
+ 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<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 {
+ 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<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 {
+ 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"));
+ }
+ }
+}
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/vtest/java-api/annotations/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/pom.xml?rev=653615&r1=653614&r2=653615&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/java-api/annotations/pom.xml (original)
+++ incubator/tuscany/java/sca/vtest/java-api/annotations/pom.xml Mon May 5
15:05:41 2008
@@ -58,6 +58,7 @@
<module>property</module>
<module>scope</module>
<module>init</module>
+ <module>destroy</module>
<module>oneway</module>
<module>conversational</module>
<module>conversationattributes</module>
