From 3c7c4a749baafcf375f4785a7668d3a25c9063e3 Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 13 Nov 2009 01:42:27 +0000 Subject: Moving 1.x trunk git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835700 13f79535-47bb-0310-9956-ffa450edef68 --- .../itest/exceptions-simple-ws/pom.xml | 59 -------- .../main/java/com/example/BusinessException.java | 43 ------ .../java/com/example/BusinessExceptionMinimal.java | 28 ---- .../src/main/java/com/example/ExampleClient.java | 23 --- .../main/java/com/example/ExampleClientImpl.java | 51 ------- .../java/com/example/ExampleClientMinimalImpl.java | 54 ------- .../src/main/java/com/example/ExampleService.java | 28 ---- .../main/java/com/example/ExampleServiceImpl.java | 32 ----- .../java/com/example/ExampleServiceMinimal.java | 28 ---- .../com/example/ExampleServiceMinimalImpl.java | 30 ---- .../src/main/resources/example.composite | 56 -------- .../src/main/resources/wsdl/ExampleService.wsdl | 157 --------------------- .../java/com/example/ExampleMinimalTestCase.java | 44 ------ .../src/test/java/com/example/ExampleTestCase.java | 44 ------ 14 files changed, 677 deletions(-) delete mode 100644 branches/sca-java-1.x/itest/exceptions-simple-ws/pom.xml delete mode 100644 branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java delete mode 100644 branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java delete mode 100644 branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java delete mode 100644 branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java delete mode 100644 branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java delete mode 100644 branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java delete mode 100644 branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java delete mode 100644 branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java delete mode 100644 branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java delete mode 100644 branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/resources/example.composite delete mode 100644 branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl delete mode 100644 branches/sca-java-1.x/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java delete mode 100644 branches/sca-java-1.x/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java (limited to 'branches/sca-java-1.x/itest/exceptions-simple-ws') diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/pom.xml b/branches/sca-java-1.x/itest/exceptions-simple-ws/pom.xml deleted file mode 100644 index 23e6dfcd74..0000000000 --- a/branches/sca-java-1.x/itest/exceptions-simple-ws/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.6-SNAPSHOT - ../pom.xml - - itest-exceptions-simple-ws - Apache Tuscany SCA iTest Simple Exceptions Over Web Services - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.6-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.6-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.6-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.6-SNAPSHOT - runtime - - - diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java b/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java deleted file mode 100644 index 764f31b7cd..0000000000 --- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java +++ /dev/null @@ -1,43 +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 com.example; - -public class BusinessException extends Exception { - - private String clientName; - - public BusinessException(String message) { - super(message); - } - - public BusinessException(String message, String clientName) { - super(message); - this.clientName = clientName; - } - - public String getClientName() { - return clientName; - } - - public void setClientName(String clientName) { - this.clientName = clientName; - } - -} - diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java b/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java deleted file mode 100644 index 1b597984e5..0000000000 --- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java +++ /dev/null @@ -1,28 +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 com.example; - -public class BusinessExceptionMinimal extends Exception { - - public BusinessExceptionMinimal(String message) { - super(message); - } - -} - diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java b/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java deleted file mode 100644 index 0c72b52ed9..0000000000 --- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java +++ /dev/null @@ -1,23 +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 com.example; - -public interface ExampleClient { - void runTest(); -} diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java b/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java deleted file mode 100644 index c86059f4f5..0000000000 --- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.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 com.example; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(ExampleClient.class) -@Scope("COMPOSITE") -public class ExampleClientImpl implements ExampleClient { - - private ExampleService myService; - - @Reference - public void setMyService(ExampleService myService) { - this.myService = myService; - } - - public void runTest() { - try { - Object result = myService.hello("John"); - System.out.println("myService returned " + result.getClass().getName()); - } catch (BusinessException e) { - System.out.println("caught exception from hello(): " + e.getMessage() + " for " + e.getClientName()); - } - - try { - Object result = myService.helloUnchecked("John"); - System.out.println("myService returned " + result.getClass().getName()); - } catch (Exception e) { - System.out.println("caught exception from helloUnchecked(): " + e.getMessage()); - } - } -} diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java b/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java deleted file mode 100644 index 987d2107b5..0000000000 --- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java +++ /dev/null @@ -1,54 +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 com.example; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -//@Service(ExampleClient.class) -@Scope("COMPOSITE") -//public class ExampleClientMinimalImpl implements ExampleClient { -public class ExampleClientMinimalImpl { - @Reference - protected ExampleServiceMinimal myService; - - public void runTest() { - try { - //Object result = myService.hello("John"); - myService.throwException("John"); - //System.out.println("myService returned " + result.getClass().getName()); - } catch (BusinessExceptionMinimal e) { - System.out.println("caught exception from hello(): " + e.getMessage() ); - } - } - - public String hello(String name) throws BusinessExceptionMinimal{ - throw new BusinessExceptionMinimal("bad news"); - } - public void throwException(String name) throws BusinessExceptionMinimal{ - throw new BusinessExceptionMinimal("bad news"); - } - - - public static void main(String[] args) { - - } - -} diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java b/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java deleted file mode 100644 index 4f82e10241..0000000000 --- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java +++ /dev/null @@ -1,28 +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 com.example; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface ExampleService { - - String hello(String name) throws BusinessException; - String helloUnchecked(String name); -} diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java b/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java deleted file mode 100644 index 5d054c1c9b..0000000000 --- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.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 com.example; - -import org.osoa.sca.ServiceRuntimeException; - -public class ExampleServiceImpl implements ExampleService { - public String hello(String name) throws BusinessException { - throw new BusinessException("bad news", name); - // return "Hello, " + name; - } - - public String helloUnchecked(String name){ - throw new ServiceRuntimeException("bad unchecked news"); - } -} diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java b/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java deleted file mode 100644 index aa8591872e..0000000000 --- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java +++ /dev/null @@ -1,28 +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 com.example; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface ExampleServiceMinimal { - - public String hello(String name) throws Exception; - public void throwException(String name) throws BusinessExceptionMinimal; -} diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java b/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java deleted file mode 100644 index 728be51428..0000000000 --- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.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 com.example; - -public class ExampleServiceMinimalImpl implements ExampleServiceMinimal { - public String hello(String name) throws Exception { - throw new BusinessExceptionMinimal("minimal bad news" + name); - // return "Hello, " + name; - } - - public void throwException(String name) throws BusinessExceptionMinimal { - throw new BusinessExceptionMinimal("minimal bad news" + name); - } -} diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/resources/example.composite b/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/resources/example.composite deleted file mode 100644 index 505132277c..0000000000 --- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/resources/example.composite +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl b/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl deleted file mode 100644 index 59adbb49ef..0000000000 --- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java b/branches/sca-java-1.x/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java deleted file mode 100644 index 7310a0f1e7..0000000000 --- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.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 com.example; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class ExampleMinimalTestCase extends TestCase { - - private SCADomain scaDomain; - private ExampleClientMinimalImpl client; - - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("example.composite"); - client = scaDomain.getService(ExampleClientMinimalImpl.class, "ExampleClientMinimalComponent"); - } - - @Override - protected void tearDown() throws Exception { - scaDomain.close(); - } - - public void test() throws Exception { - client.runTest(); - } -} diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java b/branches/sca-java-1.x/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java deleted file mode 100644 index 740af4f43d..0000000000 --- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.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 com.example; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class ExampleTestCase extends TestCase { - - private SCADomain scaDomain; - private ExampleClient client; - - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("example.composite"); - client = scaDomain.getService(ExampleClient.class, "ExampleClientComponent"); - } - - @Override - protected void tearDown() throws Exception { - scaDomain.close(); - } - - public void test() throws Exception { - client.runTest(); - } -} -- cgit v1.2.3