From 3af07b9a904782ad560f70581aa021caeaeb8c2c Mon Sep 17 00:00:00 2001 From: ramkumar Date: Thu, 4 Dec 2008 07:10:37 +0000 Subject: removing sample modules git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723229 13f79535-47bb-0310-9956-ffa450edef68 --- branches/sca-java-1.4/itest/admin/README | 28 --- branches/sca-java-1.4/itest/admin/pom.xml | 60 ----- .../tuscany/sca/itest/admin/MyListService.java | 9 - .../sca/itest/admin/MyListServiceByYear.java | 8 - .../tuscany/sca/itest/admin/MyListServiceImpl.java | 69 ----- .../apache/tuscany/sca/itest/admin/MyLogger.java | 17 -- .../apache/tuscany/sca/itest/admin/MyService.java | 9 - .../tuscany/sca/itest/admin/MyServiceByDate.java | 10 - .../tuscany/sca/itest/admin/MyServiceImpl.java | 113 --------- .../tuscany/sca/itest/admin/MyTotalService.java | 6 - .../sca/itest/admin/MyTotalServiceImpl.java | 74 ------ .../sca/itest/admin/SCAComponentService.java | 9 - .../admin/MySimpleServiceInRecursiveTestCase.java | 61 ----- .../sca/itest/admin/MySimpleServiceTestCase.java | 57 ----- .../sca/itest/admin/MyTotalServiceTestCase.java | 48 ---- .../test/resources/Iteration1Composite.composite | 43 ---- .../test/resources/Iteration3Composite.composite | 68 ----- .../src/test/resources/MySimpleService.composite | 59 ----- branches/sca-java-1.4/itest/domain/pom.xml | 100 -------- .../src/main/java/calculator/AddService.java | 31 --- .../src/main/java/calculator/AddServiceImpl.java | 31 --- .../main/java/calculator/AddServiceUpdateImpl.java | 31 --- .../main/java/calculator/CalculatorService.java | 38 --- .../java/calculator/CalculatorServiceImpl.java | 74 ------ .../src/main/java/calculator/DivideService.java | 28 --- .../main/java/calculator/DivideServiceImpl.java | 30 --- .../src/main/java/calculator/MultiplyService.java | 28 --- .../main/java/calculator/MultiplyServiceImpl.java | 30 --- .../src/main/java/calculator/SubtractService.java | 31 --- .../main/java/calculator/SubtractServiceImpl.java | 31 --- .../resources/contributionA/Calculator.composite | 44 ---- .../contributionA/META-INF/sca-contribution.xml | 24 -- .../META-INF/sca-deployables/Calculator.composite | 45 ---- .../META-INF/sca-deployables/Calculator.composite | 32 --- .../contributionDependent/Calculator.composite | 36 --- .../META-INF/sca-contribution.xml | 24 -- .../contributionPrimary/Calculator.composite | 57 ----- .../META-INF/sca-contribution.xml | 25 -- .../sca/itest/domain/ContributionSPIsTestCase.java | 279 --------------------- .../sca-java-1.4/itest/interop-soap-client/pom.xml | 126 ---------- .../LoopbackInteropDocServiceComponentImpl.java | 46 ---- .../src/main/resources/default.composite | 35 --- .../src/main/resources/wsdl/interopdoc.wsdl | 195 -------------- .../interop/client/InteropDocClientTestCase.java | 144 ----------- .../itest/interop-soap-round2-client/pom.xml | 124 --------- .../test/interop/client/InteropTestDocLit.java | 44 ---- .../src/main/resources/default.composite | 38 --- .../src/main/resources/wsdl/interoptestdoclit.wsdl | 155 ------------ .../interop/client/InteropTestDocLitTestCase.java | 133 ---------- .../itest/interop-soap-service/pom.xml | 134 ---------- .../server/InteropDocServiceComponentImpl.java | 47 ---- .../src/main/resources/wsdl/interopdoc.wsdl | 180 ------------- .../src/main/webapp/META-INF/sca/default.scdl | 42 ---- .../src/main/webapp/WEB-INF/web.xml | 51 ---- .../sca-java-1.4/itest/interop-soap-service/t.bat | 34 --- branches/sca-java-1.4/itest/pom.xml | 11 +- 56 files changed, 3 insertions(+), 3333 deletions(-) delete mode 100644 branches/sca-java-1.4/itest/admin/README delete mode 100644 branches/sca-java-1.4/itest/admin/pom.xml delete mode 100644 branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java delete mode 100644 branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java delete mode 100644 branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java delete mode 100644 branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java delete mode 100644 branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java delete mode 100644 branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java delete mode 100644 branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java delete mode 100644 branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java delete mode 100644 branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java delete mode 100644 branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java delete mode 100644 branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java delete mode 100644 branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java delete mode 100644 branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java delete mode 100644 branches/sca-java-1.4/itest/admin/src/test/resources/Iteration1Composite.composite delete mode 100644 branches/sca-java-1.4/itest/admin/src/test/resources/Iteration3Composite.composite delete mode 100644 branches/sca-java-1.4/itest/admin/src/test/resources/MySimpleService.composite delete mode 100644 branches/sca-java-1.4/itest/domain/pom.xml delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddService.java delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddServiceImpl.java delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/java/calculator/CalculatorService.java delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/java/calculator/DivideService.java delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/java/calculator/MultiplyService.java delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/java/calculator/SubtractService.java delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/resources/contributionA/Calculator.composite delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/resources/contributionDependent/Calculator.composite delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/resources/contributionPrimary/Calculator.composite delete mode 100644 branches/sca-java-1.4/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.4/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java delete mode 100644 branches/sca-java-1.4/itest/interop-soap-client/pom.xml delete mode 100644 branches/sca-java-1.4/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java delete mode 100644 branches/sca-java-1.4/itest/interop-soap-client/src/main/resources/default.composite delete mode 100644 branches/sca-java-1.4/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl delete mode 100644 branches/sca-java-1.4/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java delete mode 100644 branches/sca-java-1.4/itest/interop-soap-round2-client/pom.xml delete mode 100644 branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java delete mode 100644 branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/resources/default.composite delete mode 100644 branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl delete mode 100644 branches/sca-java-1.4/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java delete mode 100644 branches/sca-java-1.4/itest/interop-soap-service/pom.xml delete mode 100644 branches/sca-java-1.4/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java delete mode 100644 branches/sca-java-1.4/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl delete mode 100644 branches/sca-java-1.4/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl delete mode 100644 branches/sca-java-1.4/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml delete mode 100755 branches/sca-java-1.4/itest/interop-soap-service/t.bat diff --git a/branches/sca-java-1.4/itest/admin/README b/branches/sca-java-1.4/itest/admin/README deleted file mode 100644 index c4e96d7af0..0000000000 --- a/branches/sca-java-1.4/itest/admin/README +++ /dev/null @@ -1,28 +0,0 @@ -This is a simple test compiled to test simple features of SCA - -There are interfaces to different services that have been included - -1. MyListService -2. MyListServiceByYear -3. MyService -4. MyServiceByDate -5. MyTotalservice - -The service that has been used in the tests primarily is MyService/MyTotalService. -in the test cases. - -There are three test cases and three composites (MySimppleService,Iteration1,Iteration3). - -1. MySimpleServiceTestCase - Checks if the components in MySimpleService.composite are initialized properly. - It tries to call simple functions implemented in MySimpleServiceImpl. - -2. MyTotalServiceTestCase - Initializes the components in the Iteration3Composite.composite file. - tries to call simple functions implemented in MyTotalServiceImpl. - -3. MySimpleServiceInRecursiveTestCase - Initializes the components in the Iteration1Composite.composite file. - It initializes its components using implementation:composite tag in the - composite file which points to MySimpleService.composite. - The test case recursively calls functions initialized in MySimpleService.composite. - - - diff --git a/branches/sca-java-1.4/itest/admin/pom.xml b/branches/sca-java-1.4/itest/admin/pom.xml deleted file mode 100644 index e1c1700225..0000000000 --- a/branches/sca-java-1.4/itest/admin/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4 - ../pom.xml - - tuscany-itest-admin - Apache Tuscany Admin Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.4 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.4 - runtime - - - - org.apache.tuscany.sca - tuscany-core-databinding - 1.4 - runtime - - - - org.apache.tuscany.sca - tuscany-databinding-sdo - 1.4 - compile - - - - diff --git a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java b/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java deleted file mode 100644 index b3d2137767..0000000000 --- a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.apache.tuscany.sca.itest.admin; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface MyListService { - String[] getHolidays(); - String getYear(); -} diff --git a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java b/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java deleted file mode 100644 index 025302fb6d..0000000000 --- a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.apache.tuscany.sca.itest.admin; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface MyListServiceByYear { - String[] getHolidays(int year); -} diff --git a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java b/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java deleted file mode 100644 index de480e6d85..0000000000 --- a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.apache.tuscany.sca.itest.admin; - - -import java.util.List; - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -import org.apache.tuscany.sca.itest.admin.MyListService; -import org.apache.tuscany.sca.itest.admin.MyListServiceByYear; - -@Service(interfaces={MyListService.class,MyListServiceByYear.class}) - -public class MyListServiceImpl implements MyListService,MyListServiceByYear -{ - - // This is multiplicity=1:n - @Reference(name="myListServiceList",required=true) - public List myListServicesList; - - // This is multiplicity=0:n - @Reference(name="myListServiceArray",required=false) - public MyListService[] myListServicesArray; - - @Property(name="serviceYear") - protected String year = "2006"; - - public String[] getHolidays() - { - return getHolidays(new Integer(year).intValue()); - } - - public String[] getHolidays(int year) - { - MyListService myService; - if (myListServicesList!=null) - { - for (int i=0; i=0 && index - - - - Raleigh - 2008 - - Durham - 2009 - - - - - - - - Durham - 2009 - - - diff --git a/branches/sca-java-1.4/itest/admin/src/test/resources/Iteration3Composite.composite b/branches/sca-java-1.4/itest/admin/src/test/resources/Iteration3Composite.composite deleted file mode 100644 index dd06d030d6..0000000000 --- a/branches/sca-java-1.4/itest/admin/src/test/resources/Iteration3Composite.composite +++ /dev/null @@ -1,68 +0,0 @@ - - - - - Raleigh - 2008 - - - - - - - - CARY - 2007 - - - - - - - - - - - - - - - - - - - - - Durham - 2009 - - - - - - - - Durham - 2009 - - diff --git a/branches/sca-java-1.4/itest/admin/src/test/resources/MySimpleService.composite b/branches/sca-java-1.4/itest/admin/src/test/resources/MySimpleService.composite deleted file mode 100644 index a1f8abb8da..0000000000 --- a/branches/sca-java-1.4/itest/admin/src/test/resources/MySimpleService.composite +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - Raleigh - 2008 - - - - - - - - CARY - 2007 - - - - - - - - - diff --git a/branches/sca-java-1.4/itest/domain/pom.xml b/branches/sca-java-1.4/itest/domain/pom.xml deleted file mode 100644 index 27096c0d57..0000000000 --- a/branches/sca-java-1.4/itest/domain/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4 - ../pom.xml - - itest-domain - Apache Tuscany SCA Domain Integration Tests - - - - - org.apache.tuscany.sca - tuscany-node-api - 1.4 - - - - org.apache.tuscany.sca - tuscany-node-launcher - 1.4 - - - - org.apache.tuscany.sca - tuscany-workspace-impl - 1.4 - - - - org.apache.tuscany.sca - tuscany-implementation-node-runtime - 1.4 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-sca - 1.4 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-sca-axis2 - 1.4 - runtime - - - - org.codehaus.woodstox - wstx-asl - 3.2.1 - runtime - - - - org.apache.tuscany.sca - tuscany-monitor - 1.4 - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.4 - test - - - - junit - junit - 4.5 - test - - - diff --git a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddService.java b/branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddService.java deleted file mode 100644 index 797ebb4024..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddService.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 calculator; - -import org.osoa.sca.annotations.Remotable; - -/** - * The Add service interface - */ -@Remotable -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index 1a63d4ff77..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddServiceImpl.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 calculator; - -/** - * An implementation of the Add service - */ -public class AddServiceImpl implements AddService { - - public double add(double n1, double n2) { - System.out.println("AddService - add " + n1 + " and " + n2); - return n1 + n2; - } - -} diff --git a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java b/branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java deleted file mode 100644 index 93486d915e..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.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 calculator; - -/** - * An implementation of the Add service - */ -public class AddServiceUpdateImpl implements AddService { - - public double add(double n1, double n2) { - System.out.println("AddService Update - add " + n1 + " and " + n2); - return n1 + n2; - } - -} diff --git a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/CalculatorService.java b/branches/sca-java-1.4/itest/domain/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 2718ab8772..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,38 +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 calculator; - -import org.osoa.sca.annotations.Remotable; - - -/** - * The Calculator service interface. - */ -@Remotable -public interface CalculatorService { - - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); - -} diff --git a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-1.4/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index 3cb255843f..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,74 +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 calculator; - -import org.osoa.sca.annotations.Reference; - - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceImpl implements CalculatorService { - - private AddService[] addService; - private SubtractService subtractService; - private MultiplyService multiplyService; - private DivideService divideService; - - @Reference - public void setAddService(AddService[] addService) { - this.addService = addService; - } - - @Reference - public void setSubtractService(SubtractService subtractService) { - this.subtractService = subtractService; - } - - @Reference - public void setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - @Reference - public void setDivideService(DivideService divideService) { - this.divideService = divideService; - } - - public double add(double n1, double n2) { - System.out.println("CalculatorService - add " + n1 + " and " + n2); - return addService[1].add(addService[0].add(n1, n2), n2); - } - - public double subtract(double n1, double n2) { - System.out.println("CalculatorService - subtract " + n1 + " and " + n2); - return subtractService.subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - System.out.println("CalculatorService - multiply " + n1 + " and " + n2); - return multiplyService.multiply(n1, n2); - } - - public double divide(double n1, double n2) { - System.out.println("CalculatorService - divide " + n1 + " and " + n2); - return divideService.divide(n1, n2); - } - -} diff --git a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/DivideService.java b/branches/sca-java-1.4/itest/domain/src/main/java/calculator/DivideService.java deleted file mode 100644 index ef6a8b375b..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/DivideService.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 calculator; - -/** - * The divide service interface - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-1.4/itest/domain/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index 8c33862f6d..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/DivideServiceImpl.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 calculator; - -/** - * An implementation of the Divide service. - */ -public class DivideServiceImpl implements DivideService { - - public double divide(double n1, double n2) { - return n1 / n2; - } - -} diff --git a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/MultiplyService.java b/branches/sca-java-1.4/itest/domain/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index db568cc762..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/MultiplyService.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 calculator; - -/** - * The interface for the multiply service - */ -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-1.4/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index c7fbc73c00..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/MultiplyServiceImpl.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 calculator; - -/** - * An implementation of the Multiply service. - */ -public class MultiplyServiceImpl implements MultiplyService { - - public double multiply(double n1, double n2) { - return n1 * n2; - } - -} diff --git a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/SubtractService.java b/branches/sca-java-1.4/itest/domain/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 615320e670..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/SubtractService.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 calculator; - -import org.osoa.sca.annotations.Remotable; - -/** - * The interface for the multiply service - */ -@Remotable -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-1.4/itest/domain/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index abf2777c7d..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/java/calculator/SubtractServiceImpl.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 calculator; - -/** - * An implementation of the subtract service. - */ -public class SubtractServiceImpl implements SubtractService { - - public double subtract(double n1, double n2) { - System.out.println("SubtractService - subtract " + n1 + " and " + n2); - return n1 - n2; - } - -} diff --git a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionA/Calculator.composite b/branches/sca-java-1.4/itest/domain/src/main/resources/contributionA/Calculator.composite deleted file mode 100644 index 534e1a29af..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionA/Calculator.composite +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml b/branches/sca-java-1.4/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml deleted file mode 100644 index 1b1c0291e2..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite b/branches/sca-java-1.4/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite deleted file mode 100644 index bdb89803d1..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite b/branches/sca-java-1.4/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite deleted file mode 100644 index c5af8dd3cc..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionDependent/Calculator.composite b/branches/sca-java-1.4/itest/domain/src/main/resources/contributionDependent/Calculator.composite deleted file mode 100644 index df00387b23..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionDependent/Calculator.composite +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml b/branches/sca-java-1.4/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml deleted file mode 100644 index 8264a8243f..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionPrimary/Calculator.composite b/branches/sca-java-1.4/itest/domain/src/main/resources/contributionPrimary/Calculator.composite deleted file mode 100644 index 92d069c6c9..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionPrimary/Calculator.composite +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml b/branches/sca-java-1.4/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml deleted file mode 100644 index e53c14a651..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.4/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java b/branches/sca-java-1.4/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java deleted file mode 100644 index 98f13df774..0000000000 --- a/branches/sca-java-1.4/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java +++ /dev/null @@ -1,279 +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.itest.domain; - - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Logger; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLOutputFactory; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionReadException; -import org.apache.tuscany.sca.contribution.service.ContributionResolveException; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.MonitorFactory; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.apache.tuscany.sca.workspace.Workspace; -import org.apache.tuscany.sca.workspace.WorkspaceFactory; -import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; -import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; -import org.junit.BeforeClass; -import org.junit.Test; - -import calculator.CalculatorService; - -/** - * Runs a distributed domain in a single VM by using and in memory - * implementation of the distributed domain - */ -public class ContributionSPIsTestCase { - - final static Logger logger = Logger.getLogger(ContributionSPIsTestCase.class.getName()); - - private static ModelFactoryExtensionPoint modelFactories; - private static WorkspaceFactory workspaceFactory; - private static XMLOutputFactory outputFactory; - - private static ModelResolverExtensionPoint modelResolvers; - - private static URLArtifactProcessorExtensionPoint urlProcessors; - private static URLArtifactProcessor contributionProcessor; - - private static Workspace workspace; - - private static List problems = new ArrayList(); - private static ContributionDependencyBuilder dependencyBuilder; - - @BeforeClass - public static void init() throws Exception { - - try { - // Bootstrap a runtime to get a populated registry - // FIXME needs to be tidied so we can get the registry without all of the other configuration - // that is being repeated below - ReallySmallRuntime runtime = new ReallySmallRuntime(Thread.currentThread().getContextClassLoader()); - runtime.start(); - ExtensionPointRegistry registry = runtime.getExtensionPointRegistry(); - - // Create model factories - modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class); - outputFactory = modelFactories.getFactory(XMLOutputFactory.class); - outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true); - workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); - - // Create model resolvers - modelResolvers = registry.getExtensionPoint(ModelResolverExtensionPoint.class); - - // Create artifact processors - urlProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - - // Create contribution processor - contributionProcessor = urlProcessors.getProcessor(Contribution.class); - - // Create workspace model to hold contribution information - workspace = workspaceFactory.createWorkspace(); - - MonitorFactory monitorFactory = registry.getExtensionPoint(MonitorFactory.class); - Monitor monitor = monitorFactory.createMonitor(); - dependencyBuilder = new ContributionDependencyBuilderImpl(monitor); - - } catch(Exception ex){ - ex.printStackTrace(); - } - - } - - @Test - public void testReadDependentContributions() throws Exception { - try { - // ==================================================================== - // The contribution management phase. I.e. where a use is adding contributions - // prior to selecting a composite to run - - // Load a contribution - // Note that this contribution is added before the contribution that it depends on - // as the contribution processing doesn't start until both have been added - URI uri = URI.create("contributionPrimary"); - File file = new File("./src/main/resources/contributionPrimary"); - URL url = file.toURI().toURL(); - Contribution contribution = (Contribution)contributionProcessor.read(null,uri, url); - workspace.getContributions().add(contribution); - System.out.println("Added contributionPrimary"); - - // Load another contribution - uri = URI.create("contributionDependent"); - file = new File("./src/main/resources/contributionDependent"); - url = file.toURI().toURL(); - contribution = (Contribution)contributionProcessor.read(null,uri, url); - workspace.getContributions().add(contribution); - System.out.println("Added contributionDependent"); - - // Choose a deployables as though a user had chosen it - List deployables = workspace.getContributions().get(0).getDeployables(); - QName chosenDeployableName = deployables.get(0).getName(); - System.out.println("Composite chosen to deploy = " + chosenDeployableName); - - - // List the dependency problems - for (int i = 0, n = problems.size(); i < n ; i++) { - System.out.println("Problem: "+ problems.get(i)); - } - - // ==================================================================== - // process the first chosen composite ready for a node to run the composite - - // find the contribution that holds our chosen composite and all its dependencies - // we are using the first deployable composite from the first contribution - // so we really know this here really but lets find it anyway - List contributionsToDeploy = null; - String chosenDeployableLocation = null; - for (Contribution tmpContribution : workspace.getContributions()){ - for (Composite deployable : tmpContribution.getDeployables()){ - if (deployable.getName().equals(chosenDeployableName)){ - contributionsToDeploy = dependencyBuilder.buildContributionDependencies(tmpContribution, workspace); - } - } - } - - // load all the contributions in the dependency chain to find the chosen - // composite - List loadedContributions = new ArrayList(); - for (Contribution tmpContribution : contributionsToDeploy){ - Contribution loadedContribution = contribution(loadedContributions, tmpContribution.getURI(), tmpContribution.getLocation()); - loadedContributions.add(loadedContribution); - - // find the chosen composite artifact location - for ( Artifact artifact :loadedContribution.getArtifacts()){ - if ( artifact.getURI().endsWith(".composite")){ - Composite model = (Composite)artifact.getModel(); - if (model.getName().equals(chosenDeployableName)){ - chosenDeployableLocation = artifact.getLocation(); - } - } - } - } - - System.out.println("Composite chosen to deploy location = " + chosenDeployableLocation); - for (Contribution dependency : contributionsToDeploy){ - System.out.println("Composite chosen to deploy dependency chain = " + dependency.getURI()); - } - -/* At this point if there is more than one composite in the domain - * we would build the domain to configure all the endpoint URIs - * and then pass the individual composites off to the separate - * nodes that are going to run the - * TODO - I've skipped this part for clarity at the moment - * - // create a domain level composite - Composite domainComposite = assemblyFactory.createComposite(); - domainComposite.setName(new QName(Constants.SCA10_TUSCANY_NS, "domain")); - - // etc. - */ - - - - // ==================================================================== - // run the chosen composite - SCAContribution [] contributions = new SCAContribution[contributionsToDeploy.size()]; - for (int i = 0; i < contributionsToDeploy.size(); i++) { - contributions[i] = new SCAContribution(contributionsToDeploy.get(i).getURI(), contributionsToDeploy.get(i).getLocation()); - } - - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - - SCANode node = nodeFactory.createSCANode(chosenDeployableLocation, contributions); - - node.start(); - SCAClient client = (SCAClient)node; - CalculatorService calculatorService = - client.getService(CalculatorService.class, "CalculatorServiceComponentA"); - - System.out.println("Add 2.0 + 3.0 + 3.0 = " + calculatorService.add(2.0, 3.0)); - -/* - AssemblyInspector assemblyInspector = new AssemblyInspector(); - System.out.println(assemblyInspector.assemblyAsString(node)); -*/ - - } catch (Exception ex) { - ex.printStackTrace(); - Assert.fail(); - } - } - - - private Contribution contribution(List contributions, String contributionURI, String contributionLocation) throws ContributionReadException { - try { - URI uri = URI.create(contributionURI); - URL location = locationURL(contributionLocation); - Contribution contribution = (Contribution)contributionProcessor.read(null, uri, location); - - ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories); - contributionProcessor.resolve(contribution, modelResolver); - - return contribution; - - } catch (ContributionReadException e) { - throw e; - } catch (ContributionResolveException e) { - throw new ContributionReadException(e); - } catch (MalformedURLException e) { - throw new ContributionReadException(e); - } - } - - private static URL locationURL(String location) throws MalformedURLException { - URI uri = URI.create(location); - String scheme = uri.getScheme(); - if (scheme == null) { - File file = new File(location); - return file.toURI().toURL(); - } else if (scheme.equals("file")) { - File file = new File(location.substring(5)); - return file.toURI().toURL(); - } else { - return uri.toURL(); - } - } - -} diff --git a/branches/sca-java-1.4/itest/interop-soap-client/pom.xml b/branches/sca-java-1.4/itest/interop-soap-client/pom.xml deleted file mode 100644 index 40d171afa8..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-client/pom.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4 - ../pom.xml - - itest-interop-soap-client - jar - Apache Tuscany SCA WS Interop Client Integration Tests - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.4 - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.4 - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.4 - runtime - - - org.apache.tuscany.sca - tuscany-interface-wsdl - 1.4 - runtime - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.4 - runtime - - - org.apache.tuscany.sca - tuscany-databinding-sdo - 1.4 - runtime - - - org.apache.tuscany.sca - tuscany-databinding-axiom - 1.4 - runtime - - - org.apache.tuscany.sca - tuscany-host-jetty - 1.4 - runtime - - - org.apache.tuscany.sdo - tuscany-sdo-impl - 1.0-incubating-SNAPSHOT - compile - - - - - - org.apache.tuscany.sdo - tuscany-sdo-plugin - 1.0-incubating-SNAPSHOT - - - - ${basedir}/src/main/resources/wsdl/interopdoc.wsdl - true - true - true - true - - - generate - - - - - - org.apache.tuscany.sca - tuscany-maven-wsdl2java - 1.4 - - - - - ${basedir}/src/main/resources/wsdl/interopdoc.wsdl - org.soapinterop - - - generate - - - - - - - diff --git a/branches/sca-java-1.4/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java b/branches/sca-java-1.4/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java deleted file mode 100644 index ffffb96686..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java +++ /dev/null @@ -1,46 +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.test.interop.client; - -import java.rmi.RemoteException; - -import org.osoa.sca.annotations.Service; -import org.soapinterop.ComplexDocument; -import org.soapinterop.DocTestPortType; -import org.soapinterop.SimpleDocument1; -import org.soapinterop.SingleTag; - -/** - * This class implements the DocTest service component. - */ -@Service(DocTestPortType.class) -public class LoopbackInteropDocServiceComponentImpl implements DocTestPortType { - - public ComplexDocument ComplexDocument(ComplexDocument param0){ - return param0; - } - - public SimpleDocument1 SimpleDocument(SimpleDocument1 param4) { - return param4; - } - - public SingleTag SingleTag(SingleTag param2) { - return param2; - } -} diff --git a/branches/sca-java-1.4/itest/interop-soap-client/src/main/resources/default.composite b/branches/sca-java-1.4/itest/interop-soap-client/src/main/resources/default.composite deleted file mode 100644 index 7fd5cc0d65..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-client/src/main/resources/default.composite +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.4/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl b/branches/sca-java-1.4/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl deleted file mode 100644 index 90d8a754b4..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.4/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java b/branches/sca-java-1.4/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java deleted file mode 100644 index dc1ba48580..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java +++ /dev/null @@ -1,144 +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.test.interop.client; - -import java.rmi.RemoteException; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.soapinterop.ArrayOfSimpleDocument; -import org.soapinterop.ChildDocument; -import org.soapinterop.ComplexDocument; -import org.soapinterop.DocTestPortType; -import org.soapinterop.SimpleDocument; -import org.soapinterop.SimpleDocument1; -import org.soapinterop.SingleTag; - -import commonj.sdo.helper.DataFactory; - -public class InteropDocClientTestCase extends TestCase { - private SCADomain scaDomain; - - private DataFactory dataFactory; - - private DocTestPortType interopDoc; - - public InteropDocClientTestCase(){}; - - - @Override - protected void setUp() throws Exception { - - scaDomain = SCADomain.newInstance("default.composite"); - interopDoc = locateInteropDocService(); - - //Get the SDO DataFactory - dataFactory = DataFactory.INSTANCE; - } - - - public void testSingleTag() throws RemoteException { - - assertNotNull(interopDoc); - - // Create the input - SingleTag input = (SingleTag) dataFactory.create(SingleTag.class); - - // Invoke the service - SingleTag output = interopDoc.SingleTag(input); - - // Test the results - assertNotNull(output); - - } - - public void testSimpleDocument() throws RemoteException { - - assertNotNull(interopDoc); - - // Create the input - SimpleDocument1 input = (SimpleDocument1) dataFactory.create(SimpleDocument1.class); - input.setValue("123"); - - // Invoke the service - SimpleDocument1 output = interopDoc.SimpleDocument(input); - - // Test the results - assertNotNull(output); - assertEquals("123", output.getValue()); - - } - - public void testComplexDocument() throws RemoteException { - - assertNotNull(interopDoc); - - // Create the input - ComplexDocument input = (ComplexDocument) dataFactory.create(ComplexDocument.class); - input.setAnAttribute("789"); - ChildDocument childDocument = (ChildDocument) dataFactory.create(ChildDocument.class); - SimpleDocument simpleDocument = (SimpleDocument) dataFactory.create(SimpleDocument.class); - - SimpleDocument1 simpleDocument1 = (SimpleDocument1) dataFactory.create(SimpleDocument1.class); - - simpleDocument.setSimpleDocument(simpleDocument1); - simpleDocument1.setValue("456"); - ArrayOfSimpleDocument arrayOfSimpleDocument = (ArrayOfSimpleDocument) dataFactory.create(ArrayOfSimpleDocument.class); - - arrayOfSimpleDocument.getSimpleDocument().add(simpleDocument1); - childDocument.setChildSimpleDoc(arrayOfSimpleDocument); - input.setChild(childDocument); - - // Invoke the service - ComplexDocument output = interopDoc.ComplexDocument(input); - - // Test the results - assertNotNull(output); - assertEquals("789", output.getAnAttribute()); - assertNotNull(output.getChild()); - assertNotNull(output.getChild().getChildSimpleDoc()); - - // FIXME Add more tests of the output document - - } - - - /** - * Locate the interop service to test - * - * @return - */ - protected DocTestPortType locateInteropDocService() { - String interopLocation = System.getProperty("interopLocation"); - - // Valid service names are: - // RemoteInteropDocService: the live interop Web Service - // LocalHostInteropDocService: the interop Web Service hosted by Tuscany on localhost - // LoopbackInteropDocServiceComponent: a dummy loopback service component - - // To specify the service name run mvn -interopLocation="Remote" - - if (interopLocation == null) - interopLocation = "Remote"; - - return scaDomain.getService(DocTestPortType.class, interopLocation + "InteropDocService"); - } - -} diff --git a/branches/sca-java-1.4/itest/interop-soap-round2-client/pom.xml b/branches/sca-java-1.4/itest/interop-soap-round2-client/pom.xml deleted file mode 100644 index b084b02b51..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-round2-client/pom.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4 - ../pom.xml - - itest-interop-soap-round2-client - Apache Tuscany SCA WS SOAP Round2 Interop Client Integration Tests - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.4 - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.4 - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.4 - runtime - - - org.apache.tuscany.sca - tuscany-interface-wsdl - 1.4 - runtime - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.4 - runtime - - - org.apache.tuscany.sca - tuscany-databinding-sdo - 1.4 - runtime - - - org.apache.tuscany.sca - tuscany-databinding-axiom - 1.4 - runtime - - - org.apache.tuscany.sca - tuscany-host-jetty - 1.4 - runtime - - - org.apache.tuscany.sdo - tuscany-sdo-impl - 1.0-incubating-SNAPSHOT - compile - - - - - - org.apache.tuscany.sdo - tuscany-sdo-plugin - 1.0-incubating-SNAPSHOT - - - - ${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl - true - true - true - true - - - generate - - - - - - org.apache.tuscany.sca - tuscany-maven-wsdl2java - 1.4 - - - - ${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl - org.soapinterop.wsdl.interop.test.doc.lit - - - generate - - - - - - - diff --git a/branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java b/branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java deleted file mode 100644 index ca3031c646..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.apache.tuscany.test.interop.client; -import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType; - -/* - * 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. - */ - - -/** - * - * - */ -public class InteropTestDocLit { - private WSDLInteropTestDocLitPortType interopTestDocLitPortType =null; - /** - * @param args - */ - public static void main(String[] args) { - - - } - WSDLInteropTestDocLitPortType getInteropTestDocLitPortType() { - return interopTestDocLitPortType; - } - void setInteropTestDocLitPortType(WSDLInteropTestDocLitPortType interopTestDocLitPortType) { - this.interopTestDocLitPortType = interopTestDocLitPortType; - } - -} diff --git a/branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/resources/default.composite b/branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/resources/default.composite deleted file mode 100644 index 9bde77ef37..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/resources/default.composite +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl b/branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl deleted file mode 100644 index e08039cedb..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.4/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/branches/sca-java-1.4/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java deleted file mode 100644 index bb379c89cd..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java +++ /dev/null @@ -1,133 +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.test.interop.client; - -import java.rmi.RemoteException; -import java.util.Arrays; -import java.util.List; - -import org.apache.tuscany.test.SCATestCase; -import org.osoa.sca.CompositeContext; -import org.osoa.sca.CurrentCompositeContext; -import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType; -import org.soapinterop.xsd.ArrayOfstring_literal; -import org.soapinterop.xsd.SOAPStruct; -import org.soapinterop.xsd.XsdPackage; - -import commonj.sdo.helper.DataFactory; - -/** - * This test case is part of the tuscany interop tests. This is a reduced version of the SOAPBuilders InteropTest test, document/literal mode. This - * version has operations such as echoString, echoArrayOfString and echoStruct. - * - *

- * The WSDL for the external service used in this test case can be downloaded from http://www.mssoapinterop.org/stkV3/wsdl/InteropTestDocLit.wsdl. - * This is part of the WSDL interop test from Microsoft and more details aobout this test case are found at - * http://www.mssoapinterop.org/stkV3/wsdl/WSDLInterop-0118.htm - */ -public class InteropTestDocLitTestCase extends TestCase { - - private WSDLInteropTestDocLitPortType doc = null; - - private DataFactory dataFactory; - - - protected void setUp() throws Exception { - setApplicationSCDL(InteropTestDocLit.class, "META-INF/sca/default.scdl"); - addExtension("test.extensions", InteropTestDocLit.class.getClassLoader().getResource("META-INF/tuscany/extensions/test-extensions.scdl")); - - super.setUp(); - - // Get the SDO DataFactory - dataFactory = DataFactory.INSTANCE; - - // Locate the service to test - doc = locateInteropDocService(); - } - - /** - * Locate the interop service to test - * - * @return - */ - protected WSDLInteropTestDocLitPortType locateInteropDocService() { - - CompositeContext compositeContext = CurrentCompositeContext.getContext(); - return compositeContext.locateService(WSDLInteropTestDocLitPortType.class, "RemoteInteropDocService"); - - } - - /** - * test echo void - * - * @throws RemoteException - */ - public void testEchoVoid() throws RemoteException { - doc.echoVoid(); - assertTrue(true); - } - - /** - * test echo string - * - * @throws RemoteException - */ - public void testEchoString() throws RemoteException { - String input = "a test string"; - String output = doc.echoString(input); - assertEquals(input, output); - } - - /** - * test echo string - * - * @throws RemoteException - */ - public void testEchoStringArray() throws RemoteException { - - ArrayOfstring_literal input = (ArrayOfstring_literal) dataFactory.create(ArrayOfstring_literal.class); - List inStrings = Arrays.asList(new String[] { "petra", "sue" }); - input.set(XsdPackage.ARRAY_OFSTRING_LITERAL__STRING, inStrings); - - ArrayOfstring_literal output = doc.echoStringArray(input); - - List outStrings = output.getString(); - assertNotNull(outStrings); - assertEquals(2, outStrings.size()); - assertEquals("petra", outStrings.get(0)); - assertEquals("sue", outStrings.get(1)); - } - - /** - * test echo struct - * - * @throws RemoteException - */ - public void testEchoStruct() throws RemoteException { - SOAPStruct input = (SOAPStruct) dataFactory.create(SOAPStruct.class); - input.setVarInt(200); - input.setVarFloat(.002f); - input.setVarString("Hello"); - SOAPStruct output = doc.echoStruct(input); - assertEquals(input.getVarInt(), output.getVarInt()); - assertEquals(input.getVarFloat(), output.getVarFloat()); - assertEquals(input.getVarString(), output.getVarString()); - } - -} diff --git a/branches/sca-java-1.4/itest/interop-soap-service/pom.xml b/branches/sca-java-1.4/itest/interop-soap-service/pom.xml deleted file mode 100644 index d32e814a3e..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-service/pom.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4 - ../pom.xml - - - itest-interop-soap-service - war - Apache Tuscany SCA WS Interop Service Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.4 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.4 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.4 - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.4 - runtime - - - - - org.apache.ws.commons.axiom - axiom-api - - - xerces - xercesImpl - - - xml-apis - xml-apis - - - 1.2.5 - - - - org.apache.ws.commons.axiom - axiom-impl - 1.2.5 - runtime - - - - org.codehaus.woodstox - wstx-asl - 3.2.1 - runtime - - - - - - - - org.apache.tuscany.sdo - tuscany-sdo-plugin - 1.0-incubating-SNAPSHOT - - - - ${basedir}/src/main/resources/wsdl/interopdoc.wsdl - true - true - true - true - - - generate - - - - - - org.apache.tuscany.sca - tuscany-maven-wsdl2java - 1.4 - - - - ${basedir}/src/main/resources/wsdl/interopdoc.wsdl - org.soapinterop - - - generate - - - - - - - - diff --git a/branches/sca-java-1.4/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java b/branches/sca-java-1.4/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java deleted file mode 100644 index c34941f43e..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java +++ /dev/null @@ -1,47 +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.test.interop.server; - -import java.rmi.RemoteException; - -import org.osoa.sca.annotations.Service; -import org.soapinterop.ComplexDocument; -import org.soapinterop.DocTestPortType; -import org.soapinterop.SimpleDocument1; -import org.soapinterop.SingleTag; - -/** - * This class implements the HelloWorld service component. - */ -@Service(DocTestPortType.class) -public class InteropDocServiceComponentImpl implements DocTestPortType { - - public ComplexDocument ComplexDocument(ComplexDocument param2) throws RemoteException { - return param2; - } - - public SimpleDocument1 SimpleDocument(SimpleDocument1 param0) throws RemoteException { - return param0; - } - - public SingleTag SingleTag(SingleTag param4) throws RemoteException { - return param4; - } - -} diff --git a/branches/sca-java-1.4/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl b/branches/sca-java-1.4/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl deleted file mode 100644 index 820c26ca34..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.4/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl b/branches/sca-java-1.4/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl deleted file mode 100644 index 3fbc73616e..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - InteropDocServiceComponent/DocTestPortType - - - - - - - diff --git a/branches/sca-java-1.4/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.4/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 8cf95fb789..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - Tuscany Interop Test Server - - - systemScdlPath - /META-INF/sca/webapp.system.scdl - - - - applicationScdlPath - /META-INF/sca/default.scdl - - - - org.apache.tuscany.runtime.webapp.TuscanyContextListener - - - - TuscanyServlet - Tuscany Servlet - org.apache.tuscany.runtime.webapp.TuscanyServlet - - - - TuscanyServlet - /services/* - - - diff --git a/branches/sca-java-1.4/itest/interop-soap-service/t.bat b/branches/sca-java-1.4/itest/interop-soap-service/t.bat deleted file mode 100755 index 0f83dedc37..0000000000 --- a/branches/sca-java-1.4/itest/interop-soap-service/t.bat +++ /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. - - -@echo off -pushd target -jar -xf ..\apache-tomcat-5.5.17.zip -popd -copy target\sample-helloworldws-1.0-SNAPSHOT.war target\apache-tomcat-5.5.17\webapps -rem pushd target\apache-tomcat-5.5.17\webapps -rem md sample-helloworldws-1.0-SNAPSHOT -rem cd sample-helloworldws-1.0-SNAPSHOT -rem jar -xf ..\sample-helloworldws-1.0-SNAPSHOT.war -pushd target\apache-tomcat-5.5.17\shared -rem jar -xf "%USERPROFILE%\.m2\repository\org\apache\tuscany\web\1.0-SNAPSHOT\web-1.0-SNAPSHOT-bin.zip" -jar -xf "%USERPROFILE%\.m2\repository\org\apache\tuscany\web\1.0-SNAPSHOT\web-1.0-SNAPSHOT-bin.zip" -popd -rem hack -mkdir target\apache-tomcat-5.5.17\shared\extension -copy target\apache-tomcat-5.5.17\shared\lib\axis2-1.0-SNAPSHOT.jar target\apache-tomcat-5.5.17\shared\extension diff --git a/branches/sca-java-1.4/itest/pom.xml b/branches/sca-java-1.4/itest/pom.xml index b074eaca75..4e94d8b931 100644 --- a/branches/sca-java-1.4/itest/pom.xml +++ b/branches/sca-java-1.4/itest/pom.xml @@ -74,24 +74,19 @@ contribution contribution-multiple contribution-import-export - + conversations corba conversations-ws databindings - exceptions exceptions-cross-binding exceptions-cross-binding-ws exceptions-simple-ws extended-api interfaces - jms jms-args jms-callbacks -- cgit v1.2.3