From 0f3f9b59b310833f31ba234ee4aefa808649833c Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:06:50 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835120 13f79535-47bb-0310-9956-ffa450edef68 --- branches/sca-java-0.91/itest/exceptions/pom.xml | 45 -------- .../tuscany/sca/test/exceptions/Checked.java | 57 ---------- .../sca/test/exceptions/ExceptionHandler.java | 32 ------ .../sca/test/exceptions/ExceptionThrower.java | 31 ------ .../tuscany/sca/test/exceptions/UnChecked.java | 56 ---------- .../test/exceptions/impl/ExceptionHandlerImpl.java | 120 --------------------- .../test/exceptions/impl/ExceptionThrowerImpl.java | 63 ----------- .../src/main/resources/ExceptionTest.composite | 27 ----- .../src/main/resources/intracomposite.composite | 34 ------ .../test/exceptions/IntraCompositeTestCase.java | 51 --------- 10 files changed, 516 deletions(-) delete mode 100644 branches/sca-java-0.91/itest/exceptions/pom.xml delete mode 100644 branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java delete mode 100644 branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java delete mode 100644 branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java delete mode 100644 branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java delete mode 100644 branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java delete mode 100644 branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java delete mode 100644 branches/sca-java-0.91/itest/exceptions/src/main/resources/ExceptionTest.composite delete mode 100644 branches/sca-java-0.91/itest/exceptions/src/main/resources/intracomposite.composite delete mode 100644 branches/sca-java-0.91/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java (limited to 'branches/sca-java-0.91/itest/exceptions') diff --git a/branches/sca-java-0.91/itest/exceptions/pom.xml b/branches/sca-java-0.91/itest/exceptions/pom.xml deleted file mode 100644 index e2144e9dbb..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 0.91-incubating-SNAPSHOT - ../pom.xml - - tuscany-itest-exceptions - Apache Tuscany Exceptions Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 0.91-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 0.91-incubating-SNAPSHOT - runtime - - - diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java deleted file mode 100644 index e90289a07d..0000000000 --- a/branches/sca-java-0.91/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 { - - /** - * - */ - 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/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java deleted file mode 100644 index 0d14240513..0000000000 --- a/branches/sca-java-0.91/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 { - - public abstract void testing(); - - public abstract Checked getTheBad(); - - public abstract String getTheGood(); - - public abstract UnChecked getTheUgly(); - -} \ No newline at end of file diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java deleted file mode 100644 index 80073e7679..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java +++ /dev/null @@ -1,31 +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 ExceptionThrower { - public static final String SO_THEY_SAY = "All is good that ends good."; - - public String theGood() throws org.apache.tuscany.sca.test.exceptions.Checked; - - public String theBad() throws org.apache.tuscany.sca.test.exceptions.Checked; - - public String theUgly() throws org.apache.tuscany.sca.test.exceptions.Checked; - -} diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java deleted file mode 100644 index 1a439711dd..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java +++ /dev/null @@ -1,56 +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 { - - /** - * - */ - 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/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java deleted file mode 100644 index 32a23c5e7d..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java +++ /dev/null @@ -1,120 +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.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.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; - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.exceptions.impl.ExceptionHandler#testing() - */ - 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/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java deleted file mode 100644 index c1b7c23d5d..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java +++ /dev/null @@ -1,63 +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.apache.tuscany.sca.test.exceptions.UnChecked; - -/** - * @author rineholt - * - */ -public class ExceptionThrowerImpl implements ExceptionThrower { - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.exceptions.ExceptionThrower#theBad() - */ - public String theBad() throws Checked { - - throw new Checked("theBad"); - - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.exceptions.ExceptionThrower#theGood() - */ - public String theGood() throws Checked { - - return SO_THEY_SAY; - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.exceptions.ExceptionThrower#theUgly() - */ - public String theUgly() throws Checked { - - throw new UnChecked("theUgly"); - } - -} diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/resources/ExceptionTest.composite b/branches/sca-java-0.91/itest/exceptions/src/main/resources/ExceptionTest.composite deleted file mode 100644 index a725864d30..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/main/resources/ExceptionTest.composite +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/resources/intracomposite.composite b/branches/sca-java-0.91/itest/exceptions/src/main/resources/intracomposite.composite deleted file mode 100644 index efe1c5e207..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/main/resources/intracomposite.composite +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-0.91/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/branches/sca-java-0.91/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java deleted file mode 100644 index 4f719a26c4..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java +++ /dev/null @@ -1,51 +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 junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class IntraCompositeTestCase extends TestCase { - - private SCADomain domain; - private ExceptionHandler exceptionHandler; - - public void testALL() { - exceptionHandler.testing(); - assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood() ); - assertNotNull(exceptionHandler.getTheBad()); - assertEquals( Checked.class, exceptionHandler.getTheBad().getClass()); - assertNotNull(exceptionHandler.getTheUgly()); - assertEquals( UnChecked.class, exceptionHandler.getTheUgly().getClass()); - - } - - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("ExceptionTest.composite"); - exceptionHandler = domain.getService(ExceptionHandler.class, "main"); - } - - @Override - protected void tearDown() throws Exception { - domain.close(); - } - -} -- cgit v1.2.3