summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.3.1/vtest/java-api/apis/exception
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.3.1/vtest/java-api/apis/exception')
-rw-r--r--branches/sca-java-1.3.1/vtest/java-api/apis/exception/pom.xml45
-rw-r--r--branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java40
-rw-r--r--branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java26
-rw-r--r--branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java35
-rw-r--r--branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java34
-rw-r--r--branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java33
-rw-r--r--branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java30
-rw-r--r--branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java128
-rw-r--r--branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java64
-rw-r--r--branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java50
-rw-r--r--branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java37
-rw-r--r--branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/resources/exception.composite44
-rw-r--r--branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java131
13 files changed, 0 insertions, 697 deletions
diff --git a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/pom.xml b/branches/sca-java-1.3.1/vtest/java-api/apis/exception/pom.xml
deleted file mode 100644
index 02f6c9a279..0000000000
--- a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/pom.xml
+++ /dev/null
@@ -1,45 +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-apis</artifactId>
- <version>1.3.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>vtest-java-api-apis-exception</artifactId>
- <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - APIs - Exception</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.3.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.3.1-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java b/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
deleted file mode 100644
index 5c3755b19f..0000000000
--- a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.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.apis.exception;
-
-import org.osoa.sca.annotations.Conversational;
-
-/**
- * Simple Service A.
- */
-@Conversational
-public interface AComponent {
-
- public String getName();
-
- public void testConversation();
- public void testCallBack();
-
- public boolean testServiceRuntimeException();
- public boolean testServiceUnavailableException();
-
- public boolean testCheckedException();
-
-}
diff --git a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java b/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
deleted file mode 100644
index c1c1c6544c..0000000000
--- a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
+++ /dev/null
@@ -1,26 +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.apis.exception;
-
-public interface BCallback {
-
- public void processResults(String result);
-
-}
diff --git a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java b/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
deleted file mode 100644
index 6893a3b4b8..0000000000
--- a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
+++ /dev/null
@@ -1,35 +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.apis.exception;
-
-import org.osoa.sca.annotations.Callback;
-
-/**
- * Simple Service B.
- */
-@Callback(BCallback.class)
-public interface BComponent {
-
- public String getName();
-
- public void testCallback();
- public void testRedirectedCallback();
-
-}
diff --git a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java b/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
deleted file mode 100644
index 519e66f1ce..0000000000
--- a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.apis.exception;
-
-import org.osoa.sca.annotations.Conversational;
-
-/**
- * Simple Service C.
- */
-@Conversational
-public interface CComponent {
-
- public String getName();
-
- public void testConversation();
-
-}
diff --git a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java b/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
deleted file mode 100644
index d0ef71a926..0000000000
--- a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
+++ /dev/null
@@ -1,33 +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.apis.exception;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remote Service D.
- */
-@Remotable
-public interface DComponent {
-
- public String getName();
- public void testException() throws DException;
-
-}
diff --git a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java b/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
deleted file mode 100644
index 82873ed96d..0000000000
--- a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.apis.exception;
-
-public class DException extends Exception {
-
- private static final long serialVersionUID = -3819913841563109423L;
-
- public DException(String message) {
- super(message);
- }
-
-}
diff --git a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java b/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
deleted file mode 100644
index b4d6e929c5..0000000000
--- a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
+++ /dev/null
@@ -1,128 +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.apis.exception.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.AComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.BComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.CComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.DComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.DException;
-import org.junit.Assert;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ConversationEndedException;
-import org.osoa.sca.NoRegisteredCallbackException;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(AComponent.class)
-@Scope("CONVERSATION")
-public class AComponentImpl implements AComponent {
-
- protected ComponentContext componentContext;
-
- @Reference
- protected CallableReference<BComponent> bReference;
-
- @Reference
- protected ServiceReference<CComponent> cReference;
-
- @Reference
- protected ServiceReference<DComponent> dReference;
-
- @ConversationID
- protected String cid;
-
- public String getName() {
- return "ComponentA";
- }
-
- @Context
- public void setComponentContext(ComponentContext context) {
- this.componentContext = context;
- }
-
- public void testConversation() {
- ServiceReference<CComponent> cSR = componentContext.getServiceReference(CComponent.class, "cReference");
- cSR.setConversationID("AConversationID");
- Assert.assertEquals("ComponentC", cSR.getService().getName());
-
- try {
- Thread.sleep(1100);
- cSR.getService().testConversation();
-
- Assert.fail();
- } catch (InterruptedException ie) {
- ie.printStackTrace();
- } catch (ConversationEndedException cee) {
- // Expected
- }
- }
-
- public void testCallBack() {
- ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
- bSR.setCallbackID("ComponentACallBack");
-
- try {
- bSR.getService().testCallback();
- Assert.fail();
- } catch (NoRegisteredCallbackException e) {
- // Expected
- }
- }
-
- public boolean testServiceRuntimeException() {
- try {
- componentContext.getServiceReference(BComponent.class, "dummyBReference").getService().getName();
- } catch (ServiceRuntimeException sre) {
- return true;
- }
-
- return false;
- }
-
- public boolean testServiceUnavailableException() {
- return false;
- }
-
- public boolean testCheckedException() {
- try {
- dReference.getService().testException();
- } catch (DException e) {
- if (e.getMessage().equals("ADException")) {
- return true;
- }
- }
-
- return false;
- }
-
- @Destroy
- public void destroy() {
- System.out.println("This is a Destroy of AComponent ..");
- }
-
-}
diff --git a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java b/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
deleted file mode 100644
index 245401e8aa..0000000000
--- a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
+++ /dev/null
@@ -1,64 +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.apis.exception.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.BCallback;
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.BComponent;
-import org.junit.Assert;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(BComponent.class)
-public class BComponentImpl implements BComponent {
-
- protected ComponentContext componentContext;
-
- @Callback
- protected BCallback callback;
-
- @Context
- public void setComponentContext(ComponentContext context) {
- this.componentContext = context;
- }
-
- public String getName() {
- return "ComponentB";
- }
-
- public void testCallback() {
- callback = componentContext.getRequestContext().getCallback();
- callback.processResults("CallBackFromB");
-
- CallableReference<BCallback> bCR = componentContext.getRequestContext().getCallbackReference();
- Assert.assertEquals("ComponentACallBack", bCR.getCallbackID());
- }
-
- public void testRedirectedCallback() {
- callback = componentContext.getRequestContext().getCallback();
- callback.processResults("RedirectedCallBackFromB");
-
- CallableReference<BCallback> bCR = componentContext.getRequestContext().getCallbackReference();
- Assert.assertEquals("RedirectedCallBack", bCR.getCallbackID());
- }
-
-}
diff --git a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java b/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
deleted file mode 100644
index 2546548e1c..0000000000
--- a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
+++ /dev/null
@@ -1,50 +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.apis.exception.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.CComponent;
-import org.junit.Assert;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CComponent.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxIdleTime="1 seconds")
-public class CComponentImpl implements CComponent {
-
- @Context
- protected RequestContext requestContext;
-
- @ConversationID
- protected String cid;
-
- public String getName() {
- return "ComponentC";
- }
-
- public void testConversation() {
- Assert.assertEquals("AConversationID", cid);
- }
-
-}
diff --git a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java b/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
deleted file mode 100644
index 1cbda7e10b..0000000000
--- a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
+++ /dev/null
@@ -1,37 +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.apis.exception.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.DComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.DException;
-import org.osoa.sca.annotations.Service;
-
-@Service(DComponent.class)
-public class DComponentImpl implements DComponent {
-
- public String getName() {
- return "ComponentD";
- }
-
- public void testException() throws DException {
- throw new DException("ADException");
- }
-
-}
diff --git a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/resources/exception.composite b/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/resources/exception.composite
deleted file mode 100644
index 5bd933ce96..0000000000
--- a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/main/resources/exception.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://java-api-tests"
- name="Exception-Composite">
-
- <component name="AComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.exception.impl.AComponentImpl"/>
- <reference name="bReference" target="BComponent"/>
- <reference name="cReference" target="CComponent"/>
- <reference name="dReference" target="DComponent"/>
- </component>
-
- <component name="BComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.exception.impl.BComponentImpl"/>
- </component>
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.exception.impl.CComponentImpl"/>
- </component>
-
- <component name="DComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.exception.impl.DComponentImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java b/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
deleted file mode 100644
index 9ff7e8e28f..0000000000
--- a/branches/sca-java-1.3.1/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
+++ /dev/null
@@ -1,131 +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.apis.exception;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * This test class tests the Exceptions described in 1.7.6, 1.7.7, 1.7.8, and 1.7.9 of the SCA Java Annotations & APIs Specification 1.0.
- * This also covers 1.5 of the specification.
- */
-public class ExceptionTestCase {
-
- protected static SCADomain domain;
- protected static String compositeName = "exception.composite";
- protected static AComponent a;
- protected static BComponent b;
-
- @BeforeClass
- public static void init() throws Exception {
- try {
- System.out.println("Setting up");
- domain = SCADomain.newInstance(compositeName);
- a = domain.getService(AComponent.class, "AComponent");
- b = domain.getService(BComponent.class, "BComponent");
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- System.out.println("Cleaning up");
- if (domain != null) {
- domain.close();
- }
- }
-
- /**
- * Lines 951 <br>
- * NoRegisteredCallbackException.
- *
- * @throws Exception
- */
- @Test
- public void testNoRegisteredCallbackException() throws Exception {
- a.testCallBack();
- }
-
- /**
- * Lines 960 <br>
- * ServiceRuntimeException - This exception signals problems in the management of SCA component execution.
- *
- * @throws Exception
- */
- @Test
- public void testServiceRuntimeException() throws Exception {
- Assert.assertTrue(a.testServiceRuntimeException());
- }
-
- /**
- * Lines 970 <br>
- * ServiceUnavailableException – This exception signals problems in the interaction with remote services.
- *
- * @throws Exception
- */
- @Ignore
- public void testServiceUnavailableException() throws Exception {
- domain.getComponentManager().stopComponent("AComponent");
-
- try {
- a.getName();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- try {
- AComponent ac = domain.getService(AComponent.class, "AComponent");
- ac.getName();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- domain.getComponentManager().startComponent("AComponent");
- }
-
- /**
- * Lines 983 <br>
- * ConversationEndedException.
- *
- * @throws Exception
- */
- @Test
- public void testConversationEndedException() throws Exception {
- a.testConversation();
- }
-
- /**
- * Lines 360-361 <br>
- * Business exceptions are thrown by the implementation of the called service method,
- * and are defined as checked exceptions on the interface that types the service.
- *
- * @throws Exception
- */
- @Test
- public void testCheckedException() throws Exception {
- Assert.assertTrue(a.testCheckedException());
- }
-
-}