summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--branches/sca-java-1.4/itest/admin/README28
-rw-r--r--branches/sca-java-1.4/itest/admin/pom.xml60
-rw-r--r--branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java9
-rw-r--r--branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java8
-rw-r--r--branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java69
-rw-r--r--branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java17
-rw-r--r--branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java9
-rw-r--r--branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java10
-rw-r--r--branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java113
-rw-r--r--branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java6
-rw-r--r--branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java74
-rw-r--r--branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java9
-rw-r--r--branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java61
-rw-r--r--branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java57
-rw-r--r--branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java48
-rw-r--r--branches/sca-java-1.4/itest/admin/src/test/resources/Iteration1Composite.composite43
-rw-r--r--branches/sca-java-1.4/itest/admin/src/test/resources/Iteration3Composite.composite68
-rw-r--r--branches/sca-java-1.4/itest/admin/src/test/resources/MySimpleService.composite59
-rw-r--r--branches/sca-java-1.4/itest/domain/pom.xml100
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddService.java31
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddServiceImpl.java31
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java31
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/java/calculator/CalculatorService.java38
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java74
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/java/calculator/DivideService.java28
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/java/calculator/DivideServiceImpl.java30
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/java/calculator/MultiplyService.java28
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java30
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/java/calculator/SubtractService.java31
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/java/calculator/SubtractServiceImpl.java31
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/resources/contributionA/Calculator.composite44
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml24
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite45
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite32
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/resources/contributionDependent/Calculator.composite36
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml24
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/resources/contributionPrimary/Calculator.composite57
-rw-r--r--branches/sca-java-1.4/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml25
-rw-r--r--branches/sca-java-1.4/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java279
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-client/pom.xml126
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java46
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-client/src/main/resources/default.composite35
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl195
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java144
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-round2-client/pom.xml124
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java44
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/resources/default.composite38
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl155
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java133
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-service/pom.xml134
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java47
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl180
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl42
-rw-r--r--branches/sca-java-1.4/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml51
-rwxr-xr-xbranches/sca-java-1.4/itest/interop-soap-service/t.bat34
-rw-r--r--branches/sca-java-1.4/itest/pom.xml11
56 files changed, 3 insertions, 3333 deletions
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>1.4</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-itest-admin</artifactId>
- <name>Apache Tuscany Admin Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-databinding</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-sdo</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
-</project>
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<MyListService> 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<myListServicesList.size(); i++)
- {
- myService=myListServicesList.get(i);
- if(new Integer(myService.getYear()).intValue()==year)
- {
- return myService.getHolidays();
- }
- }
- }
- if (myListServicesArray!=null)
- {
- for (int i=0; i<myListServicesArray.length; i++)
- {
- myService=myListServicesArray[i];
- if(new Integer(myService.getYear()).intValue()==year)
- {
- return myService.getHolidays();
- }
- }
- }
- return null;
- }
-
- public String getYear()
- {
- return year;
- }
-
-
-
-}
diff --git a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java b/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
deleted file mode 100644
index 8ff146b630..0000000000
--- a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;
-
-import java.io.PrintStream;
-
-public class MyLogger {
-
- private PrintStream outStream;
-
- public MyLogger(PrintStream out) {
- this.outStream = out;
- }
-
- public void println(String text) {
- outStream.println("MyLog: " + text);
- }
-
-}
diff --git a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java b/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
deleted file mode 100644
index 638c6aff8c..0000000000
--- a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;
-
-import java.util.Date;
-
-public interface MyService extends SCAComponentService{
- Date nextHoliday();
- String getLocation();
- String getYear();
-}
diff --git a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java b/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
deleted file mode 100644
index bd820884e7..0000000000
--- a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;
-
-import java.util.Date;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface MyServiceByDate {
- Date nextHoliday(Date date);
-}
diff --git a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java b/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
deleted file mode 100644
index fa2720001b..0000000000
--- a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;
-
-import java.util.Date;
-
-import org.osoa.sca.annotations.ComponentName;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-import org.apache.tuscany.sca.itest.admin.MyListService;
-import org.apache.tuscany.sca.itest.admin.MyListServiceByYear;
-import org.apache.tuscany.sca.itest.admin.MyLogger;
-import org.apache.tuscany.sca.itest.admin.MyService;
-import org.apache.tuscany.sca.itest.admin.MyServiceByDate;
-
-
-@Service(interfaces={MyService.class, MyServiceByDate.class, MyListService.class, MyListServiceByYear.class})
-
-public class MyServiceImpl implements MyService, MyServiceByDate, MyListService, MyListServiceByYear{
- static String[][] holidays = {{"2006/01/02","2006/05/29","2006/07/03","2006/07/04","2006/09/04","2006/11/23",
- "2006/11/23","2006/11/24", "2006/12/25"},{"2007/01/01","2007/05/28","2007/07/04","2007/09/03","2007/11/22",
- "2007/11/23","2007/12/25"},{"2006/01/02","2006/05/29","2006/07/03","2006/07/04","2006/09/04","2006/11/23",
- "2006/11/23","2006/11/24", "2006/12/25"},{"2007/01/01","2007/05/28","2007/07/04","2007/09/03","2007/11/22",
- "2007/11/23","2007/12/25"}};
-
- @Property(name="location")
- protected String location = "RTP";
-
- @Property(name="year")
- protected String year = "2006";
-
-
- private String componentName;
-
-
- private MyLogger logger;
-
- public MyServiceImpl()
- {
- logger = new MyLogger(System.out);
- logger.println("creating service instance...");
- }
-
- public Date nextHoliday() {
-
- return nextHoliday(new Date());
- }
-
-
- public Date nextHoliday(Date today)
- {
- Date d1;
- String[] days = getHolidays();
- for (int j=0; j<days.length; j++)
- {
- d1 = new Date(days[j]);
- if (d1.after(today))
- return d1;
- }
- return null;
- }
-
-
- public String[] getHolidays(int year)
- {
- int index = year -2006;
- if (index>=0 && index<holidays.length)
- return holidays[index];
- return null;
- }
-
- public String[] getHolidays()
- {
-
- Integer theYear;
- if (year ==null || year.length()==0)
- theYear = new Integer("2006");
- else
- theYear = new Integer(year);
-
- return getHolidays(theYear.intValue());
- }
-
- @Init
- public void start()
- {
- logger.println("Start service..");
- }
-
- @Destroy
- public void stop()
- {
- logger.println("Stop service..");
-
- }
-
- public String getComponentName()
- {
- return componentName;
- }
-
-
- public String getLocation()
- {
- return location;
- }
-
- public String getYear()
- {
- return year;
- }
-
-}
diff --git a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java b/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
deleted file mode 100644
index eec64fa0d8..0000000000
--- a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;
-
-public interface MyTotalService extends MyListService, MyListServiceByYear, MyService, MyServiceByDate
-{
-
-}
diff --git a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java b/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
deleted file mode 100644
index d712662cb3..0000000000
--- a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;
-
-import java.util.Date;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.ComponentName;
-import org.apache.tuscany.sca.itest.admin.MyListService;
-import org.apache.tuscany.sca.itest.admin.MyListServiceByYear;
-import org.apache.tuscany.sca.itest.admin.MyService;
-import org.apache.tuscany.sca.itest.admin.MyServiceByDate;
-import org.apache.tuscany.sca.itest.admin.MyTotalService;
-
-@Service(MyTotalService.class)
-
-public class MyTotalServiceImpl implements MyTotalService
-{
-
- // This is multiplicity=1:1
- @Reference(required=true)
- public MyListService myListService;
-
- // default required==true so it is 1:1
- @Reference (required=false)
- public MyListServiceByYear myListServiceByYear = new MyServiceImpl();
-
- // default required==true so it is 1:1
- @Reference
- public MyService myService;
-
- // This is multiplicity=0:1
- @Reference(required=false)
- public MyServiceByDate myServiceByDate = new MyServiceImpl();
-
- @ComponentName
- private String componentName;
-
- public String[] getHolidays()
- {
- return myListService.getHolidays();
- }
-
- public String[] getHolidays(int year)
- {
- return myListServiceByYear.getHolidays(year);
- }
-
-
- public Date nextHoliday(Date date)
- {
- return myServiceByDate.nextHoliday(date);
- }
-
- public String getLocation()
- {
- return myService.getLocation();
- }
-
- public String getYear()
- {
- return myService.getYear();
- }
-
- public String getComponentName()
- {
- return componentName;
- }
-
- public Date nextHoliday()
- {
- return myService.nextHoliday();
- }
-}
diff --git a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java b/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
deleted file mode 100644
index 42fa3f0c41..0000000000
--- a/branches/sca-java-1.4/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;
-
-
-
-public interface SCAComponentService
-{
- String getComponentName();
-
-}
diff --git a/branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java b/branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
deleted file mode 100644
index bcf4153064..0000000000
--- a/branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;
-
-import static junit.framework.Assert.assertEquals;
-
-import org.apache.tuscany.sca.itest.admin.MyService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-
-
-public class MySimpleServiceInRecursiveTestCase
-{
- private static MyService myServiceOrg;
- private static MyService myServiceAnother;
- private static MyService myServiceCary;
-
- private static SCADomain domain;
-
-
- @Test
- public void testPropertyDefault()
- {
- assertEquals("RTP",myServiceOrg.getLocation());
- assertEquals("2006",myServiceOrg.getYear());
- }
-
-
- @Test
- public void testPropertyOverrideValue()
- {
- assertEquals("CARY",myServiceCary.getLocation());
- assertEquals("2007",myServiceCary.getYear());
- }
-
-
- @Test
- public void testPropertyOverrideVariable()
- {
- assertEquals("Durham",myServiceAnother.getLocation());
- assertEquals("2009",myServiceAnother.getYear());
- }
-
-
- @BeforeClass
- public static void init() throws Exception {
- try {
- domain = SCADomain.newInstance("Iteration1Composite.composite");
- } catch ( Exception e ) { e.printStackTrace(); }
-
- myServiceOrg = domain.getService(MyService.class, "MySimpleServiceInRecursive/MyServiceOrig1");
- myServiceCary = domain.getService(MyService.class, "MySimpleServiceInRecursive/MyServiceCary1");
- myServiceAnother = domain.getService(MyService.class, "MySimpleServiceInRecursiveAnother/MyServiceNew1");
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java b/branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
deleted file mode 100644
index 747f71576c..0000000000
--- a/branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;
-
-import static junit.framework.Assert.assertEquals;
-
-import org.apache.tuscany.sca.itest.admin.MyService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class MySimpleServiceTestCase
-{
- private static SCADomain domain;
- private static MyService myServiceOrg;
- private static MyService myServiceNew;
- private static MyService myServiceCary;
-
- @Test
- public void testPropertyDefault()
- {
- assertEquals("RTP",myServiceOrg.getLocation());
- assertEquals("2006",myServiceOrg.getYear());
- }
-
-
- @Test
- public void testPropertyOverrideWithValue()
- {
- assertEquals("CARY",myServiceCary.getLocation());
- assertEquals("2007",myServiceCary.getYear());
- }
-
-
- @Test
- public void testPropertyOverrideWithVariable()
- {
- assertEquals("Raleigh",myServiceNew.getLocation());
- assertEquals("2008",myServiceNew.getYear());
- }
-
-
- @BeforeClass
- public static void init() throws Exception {
- try {
- domain = SCADomain.newInstance("MySimpleService.composite");
- } catch ( Exception e ) { System.out.println("Could not initialize " + e.toString());
- e.printStackTrace(); }
- myServiceOrg = domain.getService(MyService.class, "MyServiceComponentOrig/MyService");
- myServiceCary = domain.getService(MyService.class, "MyServiceComponentCary2007/MyService");
- myServiceNew = domain.getService(MyService.class, "MyServiceComponentNew/MyService");
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java b/branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
deleted file mode 100644
index 6c2dffb7b4..0000000000
--- a/branches/sca-java-1.4/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;
-
-import static junit.framework.Assert.assertEquals;
-
-import org.apache.tuscany.sca.itest.admin.MyTotalService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class MyTotalServiceTestCase
-{
- private static MyTotalService myTotalServiceOrg;
- private static MyTotalService myTotalServiceNew;
-
- private static SCADomain domain;
-
- @Test
- public void testPropertyDefault()
- {
- assertEquals("RTP",myTotalServiceOrg.getLocation());
- assertEquals("2006",myTotalServiceOrg.getYear());
- }
-
-
- @Test
- public void testPropertyOverrideVariable()
- {
- assertEquals("Raleigh",myTotalServiceNew.getLocation());
- assertEquals("2008",myTotalServiceNew.getYear());
- }
-
-
- @BeforeClass
- public static void init() throws Exception {
- try {
- domain = SCADomain.newInstance("Iteration3Composite.composite");
- } catch ( Exception e ) { e.printStackTrace(); }
-
- myTotalServiceOrg =domain.getService(MyTotalService.class, "MyTotalServiceComponent");
- myTotalServiceNew=domain.getService(MyTotalService.class, "MyTotalServiceNewComponent");
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-java-1.4/itest/admin/src/test/resources/Iteration1Composite.composite b/branches/sca-java-1.4/itest/admin/src/test/resources/Iteration1Composite.composite
deleted file mode 100644
index 95dbbf0124..0000000000
--- a/branches/sca-java-1.4/itest/admin/src/test/resources/Iteration1Composite.composite
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:foo="http://foo"
- xmlns:cust="http://www.example.com/Customer"
- xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
- targetNamespace="http://foo"
- name="Iteration1Composite" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <property name="newLocation" type="xs:anyURI">Raleigh</property>
- <property name="newYear" type="xs:anyURI">2008</property>
-
- <property name="anotherLocation" type="xs:anyURI">Durham</property>
- <property name="anotherYear" type="xs:anyURI">2009</property>
-
- <component name="MySimpleServiceInRecursive">
- <implementation.composite name="foo:MySimpleService"/>
- </component>
-
- <component name="MySimpleServiceInRecursiveAnother">
- <implementation.composite name="foo:MySimpleService"/>
- <property name="newLocation">Durham</property>
- <property name="newYear">2009</property>
- </component>
-
-</composite>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" name="Iteration3Composite"
- targetNamespace="http://foo" local="true" autowire="false" requires="cns:confidentiality"
- policySets="sns:secure">
- <property name="newLocation" type="anyURI">Raleigh</property>
- <property name="newYear" type="anyURI">2008</property>
-
- <component name="MyServiceComponentOrig">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>
- </component>
-
- <component name="MyServiceComponentCary2007">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>
- <property name="location">CARY</property>
- <property name="year">2007</property>
- </component>
-
- <component name="MyServiceComponentNew">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>
- <property name="location" source="$newLocation"/>
- <property name="year" source="$newYear"/>
- </component>
-
- <component name="MyTotalServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyTotalServiceImpl"/>
- <reference name="myService" target="MyServiceComponentOrig/MyService"/>
- <reference name="myListService" target="MyServiceComponentOrig/MyListService"/>
- </component>
-
- <component name="MyTotalServiceNewComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyTotalServiceImpl"/>
- <reference name="myService" target="MyServiceComponentNew/MyService"/>
- <reference name="myListService" target="MyServiceComponentNew/MyListService"/>
- </component>
-
- <property name="anotherLocation" type="anyURI">Durham</property>
- <property name="anotherYear" type="anyURI">2009</property>
-
- <component name="MySimpleServiceInRecursive">
- <implementation.composite name="foo:MySimpleService"/>
- </component>
-
- <component name="MySimpleServiceInRecursiveAnother">
- <implementation.composite name="foo:MySimpleService"/>
- <property name="newLocation">Durham</property>
- <property name="newYear">2009</property>
- </component>
-</composite>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:foo="http://foo"
- xmlns:cust="http://www.example.com/Customer"
- xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
- targetNamespace="http://foo"
- name="MySimpleService" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <service name="MyServiceCary1" promote="MyServiceComponentCary2007/MyService">
- <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>
- </service>
-
- <service name="MyServiceOrig1" promote="MyServiceComponentOrig/MyService">
- <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>
- </service>
-
- <service name="MyServiceNew1" promote="MyServiceComponentNew/MyService">
- <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>
- </service>
-
- <property name="newLocation" type="anyURI">Raleigh</property>
- <property name="newYear" type="anyURI">2008</property>
-
- <component name="MyServiceComponentOrig">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>
- </component>
-
- <component name="MyServiceComponentCary2007">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>
- <property name="location">CARY</property>
- <property name="year">2007</property>
- </component>
-
- <component name="MyServiceComponentNew">
- <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>
- <property name="location" source="$newLocation"/>
- <property name="year" source="$newYear"/>
- </component>
-
-</composite>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>1.4</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-domain</artifactId>
- <name>Apache Tuscany SCA Domain Integration Tests</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-workspace-impl</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-node-runtime</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-axis2</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-monitor</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
- <version>1.4</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="CalculatorA">
-
- <component name="CalculatorServiceComponentA">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <service name="CalculatorService">
- <binding.sca/>
- </service>
- <reference name="addService" target="AddServiceComponentB" />
- <reference name="subtractService" target="SubtractServiceComponentC" />
- <reference name="multiplyService" target="MultiplyServiceComponentA"/>
- <reference name="divideService" target="DivideServiceComponentA" />
- </component>
-
- <component name="MultiplyServiceComponentA">
- <implementation.java class="calculator.MultiplyServiceImpl" />
- </component>
-
- <component name="DivideServiceComponentA">
- <implementation.java class="calculator.DivideServiceImpl" />
- </component>
-
-</composite>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:CalculatorA"/>
-</contribution> \ 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="CalculatorB">
-
- <component name="CalculatorServiceComponentB">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponentB" />
- <reference name="subtractService" target="SubtractServiceComponentC" />
- <reference name="multiplyService" target="MultiplyServiceComponentB"/>
- <reference name="divideService" target="DivideServiceComponentB" />
- </component>
-
- <component name="MultiplyServiceComponentB">
- <implementation.java class="calculator.MultiplyServiceImpl" />
- </component>
-
- <component name="DivideServiceComponentB">
- <implementation.java class="calculator.DivideServiceImpl" />
- </component>
-
- <component name="AddServiceComponentB">
- <implementation.java class="calculator.AddServiceImpl" />
- </component>
-
-</composite>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="CalculatorC">
-
- <component name="SubtractServiceComponentC">
- <implementation.java class="calculator.SubtractServiceImpl" />
- <service name="SubtractService">
- <binding.sca/>
- </service>
- </component>
-
-</composite>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://dependent"
- xmlns:dependent="http://dependent"
- name="CalculatorB">
-
- <component name="AddServiceComponentB">
- <implementation.java class="calculator.AddServiceImpl" />
- <service name="AddService">
- <binding.ws uri="http://localhost:8085/AddServiceComponentB"/>
- </service>
- </component>
-
- <component name="SubtractServiceComponentB">
- <implementation.java class="calculator.SubtractServiceImpl" />
- </component>
-
-</composite>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://dependent"
- xmlns:sample="http://dependent">
- <export namespace="http://dependent"/>
-</contribution> \ 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://primary"
- xmlns:primary="http://primary"
- xmlns:dependent="http://dependent"
- name="CalculatorA">
-
- <include name="dependent:CalculatorB"/>
-
- <component name="CalculatorServiceComponentA">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <service name="CalculatorService">
- <binding.sca/>
- </service>
- <reference name="addService" multiplicity="0..n" target="AddServiceComponentA AddServiceComponentB AddServiceComponentC">
- <binding.sca/>
- <binding.ws/>
- </reference>
- <reference name="subtractService" target="SubtractServiceComponentB" />
- <reference name="multiplyService" target="MultiplyServiceComponentA" />
- <reference name="divideService" target="DivideServiceComponentA" />
- </component>
-
- <component name="AddServiceComponentA">
- <implementation.java class="calculator.AddServiceImpl" />
- <service name="AddService">
- <binding.sca/>
- </service>
- </component>
-
- <component name="MultiplyServiceComponentA">
- <implementation.java class="calculator.MultiplyServiceImpl" />
- </component>
-
- <component name="DivideServiceComponentA">
- <implementation.java class="calculator.DivideServiceImpl" />
- </component>
-
-</composite>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://primary"
- xmlns:sample="http://primary">
- <deployable composite="sample:CalculatorA"/>
- <import namespace="http://dependent"/>
-</contribution> \ 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<Contribution> contributionProcessor;
-
- private static Workspace workspace;
-
- private static List<String> problems = new ArrayList<String>();
- 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<Composite> 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<Contribution> 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<Contribution> loadedContributions = new ArrayList<Contribution>();
- 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<Contribution> 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>1.4</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-interop-soap-client</artifactId>
- <packaging>jar</packaging>
- <name>Apache Tuscany SCA WS Interop Client Integration Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-wsdl</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-sdo</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-axiom</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- <executions>
- <execution>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/wsdl/interopdoc.wsdl</schemaFile>
- <noNotification>true</noNotification>
- <noContainer>true</noContainer>
- <noInterfaces>true</noInterfaces>
- <noUnsettable>true</noUnsettable>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-wsdl2java</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <configuration>
- <wsdlFile>
- ${basedir}/src/main/resources/wsdl/interopdoc.wsdl</wsdlFile>
- <javaPackage>org.soapinterop</javaPackage>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="interop.client">
-
- <component name="InteropDocComponentService">
- <implementation.java class="org.apache.tuscany.test.interop.client.LoopbackInteropDocServiceComponentImpl"/>
-
- <service name="DocTestPortType">
- <!-- interface.wsdl interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/ -->
- <interface.java interface="org.soapinterop.DocTestPortType"/>
- <binding.ws wsdlElement="http://soapinterop.org/#wsdl.endpoint(interopDocSvc/interopDocPort)"/>
- </service>
- </component>
-
-
-
-</composite> \ 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 @@
-<?xml version="1.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.
--->
-<definitions name="InteropTestDoc"
- targetNamespace="http://soapinterop.org/"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://soapinterop.org/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
- <types>
-
- <xsd:schema elementFormDefault="qualified"
- targetNamespace="http://soapinterop.org/"
- xmlns:interop="http://soapinterop.org/">
-
- <xsd:element name="SingleTag">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:complexType name="SingleTag" />
- <xsd:element name="SingleTagResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="SimpleDocument">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:complexType name="SimpleDocument">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string" />
- </xsd:simpleContent>
- </xsd:complexType>
- <xsd:element name="SimpleDocumentResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="ComplexDocument">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:complexType name="ComplexDocument">
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="simpleDoc" type="interop:ArrayOfSimpleDocument" />
- <xsd:element minOccurs="0" maxOccurs="1" name="child" type="interop:ChildDocument" />
- </xsd:sequence>
- <xsd:attribute name="AnAttribute" type="xsd:string" />
- </xsd:complexType>
- <xsd:element name="ComplexDocumentResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="ArrayOfSimpleDocument">
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="unbounded" name="SimpleDocument" nillable="true" type="interop:SimpleDocument" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="ChildDocument">
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="childSimpleDoc" type="interop:ArrayOfSimpleDocument" />
- </xsd:sequence>
- </xsd:complexType>
-
- </xsd:schema>
-
- </types>
-
- <message name="SingleTagSoapIn">
- <part name="parameters" element="tns:SingleTag" />
- </message>
- <message name="SingleTagSoapOut">
- <part name="outputDoc" element="tns:SingleTagResponse" />
- </message>
- <message name="SimpleDocumentSoapIn">
- <part name="parameters" element="tns:SimpleDocument" />
- </message>
- <message name="SimpleDocumentSoapOut">
- <part name="outputDoc" element="tns:SimpleDocumentResponse" />
- </message>
- <message name="ComplexDocumentSoapIn">
- <part name="parameters" element="tns:ComplexDocument" />
- </message>
- <message name="ComplexDocumentSoapOut">
- <part name="outputDoc" element="tns:ComplexDocumentResponse" />
- </message>
-
- <portType name="DocTestPortType">
-
- <operation name="SingleTag">
- <input message="tns:SingleTagSoapIn" />
- <output message="tns:SingleTagSoapOut" />
- </operation>
- <operation name="SimpleDocument">
- <input message="tns:SimpleDocumentSoapIn" />
- <output message="tns:SimpleDocumentSoapOut" />
- </operation>
- <operation name="ComplexDocument">
- <input message="tns:ComplexDocumentSoapIn" />
- <output message="tns:ComplexDocumentSoapOut" />
- </operation>
-
- </portType>
-
- <binding name="doc_test_binding" type="tns:DocTestPortType">
- <soap:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http" />
-
- <operation name="SingleTag">
- <soap:operation
- soapAction="http://soapinterop.org/SingleTag" />
- <input>
- <soap:body use="literal" />
- </input>
- <output>
- <soap:body use="literal" />
- </output>
- </operation>
-
- <operation name="SimpleDocument">
- <soap:operation
- soapAction="http://soapinterop.org/SimpleDocument" />
- <input>
- <soap:body use="literal" />
- </input>
- <output>
- <soap:body use="literal" />
- </output>
- </operation>
-
- <operation name="ComplexDocument">
- <soap:operation
- soapAction="http://soapinterop.org/ComplexDocument" />
- <input>
- <soap:body use="literal" />
- </input>
- <output>
- <soap:body use="literal" />
- </output>
- </operation>
- </binding>
-
- <service name="interopDocSvc">
-
- <port name="interopDocPort" binding="tns:doc_test_binding">
- <soap:address location="http://www.whitemesa.net/interopdoc" />
- <!-- soap:address location="http://mssoapinterop.org/asmx/simple.asmx"/ -->
- <!-- soap:address location="http://easysoap.sourceforge.net/cgi-bin/interopserver"/ -->
- <!-- soap:address location="http://www.mssoapinterop.org/remoting/ServiceAllTypes.soap"/ -->
- <http-conf:client
- xmlns:http-conf="http://celtix.objectweb.org/transports/http/configuration"
- AllowChunking="false" />
- </port>
-
- </service>
-
-</definitions>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>1.4</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-interop-soap-round2-client</artifactId>
- <name>Apache Tuscany SCA WS SOAP Round2 Interop Client Integration Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-wsdl</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-sdo</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-axiom</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- <executions>
- <execution>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl</schemaFile>
- <noNotification>true</noNotification>
- <noContainer>true</noContainer>
- <noInterfaces>true</noInterfaces>
- <noUnsettable>true</noUnsettable>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-wsdl2java</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <configuration>
- <wsdlFile>${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl</wsdlFile>
- <javaPackage>org.soapinterop.wsdl.interop.test.doc.lit</javaPackage>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
- name="InteropClient">
-
- <dbsdo:import.sdo location="wsdl/interoptestdoclit.wsdl"/>
- <dbsdo:import.sdo factory="org.soapinterop.xsd.XsdFactory"/>
-
- <reference name="RemoteInteropDocService">
-<!--
- <interface.wsdl interface="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.interface(WSDLInteropTestDocLitPortType)"/>
- <binding.ws port="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.endpoint(WSDLInteropTestDocLitService/WSDLInteropTestDocLitPort)"/>
--->
-
- <interface.java interface="org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType"/>
- <binding.ws endpoint="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.endpoint(WSDLInteropTestDocLitService/WSDLInteropTestDocLitPort)"
- location="wsdl/interoptestdoclit.wsdl" />
- </reference>
-
-</composite> \ 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<definitions name="WSDLInteropTestDocLitService"
- targetNamespace="http://soapinterop.org/WSDLInteropTestDocLit"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://soapinterop.org/WSDLInteropTestDocLit"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:xsd1="http://soapinterop.org/xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <types>
- <schema targetNamespace="http://soapinterop.org/xsd"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- elementFormDefault="qualified">
- <complexType name="ArrayOfstring_literal">
- <sequence>
- <element maxOccurs="unbounded" minOccurs="1" name="string" type="xsd:string"/>
- </sequence>
- </complexType>
- <complexType name="SOAPStruct">
- <all>
- <element name="varFloat" type="xsd:float"/>
- <element name="varInt" type="xsd:int"/>
- <element name="varString" type="xsd:string"/>
- </all>
- </complexType>
-
- <element name="echoStringParam" type="xsd:string"/>
-
- <element name="echoStringReturn" type="xsd:string"/>
- <element name="echoStringArrayParam" type="xsd1:ArrayOfstring_literal"/>
-
- <element name="echoStringArrayReturn" type="xsd1:ArrayOfstring_literal"/>
-
- <element name="echoStructParam" type="xsd1:SOAPStruct"/>
-
- <element name="echoStructReturn" type="xsd1:SOAPStruct"/>
- </schema>
- </types>
- <message name="echoString">
- <part element="xsd1:echoStringParam" name="a"/>
- </message>
- <message name="echoStringResponse">
- <part element="xsd1:echoStringReturn" name="result"/>
- </message>
- <message name="echoStringArray">
- <part element="xsd1:echoStringArrayParam" name="a"/>
- </message>
- <message name="echoStringArrayResponse">
- <part element="xsd1:echoStringArrayReturn" name="result"/>
- </message>
- <message name="echoStruct">
- <part element="xsd1:echoStructParam" name="a"/>
- </message>
- <message name="echoStructResponse">
- <part element="xsd1:echoStructReturn" name="result"/>
- </message>
- <message name="echoVoid"/>
- <message name="echoVoidResponse"/>
-
- <portType name="WSDLInteropTestDocLitPortType">
- <operation name="echoString">
- <input message="tns:echoString" name="echoString"/>
- <output message="tns:echoStringResponse" name="echoStringResponse"/>
- </operation>
- <operation name="echoStringArray">
- <input message="tns:echoStringArray" name="echoStringArray"/>
- <output message="tns:echoStringArrayResponse" name="echoStringArrayResponse"/>
- </operation>
- <operation name="echoStruct">
- <input message="tns:echoStruct" name="echoStruct"/>
- <output message="tns:echoStructResponse" name="echoStructResponse"/>
- </operation>
- <operation name="echoVoid">
- <input message="tns:echoVoid" name="echoVoid"/>
- <output message="tns:echoVoidResponse" name="echoVoidResponse"/>
- </operation>
- </portType>
- <binding name="WSDLInteropTestDocLitPortBinding"
- type="tns:WSDLInteropTestDocLitPortType">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="echoString">
- <soap:operation soapAction="http://soapinterop.org/" style="document"/>
- <input name="echoString">
- <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit"
- use="literal"/>
- </input>
- <output name="echoStringResponse">
- <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit"
- use="literal"/>
- </output>
- </operation>
- <operation name="echoStringArray">
- <soap:operation soapAction="http://soapinterop.org/" style="document"/>
- <input name="echoStringArray">
- <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit"
- use="literal"/>
- </input>
- <output name="echoStringArrayResponse">
- <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit"
- use="literal"/>
- </output>
- </operation>
- <operation name="echoStruct">
- <soap:operation soapAction="http://soapinterop.org/" style="document"/>
- <input name="echoStruct">
- <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit"
- use="literal"/>
- </input>
- <output name="echoStructResponse">
- <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit"
- use="literal"/>
- </output>
- </operation>
- <operation name="echoVoid">
- <soap:operation soapAction="http://soapinterop.org/" style="document"/>
- <input name="echoVoid">
- <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit"
- use="literal"/>
- </input>
- <output name="echoVoidResponse">
- <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit"
- use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="WSDLInteropTestDocLitService">
- <port binding="tns:WSDLInteropTestDocLitPortBinding"
- name="WSDLInteropTestDocLitPort">
- <soap:address
- location="http://mssoapinterop.org/stkv3/wsdl/interopTestDocLit.wsdl"/>
- <http-conf:client xmlns:http-conf="http://celtix.objectweb.org/transports/http/configuration"
- AllowChunking="false"/>
- </port>
- </service>
-</definitions>
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.
- *
- * <p>
- * 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>1.4</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-interop-soap-service</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany SCA WS Interop Service Integration Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
-
-<dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- <version>1.2.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- <executions>
- <execution>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/wsdl/interopdoc.wsdl</schemaFile>
- <noNotification>true</noNotification>
- <noContainer>true</noContainer>
- <noInterfaces>true</noInterfaces>
- <noUnsettable>true</noUnsettable>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-wsdl2java</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <configuration>
- <wsdlFile>${basedir}/src/main/resources/wsdl/interopdoc.wsdl</wsdlFile>
- <javaPackage>org.soapinterop</javaPackage>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
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 @@
-<?xml version="1.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.
- -->
-<definitions name="InteropTestDoc" targetNamespace="http://soapinterop.org/"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://soapinterop.org/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
- <types>
-
- <xsd:schema elementFormDefault="qualified" targetNamespace="http://soapinterop.org/" xmlns:interop="http://soapinterop.org/">
-
- <xsd:element name="SingleTag">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="SingleTag"/>
- <xsd:element name="SingleTagResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="SimpleDocument">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:complexType name="SimpleDocument">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string"/>
- </xsd:simpleContent>
- </xsd:complexType>
- <xsd:element name="SimpleDocumentResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="ComplexDocument">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:complexType name="ComplexDocument">
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="simpleDoc" type="interop:ArrayOfSimpleDocument"/>
- <xsd:element minOccurs="0" maxOccurs="1" name="child" type="interop:ChildDocument"/>
- </xsd:sequence>
- <xsd:attribute name="AnAttribute" type="xsd:string"/>
- </xsd:complexType>
- <xsd:complexType name="ArrayOfSimpleDocument">
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="unbounded" name="SimpleDocument" nillable="true" type="interop:SimpleDocument"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="ChildDocument">
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="childSimpleDoc" type="interop:ArrayOfSimpleDocument"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="ComplexDocumentResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- </xsd:schema>
-
- </types>
-
- <message name="SingleTagSoapIn">
- <part name="parameters" element="tns:SingleTag"/>
- </message>
- <message name="SingleTagSoapOut">
- <part name="outputDoc" element="tns:SingleTagResponse"/>
- </message>
- <message name="SimpleDocumentSoapIn">
- <part name="parameters" element="tns:SimpleDocument"/>
- </message>
- <message name="SimpleDocumentSoapOut">
- <part name="outputDoc" element="tns:SimpleDocumentResponse"/>
- </message>
- <message name="ComplexDocumentSoapIn">
- <part name="parameters" element="tns:ComplexDocument"/>
- </message>
- <message name="ComplexDocumentSoapOut">
- <part name="outputDoc" element="tns:ComplexDocumentResponse"/>
- </message>
-
- <portType name="DocTestPortType">
-
- <operation name="SingleTag">
- <input message="tns:SingleTagSoapIn"/>
- <output message="tns:SingleTagSoapOut"/>
- </operation>
- <operation name="SimpleDocument">
- <input message="tns:SimpleDocumentSoapIn"/>
- <output message="tns:SimpleDocumentSoapOut"/>
- </operation>
- <operation name="ComplexDocument">
- <input message="tns:ComplexDocumentSoapIn"/>
- <output message="tns:ComplexDocumentSoapOut"/>
- </operation>
-
- </portType>
-
- <binding name="doc_test_binding" type="tns:DocTestPortType">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <operation name="SingleTag">
- <soap:operation soapAction="http://soapinterop.org/SingleTag"/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
-
- <operation name="SimpleDocument">
- <soap:operation soapAction="http://soapinterop.org/SimpleDocument"/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
-
- <operation name="ComplexDocument">
- <soap:operation soapAction="http://soapinterop.org/ComplexDocument"/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
-
- <service name="interopDocSvc">
-
- <port name="interopDocPort" binding="tns:doc_test_binding">
- <soap:address location="http://www.whitemesa.net/interopdoc"/>
- </port>
-
- </service>
-
-</definitions>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="interop.server">
-
- <import.sdo location="wsdl/interopdoc.wsdl"/>
- <!-- import.wsdl wsdlLocation="wsdl/interopdoc.wsdl"/ -->
-
- <service name="InteropDocService">
- <!-- interface.wsdl interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/ -->
- <interface.java interface="org.soapinterop.DocTestPortType"/>
-
- <binding.ws endpoint="http://soapinterop.org/#wsdl.endpoint(interopDocSvc/interopDocPort)"
- conformanceURIs="http://ws-i.org/profiles/basic/1.1"
- location="wsdl/interopdoc.wsdl"
- />
-
- <reference>InteropDocServiceComponent/DocTestPortType</reference>
- </service>
-
- <component name="InteropDocServiceComponent">
- <implementation.java class="org.apache.tuscany.test.interop.server.InteropDocServiceComponentImpl"/>
- </component>
-
-</composite>
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 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
- <display-name>Tuscany Interop Test Server</display-name>
-
- <context-param>
- <param-name>systemScdlPath</param-name>
- <param-value>/META-INF/sca/webapp.system.scdl</param-value>
- </context-param>
-
- <context-param>
- <param-name>applicationScdlPath</param-name>
- <param-value>/META-INF/sca/default.scdl</param-value>
- </context-param>
-
- <listener>
- <listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>TuscanyServlet</servlet-name>
- <display-name>Tuscany Servlet</display-name>
- <servlet-class>org.apache.tuscany.runtime.webapp.TuscanyServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TuscanyServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
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 @@
<module>contribution</module>
<module>contribution-multiple</module>
<module>contribution-import-export</module>
- <!--
- <module>contribution-classloader</module> -->
+ <!--
+ <module>contribution-classloader</module>
+ -->
<module>conversations</module>
<module>corba</module>
<module>conversations-ws</module>
<module>databindings</module>
- <!--module>domain</module-->
<module>exceptions</module>
<module>exceptions-cross-binding</module>
<module>exceptions-cross-binding-ws</module>
<module>exceptions-simple-ws</module>
<module>extended-api</module>
<module>interfaces</module>
- <!--
- <module>interop-soap-client</module>
- <module>interop-soap-round2-client</module>
- <module>interop-soap-service</module>
- -->
<module>jms</module>
<module>jms-args</module>
<module>jms-callbacks</module>