summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/itest/exceptions
diff options
context:
space:
mode:
Diffstat (limited to 'sca-java-2.x/trunk/itest/exceptions')
-rw-r--r--sca-java-2.x/trunk/itest/exceptions/pom.xml53
-rw-r--r--sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java57
-rw-r--r--sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java32
-rw-r--r--sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java30
-rw-r--r--sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java37
-rw-r--r--sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java57
-rw-r--r--sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java115
-rw-r--r--sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java44
-rw-r--r--sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java45
-rw-r--r--sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java116
-rw-r--r--sca-java-2.x/trunk/itest/exceptions/src/main/resources/ExceptionTest.composite41
-rw-r--r--sca-java-2.x/trunk/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java85
12 files changed, 0 insertions, 712 deletions
diff --git a/sca-java-2.x/trunk/itest/exceptions/pom.xml b/sca-java-2.x/trunk/itest/exceptions/pom.xml
deleted file mode 100644
index 41dd198009..0000000000
--- a/sca-java-2.x/trunk/itest/exceptions/pom.xml
+++ /dev/null
@@ -1,53 +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>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-exceptions</artifactId>
- <name>Apache Tuscany SCA iTest Exceptions</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
deleted file mode 100644
index 1f57116bac..0000000000
--- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ /dev/null
@@ -1,57 +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.test.exceptions;
-
-public class Checked extends Exception {
- private static final long serialVersionUID = -129752837478357452L;
-
- /**
- *
- */
- public Checked() {
-
- }
-
- /**
- * @param message
- */
- public Checked(String message) {
- super(message);
-
- }
-
- /**
- * @param cause
- */
- public Checked(Throwable cause) {
- super(cause);
-
- }
-
- /**
- * @param message
- * @param cause
- */
- public Checked(String message, Throwable cause) {
- super(message, cause);
-
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
deleted file mode 100644
index 112aefc747..0000000000
--- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ /dev/null
@@ -1,32 +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.test.exceptions;
-
-public interface ExceptionHandler {
-
- void testing();
-
- Checked getTheBad();
-
- String getTheGood();
-
- UnChecked getTheUgly();
-
-}
diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
deleted file mode 100644
index 53a6c70b57..0000000000
--- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.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.test.exceptions;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Remote exception thrower
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface ExceptionRemoteThrower extends ExceptionThrower {
-}
diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
deleted file mode 100644
index ace219991b..0000000000
--- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.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.test.exceptions;
-
-/**
- * Local exception thrower
- * @version $Rev$ $Date$
- */
-public interface ExceptionThrower {
- Checked BAD = new Checked("theBad");
- UnChecked UGLY = new UnChecked("theUgly");
- String SO_THEY_SAY = "All is good that ends good.";
-
- String theGood() throws Checked;
-
- String theBad() throws Checked;
-
- String theUgly() throws Checked;
-
-}
diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
deleted file mode 100644
index 453528444d..0000000000
--- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ /dev/null
@@ -1,57 +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.test.exceptions;
-
-public class UnChecked extends RuntimeException {
- private static final long serialVersionUID = -1318118082838092244L;
-
- /**
- *
- */
- public UnChecked() {
-
- }
-
- /**
- * @param message
- */
- public UnChecked(String message) {
- super(message);
-
- }
-
- /**
- * @param cause
- */
- public UnChecked(Throwable cause) {
- super(cause);
-
- }
-
- /**
- * @param message
- * @param cause
- */
- public UnChecked(String message, Throwable cause) {
- super(message, cause);
-
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
deleted file mode 100644
index 26b9f0a383..0000000000
--- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ /dev/null
@@ -1,115 +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.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.Checked;
-import org.apache.tuscany.sca.test.exceptions.ExceptionHandler;
-import org.apache.tuscany.sca.test.exceptions.ExceptionThrower;
-import org.apache.tuscany.sca.test.exceptions.UnChecked;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class ExceptionHandlerImpl implements ExceptionHandler {
- static final String INIT = "INIT";
-
- private ExceptionThrower exceptionThrower;
-
- private String theGood;
-
- private Checked theBad;
-
- private UnChecked theUgly;
-
- public void testing() {
-
- assert exceptionThrower != null : "'exceptionThrower' never wired";
- String result = INIT;
- try {
- theGood = result = exceptionThrower.theGood();
- assert result == ExceptionThrower.SO_THEY_SAY;
- } catch (Throwable e) {
- assert result == INIT;
- assert false;
- e.printStackTrace();
- }
-
- result = INIT;
- try {
- result = exceptionThrower.theBad();
- // incredible
- assert false : "Expected 'Check' Exception";
-
- } catch (Checked e) {
- // This is good...
- assert result == INIT;
- theBad = e;
- } catch (Throwable t) {
- // This is not so good.
- t.printStackTrace();
- assert result == INIT;
- assert false : "Got wrong exception '" + t.getClass().getName();
- }
-
- result = INIT;
- try {
- result = exceptionThrower.theUgly();
- // incredible
- assert false : "Expected 'UnCheck' Exception";
-
- } catch (Checked e) {
- // This is not so good...
- assert false : "Got wrong exception '" + e.getClass().getName();
- assert result == INIT;
- } catch (UnChecked e) {
- theUgly = e;
-
- } catch (Throwable t) {
- // This is not good.
- assert false;
- assert result == INIT;
-
- System.out.println(ExceptionThrower.SO_THEY_SAY + " " + INIT);
- }
-
- }
-
- @Reference
- public void setExceptionThrower(ExceptionThrower exceptionThrower) {
- this.exceptionThrower = exceptionThrower;
- }
-
- public String getTheGood() {
- return theGood;
- }
-
- public Checked getTheBad() {
- return theBad;
- }
-
- public UnChecked getTheUgly() {
- return theUgly;
- }
-
- public ExceptionThrower getExceptionThrower() {
- return exceptionThrower;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
deleted file mode 100644
index cd62338841..0000000000
--- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
+++ /dev/null
@@ -1,44 +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.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.Checked;
-import org.apache.tuscany.sca.test.exceptions.ExceptionRemoteThrower;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-@Service(ExceptionRemoteThrower.class)
-public class ExceptionRemoteThrowerImpl implements ExceptionRemoteThrower {
- public String theBad() throws Checked {
- throw BAD;
- }
-
- public String theGood() throws Checked {
- return SO_THEY_SAY;
- }
-
- public String theUgly() throws Checked {
- throw UGLY;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
deleted file mode 100644
index 56b9fc6f5b..0000000000
--- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
+++ /dev/null
@@ -1,45 +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.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.Checked;
-import org.apache.tuscany.sca.test.exceptions.ExceptionThrower;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-@Service(ExceptionThrower.class)
-public class ExceptionThrowerImpl implements ExceptionThrower {
-
- public String theBad() throws Checked {
- throw BAD;
- }
-
- public String theGood() throws Checked {
- return SO_THEY_SAY;
- }
-
- public String theUgly() throws Checked {
- throw UGLY;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
deleted file mode 100644
index c5b54ff902..0000000000
--- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
+++ /dev/null
@@ -1,116 +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.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.Checked;
-import org.apache.tuscany.sca.test.exceptions.ExceptionHandler;
-import org.apache.tuscany.sca.test.exceptions.ExceptionRemoteThrower;
-import org.apache.tuscany.sca.test.exceptions.ExceptionThrower;
-import org.apache.tuscany.sca.test.exceptions.UnChecked;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class RemoteExceptionHandlerImpl implements ExceptionHandler {
- static final String INIT = "INIT";
-
- private ExceptionRemoteThrower exceptionThrower;
-
- private String theGood;
-
- private Checked theBad;
-
- private UnChecked theUgly;
-
- public void testing() {
-
- assert exceptionThrower != null : "'exceptionThrower' never wired";
- String result = INIT;
- try {
- theGood = result = exceptionThrower.theGood();
- assert result == ExceptionThrower.SO_THEY_SAY;
- } catch (Throwable e) {
- assert result == INIT;
- assert false;
- e.printStackTrace();
- }
-
- result = INIT;
- try {
- result = exceptionThrower.theBad();
- // incredible
- assert false : "Expected 'Check' Exception";
-
- } catch (Checked e) {
- // This is good...
- assert result == INIT;
- theBad = e;
- } catch (Throwable t) {
- // This is not so good.
- t.printStackTrace();
- assert result == INIT;
- assert false : "Got wrong exception '" + t.getClass().getName();
- }
-
- result = INIT;
- try {
- result = exceptionThrower.theUgly();
- // incredible
- assert false : "Expected 'UnCheck' Exception";
-
- } catch (Checked e) {
- // This is not so good...
- assert false : "Got wrong exception '" + e.getClass().getName();
- assert result == INIT;
- } catch (UnChecked e) {
- theUgly = e;
-
- } catch (Throwable t) {
- // This is not good.
- assert false;
- assert result == INIT;
-
- System.out.println(ExceptionThrower.SO_THEY_SAY + " " + INIT);
- }
-
- }
-
- @Reference
- public void setExceptionThrower(ExceptionRemoteThrower exceptionThrower) {
- this.exceptionThrower = exceptionThrower;
- }
-
- public String getTheGood() {
- return theGood;
- }
-
- public Checked getTheBad() {
- return theBad;
- }
-
- public UnChecked getTheUgly() {
- return theUgly;
- }
-
- public ExceptionRemoteThrower getExceptionThrower() {
- return exceptionThrower;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/resources/ExceptionTest.composite b/sca-java-2.x/trunk/itest/exceptions/src/main/resources/ExceptionTest.composite
deleted file mode 100644
index b8a8b01e8b..0000000000
--- a/sca-java-2.x/trunk/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ /dev/null
@@ -1,41 +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://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:foo="http://foo" targetNamespace="http://foo"
- name="ExceptionTest">
- <component name="main">
- <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionHandlerImpl" />
- <reference name="exceptionThrower" target="exceptionThrower" />
- </component>
-
- <component name="exceptionThrower">
- <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionThrowerImpl" />
- </component>
-
- <component name="mainRemote">
- <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.RemoteExceptionHandlerImpl" />
- <reference name="exceptionThrower" target="exceptionThrowerRemote" />
- </component>
-
- <component name="exceptionThrowerRemote">
- <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionRemoteThrowerImpl" />
- </component>
-
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/sca-java-2.x/trunk/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
deleted file mode 100644
index 7794348476..0000000000
--- a/sca-java-2.x/trunk/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
+++ /dev/null
@@ -1,85 +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.test.exceptions;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class ExceptionsTestCase {
-
- private static Node node;
-
- /**
- * Test exception handling over a local interface
- */
- @Test
- public void testLocal() {
- ExceptionHandler exceptionHandler = node.getService(ExceptionHandler.class, "main");
- exceptionHandler.testing();
- assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood());
- assertNotNull(exceptionHandler.getTheBad());
- assertEquals(Checked.class, exceptionHandler.getTheBad().getClass());
- assertSame(ExceptionThrower.BAD, exceptionHandler.getTheBad());
- assertNotNull(exceptionHandler.getTheUgly());
- assertEquals(UnChecked.class, exceptionHandler.getTheUgly().getClass());
- assertSame(ExceptionThrower.UGLY, exceptionHandler.getTheUgly());
- }
-
- /**
- * Test exception handling over a remotable interface
- */
- @Test
- public void testRemote() {
- ExceptionHandler exceptionHandler = node.getService(ExceptionHandler.class, "mainRemote");
- exceptionHandler.testing();
- assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood());
- assertNotNull(exceptionHandler.getTheBad());
- assertEquals(Checked.class, exceptionHandler.getTheBad().getClass());
- assertNotSame(ExceptionThrower.BAD, exceptionHandler.getTheBad());
- assertNotNull(exceptionHandler.getTheUgly());
- assertEquals(UnChecked.class, exceptionHandler.getTheUgly().getClass());
-
- // [rfeng] We're not in a position to copy non business exceptions
- // assertNotSame(ExceptionThrower.UGLY, exceptionHandler.getTheUgly());
-
- }
-
- @BeforeClass
- public static void setUp() throws Exception {
- String location = ContributionLocationHelper.getContributionLocation("ExceptionTest.composite");
- node = NodeFactory.newInstance().createNode("ExceptionTest.composite", new Contribution("c1", location));
- node.start();
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- node.stop();
- }
-
-}