diff options
Diffstat (limited to 'branches/sca-java-0.91/itest')
515 files changed, 0 insertions, 29877 deletions
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsclient/pom.xml b/branches/sca-java-0.91/itest/bindings/bindingsclient/pom.xml deleted file mode 100644 index 505e189ef1..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsclient/pom.xml +++ /dev/null @@ -1,64 +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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <parent> - <groupId>org.apache.tuscany.testing</groupId> - <artifactId>sca-itest</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.tuscany.testing.bindingstest</groupId> - <artifactId>tuscany-itest-bindings-bindingsclient</artifactId> - <packaging>jar</packaging> - <name>SCA FVT Bindings Test Tool JSP Client</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.testing.bindingstest</groupId> - <artifactId>tuscany-itest-bindings-bindingscomposite</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.testing.bindingstest</groupId> - <artifactId>tuscany-itest-bindings-bindingsutility</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca.services.databinding</groupId> - <artifactId>databinding-sdo</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>commonj</groupId> - <artifactId>sdo-api-r2.1</artifactId> - <version>1.0-incubating-beta1</version> - <scope>runtime</scope> - </dependency> - </dependencies> - -</project> diff --git a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java b/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java deleted file mode 100644 index 44801846f6..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java +++ /dev/null @@ -1,40 +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; - -import org.osoa.sca.annotations.Remotable; - -/** - * SCA Test Tool Service - */ - -@Remotable -public interface SCATestToolService { - - public String doOneHopPing(String input); - - public String doTwoHopPing(String input); - - public String doDataTypeTest(String input); - - public String getCallbackBuffer(); - - public void clearCallbackBuffer(); -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/resources/bindingsclient.composite b/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/resources/bindingsclient.composite deleted file mode 100644 index ca3ff6494e..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/resources/bindingsclient.composite +++ /dev/null @@ -1,47 +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:v="http://www.osoa.org/xmlns/sca/values/1.0" - xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - xmlns:dbsdo="http://incubator.apache.org/tuscany/xmlns/databinding/sdo/1.0-incubator-M2" - name="bindingsclient"> - - <!-- - <reference name="SCATestToolSCAReference"> - <interface.java interface="org.apache.tuscany.sca.itest.SCATestToolService"/> - <binding.sca uri="SCATestToolSCAServiceComponent"/> - </reference> - --> - - <reference name="SCATestToolWSReference"> - <interface.java interface="org.apache.tuscany.sca.itest.SCATestToolService" /> - <binding.ws endpoint="http://scatesttool.scabeta1fvt#wsdl.endpoint(SCATestToolService/SCATestToolServiceSoapPort)" - location="wsdl/testtool.wsdl" /> - </reference> - - <!-- - <reference name="SCATestToolEJBReference"> - <interface.java interface="org.apache.tuscany.sca.itest.SCATestToolService"/> - <binding.ejb uri="corbaname:iiop:localhost:2811/NameServiceServerRoot#ejb/scabeta1fvt/scatesttool/SCATestToolServiceHome"/> - </reference> - - --> -</composite> - diff --git a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/resources/wsdl/testtool.wsdl b/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/resources/wsdl/testtool.wsdl deleted file mode 100644 index 7dc608f063..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/resources/wsdl/testtool.wsdl +++ /dev/null @@ -1,272 +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.
- -->
-<wsdl:definitions targetNamespace="http://scatesttool.scabeta1fvt" xmlns:impl="http://scatesttool.scabeta1fvt"
- xmlns:tns="http://scatesttool.scabeta1fvt" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="testtool"> - <wsdl:types> - <schema targetNamespace="http://scatesttool.scabeta1fvt" xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <element name="doOneHopPingResponse"> - <complexType> - <sequence> - <element name="doOneHopPingReturn" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="doTwoHopPing"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="doTwoHopPingResponse"> - <complexType> - <sequence> - <element name="doTwoHopPingReturn" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="doDataTypeTest"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="doDataTypeTestResponse"> - <complexType> - <sequence> - <element name="doDataTypeTestReturn" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="getCallbackBuffer"> - <complexType> - <sequence /> - </complexType> - </element> - <element name="getCallbackBufferResponse"> - <complexType> - <sequence> - <element name="getCallbackBufferReturn" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="clearCallbackBuffer"> - <complexType> - <sequence /> - </complexType> - </element> - <element name="clearCallbackBufferResponse"> - <complexType> - <sequence /> - </complexType> - </element> - <element name="doOneHopPing"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - </schema> - </wsdl:types> - - <wsdl:message name="doOneHopPingResponse"> - <wsdl:part element="tns:doOneHopPingResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="doDataTypeTestResponse"> - <wsdl:part element="tns:doDataTypeTestResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="clearCallbackBufferResponse"> - <wsdl:part element="tns:clearCallbackBufferResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="getCallbackBufferRequest"> - <wsdl:part element="tns:getCallbackBuffer" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="doTwoHopPingRequest"> - <wsdl:part element="tns:doTwoHopPing" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="doTwoHopPingResponse"> - <wsdl:part element="tns:doTwoHopPingResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="getCallbackBufferResponse"> - <wsdl:part element="tns:getCallbackBufferResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="clearCallbackBufferRequest"> - <wsdl:part element="tns:clearCallbackBuffer" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="doDataTypeTestRequest"> - <wsdl:part element="tns:doDataTypeTest" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="doOneHopPingRequest"> - <wsdl:part element="tns:doOneHopPing" name="parameters" /> - - </wsdl:message> - - <wsdl:portType name="SCATestToolService"> - <wsdl:operation name="doOneHopPing"> - <wsdl:input message="tns:doOneHopPingRequest" name="doOneHopPingRequest" /> - - <wsdl:output message="tns:doOneHopPingResponse" name="doOneHopPingResponse" /> - - </wsdl:operation> - - <wsdl:operation name="doTwoHopPing"> - <wsdl:input message="tns:doTwoHopPingRequest" name="doTwoHopPingRequest" /> - - <wsdl:output message="tns:doTwoHopPingResponse" name="doTwoHopPingResponse" /> - - </wsdl:operation> - - <wsdl:operation name="doDataTypeTest"> - <wsdl:input message="tns:doDataTypeTestRequest" name="doDataTypeTestRequest" /> - - <wsdl:output message="tns:doDataTypeTestResponse" name="doDataTypeTestResponse" /> - - </wsdl:operation> - - <wsdl:operation name="getCallbackBuffer"> - <wsdl:input message="tns:getCallbackBufferRequest" name="getCallbackBufferRequest" /> - - <wsdl:output message="tns:getCallbackBufferResponse" name="getCallbackBufferResponse" /> - - </wsdl:operation> - - <wsdl:operation name="clearCallbackBuffer"> - <wsdl:input message="tns:clearCallbackBufferRequest" name="clearCallbackBufferRequest" /> - - <wsdl:output message="tns:clearCallbackBufferResponse" name="clearCallbackBufferResponse" /> - - </wsdl:operation> - - </wsdl:portType> - - <wsdl:binding name="SCATestToolServiceSoapBinding" type="tns:SCATestToolService"> - <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> --> - - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" /> - - <wsdl:operation name="doOneHopPing"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="doOneHopPingRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="doOneHopPingResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="doTwoHopPing"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="doTwoHopPingRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="doTwoHopPingResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="doDataTypeTest"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="doDataTypeTestRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="doDataTypeTestResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="getCallbackBuffer"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="getCallbackBufferRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="getCallbackBufferResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="clearCallbackBuffer"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="clearCallbackBufferRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="clearCallbackBufferResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="SCATestToolService"> - <wsdl:port binding="tns:SCATestToolServiceSoapBinding" name="SCATestToolServiceSoapPort"> - <wsdlsoap:address location="http://localhost:8085/services/SCATestToolWSService" /> - - </wsdl:port> - - </wsdl:service> - -</wsdl:definitions> diff --git a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/webapp/SCATestTool.jsp b/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/webapp/SCATestTool.jsp deleted file mode 100644 index eb219e4cef..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/webapp/SCATestTool.jsp +++ /dev/null @@ -1,130 +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.
- */
- --%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%--
- * SCATestService.java
- * written by Chris Ortiz
- * interface class for basic test service
- * version .1 9/22/2006
- *
- *
- --%>
-
-
-<HTML>
-<HEAD>
- <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1" session="true" autoFlush="true"
- isThreadSafe="true" isErrorPage="false"
- import="org.apache.tuscany.sca.itest.SCATestToolService"
- import="java.io.PrintWriter"
- import="java.io.StringWriter"
- import="org.osoa.sca.CurrentCompositeContext"
- import="org.osoa.sca.CompositeContext"
- %>
- <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <META name="GENERATOR" content="IBM Software Development Platform">
- <TITLE>SCA FVT Test Service Driver</TITLE>
-</HEAD>
-
-<BODY bgcolor="#c8d8f8">
-<H2>SCA FVT Test Tool Client</H2>
-
-<form action="SCATestTool.jsp" method="get"><HR><BR>Choose Binding type:<BR><BR>
- <INPUT type="radio" name="bind" value="WS"> WS Binding
- <INPUT type="radio" name="bind" value="EJB"> EJB Binding
- <INPUT type="radio" name="bind" value="SCA" checked> Default Binding<BR><BR><HR>
- <BR>Check Tests to run:<BR><BR>
- <INPUT type="checkbox" name="test" value="Ping First Composite" checked> Ping First Composite
- <INPUT type="checkbox" name="test" value="Ping Second Composite"> Ping Second Composite<BR><BR>
- <INPUT type="checkbox" name="test" value="Data Type Test"> Data Type Test<BR><BR>
- <INPUT type="checkbox" name="test" value="Async One Way"> Async One Way
- <INPUT type="checkbox" name="test" value="Async Callback"> Async Call Back<BR><BR>
-
-
- <BR>
- <INPUT type="submit" value="Run Test"></FORM>
-<BR>
-
- <%
-
- String bindingchoice = request.getParameter("bind");
- String[] selected = request.getParameterValues("test");
-
- try {
- SCATestToolService scaTestTool;
- if (bindingchoice.equals("WS")) {
- CompositeContext compositeContext = CurrentCompositeContext.getContext();
- scaTestTool = (SCATestToolService) compositeContext.locateService(SCATestToolService.class, "SCATestToolWSReference");
- } else if (bindingchoice.equals("EJB")) {
- CompositeContext compositeContext = CurrentCompositeContext.getContext();
- scaTestTool = (SCATestToolService) compositeContext.locateService(SCATestToolService.class, "SCATestToolEJBReference");
- } else {
- // assume default binding
- CompositeContext compositeContext = CurrentCompositeContext.getContext();
- scaTestTool = (SCATestToolService) compositeContext.locateService(SCATestToolService.class, "SCATestToolSCAReference");
- }
- if (selected != null && selected.length != 0) {
- for (int i = 0; i < selected.length; i++) {
- String value = null;
- if (null != selected[i] && selected[i].equals("Ping First Composite")) {
- value = scaTestTool.doOneHopPing("brio");
- } else if (null != selected[i] && selected[i].equals("Ping Second Composite")){
- value = scaTestTool.doTwoHopPing("brio");
- } else if (null != selected[i] && selected[i].equals("Data Type Test")){
- value = scaTestTool.doDataTypeTest("brio");
- } else if (null != selected[i] && selected[i].equals("Async One Way")){
- value = "Ut Oh! Test tool not complete for oneway testing";
- } else if (null != selected[i] && selected[i].equals("Async Callback")){
- value = "Ut Oh! Test tool not complete for async testing";
- } else {
- value = "Ut Oh! unknown test";
- }
-
-%>
-
-<HR>
-Results from <%=selected[i]%> test with <%=bindingchoice%> binding:
-<P><%=value%>
- <%
- } //for
- } //if
-
- }catch(Exception e){
- e.printStackTrace();
- StringWriter sw= new StringWriter();
- PrintWriter pw= new PrintWriter(sw);
-
- e.printStackTrace(pw);
- pw.flush();
-
-%>
- Whoops!<BR clear="all">
-<PRE>
- Exception "<%=e.getClass().getName()%>" Exception message: "<%=e.getMessage()%>"<BR clear="all">
- <%=sw.toString() %>
-</PRE>
-<% } //catch
-
-%>
-
-</BODY>
-</HTML>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index fd58cb8b0e..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/main/webapp/WEB-INF/web.xml +++ /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. - */ - --> - -<!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>SCA Test Service Driver</display-name> - <welcome-file-list id="WelcomeFileList"> - <welcome-file>SCATestTool.jsp</welcome-file> - </welcome-file-list> -</web-app> diff --git a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTest.java b/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTest.java deleted file mode 100644 index 6cc72c99a2..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.itest; - - -import java.io.IOException; -import java.net.Socket; - -import junit.framework.TestCase; - -import org.apache.tuscany.api.SCARuntime; - -public class SCATestToolServerTest extends TestCase { - - @Override - protected void setUp() throws Exception { - SCARuntime.start("bindingscomposite-system.composite", "bindingscomposite.composite"); - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - @Override - protected void tearDown() throws Exception { - SCARuntime.stop(); - } - -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java b/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java deleted file mode 100644 index b5f076b7e8..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java +++ /dev/null @@ -1,80 +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; - -import java.lang.reflect.UndeclaredThrowableException; - -import junit.framework.TestCase; - -import org.apache.tuscany.api.SCARuntime; -import org.apache.tuscany.core.test.SCATestCaseRunner; -import org.apache.tuscany.sca.util.SCATestUtilityServerTest; -import org.osoa.sca.CompositeContext; -import org.osoa.sca.CurrentCompositeContext; - -public class WSBindingsClientTestCase extends TestCase { - private SCATestToolService scaTestTool; - - private SCATestCaseRunner toolServer; - private SCATestCaseRunner utilityServer; - - // Hops over one composite - public void testOneHopPing() throws Throwable { - try { - assertTrue(scaTestTool.doOneHopPing("brio").contains("brio")); - } catch (UndeclaredThrowableException e) { - throw (e.getCause()); - } - } - - // Hops over two composites - public void testTwoHopPing() { - assertTrue(scaTestTool.doTwoHopPing("brio").contains("brio")); - } - - protected void setUp() throws Exception { - SCARuntime.start("bindingsclient.composite"); - - toolServer = new SCATestCaseRunner(SCATestToolServerTest.class); - toolServer.setUp(); - utilityServer = new SCATestCaseRunner(SCATestUtilityServerTest.class); - utilityServer.setUp(); - - CompositeContext cc = CurrentCompositeContext.getContext(); - System.out.println("Composite Name = " + cc.getName()); - System.out.println(CurrentCompositeContext.getContext()); - scaTestTool = - (SCATestToolService)CurrentCompositeContext.getContext().locateService(SCATestToolService.class, - "SCATestToolWSReference"); - if (scaTestTool == null) { - System.out.println("Yo Yo It is null"); - } else { - System.out.println("Yo Yo It is not null: " + scaTestTool); - } - - } - - @Override - protected void tearDown() throws Exception { - SCARuntime.stop(); - toolServer.tearDown(); - utilityServer.tearDown(); - } -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTest.java b/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTest.java deleted file mode 100644 index 0f6cb912a7..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTest.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.sca.util; - - - -import java.io.IOException; -import java.net.Socket; - -import org.apache.tuscany.api.SCARuntime; - -import junit.framework.TestCase; - -public class SCATestUtilityServerTest extends TestCase { - - @Override - protected void setUp() throws Exception { - SCARuntime.start("bindingsutility-system.composite", "bindingsutility.composite"); - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8081); - } - - @Override - protected void tearDown() throws Exception { - SCARuntime.stop(); - } - -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/pom.xml b/branches/sca-java-0.91/itest/bindings/bindingscomposite/pom.xml deleted file mode 100644 index 28e9480291..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/pom.xml +++ /dev/null @@ -1,58 +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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.apache.tuscany.testing</groupId> - <artifactId>sca-itest</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.tuscany.testing.bindingstest</groupId> - <artifactId>tuscany-itest-bindings-bindingscomposite</artifactId> - <packaging>jar</packaging> - <name>SCA FVT Bindings Test Tool Service Composite</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca.services.databinding</groupId> - <artifactId>databinding-sdo</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>commonj</groupId> - <artifactId>sdo-api-r2.1</artifactId> - <version>1.0-incubating-beta1</version> - <scope>runtime</scope> - </dependency> - - <!-- SDO's XXXHelper.INSTANCE pattern requires the implementation --> - <dependency> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-impl</artifactId> - <version>1.0-incubating-beta1</version> - <scope>runtime</scope> - </dependency> - - </dependencies> - -</project> diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelper.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelper.java deleted file mode 100644 index efe30c4f4e..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelper.java +++ /dev/null @@ -1,341 +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; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.Random; -import java.util.Vector; - -import org.apache.tuscany.sca.util.SCATestUtilityService; - -public class SCADataTypeHelper { - - Date date; - Random ran; - SCATestUtilityService scaUtil; // change this to be the service provider - - public SCADataTypeHelper(SCATestUtilityService util) { - date = new Date(); - ran = new Random(date.getTime()); - scaUtil = util; - } - - public StringBuffer test_char() throws SCADataTypeHelperException { - - char x = 'a'; - x += ran.nextInt(26); // get a char a-z - StringBuffer rc = new StringBuffer("\nchar datatype test sending ==> " + x); - try { - char y = scaUtil.echo_char(x); - if (x == y) { - rc.append("\nchar successfully received ==> " + y); - } else { - throw new SCADataTypeHelperException(rc + "\nDatatype exception: char ==> " + y); - } - } catch (Exception e) { - throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_char\n" + e.toString()); - } - return rc; - } - - public StringBuffer test_String() throws SCADataTypeHelperException { - - String x = date.toString(); - StringBuffer rc = new StringBuffer("\nString datatype test sending ==> " + x); - try { - String y = scaUtil.echo_String(x); - if (x.equals(y)) { - rc.append("\nString successfully received ==> " + y); - } else { - throw new SCADataTypeHelperException(rc + "\nDatatype exception: String ==> " + y); - } - } catch (Exception e) { - throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_String\n" + e.toString()); - } - return rc; - } - - public StringBuffer test_int() throws SCADataTypeHelperException { - - int x = ran.nextInt(); - StringBuffer rc = new StringBuffer("\nint datatype test sending ==> " + x); - try { - int y = scaUtil.echo_int(x); - if (x == y) { - rc.append("\nint successfully received ==> " + y); - } else { - throw new SCADataTypeHelperException(rc + "\nDatatype exception: int ==> " + y); - } - } catch (Exception e) { - throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_int\n" + e.toString()); - } - return rc; - } - - public StringBuffer test_boolean() throws SCADataTypeHelperException { - - boolean x = ran.nextBoolean(); - StringBuffer rc = new StringBuffer("\nboolean datatype test sending ==> " + x); - try { - boolean y = scaUtil.echo_boolean(x); - if (x == y) { - rc.append("\nboolean successfully received ==> " + y); - } else { - throw new SCADataTypeHelperException(rc + "\nDatatype exception: boolean ==> " + y); - } - } catch (Exception e) { - throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_boolean\n" + e.toString()); - } - return rc; - } - - public StringBuffer test_long() throws SCADataTypeHelperException { - - long x = ran.nextLong(); - StringBuffer rc = new StringBuffer("\nlong datatype test sending ==> " + x); - try { - long y = scaUtil.echo_long(x); - if (x == y) { - rc.append("\nlong successfully received ==> " + y); - } else { - throw new SCADataTypeHelperException(rc + "\nDatatype exception: long ==> " + y); - } - } catch (Exception e) { - throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_long\n" + e.toString()); - } - return rc; - } - - public StringBuffer test_short() throws SCADataTypeHelperException { - - short x = (short)ran.nextInt(); - StringBuffer rc = new StringBuffer("\nshort datatype test sending ==> " + x); - try { - short y = scaUtil.echo_short(x); - if (x == y) { - rc.append("\nshort successfully received ==> " + y); - } else { - throw new SCADataTypeHelperException(rc + "\nDatatype exception: short ==> " + y); - } - } catch (Exception e) { - throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_short\n" + e.toString()); - } - return rc; - } - - public StringBuffer test_float() throws SCADataTypeHelperException { - - float x = ran.nextFloat(); - StringBuffer rc = new StringBuffer("\nfloat datatype test sending ==> " + x); - try { - float y = scaUtil.echo_float(x); - if (x == y) { - rc.append("\nfloat successfully received ==> " + y); - } else { - throw new SCADataTypeHelperException(rc + "\nDatatype exception: float ==> " + y); - } - } catch (Exception e) { - throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_float " + e.toString()); - } - return rc; - } - - public StringBuffer test_double() throws SCADataTypeHelperException { - - double x = ran.nextDouble(); - StringBuffer rc = new StringBuffer("\ndouble datatype test sending ==> " + x); - try { - double y = scaUtil.echo_double(x); - if (x == y) { - rc.append("\ndouble successfully received ==> " + y); - } else { - throw new SCADataTypeHelperException(rc + "\nDatatype exception: double ==> " + y); - } - } catch (Exception e) { - throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_double\n" + e.toString()); - } - return rc; - } - - public StringBuffer test_BigInteger() throws SCADataTypeHelperException { - - BigInteger x = new BigInteger(ran.nextInt(32) + 32, ran); // between - // 32 - 64 - // bitLength - StringBuffer rc = new StringBuffer("\nBigInteger datatype test sending ==> " + x); - try { - BigInteger y = scaUtil.echo_BigInteger(x); - if (x.equals(y)) { - rc.append("\nBigInteger successfully received ==> " + y); - } else { - throw new SCADataTypeHelperException("\n" + rc + "\nDatatype exception: BigInteger ==> " + y); - } - } catch (Exception e) { - throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_BigInteger\n" + e.toString()); - } - return rc; - } - - public StringBuffer test_BigDecimal() throws SCADataTypeHelperException { - - BigDecimal x = new BigDecimal(ran.nextDouble()); - StringBuffer rc = new StringBuffer("\nBigDecimal datatype test sending ==> " + x); - try { - BigDecimal y = scaUtil.echo_BigDecimal(x); - if (x.equals(y)) { - rc.append("\nBigDecimal successfully received ==> " + y); - } else { - throw new SCADataTypeHelperException("\n" + rc + "\nDatatype exception: BigDecimal ==> " + y); - } - } catch (Exception e) { - throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_BigDecimal\n" + e.toString()); - } - return rc; - } - - private StringBuffer test_Vector() throws SCADataTypeHelperException { - - Vector vector = new Vector(); - vector.addElement("DanW"); - vector.addElement(new Float(2000F)); - vector.addElement(new Short((short)11)); - StringBuffer rc = new StringBuffer("\nVector datatype test sending ==> " + vector.toString()); - boolean passed = true; - try { - Vector y = scaUtil.echo_Vector(vector); - if (((String)y.elementAt(0)).equals("DanW")) { - rc.append("\nVector element 0 string " + y.elementAt(0) + " successfully recieved"); - } else { - passed = false; - } - if ((((Float)y.elementAt(1)).equals((Float)vector.elementAt(1)))) { - rc.append("\nVector element 1 Float " + y.elementAt(1) + " successfully recieved"); - } else { - passed = false; - } - if (y.elementAt(2).equals(vector.elementAt(2))) { - rc.append("\nVector element 2 (Short) " + y.elementAt(2) + " successfully received"); - } else { - passed = false; - } - if (!passed) { - // - // one of the tests failed - // - rc.append("\nVector element 0 (String) " + y.elementAt(0) + " should be \"DanW\""); - rc.append("\nVector element 1 (Float) " + y.elementAt(1) + " should be \"2000F\""); - rc.append("\nVector element 2 (Short) " + y.elementAt(2) + " should be \"11\""); - throw new SCADataTypeHelperException("\n" + rc + "\nDataType exception: Vector ==> " + y); - } - } catch (Exception e) { - throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_Vector\n" + e.toString()); - } - return rc; - } - - public StringBuffer test_GregorianCalendar() throws SCADataTypeHelperException { - - GregorianCalendar x = new GregorianCalendar(); - StringBuffer rc = new StringBuffer("\nGregorianCalendar datatype test sending ==> " + x.toString()); - try { - GregorianCalendar y = scaUtil.echo_GregorianCalendar(x); - if (x.equals(y)) { - rc.append("\nGregorianCalendar successfully received ==> " + y); - } else { - throw new SCADataTypeHelperException("\n" + rc + "\nDatatype exception: GregorianCalendar ==> " + y); - } - } catch (Exception e) { - throw new SCADataTypeHelperException("\nRemote exception from scaUtil.echo_GregorianCalendar\n" + e - .toString()); - } - return rc; - } - - public StringBuffer doDataType() { - - StringBuffer rc = new StringBuffer(); - try { - rc.append(test_boolean()); - } catch (SCADataTypeHelperException e) { - rc.append("\n" + e.toString() + "\n"); - } - try { - rc.append(test_char()); - } catch (SCADataTypeHelperException e) { - rc.append("\n" + e.toString() + "\n"); - } - try { - rc.append(test_String()); - } catch (SCADataTypeHelperException e) { - rc.append("\n" + e.toString() + "\n"); - } - try { - rc.append(test_int()); - } catch (SCADataTypeHelperException e) { - rc.append("\n" + e.toString()); - } - try { - rc.append(test_long()); - } catch (SCADataTypeHelperException e) { - rc.append("\n" + e.toString() + "\n"); - } - try { - rc.append(test_short()); - } catch (SCADataTypeHelperException e) { - rc.append("\n" + e.toString() + "\n"); - } - try { - rc.append(test_float()); - } catch (SCADataTypeHelperException e) { - rc.append("\n" + e.toString() + "\n"); - } - try { - rc.append(test_double()); - } catch (SCADataTypeHelperException e) { - rc.append("\n" + e.toString() + "\n"); - } - try { - rc.append(test_BigInteger()); - } catch (SCADataTypeHelperException e) { - rc.append("\n" + e.toString() + "\n"); - } - try { - rc.append(test_BigDecimal()); - } catch (SCADataTypeHelperException e) { - rc.append("\n" + e.toString() + "\n"); - } - try { - rc.append(test_Vector()); - } catch (SCADataTypeHelperException e) { - rc.append("\n" + e.toString() + "\n"); - } - try { - rc.append(test_GregorianCalendar()); - } catch (SCADataTypeHelperException e) { - rc.append("\n" + e.toString() + "\n"); - } catch (Exception e) { - rc.append("\n" + e.toString() + "\n"); - } - - return rc; - } -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelperException.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelperException.java deleted file mode 100644 index 074fba8057..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelperException.java +++ /dev/null @@ -1,29 +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; - -public class SCADataTypeHelperException extends Exception { - - public SCADataTypeHelperException() { - } - - public SCADataTypeHelperException(String msg) { - super(msg); - } -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java deleted file mode 100644 index c55e22c905..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java +++ /dev/null @@ -1,27 +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; - -/** - * SCA Test Tool Callback Service - */ -public interface SCATestToolCallbackService { - - public void pingCallBack(String reply); -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.java deleted file mode 100644 index 44e799a566..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.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.sca.itest; - - -import java.io.IOException; - -import org.apache.tuscany.api.SCARuntime; - -public class SCATestToolServer { - - /** - * @param args - */ - public static void main(String[] args) { - - SCARuntime.start("bindingscomposite-system.composite", "bindingscomposite.composite"); - - try { - System.out.println("SCATestTool server started"); - System.in.read(); - } catch (IOException e) { - e.printStackTrace(); - } - - SCARuntime.stop(); - System.out.println("SCATestTool server stopped"); - } - -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java deleted file mode 100644 index 67b7e8eb64..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java +++ /dev/null @@ -1,39 +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; - -import org.osoa.sca.annotations.Remotable; - -/** - * SCA Test Tool Service - */ - -@Remotable -public interface SCATestToolService { - - public String doOneHopPing(String input); - - public String doTwoHopPing(String input); - - public String doDataTypeTest(String input); - - public String getCallbackBuffer(); - - public void clearCallbackBuffer(); -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServiceImpl.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServiceImpl.java deleted file mode 100644 index e207a23927..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServiceImpl.java +++ /dev/null @@ -1,76 +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; - -import org.apache.tuscany.sca.util.SCATestUtilityService; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * SCA Test Service Implementation - */ - -@Service(SCATestToolService.class) -public class SCATestToolServiceImpl implements SCATestToolService, SCATestToolCallbackService { - @Reference - public SCATestUtilityService scaTestUtil; - - private String callbackBuffer = null; - - public String doOneHopPing(String input) { - System.out.println("Invoking SCATestToolServiceImpl.doOneHopPing()"); - StringBuffer rc = new StringBuffer(); - rc.append("doOneHopPing(): "); - rc.append(input); - return rc.toString(); - } - - public String doTwoHopPing(String input) { - System.out.println("Invoking SCATestToolServiceImpl.doTwoHopPing()"); - StringBuffer rc = new StringBuffer(); - rc.append("doTwoHopPing(): "); - rc.append(input); - rc.append(" --> "); - rc.append(scaTestUtil.ping(input)); - return rc.toString(); - } - - public String doDataTypeTest(String input) { - StringBuffer rc = new StringBuffer(); - rc.append("doDataTypeTest(): "); - rc.append(input); - rc.append(" --> "); - SCADataTypeHelper dataHelper = new SCADataTypeHelper(scaTestUtil); - rc.append(dataHelper.doDataType()); - return rc.toString(); - } - - public void pingCallBack(String reply) { - callbackBuffer = reply; - } - - public String getCallbackBuffer() { - return callbackBuffer; - } - - public void clearCallbackBuffer() { - callbackBuffer = null; - } - -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java deleted file mode 100644 index 0ceb553727..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java +++ /dev/null @@ -1,64 +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.util; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Vector; -import java.util.GregorianCalendar; - -import org.apache.tuscany.sca.itest.SCATestToolCallbackService; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -/** - * SCA Test Utility Service - */ - -@Remotable -public interface SCATestUtilityService { - public String ping(String input); - - @Callback(SCATestToolCallbackService.class) - public void asyncping(); - - public int echo_int(int input); - - public short echo_short(short input); - - public long echo_long(long input); - - public float echo_float(float input); - - public double echo_double(double input); - - public boolean echo_boolean(boolean input); - - public char echo_char(char input); - - public String echo_String(String input); - - public BigDecimal echo_BigDecimal(BigDecimal input); - - public BigInteger echo_BigInteger(BigInteger input); - - public Vector echo_Vector(Vector input); - - public GregorianCalendar echo_GregorianCalendar(GregorianCalendar input); -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite-system.composite b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite-system.composite deleted file mode 100644 index 0b894bf701..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite-system.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.
--->
-<!--
- Tuscany system configuration.
-
- $Rev$ $Date$
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
- name="system">
-
- <include name="default-system"
- scdlResource="META-INF/tuscany/default-system.composite" />
- - <component name="httpserver"> - <t:implementation.system class="org.apache.tuscany.service.jetty.JettyServiceImpl" /> - <property name="httpPort">8085</property> - </component> -
-</composite>
diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite deleted file mode 100644 index 33f9f713c2..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite +++ /dev/null @@ -1,49 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance" - xmlns:v="http://www.osoa.org/xmlns/sca/values/1.0" xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" - name="bindingscomposite"> - - <dbsdo:import.sdo location="wsdl/testtool.wsdl" /> - <dbsdo:import.sdo location="wsdl/testutility.wsdl" /> - - <service name="SCATestToolWSService"> - <interface.wsdl interface="http://scatesttool.scabeta1fvt#wsdl.interface(SCATestToolService)" - wsdli:wsdlLocation="http://scatesttool.scabeta1fvt wsdl/testtool.wsdl" /> - <reference>SCATestToolWSServiceComponent</reference> - <binding.ws endpoint="http://scatesttool.scabeta1fvt#wsdl.endpoint(SCATestToolService/SCATestToolServiceSoapPort)" - location="wsdl/testtool.wsdl" uri="testtool" /> - </service> - - <component name="SCATestToolWSServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.SCATestToolServiceImpl" /> - <reference name="scaTestUtil">SCATestUtilityWSReference</reference> - </component> - - <reference name="SCATestUtilityWSReference"> - <interface.java interface="org.apache.tuscany.sca.util.SCATestUtilityService" /> - <binding.ws endpoint="http://scatestutil.scabeta1fvt#wsdl.endpoint(SCATestUtilityService/SCATestUtilityServiceSoapPort)" - location="wsdl/testutility.wsdl" /> - </reference> - - -</composite> - diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/wsdl/testtool.wsdl b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/wsdl/testtool.wsdl deleted file mode 100644 index 870af6ac2e..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/wsdl/testtool.wsdl +++ /dev/null @@ -1,272 +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.
---> -<wsdl:definitions targetNamespace="http://scatesttool.scabeta1fvt" xmlns:impl="http://scatesttool.scabeta1fvt"
- xmlns:tns="http://scatesttool.scabeta1fvt" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="testtool"> - <wsdl:types> - <schema targetNamespace="http://scatesttool.scabeta1fvt" xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <element name="doOneHopPingResponse"> - <complexType> - <sequence> - <element name="doOneHopPingReturn" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="doTwoHopPing"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="doTwoHopPingResponse"> - <complexType> - <sequence> - <element name="doTwoHopPingReturn" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="doDataTypeTest"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="doDataTypeTestResponse"> - <complexType> - <sequence> - <element name="doDataTypeTestReturn" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="getCallbackBuffer"> - <complexType> - <sequence /> - </complexType> - </element> - <element name="getCallbackBufferResponse"> - <complexType> - <sequence> - <element name="getCallbackBufferReturn" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="clearCallbackBuffer"> - <complexType> - <sequence /> - </complexType> - </element> - <element name="clearCallbackBufferResponse"> - <complexType> - <sequence /> - </complexType> - </element> - <element name="doOneHopPing"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - </schema> - </wsdl:types> - - <wsdl:message name="doOneHopPingResponse"> - <wsdl:part element="tns:doOneHopPingResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="doDataTypeTestResponse"> - <wsdl:part element="tns:doDataTypeTestResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="clearCallbackBufferResponse"> - <wsdl:part element="tns:clearCallbackBufferResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="getCallbackBufferRequest"> - <wsdl:part element="tns:getCallbackBuffer" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="doTwoHopPingRequest"> - <wsdl:part element="tns:doTwoHopPing" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="doTwoHopPingResponse"> - <wsdl:part element="tns:doTwoHopPingResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="getCallbackBufferResponse"> - <wsdl:part element="tns:getCallbackBufferResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="clearCallbackBufferRequest"> - <wsdl:part element="tns:clearCallbackBuffer" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="doDataTypeTestRequest"> - <wsdl:part element="tns:doDataTypeTest" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="doOneHopPingRequest"> - <wsdl:part element="tns:doOneHopPing" name="parameters" /> - - </wsdl:message> - - <wsdl:portType name="SCATestToolService"> - <wsdl:operation name="doOneHopPing"> - <wsdl:input message="tns:doOneHopPingRequest" name="doOneHopPingRequest" /> - - <wsdl:output message="tns:doOneHopPingResponse" name="doOneHopPingResponse" /> - - </wsdl:operation> - - <wsdl:operation name="doTwoHopPing"> - <wsdl:input message="tns:doTwoHopPingRequest" name="doTwoHopPingRequest" /> - - <wsdl:output message="tns:doTwoHopPingResponse" name="doTwoHopPingResponse" /> - - </wsdl:operation> - - <wsdl:operation name="doDataTypeTest"> - <wsdl:input message="tns:doDataTypeTestRequest" name="doDataTypeTestRequest" /> - - <wsdl:output message="tns:doDataTypeTestResponse" name="doDataTypeTestResponse" /> - - </wsdl:operation> - - <wsdl:operation name="getCallbackBuffer"> - <wsdl:input message="tns:getCallbackBufferRequest" name="getCallbackBufferRequest" /> - - <wsdl:output message="tns:getCallbackBufferResponse" name="getCallbackBufferResponse" /> - - </wsdl:operation> - - <wsdl:operation name="clearCallbackBuffer"> - <wsdl:input message="tns:clearCallbackBufferRequest" name="clearCallbackBufferRequest" /> - - <wsdl:output message="tns:clearCallbackBufferResponse" name="clearCallbackBufferResponse" /> - - </wsdl:operation> - - </wsdl:portType> - - <wsdl:binding name="SCATestToolServiceSoapBinding" type="tns:SCATestToolService"> - <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> --> - - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" /> - - <wsdl:operation name="doOneHopPing"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="doOneHopPingRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="doOneHopPingResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="doTwoHopPing"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="doTwoHopPingRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="doTwoHopPingResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="doDataTypeTest"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="doDataTypeTestRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="doDataTypeTestResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="getCallbackBuffer"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="getCallbackBufferRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="getCallbackBufferResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="clearCallbackBuffer"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="clearCallbackBufferRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="clearCallbackBufferResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="SCATestToolService"> - <wsdl:port binding="tns:SCATestToolServiceSoapBinding" name="SCATestToolServiceSoapPort"> - <wsdlsoap:address location="http://localhost:8085/services/SCATestToolWSService" /> - - </wsdl:port> - - </wsdl:service> - -</wsdl:definitions> diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/wsdl/testutility.wsdl b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/wsdl/testutility.wsdl deleted file mode 100644 index 32d9050a61..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/main/resources/wsdl/testutility.wsdl +++ /dev/null @@ -1,704 +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.
---> -<wsdl:definitions targetNamespace="http://scatestutil.scabeta1fvt" xmlns:impl="http://scatestutil.scabeta1fvt"
- xmlns:tns="http://scatestutil.scabeta1fvt" xmlns:tns2="http://xml.apache.org/xml-soap" xmlns:tns3="http://util.java"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="testutility"> - <wsdl:types> - - <schema elementFormDefault="qualified" targetNamespace="http://scatestutil.scabeta1fvt"
- xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns2="http://xml.apache.org/xml-soap"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <import namespace="http://xml.apache.org/xml-soap" /> - <element name="pingResponse"> - <complexType> - <sequence> - <element name="pingReturn" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="asyncping"> - <complexType> - <sequence /> - </complexType> - </element> - <element name="asyncpingResponse"> - <complexType> - <sequence /> - </complexType> - </element> - <element name="echo_int"> - <complexType> - <sequence> - <element name="input" type="xsd:int" /> - </sequence> - </complexType> - </element> - <element name="echo_intResponse"> - <complexType> - <sequence> - <element name="echo_intReturn" type="xsd:int" /> - </sequence> - </complexType> - </element> - <element name="echo_short"> - <complexType> - <sequence> - <element name="input" type="xsd:short" /> - </sequence> - </complexType> - </element> - <element name="echo_shortResponse"> - <complexType> - <sequence> - <element name="echo_shortReturn" type="xsd:short" /> - </sequence> - </complexType> - </element> - <element name="echo_long"> - <complexType> - <sequence> - <element name="input" type="xsd:long" /> - </sequence> - </complexType> - </element> - <element name="echo_longResponse"> - <complexType> - <sequence> - <element name="echo_longReturn" type="xsd:long" /> - </sequence> - </complexType> - </element> - <element name="echo_float"> - <complexType> - <sequence> - <element name="input" type="xsd:float" /> - </sequence> - </complexType> - </element> - <element name="echo_floatResponse"> - <complexType> - <sequence> - <element name="echo_floatReturn" type="xsd:float" /> - </sequence> - </complexType> - </element> - <element name="echo_double"> - <complexType> - <sequence> - <element name="input" type="xsd:double" /> - </sequence> - </complexType> - </element> - <element name="echo_doubleResponse"> - <complexType> - <sequence> - <element name="echo_doubleReturn" type="xsd:double" /> - </sequence> - </complexType> - </element> - <element name="echo_boolean"> - <complexType> - <sequence> - <element name="input" type="xsd:boolean" /> - </sequence> - </complexType> - </element> - <element name="echo_booleanResponse"> - <complexType> - <sequence> - <element name="echo_booleanReturn" type="xsd:boolean" /> - </sequence> - </complexType> - </element> - <element name="echo_char"> - <complexType> - <sequence> - <element name="input" type="tns2:char" /> - </sequence> - </complexType> - </element> - <element name="echo_charResponse"> - <complexType> - <sequence> - <element name="echo_charReturn" type="tns2:char" /> - </sequence> - </complexType> - </element> - <element name="echo_String"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="echo_StringResponse"> - <complexType> - <sequence> - <element name="echo_StringReturn" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="echo_BigDecimal"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:decimal" /> - </sequence> - </complexType> - </element> - <element name="echo_BigDecimalResponse"> - <complexType> - <sequence> - <element name="echo_BigDecimalReturn" minOccurs="0" type="xsd:decimal" /> - </sequence> - </complexType> - </element> - <element name="echo_BigInteger"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:integer" /> - </sequence> - </complexType> - </element> - <element name="echo_BigIntegerResponse"> - <complexType> - <sequence> - <element name="echo_BigIntegerReturn" minOccurs="0" type="xsd:integer" /> - </sequence> - </complexType> - </element> - <element name="echo_Vector"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="tns2:Vector" /> - </sequence> - </complexType> - </element> - <element name="echo_VectorResponse"> - <complexType> - <sequence> - <element name="echo_VectorReturn" minOccurs="0" type="tns2:Vector" /> - </sequence> - </complexType> - </element> - <element name="echo_GregorianCalendar"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:anyType" /> - </sequence> - </complexType> - </element> - <element name="echo_GregorianCalendarResponse"> - <complexType> - <sequence> - <element name="echo_GregorianCalendarReturn" minOccurs="0" type="xsd:anyType" /> - </sequence> - </complexType> - </element> - <element name="ping"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - </schema> - <schema targetNamespace="http://xml.apache.org/xml-soap" xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <simpleType name="char"> - <restriction base="xsd:string"> - <length value="1" /> - </restriction> - </simpleType> - <complexType name="Vector"> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="item" type="xsd:anyType" /> - </sequence> - </complexType> - </schema> - </wsdl:types> - - <wsdl:message name="echo_StringRequest"> - <wsdl:part element="tns:echo_String" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_shortResponse"> - <wsdl:part element="tns:echo_shortResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="asyncpingRequest"> - <wsdl:part element="tns:asyncping" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="asyncpingResponse"> - <wsdl:part element="tns:asyncpingResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_doubleResponse"> - <wsdl:part element="tns:echo_doubleResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_BigDecimalResponse"> - <wsdl:part element="tns:echo_BigDecimalResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_shortRequest"> - <wsdl:part element="tns:echo_short" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_BigIntegerRequest"> - <wsdl:part element="tns:echo_BigInteger" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_VectorRequest"> - <wsdl:part element="tns:echo_Vector" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="pingResponse"> - <wsdl:part element="tns:pingResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_charResponse"> - <wsdl:part element="tns:echo_charResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_VectorResponse"> - <wsdl:part element="tns:echo_VectorResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_longRequest"> - <wsdl:part element="tns:echo_long" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_doubleRequest"> - <wsdl:part element="tns:echo_double" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_BigDecimalRequest"> - <wsdl:part element="tns:echo_BigDecimal" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_GregorianCalendarRequest"> - <wsdl:part element="tns:echo_GregorianCalendar" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_floatResponse"> - <wsdl:part element="tns:echo_floatResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_booleanRequest"> - <wsdl:part element="tns:echo_boolean" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_booleanResponse"> - <wsdl:part element="tns:echo_booleanResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_StringResponse"> - <wsdl:part element="tns:echo_StringResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_floatRequest"> - <wsdl:part element="tns:echo_float" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_GregorianCalendarResponse"> - <wsdl:part element="tns:echo_GregorianCalendarResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_intResponse"> - <wsdl:part element="tns:echo_intResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_longResponse"> - <wsdl:part element="tns:echo_longResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_charRequest"> - <wsdl:part element="tns:echo_char" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="pingRequest"> - <wsdl:part element="tns:ping" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_intRequest"> - <wsdl:part element="tns:echo_int" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_BigIntegerResponse"> - <wsdl:part element="tns:echo_BigIntegerResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:portType name="SCATestUtilityService"> - <wsdl:operation name="ping"> - <wsdl:input message="tns:pingRequest" name="pingRequest" /> - - <wsdl:output message="tns:pingResponse" name="pingResponse" /> - - </wsdl:operation> - - <wsdl:operation name="asyncping"> - <wsdl:input message="tns:asyncpingRequest" name="asyncpingRequest" /> - - <wsdl:output message="tns:asyncpingResponse" name="asyncpingResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_int"> - <wsdl:input message="tns:echo_intRequest" name="echo_intRequest" /> - - <wsdl:output message="tns:echo_intResponse" name="echo_intResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_short"> - <wsdl:input message="tns:echo_shortRequest" name="echo_shortRequest" /> - - <wsdl:output message="tns:echo_shortResponse" name="echo_shortResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_long"> - <wsdl:input message="tns:echo_longRequest" name="echo_longRequest" /> - - <wsdl:output message="tns:echo_longResponse" name="echo_longResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_float"> - <wsdl:input message="tns:echo_floatRequest" name="echo_floatRequest" /> - - <wsdl:output message="tns:echo_floatResponse" name="echo_floatResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_double"> - <wsdl:input message="tns:echo_doubleRequest" name="echo_doubleRequest" /> - - <wsdl:output message="tns:echo_doubleResponse" name="echo_doubleResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_boolean"> - <wsdl:input message="tns:echo_booleanRequest" name="echo_booleanRequest" /> - - <wsdl:output message="tns:echo_booleanResponse" name="echo_booleanResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_char"> - <wsdl:input message="tns:echo_charRequest" name="echo_charRequest" /> - - <wsdl:output message="tns:echo_charResponse" name="echo_charResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_String"> - <wsdl:input message="tns:echo_StringRequest" name="echo_StringRequest" /> - - <wsdl:output message="tns:echo_StringResponse" name="echo_StringResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_BigDecimal"> - <wsdl:input message="tns:echo_BigDecimalRequest" name="echo_BigDecimalRequest" /> - - <wsdl:output message="tns:echo_BigDecimalResponse" name="echo_BigDecimalResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_BigInteger"> - <wsdl:input message="tns:echo_BigIntegerRequest" name="echo_BigIntegerRequest" /> - - <wsdl:output message="tns:echo_BigIntegerResponse" name="echo_BigIntegerResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_Vector"> - <wsdl:input message="tns:echo_VectorRequest" name="echo_VectorRequest" /> - - <wsdl:output message="tns:echo_VectorResponse" name="echo_VectorResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_GregorianCalendar"> - <wsdl:input message="tns:echo_GregorianCalendarRequest" name="echo_GregorianCalendarRequest" /> - - <wsdl:output message="tns:echo_GregorianCalendarResponse" name="echo_GregorianCalendarResponse" /> - - </wsdl:operation> - - </wsdl:portType> - - <wsdl:binding name="SCATestUtilityServiceSoapBinding" type="tns:SCATestUtilityService"> - <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> --> - - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" /> - - <wsdl:operation name="ping"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="pingRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="pingResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="asyncping"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="asyncpingRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="asyncpingResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_int"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_intRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_intResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_short"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_shortRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_shortResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_long"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_longRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_longResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_float"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_floatRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_floatResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_double"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_doubleRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_doubleResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_boolean"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_booleanRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_booleanResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_char"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_charRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_charResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_String"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_StringRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_StringResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_BigDecimal"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_BigDecimalRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_BigDecimalResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_BigInteger"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_BigIntegerRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_BigIntegerResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_Vector"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_VectorRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_VectorResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_GregorianCalendar"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_GregorianCalendarRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_GregorianCalendarResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="SCATestUtilityService"> - <wsdl:port binding="tns:SCATestUtilityServiceSoapBinding" name="SCATestUtilityServiceSoapPort"> - <wsdlsoap:address location="http://localhost:8081/services/SCATestUtilityWSService" /> - - </wsdl:port> - - </wsdl:service> - -</wsdl:definitions> diff --git a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java b/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java deleted file mode 100644 index 727eb2332f..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.itest; - - -import java.io.IOException; -import java.net.Socket; - -import junit.framework.TestCase; - -import org.apache.tuscany.api.SCARuntime; - -public class SCATestToolServerTestCase extends TestCase { - - @Override - protected void setUp() throws Exception { - SCARuntime.start("bindingscomposite-system.composite", "bindingscomposite.composite"); - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - @Override - protected void tearDown() throws Exception { - SCARuntime.stop(); - } - -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/pom.xml b/branches/sca-java-0.91/itest/bindings/bindingsutility/pom.xml deleted file mode 100644 index 24601d5c4c..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsutility/pom.xml +++ /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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.apache.tuscany.testing</groupId> - <artifactId>sca-itest</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.tuscany.testing.bindingstest</groupId> - <artifactId>tuscany-itest-bindings-bindingsutility</artifactId> - <packaging>jar</packaging> - <name>SCA FVT Bindings Test Tool Utility Composite</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca.services.databinding</groupId> - <artifactId>databinding-sdo</artifactId> - <version>1.0-incubating-beta1</version> - </dependency> - - <dependency> - <groupId>commonj</groupId> - <artifactId>sdo-api-r2.1</artifactId> - <version>1.0-incubating-beta1</version> - <scope>runtime</scope> - </dependency> - - <!-- SDO's XXXHelper.INSTANCE pattern requires the implementation --> - <dependency> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-impl</artifactId> - <version>1.0-incubating-beta1</version> - <scope>runtime</scope> - </dependency> - - </dependencies> - -</project> diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java deleted file mode 100644 index 664fb06930..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.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 org.apache.tuscany.sca.itest; - -/** - * SCA Test Tool Callback Service - */ - -public interface SCATestToolCallbackService { - - public void pingCallBack(String reply); -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.java b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.java deleted file mode 100644 index cd967e275a..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.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.sca.util; - - -import java.io.IOException; - -import org.apache.tuscany.api.SCARuntime; - -public class SCATestUtilityServer { - - /** - * @param args - */ - public static void main(String[] args) { - - SCARuntime.start("bindingsutility-system.composite", "bindingsutility.composite"); - - try { - System.out.println("SCATestUtility server started"); - System.in.read(); - } catch (IOException e) { - e.printStackTrace(); - } - - SCARuntime.stop(); - System.out.println("SCATestUtility server stopped"); - } - -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java deleted file mode 100644 index 0ceb553727..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java +++ /dev/null @@ -1,64 +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.util; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Vector; -import java.util.GregorianCalendar; - -import org.apache.tuscany.sca.itest.SCATestToolCallbackService; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -/** - * SCA Test Utility Service - */ - -@Remotable -public interface SCATestUtilityService { - public String ping(String input); - - @Callback(SCATestToolCallbackService.class) - public void asyncping(); - - public int echo_int(int input); - - public short echo_short(short input); - - public long echo_long(long input); - - public float echo_float(float input); - - public double echo_double(double input); - - public boolean echo_boolean(boolean input); - - public char echo_char(char input); - - public String echo_String(String input); - - public BigDecimal echo_BigDecimal(BigDecimal input); - - public BigInteger echo_BigInteger(BigInteger input); - - public Vector echo_Vector(Vector input); - - public GregorianCalendar echo_GregorianCalendar(GregorianCalendar input); -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServiceImpl.java b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServiceImpl.java deleted file mode 100644 index e752e4d6e6..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServiceImpl.java +++ /dev/null @@ -1,157 +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.util; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.InetAddress; -import java.util.GregorianCalendar; -import java.util.Properties; -import java.util.Vector; - -import org.osoa.sca.annotations.Service; - -@Service(SCATestUtilityService.class) -public class SCATestUtilityServiceImpl implements SCATestUtilityService { - - // private SCATestToolCallbackService utilCallBack; - - /** - * The setter used by the runtime to set the callback reference - * - * @param myServiceCallback - */ - - // @Callback - // public void setCallback(SCATestToolCallbackService utilCallBack) { - // this.utilCallBack = utilCallBack; - // } - public String ping(String input) { - System.out.println("Invoking SCATestUtilityServiceImpl.ping()"); - StringBuffer rc = new StringBuffer(); - - try { - // get a systems property object - Properties sp = System.getProperties(); - rc.append("Pinged SCA Test Utility Service on: "); - // get operating system info - rc.append(sp.getProperty("os.name")); - rc.append(", " + sp.getProperty("os.version")); - // get network info - rc.append(" - " + InetAddress.getLocalHost().toString()); - } catch (Exception e) { - System.out.println("\nException preparing system infomation for ping service reply\n" + e.toString()); - e.printStackTrace(); - } - return rc.toString(); - } - - public void asyncping() { - - StringBuffer rc = new StringBuffer(); - - try { - // get a systems property object - Properties sp = System.getProperties(); - rc.append("Pinged SCA Test Utility Service on: "); - // get operating system info - rc.append(sp.getProperty("os.name")); - rc.append(", " + sp.getProperty("os.version")); - // get network info - rc.append(" - " + InetAddress.getLocalHost().toString()); - } catch (Exception e) { - System.out.println("\nException preparing system infomation for ping service reply\n" + e.toString()); - e.printStackTrace(); - } - // utilCallBack.pingCallBack(rc.toString()); - } - - public int echo_int(int input) { - int local; - local = input; - return local; - } - - public short echo_short(short input) { - short local; - local = input; - return local; - } - - public long echo_long(long input) { - long local; - local = input; - return local; - } - - public float echo_float(float input) { - float local; - local = input; - return local; - } - - public double echo_double(double input) { - double local; - local = input; - return local; - } - - public boolean echo_boolean(boolean input) { - boolean local; - local = input; - return local; - } - - public char echo_char(char input) { - char local; - local = input; - return local; - } - - public String echo_String(String input) { - String local; - local = input; - return local; - } - - public BigDecimal echo_BigDecimal(BigDecimal input) { - BigDecimal local; - local = input; - return local; - } - - public BigInteger echo_BigInteger(BigInteger input) { - BigInteger local; - local = input; - return local; - } - - public Vector echo_Vector(Vector input) { - Vector local; - local = input; - return local; - } - - public GregorianCalendar echo_GregorianCalendar(GregorianCalendar input) { - GregorianCalendar local; - local = input; - return local; - } - -} diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/bindingsutility-system.composite b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/bindingsutility-system.composite deleted file mode 100644 index 7126b78572..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/bindingsutility-system.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.
--->
-<!--
- Tuscany system configuration.
-
- $Rev$ $Date$
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
- name="system">
-
- <include name="default-system"
- scdlResource="META-INF/tuscany/default-system.composite" />
- - <component name="httpserver"> - <t:implementation.system class="org.apache.tuscany.service.jetty.JettyServiceImpl" /> - <property name="httpPort">8081</property> - </component> -
-</composite>
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/bindingsutility.composite b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/bindingsutility.composite deleted file mode 100644 index 6771b72442..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/bindingsutility.composite +++ /dev/null @@ -1,39 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- xmlns:v="http://www.osoa.org/xmlns/sca/values/1.0" - xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
- name="bindingsutility">
-
- <dbsdo:import.sdo location="wsdl/testutility.wsdl" />
-
- <service name="SCATestUtilityWSService">
- <interface.wsdl interface="http://scatestutil.scabeta1fvt#wsdl.interface(SCATestUtilityService)"
- wsdli:wsdlLocation="http://scatestutil.scabeta1fvt wsdl/testutility.wsdl" />
- <reference>SCATestUtilityWSServiceComponent</reference>
- <binding.ws endpoint="http://scatestutil.scabeta1fvt#wsdl.endpoint(SCATestUtilityService/SCATestUtilityServiceSoapPort)"
- location="wsdl/testutility.wsdl" uri="testutil" />
- </service>
-
- <component name="SCATestUtilityWSServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.util.SCATestUtilityServiceImpl" />
- </component>
-</composite>
-
diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/wsdl/testutility.wsdl b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/wsdl/testutility.wsdl deleted file mode 100644 index 32d9050a61..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/main/resources/wsdl/testutility.wsdl +++ /dev/null @@ -1,704 +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.
---> -<wsdl:definitions targetNamespace="http://scatestutil.scabeta1fvt" xmlns:impl="http://scatestutil.scabeta1fvt"
- xmlns:tns="http://scatestutil.scabeta1fvt" xmlns:tns2="http://xml.apache.org/xml-soap" xmlns:tns3="http://util.java"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="testutility"> - <wsdl:types> - - <schema elementFormDefault="qualified" targetNamespace="http://scatestutil.scabeta1fvt"
- xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns2="http://xml.apache.org/xml-soap"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <import namespace="http://xml.apache.org/xml-soap" /> - <element name="pingResponse"> - <complexType> - <sequence> - <element name="pingReturn" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="asyncping"> - <complexType> - <sequence /> - </complexType> - </element> - <element name="asyncpingResponse"> - <complexType> - <sequence /> - </complexType> - </element> - <element name="echo_int"> - <complexType> - <sequence> - <element name="input" type="xsd:int" /> - </sequence> - </complexType> - </element> - <element name="echo_intResponse"> - <complexType> - <sequence> - <element name="echo_intReturn" type="xsd:int" /> - </sequence> - </complexType> - </element> - <element name="echo_short"> - <complexType> - <sequence> - <element name="input" type="xsd:short" /> - </sequence> - </complexType> - </element> - <element name="echo_shortResponse"> - <complexType> - <sequence> - <element name="echo_shortReturn" type="xsd:short" /> - </sequence> - </complexType> - </element> - <element name="echo_long"> - <complexType> - <sequence> - <element name="input" type="xsd:long" /> - </sequence> - </complexType> - </element> - <element name="echo_longResponse"> - <complexType> - <sequence> - <element name="echo_longReturn" type="xsd:long" /> - </sequence> - </complexType> - </element> - <element name="echo_float"> - <complexType> - <sequence> - <element name="input" type="xsd:float" /> - </sequence> - </complexType> - </element> - <element name="echo_floatResponse"> - <complexType> - <sequence> - <element name="echo_floatReturn" type="xsd:float" /> - </sequence> - </complexType> - </element> - <element name="echo_double"> - <complexType> - <sequence> - <element name="input" type="xsd:double" /> - </sequence> - </complexType> - </element> - <element name="echo_doubleResponse"> - <complexType> - <sequence> - <element name="echo_doubleReturn" type="xsd:double" /> - </sequence> - </complexType> - </element> - <element name="echo_boolean"> - <complexType> - <sequence> - <element name="input" type="xsd:boolean" /> - </sequence> - </complexType> - </element> - <element name="echo_booleanResponse"> - <complexType> - <sequence> - <element name="echo_booleanReturn" type="xsd:boolean" /> - </sequence> - </complexType> - </element> - <element name="echo_char"> - <complexType> - <sequence> - <element name="input" type="tns2:char" /> - </sequence> - </complexType> - </element> - <element name="echo_charResponse"> - <complexType> - <sequence> - <element name="echo_charReturn" type="tns2:char" /> - </sequence> - </complexType> - </element> - <element name="echo_String"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="echo_StringResponse"> - <complexType> - <sequence> - <element name="echo_StringReturn" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - <element name="echo_BigDecimal"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:decimal" /> - </sequence> - </complexType> - </element> - <element name="echo_BigDecimalResponse"> - <complexType> - <sequence> - <element name="echo_BigDecimalReturn" minOccurs="0" type="xsd:decimal" /> - </sequence> - </complexType> - </element> - <element name="echo_BigInteger"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:integer" /> - </sequence> - </complexType> - </element> - <element name="echo_BigIntegerResponse"> - <complexType> - <sequence> - <element name="echo_BigIntegerReturn" minOccurs="0" type="xsd:integer" /> - </sequence> - </complexType> - </element> - <element name="echo_Vector"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="tns2:Vector" /> - </sequence> - </complexType> - </element> - <element name="echo_VectorResponse"> - <complexType> - <sequence> - <element name="echo_VectorReturn" minOccurs="0" type="tns2:Vector" /> - </sequence> - </complexType> - </element> - <element name="echo_GregorianCalendar"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:anyType" /> - </sequence> - </complexType> - </element> - <element name="echo_GregorianCalendarResponse"> - <complexType> - <sequence> - <element name="echo_GregorianCalendarReturn" minOccurs="0" type="xsd:anyType" /> - </sequence> - </complexType> - </element> - <element name="ping"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - </element> - </schema> - <schema targetNamespace="http://xml.apache.org/xml-soap" xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <simpleType name="char"> - <restriction base="xsd:string"> - <length value="1" /> - </restriction> - </simpleType> - <complexType name="Vector"> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="item" type="xsd:anyType" /> - </sequence> - </complexType> - </schema> - </wsdl:types> - - <wsdl:message name="echo_StringRequest"> - <wsdl:part element="tns:echo_String" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_shortResponse"> - <wsdl:part element="tns:echo_shortResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="asyncpingRequest"> - <wsdl:part element="tns:asyncping" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="asyncpingResponse"> - <wsdl:part element="tns:asyncpingResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_doubleResponse"> - <wsdl:part element="tns:echo_doubleResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_BigDecimalResponse"> - <wsdl:part element="tns:echo_BigDecimalResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_shortRequest"> - <wsdl:part element="tns:echo_short" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_BigIntegerRequest"> - <wsdl:part element="tns:echo_BigInteger" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_VectorRequest"> - <wsdl:part element="tns:echo_Vector" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="pingResponse"> - <wsdl:part element="tns:pingResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_charResponse"> - <wsdl:part element="tns:echo_charResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_VectorResponse"> - <wsdl:part element="tns:echo_VectorResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_longRequest"> - <wsdl:part element="tns:echo_long" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_doubleRequest"> - <wsdl:part element="tns:echo_double" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_BigDecimalRequest"> - <wsdl:part element="tns:echo_BigDecimal" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_GregorianCalendarRequest"> - <wsdl:part element="tns:echo_GregorianCalendar" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_floatResponse"> - <wsdl:part element="tns:echo_floatResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_booleanRequest"> - <wsdl:part element="tns:echo_boolean" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_booleanResponse"> - <wsdl:part element="tns:echo_booleanResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_StringResponse"> - <wsdl:part element="tns:echo_StringResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_floatRequest"> - <wsdl:part element="tns:echo_float" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_GregorianCalendarResponse"> - <wsdl:part element="tns:echo_GregorianCalendarResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_intResponse"> - <wsdl:part element="tns:echo_intResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_longResponse"> - <wsdl:part element="tns:echo_longResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_charRequest"> - <wsdl:part element="tns:echo_char" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="pingRequest"> - <wsdl:part element="tns:ping" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_intRequest"> - <wsdl:part element="tns:echo_int" name="parameters" /> - - </wsdl:message> - - <wsdl:message name="echo_BigIntegerResponse"> - <wsdl:part element="tns:echo_BigIntegerResponse" name="parameters" /> - - </wsdl:message> - - <wsdl:portType name="SCATestUtilityService"> - <wsdl:operation name="ping"> - <wsdl:input message="tns:pingRequest" name="pingRequest" /> - - <wsdl:output message="tns:pingResponse" name="pingResponse" /> - - </wsdl:operation> - - <wsdl:operation name="asyncping"> - <wsdl:input message="tns:asyncpingRequest" name="asyncpingRequest" /> - - <wsdl:output message="tns:asyncpingResponse" name="asyncpingResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_int"> - <wsdl:input message="tns:echo_intRequest" name="echo_intRequest" /> - - <wsdl:output message="tns:echo_intResponse" name="echo_intResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_short"> - <wsdl:input message="tns:echo_shortRequest" name="echo_shortRequest" /> - - <wsdl:output message="tns:echo_shortResponse" name="echo_shortResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_long"> - <wsdl:input message="tns:echo_longRequest" name="echo_longRequest" /> - - <wsdl:output message="tns:echo_longResponse" name="echo_longResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_float"> - <wsdl:input message="tns:echo_floatRequest" name="echo_floatRequest" /> - - <wsdl:output message="tns:echo_floatResponse" name="echo_floatResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_double"> - <wsdl:input message="tns:echo_doubleRequest" name="echo_doubleRequest" /> - - <wsdl:output message="tns:echo_doubleResponse" name="echo_doubleResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_boolean"> - <wsdl:input message="tns:echo_booleanRequest" name="echo_booleanRequest" /> - - <wsdl:output message="tns:echo_booleanResponse" name="echo_booleanResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_char"> - <wsdl:input message="tns:echo_charRequest" name="echo_charRequest" /> - - <wsdl:output message="tns:echo_charResponse" name="echo_charResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_String"> - <wsdl:input message="tns:echo_StringRequest" name="echo_StringRequest" /> - - <wsdl:output message="tns:echo_StringResponse" name="echo_StringResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_BigDecimal"> - <wsdl:input message="tns:echo_BigDecimalRequest" name="echo_BigDecimalRequest" /> - - <wsdl:output message="tns:echo_BigDecimalResponse" name="echo_BigDecimalResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_BigInteger"> - <wsdl:input message="tns:echo_BigIntegerRequest" name="echo_BigIntegerRequest" /> - - <wsdl:output message="tns:echo_BigIntegerResponse" name="echo_BigIntegerResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_Vector"> - <wsdl:input message="tns:echo_VectorRequest" name="echo_VectorRequest" /> - - <wsdl:output message="tns:echo_VectorResponse" name="echo_VectorResponse" /> - - </wsdl:operation> - - <wsdl:operation name="echo_GregorianCalendar"> - <wsdl:input message="tns:echo_GregorianCalendarRequest" name="echo_GregorianCalendarRequest" /> - - <wsdl:output message="tns:echo_GregorianCalendarResponse" name="echo_GregorianCalendarResponse" /> - - </wsdl:operation> - - </wsdl:portType> - - <wsdl:binding name="SCATestUtilityServiceSoapBinding" type="tns:SCATestUtilityService"> - <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> --> - - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" /> - - <wsdl:operation name="ping"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="pingRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="pingResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="asyncping"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="asyncpingRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="asyncpingResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_int"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_intRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_intResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_short"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_shortRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_shortResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_long"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_longRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_longResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_float"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_floatRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_floatResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_double"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_doubleRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_doubleResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_boolean"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_booleanRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_booleanResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_char"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_charRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_charResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_String"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_StringRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_StringResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_BigDecimal"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_BigDecimalRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_BigDecimalResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_BigInteger"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_BigIntegerRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_BigIntegerResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_Vector"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_VectorRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_VectorResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - <wsdl:operation name="echo_GregorianCalendar"> - <wsdlsoap:operation soapAction="" /> - - <wsdl:input name="echo_GregorianCalendarRequest"> - <wsdlsoap:body use="literal" /> - - </wsdl:input> - - <wsdl:output name="echo_GregorianCalendarResponse"> - <wsdlsoap:body use="literal" /> - - </wsdl:output> - - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="SCATestUtilityService"> - <wsdl:port binding="tns:SCATestUtilityServiceSoapBinding" name="SCATestUtilityServiceSoapPort"> - <wsdlsoap:address location="http://localhost:8081/services/SCATestUtilityWSService" /> - - </wsdl:port> - - </wsdl:service> - -</wsdl:definitions> diff --git a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java b/branches/sca-java-0.91/itest/bindings/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java deleted file mode 100644 index 66246fc006..0000000000 --- a/branches/sca-java-0.91/itest/bindings/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.util; - - -import java.io.IOException; -import java.net.Socket; - -import org.apache.tuscany.api.SCARuntime; - -import junit.framework.TestCase; - -public class SCATestUtilityServerTestCase extends TestCase { - - @Override - protected void setUp() throws Exception { - SCARuntime.start("bindingsutility-system.composite", "bindingsutility.composite"); - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8081); - } - - @Override - protected void tearDown() throws Exception { - SCARuntime.stop(); - } - -} diff --git a/branches/sca-java-0.91/itest/bindings/pom.xml b/branches/sca-java-0.91/itest/bindings/pom.xml deleted file mode 100644 index 4c332708f3..0000000000 --- a/branches/sca-java-0.91/itest/bindings/pom.xml +++ /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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.apache.tuscany.testing</groupId> - <artifactId>sca-itest</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.tuscany.testing</groupId> - <version>${testing.version}</version> - <artifactId>bindingstest</artifactId> - <packaging>pom</packaging> - <name>SCA FVT Test Tool Suite</name> - - - <modules> - <module>bindingscomposite</module> - <module>bindingsutility</module> - <module>bindingsclient</module> - </modules> -</project> diff --git a/branches/sca-java-0.91/itest/callback-api/pom.xml b/branches/sca-java-0.91/itest/callback-api/pom.xml deleted file mode 100644 index 1c329be97c..0000000000 --- a/branches/sca-java-0.91/itest/callback-api/pom.xml +++ /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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-itest-callback-api</artifactId> - <name>Apache Tuscany SCA Callback API Integration Tests</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</project> diff --git a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java deleted file mode 100644 index 56e7ba7b3f..0000000000 --- a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -/** - * @author lamodeo - */ -public interface CallBackApiCallBack { - - public void callBackMessage(String aString); - - public void callBackIncrement(String aString); - -} diff --git a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java deleted file mode 100644 index 3e7c840e15..0000000000 --- a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.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 org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface CallBackApiClient { - - public void run(); - -} diff --git a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java deleted file mode 100644 index 1c32783271..0000000000 --- a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import junit.framework.Assert; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(CallBackApiClient.class) -public class CallBackApiClientImpl implements CallBackApiClient, CallBackApiCallBack { - - @Reference - protected CallBackApiService aCallBackService; - - private static String returnMessage = null; - private static int callBackCount = 0; - private static Object monitor = new Object(); - - public void run() { - - // This tests basic callback patterns. - - // Test3a is the basic callback where the target calls back prior to - // returning to the client. - test3a(); - - // Test3b is where the target does not call back to the client. - test3b(); - - // Test3c is where the target calls back multiple times to the client. - test3c(); - - return; - } - - private void test3a() { - aCallBackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we cant get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackApiITest - test3a", "Who's There", this.getReturnMessage()); - - } - - private void test3b() { - aCallBackService.noCallBack("No Reply Desired"); - Assert.assertEquals("CallBackApiITest - test3b", 1, 1); - return; - } - - private void test3c() { - aCallBackService.multiCallBack("Call me back 3 times"); - int count = 0; - - // - // If we cant get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (this.getCallBackCount() < 3 && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackApiITest - test3c", 3, this.getCallBackCount()); - return; - } - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public int getCallBackCount() { - return callBackCount; - } - - public void incrementCallBackCount() { - callBackCount++; - } - - public void callBackMessage(String aString) { - System.out.println("Entering callback callBackMessage: " + aString); - synchronized (monitor) { - this.setReturnMessage(aString); - monitor.notify(); - } - } - - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - synchronized (monitor) { - this.incrementCallBackCount(); - monitor.notify(); - } - } - -} diff --git a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java deleted file mode 100644 index 51d9f24723..0000000000 --- a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -@Remotable -@Callback(CallBackApiCallBack.class) -/** - * - */ -public interface CallBackApiService { - - public void knockKnock(String aString); - - public void noCallBack(String aString); - - public void multiCallBack(String aString); - -} diff --git a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java deleted file mode 100644 index 727047e42e..0000000000 --- a/branches/sca-java-0.91/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; - -@Service(CallBackApiService.class) -public class CallBackApiServiceImpl implements CallBackApiService { - - @Context - protected ComponentContext componentContext; - - private CallBackApiCallBack callback; - - public void knockKnock(String aString) { - - System.out.println("CallBackApiServiceImpl message received: " + aString); - callback = this.getCallBackInterface(); - callback.callBackMessage("Who's There"); - System.out.println("CallBackApiServiceImpl response sent"); - return; - - } - - public void multiCallBack(String aString) { - - callback = this.getCallBackInterface(); - - System.out.println("CallBackApiServiceImpl message received: " + aString); - callback.callBackIncrement("Who's There 1"); - System.out.println("CallBackApiServiceImpl response sent"); - callback.callBackIncrement("Who's There 2"); - System.out.println("CallBackApiServiceImpl response sent"); - callback.callBackIncrement("Who's There 3"); - System.out.println("CallBackApiServiceImpl response sent"); - return; - - } - - public void noCallBack(String aString) { - - System.out.println("CallBackApiServiceImpl message received: " + aString); - - return; - - } - - private CallBackApiCallBack getCallBackInterface() { - System.out.println("CallBackApiServiceImpl getting request context"); - RequestContext rc = componentContext.getRequestContext(); - System.out.println("CallBackApiServiceImpl getting callback from request context"); - callback = (CallBackApiCallBack) ((ServiceReference) rc.getServiceReference()).getCallback(); - System.out.println("CallBackApiServiceImpl returning callback"); - return callback; - - } - -} diff --git a/branches/sca-java-0.91/itest/callback-api/src/main/resources/CallBackApiTest.composite b/branches/sca-java-0.91/itest/callback-api/src/main/resources/CallBackApiTest.composite deleted file mode 100644 index 946c4862ee..0000000000 --- a/branches/sca-java-0.91/itest/callback-api/src/main/resources/CallBackApiTest.composite +++ /dev/null @@ -1,33 +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://callback" - name="CallBackApiTest"> - - <component name="CallBackApiClient"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackApiClientImpl"/> - <reference name="aCallBackService" target="CallBackApiService"/> - </component> - - <component name="CallBackApiService"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackApiServiceImpl"/> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java b/branches/sca-java-0.91/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java deleted file mode 100644 index 892c425e48..0000000000 --- a/branches/sca-java-0.91/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class CallBackApiTest extends TestCase { - - private SCADomain domain; - private CallBackApiClient aCallBackClient; - - public void testCallBackBasic() { - aCallBackClient.run(); - } - - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackApiTest.composite"); - - aCallBackClient = - domain.getService(CallBackApiClient.class, "CallBackApiClient"); - } - - protected void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/branches/sca-java-0.91/itest/callback-basic/pom.xml b/branches/sca-java-0.91/itest/callback-basic/pom.xml deleted file mode 100644 index cc72f5bdb1..0000000000 --- a/branches/sca-java-0.91/itest/callback-basic/pom.xml +++ /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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-itest-callback-basic</artifactId> - <name>Apache Tuscany SCA Callback Basic Integration Tests</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</project> diff --git a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java deleted file mode 100644 index ab1f39c057..0000000000 --- a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -/** - * @author lamodeo - */ -public interface CallBackBasicCallBack { - - public void callBackMessage(String aString); - - public void callBackIncrement(String aString); - -} diff --git a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java deleted file mode 100644 index 9f4019f28c..0000000000 --- a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.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 org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface CallBackBasicClient { - - public void run(); - -} diff --git a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java deleted file mode 100644 index 1bb2dc22b7..0000000000 --- a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import junit.framework.Assert; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(CallBackBasicClient.class) -public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBasicCallBack { - - @Reference - protected CallBackBasicService aCallBackService; - private static String returnMessage = null; - private static int callBackCount = 0; - private static Object monitor = new Object(); - - public void run() { - - // This tests basic callback patterns. - - // Test1 is the basic callback where the target calls back prior to - // returning to the client. - test1a(); - - // Test2 is where the target does not call back to the client. - test1b(); - - // Test3 is where the target calls back multiple times to the client. - test1c(); - - return; - } - - private void test1a() { - aCallBackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we cant get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test1a", "Who's There", this.getReturnMessage()); - - } - - private void test1b() { - aCallBackService.noCallBack("No Reply Desired"); - Assert.assertEquals("CallBackBasicITest - test1b", 1, 1); - - return; - } - - private void test1c() { - aCallBackService.multiCallBack("Call me back 3 times"); - int count = 0; - - // - // If we cant get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (this.getCallBackCount() < 3 && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test1c", 3, this.getCallBackCount()); - return; - } - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public int getCallBackCount() { - return callBackCount; - } - - public void incrementCallBackCount() { - callBackCount++; - } - - public void callBackMessage(String aString) { - System.out.println("Entering callback callBackMessage: " + aString); - synchronized (monitor) { - this.setReturnMessage(aString); - monitor.notify(); - } - } - - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - synchronized (monitor) { - this.incrementCallBackCount(); - monitor.notify(); - } - } - -} diff --git a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java deleted file mode 100644 index bd41fa7037..0000000000 --- a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -@Remotable -@Callback(CallBackBasicCallBack.class) -/** - * - */ -public interface CallBackBasicService { - - public void knockKnock(String aString); - - public void noCallBack(String aString); - - public void multiCallBack(String aString); - -} diff --git a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java deleted file mode 100644 index 4ca2dc9af9..0000000000 --- a/branches/sca-java-0.91/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; - -@Service(CallBackBasicService.class) -public class CallBackBasicServiceImpl implements CallBackBasicService { - - @Callback - protected CallBackBasicCallBack callback; - - public void knockKnock(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - callback.callBackMessage("Who's There"); - System.out.println("CallBackBasicServiceImpl response sent"); - return; - - } - - public void multiCallBack(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - callback.callBackIncrement("Who's There 1"); - System.out.println("CallBackBasicServiceImpl response sent"); - callback.callBackIncrement("Who's There 2"); - System.out.println("CallBackBasicServiceImpl response sent"); - callback.callBackIncrement("Who's There 3"); - System.out.println("CallBackBasicServiceImpl response sent"); - return; - - } - - public void noCallBack(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - // System.out.println("CallBackBasicServiceImpl No response desired"); - return; - - } -} diff --git a/branches/sca-java-0.91/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/branches/sca-java-0.91/itest/callback-basic/src/main/resources/CallBackBasicTest.composite deleted file mode 100644 index c506956088..0000000000 --- a/branches/sca-java-0.91/itest/callback-basic/src/main/resources/CallBackBasicTest.composite +++ /dev/null @@ -1,33 +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://callback" - name="CallBackBasicTest"> - - <component name="CallBackBasicClient"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/> - <reference name="aCallBackService" target="CallBackBasicService"/> - </component> - - <component name="CallBackBasicService"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/branches/sca-java-0.91/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java deleted file mode 100644 index c01d3d3e2c..0000000000 --- a/branches/sca-java-0.91/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.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.sca.test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class CallBackBasicTestCase extends TestCase { - - private SCADomain domain; - private CallBackBasicClient aCallBackClient; - - public void testCallBackBasic() { - aCallBackClient.run(); - } - - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackBasicTest.composite"); - aCallBackClient = domain.getService(CallBackBasicClient.class, "CallBackBasicClient"); - } - - @Override - protected void tearDown() throws Exception { - domain.close(); - } - - -} diff --git a/branches/sca-java-0.91/itest/callback-complex-type/pom.xml b/branches/sca-java-0.91/itest/callback-complex-type/pom.xml deleted file mode 100644 index d99cf8b85f..0000000000 --- a/branches/sca-java-0.91/itest/callback-complex-type/pom.xml +++ /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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-itest-callback-complex-type</artifactId> - <name>Apache Tuscany SCA Callback Complex Type Integration Tests</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</project> diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java deleted file mode 100644 index 70e22f4ef2..0000000000 --- a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -/** - * @author lamodeo - */ -public interface CallBackCTypeCallBack { - - public void callBackMessage(String aString); - - public void callBackIncrement(String aString); - -} diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java deleted file mode 100644 index 739983c277..0000000000 --- a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.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 org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface CallBackCTypeClient { - - public void run(); - -} diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java deleted file mode 100644 index 188b1f2c01..0000000000 --- a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import junit.framework.Assert; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(CallBackCTypeClient.class) -public class CallBackCTypeClientImpl implements CallBackCTypeClient, CallBackCTypeCallBack { - - @Reference - protected CallBackCTypeService aCallBackService; - private static String returnMessage = null; - private static int callBackCount = 0; - private static Object monitor = new Object(); - - public CallBackCTypeClientImpl() { - } - - public void run() { - - // This test is the same as the Basic Callback except it uses a - // componentType side file. - // This test currently fails because the integration test environment - // does not properly copy - // the componentType files to the target folder. This is documented in - // Tuscany-967. - - // Test12a is the basic callback where the target calls back prior to - // returning to the client. - test12a(); - - // Test12b is where the target does not call back to the client. - test12b(); - - // Test12c is where the target calls back multiple times to the client. - test12c(); - - return; - } - - private void test12a() { - aCallBackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we cant get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test12a -", "Who's There", this.getReturnMessage()); - - } - - private void test12b() { - aCallBackService.noCallBack("No Reply Desired"); - Assert.assertEquals("CallBackBasicITest - test12b -", 1, 1); - return; - } - - private void test12c() { - aCallBackService.multiCallBack("Call me back 3 times"); - int count = 0; - - // - // If we cant get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (this.getCallBackCount() < 3 && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test12c -", 3, this.getCallBackCount()); - return; - } - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public int getCallBackCount() { - return callBackCount; - } - - public void incrementCallBackCount() { - callBackCount++; - } - - public void callBackMessage(String aString) { - System.out.println("Entering callback callBackMessage: " + aString); - synchronized (monitor) { - this.setReturnMessage(aString); - monitor.notify(); - } - } - - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - synchronized (monitor) { - this.incrementCallBackCount(); - monitor.notify(); - } - } - -} diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java deleted file mode 100644 index ffbf4f35fa..0000000000 --- a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -// @Callback(CallBackCTypeCallBack.class) -/** - * - */ -public interface CallBackCTypeService { - - public void knockKnock(String aString); - - public void noCallBack(String aString); - - public void multiCallBack(String aString); - -} diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java deleted file mode 100644 index dc31ed156b..0000000000 --- a/branches/sca-java-0.91/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; - -@Service(CallBackCTypeService.class) -public class CallBackCTypeServiceImpl implements CallBackCTypeService { - - @Callback - protected CallBackCTypeCallBack callback; - - public CallBackCTypeServiceImpl() { - } - - public void knockKnock(String aString) { - - System.out.println("CallBackCTypeServiceImpl message received: " + aString); - callback.callBackMessage("Who's There"); - System.out.println("CallBackCTypeServiceImpl response sent"); - return; - - } - - public void multiCallBack(String aString) { - - System.out.println("CallBackCTypeServiceImpl message received: " + aString); - callback.callBackIncrement("Who's There 1"); - System.out.println("CallBackCTypeServiceImpl response sent"); - callback.callBackIncrement("Who's There 2"); - System.out.println("CallBackCTypeServiceImpl response sent"); - callback.callBackIncrement("Who's There 3"); - System.out.println("CallBackCTypeServiceImpl response sent"); - return; - - } - - public void noCallBack(String aString) { - - System.out.println("CallBackCTypeServiceImpl message received: " + aString); - System.out.println("CallBackCTypeServiceImpl No response desired"); - return; - - } -} diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/branches/sca-java-0.91/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite deleted file mode 100644 index 3f48f16389..0000000000 --- a/branches/sca-java-0.91/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite +++ /dev/null @@ -1,33 +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://callback" - name="CallBackCTypeTest"> - - <component name="CallBackCTypeClient"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackCTypeClientImpl"/> - <reference name="aCallBackService" target="CallBackCTypeService"/> - </component> - - <component name="CallBackCTypeService"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackCTypeServiceImpl"/> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/branches/sca-java-0.91/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType deleted file mode 100644 index ff38134df5..0000000000 --- a/branches/sca-java-0.91/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" > -
- <service name="CallBackCTypeService">
- <interface.java interface="org.apache.tuscany.sca.test.CallBackCTypeService"
- callbackInterface="org.apache.tuscany.sca.test.CallBackCTypeCallBack"/>
- </service>
- -</componentType>
-
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java b/branches/sca-java-0.91/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java deleted file mode 100644 index 5ea13b8981..0000000000 --- a/branches/sca-java-0.91/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class CallBackCTypeTest extends TestCase { - - private SCADomain domain; - private CallBackCTypeClient aCallBackClient; - - public void testCallBackBasic() { - aCallBackClient.run(); - } - - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackCTypeClient.composite"); - - aCallBackClient = - domain.getService(CallBackCTypeClient.class, "CallBackCTypeClient"); - } - - protected void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/branches/sca-java-0.91/itest/callback-id/pom.xml b/branches/sca-java-0.91/itest/callback-id/pom.xml deleted file mode 100644 index fed0d4d794..0000000000 --- a/branches/sca-java-0.91/itest/callback-id/pom.xml +++ /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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-itest-callback-id</artifactId> - <name>Apache Tuscany SCA Callback ID Integration Tests</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</project> diff --git a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java deleted file mode 100644 index e86c7e9ed7..0000000000 --- a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -/** - * @author lamodeo - */ -public interface CallBackIdCallBack { - - public void callBackMessage(String aString); - -} diff --git a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java deleted file mode 100644 index a9e551f8b4..0000000000 --- a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.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 org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface CallBackIdClient { - - public void run(); - -} diff --git a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java deleted file mode 100644 index 5adf64f0c6..0000000000 --- a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import junit.framework.Assert; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(CallBackIdClient.class) -public class CallBackIdClientImpl implements CallBackIdClient, CallBackIdCallBack { - - @Context - protected ComponentContext componentContext; - @Reference - protected CallBackIdService aCallBackService; - - private static String returnMessage = null; - private static Object monitor = new Object(); - private static Object callBackId; - - public void run() { - - // This tests the use of the set/get callbackId API both SCA generated - // and client specified. - - // Test1 uses a SCA generated callback ID and compare that with the - // callbackID returned during callback. - test11a(); - - // Test2 uses a Client specified callback ID and compare that with the - // callbackID returned during callback. - test11b(); - - return; - } - - private void test11a() { - - // Retrieve this services callback ID and save it. Once the callback is - // received the callback ID will be compared with the one - // returned. Equal is good. - - Object origCallBackId = ((ServiceReference)aCallBackService).getCallbackID(); - aCallBackService.knockKnock("Knock Knock - Test1"); - int count = 0; - - // - // If we cannot get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackIdITest - test11a - SCA Generated Id", origCallBackId, this.getCallBackId()); - - } - - private void test11b() { - - // Set the services callback ID and save it. Once the callback is - // received the callback ID will be compared with the one - // returned. Equal is good. - - String origCallBackId = "CallBackId1"; - ((ServiceReference)aCallBackService).setCallbackID(origCallBackId); - - aCallBackService.knockKnock("Knock Knock - Test2"); - int count = 0; - - // - // If we cant get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert - .assertEquals("CallBackIdITest - 11b - Client Specified Id", origCallBackId, (String)this.getCallBackId()); - - } - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public void callBackMessage(String aString) { - - System.out.println("Entering callback callBackMessage: " + aString); - RequestContext rc = componentContext.getRequestContext(); - Object callBackId = rc.getServiceReference().getCallbackID(); - - synchronized (monitor) { - this.setReturnMessage(aString); - this.setCallBackId(callBackId); - monitor.notify(); - } - } - - protected Object getCallBackId() { - return callBackId; - } - - protected void setCallBackId(Object aCallBackId) { - callBackId = aCallBackId; - } - -} diff --git a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java deleted file mode 100644 index 18c592a1c1..0000000000 --- a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -@Remotable -@Callback(CallBackIdCallBack.class) -/** - * - */ -public interface CallBackIdService { - - public void knockKnock(String aString); - -} diff --git a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java deleted file mode 100644 index 16f5ec3e11..0000000000 --- a/branches/sca-java-0.91/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; - -@Service(CallBackIdService.class) -public class CallBackIdServiceImpl implements CallBackIdService { - - @Callback - protected CallBackIdCallBack callback; - @Context - protected ComponentContext compositeContext; - - public void knockKnock(String aString) { - - System.out.println("CallBackIdServiceImpl message received: " + aString); - RequestContext rc = compositeContext.getRequestContext(); - Object callBackId = rc.getServiceReference().getCallbackID(); - System.out.println("CallBackIdServiceImpl callbackID: " + callBackId.toString()); - - callback.callBackMessage("Who's There"); - System.out.println("CallBackIdServiceImpl response sent"); - return; - - } - -} diff --git a/branches/sca-java-0.91/itest/callback-id/src/main/resources/CallBackIdClient.composite b/branches/sca-java-0.91/itest/callback-id/src/main/resources/CallBackIdClient.composite deleted file mode 100644 index c9a6ba6258..0000000000 --- a/branches/sca-java-0.91/itest/callback-id/src/main/resources/CallBackIdClient.composite +++ /dev/null @@ -1,33 +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://callback" - name="CallBackIdTest"> - - <component name="CallBackIdClient"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackIdClientImpl"/> - <reference name="aCallBackService" target="CallBackIdService"/> - </component> - - <component name="CallBackIdService"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackIdServiceImpl"/> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java b/branches/sca-java-0.91/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java deleted file mode 100644 index a86fbc9a45..0000000000 --- a/branches/sca-java-0.91/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class CallBackIdTest extends TestCase { - - private SCADomain domain; - private CallBackIdClient aCallBackClient; - - public void testCallBackBasic() { - aCallBackClient.run(); - } - - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackIdClient.composite"); - - aCallBackClient = domain.getService(CallBackIdClient.class, "CallBackIdClient"); - } - - protected void tearDown() throws Exception { - domain.close(); - } -} diff --git a/branches/sca-java-0.91/itest/callback-set-callback/pom.xml b/branches/sca-java-0.91/itest/callback-set-callback/pom.xml deleted file mode 100644 index 6b85f04466..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-callback/pom.xml +++ /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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-itest-callback-set-callback</artifactId> - <name>Apache Tuscany SCA Set Callback Integration Tests</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</project> diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java deleted file mode 100644 index b352a2f1f7..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java +++ /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. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Callback; - -// @Remotable -@Callback(CallBackSetCallbackCallback.class) -/** - * - */ -public interface CallBackSetCalbackService { - - public void knockKnock(String aString); - - public void setCallbackIllegally(String aString); - -} diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java deleted file mode 100644 index 766d47c654..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import junit.framework.Assert; - -public class CallBackSetCallbackBadCallback { - - private String anAttribure = null; - private int anIntAttribute = 0; - - public CallBackSetCallbackBadCallback() { - super(); - } - - public void callback(String aString) { - // - // This callback method should never be called. - // - System.out.println("CallBackSetCallbackBadCallback: callback called"); - Assert.fail("CallBackSetCallbackBadCallback: callback called"); - return; - } - -} diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java deleted file mode 100644 index 26a6ecc879..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -// @Remotable -/** - * @author lamodeo - */ -public interface CallBackSetCallbackCallback { - - public void callBackMessage(String aString); - - public void callBackIncrement(String aString); - -} diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java deleted file mode 100644 index 0a22b0e01f..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import java.io.File; - -import org.osoa.sca.annotations.Service; - -@Service(CallBackSetCallbackCallback.class) -public class CallBackSetCallbackCallbackImpl implements CallBackSetCallbackCallback { - - private static String returnMessage = null; - private static int callBackCount = 0; - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public int getCallBackCount() { - return callBackCount; - } - - public void incrementCallBackCount() { - callBackCount++; - } - - public void callBackMessage(String aString) { - - System.out.println("Entering CallBackSetCallbackCallbackImpl callBackMessage: " + aString); - - File aFile = new File("target/test4_marker"); - try { - aFile.createNewFile(); - } catch (Exception ex) { - System.out.println("Error Creating target/test4_marker marker file"); - ex.printStackTrace(); - } - - } - - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - this.incrementCallBackCount(); - } - -} diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java deleted file mode 100644 index 94cb6aa73b..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.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 org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface CallBackSetCallbackClient { - - public void run(); - -} diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java deleted file mode 100644 index 9fafb05835..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java +++ /dev/null @@ -1,193 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import java.io.File; - -import junit.framework.Assert; - -import org.osoa.sca.NoRegisteredCallbackException; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(CallBackSetCallbackClient.class) -public class CallBackSetCallbackClientImpl implements CallBackSetCallbackClient { - - @Reference - protected CallBackSetCalbackService aCallBackService; - @Reference - protected CallBackSetCallbackCallback callBack; - - public void run() { - - // This test various aspects of the setCallback() API in a stateless - // scope. - - /* - * test4 Client does not implement the callback interface but calls - * setCallback with a service reference before invoking the target, - * Verify successful executon. - */ - - test4(); - - /* - * test5 The client does not implement the callback interface and does - * not call setCallback() before invoking the target. Verify a - * NoRegisteredCallbackException is thrown. - */ - - test5(); - - /* - * test6() The client calls setCallback() with an object that is not a - * service reference and the callback interface is stateless. Verify - * that an appropriate exception is thrown. When calling setCallback - * with an object the interface must be stateful. Stateless interfaces - * require a service Reference. - */ - - test6(); - - /* - * test10 The target calls setCallback() on its own service reference, - * e.g. getRequestContext().getServiceReference().getCallback(). Verify - * an appropriate exeception occurs. - */ - - test10(); - - return; - } - - private void test4() { - - // - // Since callbacks do not synchronously return and this test results in - // a callback to a component other - // than this client I am using a marker file to determine the outcome. - // The presence of the marker - // file will be used for the Assertion test. If it exists then the - // callback occurred and all is good. - // - - // Make sure the marker file is not present before starting the test. - File aFile = new File("target/test4_marker"); - if (aFile.exists()) - aFile.delete(); - - ((ServiceReference)aCallBackService).setCallback(callBack); - - aCallBackService.knockKnock("Knock Knock"); - - // Lets give the callback a little time to complete.... - - int count = 0; - long timeout = 1000; - - while (count++ < 30 && (aFile.exists() == false)) { - try { - Thread.sleep(timeout); - } catch (InterruptedException ie) { - } - } - - Assert.assertEquals("CallBackSetCallback - Test4", true, aFile.exists()); - - } - - private void test5() { - - boolean correctException = false; - - // - // The backend service is expecting a callback reference to be set. This - // test will not - // set one so an exception is expected. According to the spec if a - // client calls a method on - // a service reference prior to calling setCallback() then a - // NoRegisteredCallbackException - // will be thrown on the client. - // - - try { - aCallBackService.knockKnock("Knock Knock"); - } catch (NoRegisteredCallbackException NotRegEx) { - correctException = true; - } catch (Exception ex) { - ex.printStackTrace(); - } - - Assert.assertEquals("CallBackSetCallback - Test5", true, correctException); - - } - - private void test6() { - - boolean correctException = false; - - // - // This test is to specify an Object that is not a service reference - // that does impliment - // the callback interface. However because this callback service is - // stateless the expected - // result is an appropriate exception. - // - - try { - ((ServiceReference)aCallBackService).setCallback(new CallBackSetCallbackObjectCallback()); - aCallBackService.knockKnock("Knock Knock"); - } - // - // This should catch an appropriate exception. - // - catch (NoRegisteredCallbackException NotRegEx) { - correctException = true; - } catch (Exception ex) { - ex.printStackTrace(); - } - - Assert.assertEquals("CallBackSetCallback - Test6", true, correctException); - - } - - private void test10() { - // - // Since callbacks do not synchronously return and this test results in - // a failure on the service - // side of the fence I am using a marker file to determine the outcome. - // The presence of the marker - // file will be used for the Assertion test. If it exists then all is - // good. - // - - // Make sure the marker file is not present before starting the test. - File aFile = new File("target/test10_marker"); - if (aFile.exists()) - aFile.delete(); - - aCallBackService.setCallbackIllegally("Try to set callback on your own service reference"); - - Assert.assertEquals("CallBackSetCallback - Test10", true, aFile.exists()); - - return; - } - -} diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java deleted file mode 100644 index afedcdf7f1..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -public class CallBackSetCallbackObjectCallback implements CallBackSetCallbackCallback { - - private int callBackCount = 0; - - public CallBackSetCallbackObjectCallback() { - super(); - } - - public void incrementCallBackCount() { - callBackCount++; - } - - public void callBackMessage(String aString) { - - System.out.println("Entering CallBackSetCallbackObjectCallback callBackMessage: " + aString); - - } - - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - this.incrementCallBackCount(); - } - -} diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java deleted file mode 100644 index 0eccf6e379..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import java.io.File; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; - -@Service(CallBackSetCalbackService.class) -public class CallBackSetCallbackServiceImpl implements CallBackSetCalbackService { - - @Callback - private CallBackSetCallbackCallback callback; - @Context - private ComponentContext context; - - public void knockKnock(String aString) { - - try { - System.out.println("CallBackBasicServiceImpl message received: " + aString); - callback.callBackMessage("Who's There"); - System.out.println("CallBackBasicServiceImpl response sent"); - return; - } catch (Exception ex) { - ex.printStackTrace(); - } - - } - - public void setCallbackIllegally(String aString) { - - System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() message received: " + aString); - - boolean exceptionProduced = false; - RequestContext requestContext = null; - ServiceReference serviceRef = null; - - // Context is not working properly so we can't trust that this is - // working..... - try { - requestContext = context.getRequestContext(); - serviceRef = (ServiceReference) requestContext.getServiceReference(); - } catch (Exception ex) { - System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() " + ex.toString()); - ex.printStackTrace(); - return; - } - - // Ok, call setCallback with my own service reference. - try { - serviceRef.setCallback(serviceRef); - } catch (NullPointerException npe) // This needs to be removed once - // appropriate exception is - // identified. - { - // This is not an appropriate exception. - System.out.println("Test10 NPE exception during setCallback to own service reference"); - npe.printStackTrace(); - return; - } - // This needs to catch the appropriate exception, once we figure out - // what is needs to be! - catch (Exception ex) { - exceptionProduced = true; - System.out.println("Test10 appropriate exception caught during setCallback to own service reference"); - } - ; - - // If we get the exception we are looking for then create the marker - // file. - if (exceptionProduced == true) { - File aFile = new File("target/test10_marker"); - try { - aFile.createNewFile(); - } catch (Exception ex) { - System.out.println("Error Creating target/test10_marker marker file"); - ex.printStackTrace(); - } - } - - } -} diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/branches/sca-java-0.91/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite deleted file mode 100644 index 3552ddecab..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite +++ /dev/null @@ -1,37 +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://callback" - name="CallBackSetCallbackTest"> - - <component name="CallBackSetCallbackClient"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackClientImpl"/> - <reference name="aCallBackService" target="CallBackSetCallbackService"/> - <reference name="callBack" target="CallBackSetCallbackCallback"/> - </component> - - <component name="CallBackSetCallbackCallback"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackCallbackImpl"/> - </component> - - <component name="CallBackSetCallbackService"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackServiceImpl"/> - </component> -</composite> diff --git a/branches/sca-java-0.91/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java b/branches/sca-java-0.91/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java deleted file mode 100644 index f977dd643f..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.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.sca.test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class CallBackSetCallbackTest extends TestCase { - - private SCADomain domain; - private CallBackSetCallbackClient aCallBackClient; - - public void testCallBackSetCallback() { - aCallBackClient.run(); - } - - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackSetCallbackTest.composite"); - - aCallBackClient = - domain.getService(CallBackSetCallbackClient.class, - "CallBackSetCallbackClient"); - } - - protected void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/pom.xml b/branches/sca-java-0.91/itest/callback-set-conversation/pom.xml deleted file mode 100644 index a70f5a40f3..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-conversation/pom.xml +++ /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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-itest-callback-set-conversation</artifactId> - <name>Apache Tuscany SCA Callback Set Conversation Integration Tests</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</project> diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java deleted file mode 100644 index 685dd83c62..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import java.io.Serializable; - -import junit.framework.Assert; - -public class CallBackSetCallbackConvBadCallback implements Serializable { - - public CallBackSetCallbackConvBadCallback() { - super(); - } - - public void callback(String aString) { - // - // This callback method should never be called. - // - System.out.println("CallBackSetCallbackBadCallback: callback called"); - Assert.fail("CallBackSetCallbackConvBadCallback: callback called"); - return; - } - -} diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java deleted file mode 100644 index 7483e834b4..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -// @Remotable -/** - * @author lamodeo - */ -public interface CallBackSetCallbackConvCallback { - - public void callBackMessage(String aString); - - public void callBackIncrement(String aString); - -} diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java deleted file mode 100644 index 013424bf5e..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.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 org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface CallBackSetCallbackConvClient { - - public void run(); - -} diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java deleted file mode 100644 index ef9d858126..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import junit.framework.Assert; - -import org.osoa.sca.NoRegisteredCallbackException; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(CallBackSetCallbackConvClient.class) -@Scope("CONVERSATION") -public class CallBackSetCallbackConvClientImpl implements CallBackSetCallbackConvClient { - - @Reference - protected CallBackSetCallbackConvService aCallBackService; - private CallBackSetCallbackConvObjectCallback aCallbackObject = null; - private Object monitor = new Object(); - - public void run() { - - // This tests aspects of the setCallback() API within a conversational - // scope. - - /* - * test7 The client calls setCallback() with an object that is not a - * service reference and the callback interface is stateful. Verify - * successful execution. - */ - test7(); - - /* - * test8() The client calls setCallback() with an object that does not - * implement the callback interface. Verify an appropriate exception is - * thrown. This requires a STATEFUL interface. - */ - test8(); - - /* - * test9 The client calls setCallback() with an object that is not - * serializable. Verify an appropriate exception is thrown. This - * requires a STATEFUL callback interface. Move from the stateless test - * case. - */ - test9(); - - return; - } - - private void test7() { - - // - // This test is to specify an Object that is not a service reference - // that does implement - // the callback interface and is Serializeable. Verify successful - // execution. - // - - aCallbackObject = new CallBackSetCallbackConvObjectCallback(); - aCallbackObject.incrementCallBackCount(); - aCallbackObject.setMonitor(monitor); - - ((ServiceReference)aCallBackService).setCallback(aCallbackObject); - aCallBackService.knockKnock("Knock Knock"); - - // Lets give the callback a little time to complete.... - - int count = 0; - - synchronized (monitor) { - while (aCallbackObject.getCount() != 2 && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackSetCallbackConv - Test7", 2, aCallbackObject.getCount()); - - } - - private void test8() { - - boolean correctException = false; - - // - // This test is to specify an Object that is not a service reference - // that does not impliment - // the callback interface. The expected result is an appropriate - // exception. - // - - try { - ((ServiceReference)aCallBackService).setCallback(new CallBackSetCallbackConvBadCallback()); - aCallBackService.knockKnock("Knock Knock"); - } - - // - // This should catch an appropriate exception. - // - - catch (NoRegisteredCallbackException NotRegEx) // This needs to be - // changed to proper - // exception once we - // know what it is ;-) - { - correctException = true; - } - - catch (Exception ex) { - // This means an inappropriate exception occurred - ex.printStackTrace(); - } - - Assert.assertEquals("CallBackSetCallbackConv - Test8", true, correctException); - - } - - private void test9() { - - boolean correctException = false; - - // - // This test is to specify an Object that is not a service reference - // that does impliment - // the callback interface but does not implement Serializeable. Verify - // an appropriate exception - // is thrown. - // - - try { - ((ServiceReference)aCallBackService).setCallback(new CallBackSetCallbackConvNonSerCallback()); - aCallBackService.knockKnock("Knock Knock"); - } - // - // This should catch an appropriate exception. - // - catch (NoRegisteredCallbackException NotRegEx) // This needs to be - // changed to - // appropriate exception - // when we know what it - // is ;-) - { - correctException = true; - } catch (Exception ex) { - ex.printStackTrace(); - } - - Assert.assertEquals("CallBackSetCallbackConv - Test9", true, correctException); - - } - -} diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java deleted file mode 100644 index 789e04e907..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -public class CallBackSetCallbackConvNonSerCallback implements CallBackSetCallbackConvCallback { - - private int callBackCount = 0; - private Object monitor; - - public CallBackSetCallbackConvNonSerCallback() { - super(); - } - - public synchronized void incrementCallBackCount() { - callBackCount++; - } - - public synchronized int getCount() { - return callBackCount; - } - - public void setMonitor(Object anObject) { - monitor = anObject; - } - - public void callBackMessage(String aString) { - - System.out.println("Entering CallBackSetCallbackConvNonSerCallback callBackMessage: " + aString); - - } - - public void callBackIncrement(String aString) { - - System.out.println("Entering callback increment: " + aString); - - synchronized (monitor) { - this.incrementCallBackCount(); - monitor.notify(); - } - } - -} diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java deleted file mode 100644 index fead6705fd..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import java.io.Serializable; - -public class CallBackSetCallbackConvObjectCallback implements CallBackSetCallbackConvCallback, Serializable { - - private int callBackCount = 0; - private Object monitor; - - public CallBackSetCallbackConvObjectCallback() { - super(); - } - - public synchronized void incrementCallBackCount() { - callBackCount++; - } - - public synchronized int getCount() { - return callBackCount; - } - - public void setMonitor(Object anObject) { - monitor = anObject; - } - - public void callBackMessage(String aString) { - - System.out.println("Entering CallBackSetCallbackObjectCallback callBackMessage: " + aString); - - } - - public void callBackIncrement(String aString) { - - System.out.println("Entering callback increment: " + aString); - - synchronized (monitor) { - this.incrementCallBackCount(); - monitor.notify(); - } - } - -} diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java deleted file mode 100644 index 4b0dccefdc..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java +++ /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. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Callback; - -// @Remotable -@Callback(CallBackSetCallbackConvCallback.class) -/** - * - */ -public interface CallBackSetCallbackConvService { - - public void knockKnock(String aString); - - public void setCallbackIllegally(String aString); - -} diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java deleted file mode 100644 index 5b685e695b..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import java.io.File; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(CallBackSetCallbackConvService.class) -@Scope("CONVERSATION") -public class CallBackSetCallbackConvServiceImpl implements CallBackSetCallbackConvService { - - @Callback - private CallBackSetCallbackConvCallback callback; - @Context - protected ComponentContext context; - - public void knockKnock(String aString) { - - try { - System.out.println("CallBackBasicServiceImpl message received: " + aString); - callback.callBackMessage("Who's There"); - System.out.println("CallBackBasicServiceImpl response sent"); - return; - } catch (Exception ex) { - ex.printStackTrace(); - } - - } - - public void setCallbackIllegally(String aString) { - - System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() message received: " + aString); - - boolean exceptionProduced = false; - RequestContext requestContext = null; - ServiceReference serviceRef = null; - - // Context is not working properly so we can't trust that this is - // working..... - try { - requestContext = context.getRequestContext(); - serviceRef = (ServiceReference) requestContext.getServiceReference(); - } catch (Exception ex) { - System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() " + ex.toString()); - ex.printStackTrace(); - return; - } - - // Ok, call setCallback with my own service reference. - try { - serviceRef.setCallback(serviceRef); - } catch (NullPointerException npe) { - // This is not an appropriate exception. - System.out.println("Test10 NPE exception during setCallback to own service reference"); - npe.printStackTrace(); - return; - } - // This needs to catch the appropriate exception, once we figure out - // what is needs to be! - catch (Exception ex) { - exceptionProduced = true; - System.out.println("Test10 appropriate exception caught during setCallback to own service reference"); - } - ; - - // If we get the exception we are looking for then create the marker - // file. - if (exceptionProduced == true) { - File aFile = new File("target/test10_marker"); - try { - aFile.createNewFile(); - } catch (Exception ex) { - System.out.println("Error Creating target/test10_marker marker file"); - ex.printStackTrace(); - } - } - - } -} diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/branches/sca-java-0.91/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite deleted file mode 100644 index ce73417f94..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite +++ /dev/null @@ -1,33 +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://callback" - name="CallBackSetCallbackConvTest"> - - <component name="CallBackSetCallbackConvClient"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackConvClientImpl"/> - <reference name="aCallBackService" target="CallBackSetCallbackConvService"/> - </component> - - - <component name="CallBackSetCallbackConvService"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackConvServiceImpl"/> - </component> -</composite> diff --git a/branches/sca-java-0.91/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java b/branches/sca-java-0.91/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java deleted file mode 100644 index e9113a8766..0000000000 --- a/branches/sca-java-0.91/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.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.sca.test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class CallBackSetCallbackConvTest extends TestCase { - - private SCADomain domain; - private CallBackSetCallbackConvClient aCallBackClient; - - public void testCallBackSetCallback() { - aCallBackClient.run(); - } - - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackSetCallbackConvTest.composite"); - - aCallBackClient = - domain.getService(CallBackSetCallbackConvClient.class, - "CallBackSetCallbackConvClient"); - } - - protected void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/branches/sca-java-0.91/itest/contribution/pom.xml b/branches/sca-java-0.91/itest/contribution/pom.xml deleted file mode 100644 index 74cd42de95..0000000000 --- a/branches/sca-java-0.91/itest/contribution/pom.xml +++ /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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>0.91-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-itest-contribution</artifactId>
- <name>Apache Tuscany Contribution Integration Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.91-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-contribution-impl</artifactId>
- <version>0.91-incubating-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/AddService.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/AddService.java deleted file mode 100644 index 6392676e76..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,25 +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;
-
-public interface AddService {
-
- double add(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index e9c635e3c8..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/AddServiceImpl.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 Add service
- */
-public class AddServiceImpl implements AddService {
-
- public double add(double n1, double n2) {
- return n1 + n2;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorClient.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 40ca4d9b0f..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorClient.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 calculator;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
- public static void main(String[] args) throws Exception {
-
- SCADomain domain = SCADomain.newInstance("Calculator.composite");
-
- CalculatorService calculatorService = domain.getService(CalculatorService.class,
- "CalculatorServiceComponent");
-
- // Calculate
- System.out.println("3 + 2=" + calculatorService.add(3, 2));
- System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
- System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
- System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
- domain.close();
-
- }
-
-}
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorService.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index ad87375529..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,35 +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 Calculator service interface.
- */
-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-0.91/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index ae4ed12b7b..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,70 +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 setDivideService(DivideService divideService) {
- this.divideService = divideService;
- }
-
- @Reference
- public void setMultiplyService(MultiplyService multiplyService) {
- this.multiplyService = multiplyService;
- }
-
- public double add(double n1, double n2) {
- return addService.add(n1, n2);
- }
-
- public double subtract(double n1, double n2) {
- return subtractService.subtract(n1, n2);
- }
-
- public double multiply(double n1, double n2) {
- return multiplyService.multiply(n1, n2);
- }
-
- public double divide(double n1, double n2) {
- return divideService.divide(n1, n2);
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/DivideService.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/DivideService.java deleted file mode 100644 index 3158458b5e..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,25 +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;
-
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index 8c33862f6d..0000000000 --- a/branches/sca-java-0.91/itest/contribution/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-0.91/itest/contribution/src/main/java/calculator/MultiplyService.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 62db05175e..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,25 +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;
-
-public interface MultiplyService {
-
- double multiply(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index c7fbc73c00..0000000000 --- a/branches/sca-java-0.91/itest/contribution/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-0.91/itest/contribution/src/main/java/calculator/SubtractService.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 309f88f098..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,25 +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;
-
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 1a7f145ad8..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/main/java/calculator/SubtractServiceImpl.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 subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
- public double subtract(double n1, double n2) {
- return n1 - n2;
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/resources/ContributionTest.composite b/branches/sca-java-0.91/itest/contribution/src/main/resources/ContributionTest.composite deleted file mode 100644 index d814e439e2..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/main/resources/ContributionTest.composite +++ /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. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:foo="http://foo" - name="ContributionTest"> - -</composite> diff --git a/branches/sca-java-0.91/itest/contribution/src/main/resources/calculator/Calculator.composite b/branches/sca-java-0.91/itest/contribution/src/main/resources/calculator/Calculator.composite deleted file mode 100644 index 657a2f95d8..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/main/resources/calculator/Calculator.composite +++ /dev/null @@ -1,51 +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="Calculator">
-
- <service name="CalculatorService" promote="CalculatorServiceComponent">
- <interface.java interface="calculator.CalculatorService"/>
- </service>
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponent"></reference>
- <reference name="subtractService" target="SubtractServiceComponent"></reference>
- <reference name="multiplyService" target="MultiplyServiceComponent"></reference>
- <reference name="divideService" target="DivideServiceComponent"></reference>
- </component>
-
- <component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl"/>
- </component>
-
- <component name="SubtractServiceComponent">
- <implementation.java class="calculator.SubtractServiceImpl"/>
- </component>
-
- <component name="MultiplyServiceComponent">
- <implementation.java class="calculator.MultiplyServiceImpl"/>
- </component>
-
- <component name="DivideServiceComponent">
- <implementation.java class="calculator.DivideServiceImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.91/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/branches/sca-java-0.91/itest/contribution/src/main/resources/calculator/sca-contribution.xml deleted file mode 100644 index 2d31075091..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/main/resources/calculator/sca-contribution.xml +++ /dev/null @@ -1,22 +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>
- <deployable composite="Calculator"/>
-</contribution>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/branches/sca-java-0.91/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java deleted file mode 100644 index 0322796417..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java +++ /dev/null @@ -1,238 +0,0 @@ -/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.test.contribution;
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.xml.ComponentTypeDocumentProcessor;
-import org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;
-import org.apache.tuscany.sca.assembly.xml.CompositeDocumentProcessor;
-import org.apache.tuscany.sca.assembly.xml.CompositeProcessor;
-import org.apache.tuscany.sca.assembly.xml.ConstrainingTypeDocumentProcessor;
-import org.apache.tuscany.sca.assembly.xml.ConstrainingTypeProcessor;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.DeployedArtifact;
-import org.apache.tuscany.sca.contribution.impl.ContributionFactoryImpl;
-import org.apache.tuscany.sca.contribution.processor.DefaultPackageProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultURLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensiblePackageProcessor;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
-import org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.impl.FolderContributionProcessor;
-import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
-import org.apache.tuscany.sca.contribution.service.ContributionRepository;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.contribution.service.impl.ContributionRepositoryImpl;
-import org.apache.tuscany.sca.contribution.service.impl.ContributionServiceImpl;
-import org.apache.tuscany.sca.contribution.service.impl.PackageTypeDescriberImpl;
-import org.apache.tuscany.sca.contribution.service.util.FileHelper;
-import org.apache.tuscany.sca.contribution.service.util.IOHelper;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- * This is more intended to be a integration test then a unit test. *
- */
-public class ContributionServiceTestCase extends TestCase {
- private static final String CONTRIBUTION_001_ID = "contribution001/";
- private static final String CONTRIBUTION_002_ID = "contribution002/";
- private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";
- private static final String FOLDER_CONTRIBUTION = "target/classes/";
-
- private ContributionService contributionService;
-
- protected void setUp() throws Exception {
-
- // Create default factories
- AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
- PolicyFactory policyFactory = new DefaultPolicyFactory();
- InterfaceContractMapper mapper = new InterfaceContractMapperImpl();
-
- // Create an extension point registry
- ExtensionPointRegistry extensionRegistry = new DefaultExtensionPointRegistry();
-
- // Add artifact processor extension points
- DefaultStAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
- extensionRegistry.addExtensionPoint(staxProcessors);
- ExtensibleStAXArtifactProcessor staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
- DefaultURLArtifactProcessorExtensionPoint documentProcessors = new DefaultURLArtifactProcessorExtensionPoint();
- extensionRegistry.addExtensionPoint(documentProcessors);
- ExtensibleURLArtifactProcessor documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors);
-
- // Register base artifact processors
- staxProcessors.addArtifactProcessor(new CompositeProcessor(assemblyFactory, policyFactory, mapper,
- staxProcessor));
- staxProcessors.addArtifactProcessor(new ComponentTypeProcessor(assemblyFactory, policyFactory, staxProcessor));
- staxProcessors.addArtifactProcessor(new ConstrainingTypeProcessor(assemblyFactory, policyFactory,
- staxProcessor));
-
- XMLInputFactory inputFactory = XMLInputFactory.newInstance();
- documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, inputFactory));
- documentProcessors.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxProcessor, inputFactory));
- documentProcessors.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxProcessor, inputFactory));
-
- // Create package processor extension point
- PackageTypeDescriberImpl describer = new PackageTypeDescriberImpl();
- PackageProcessorExtensionPoint packageProcessors = new DefaultPackageProcessorExtensionPoint();
- PackageProcessor packageProcessor = new ExtensiblePackageProcessor(packageProcessors, describer);
- extensionRegistry.addExtensionPoint(packageProcessors);
-
- // Register base package processors
- packageProcessors.addPackageProcessor(new JarContributionProcessor());
- packageProcessors.addPackageProcessor(new FolderContributionProcessor());
-
- // Create a repository
- ContributionRepository repository = new ContributionRepositoryImpl("target");
-
- // Create an artifact resolver and contribution service
- this.contributionService = new ContributionServiceImpl(repository, packageProcessor, documentProcessor,
- assemblyFactory,
- new ContributionFactoryImpl(), XMLInputFactory
- .newInstance());
- }
-
- public void testContributeJAR() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- String contributionId = CONTRIBUTION_001_ID;
- ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
- contributionService.contribute(contributionId, contributionLocation, resolver, false);
- assertNotNull(contributionService.getContribution(contributionId));
- }
-
- public void testStoreContributionPackageInRepository() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- String contributionId = CONTRIBUTION_001_ID;
- ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
- contributionService.contribute(contributionId, contributionLocation, resolver, true);
-
- assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation()))
- .exists());
-
- assertNotNull(contributionId);
-
- Contribution contributionModel = contributionService.getContribution(contributionId);
-
- File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation()));
- assertTrue(contributionFile.exists());
- }
-
- public void testStoreContributionStreamInRepository() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- String contributionId = CONTRIBUTION_001_ID;
-
- InputStream contributionStream = contributionLocation.openStream();
- try {
- ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
- contributionService.contribute(contributionId, contributionLocation, contributionStream, resolver);
- } finally {
- IOHelper.closeQuietly(contributionStream);
- }
-
- assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation()))
- .exists());
-
- assertNotNull(contributionId);
-
- Contribution contributionModel = contributionService.getContribution(contributionId);
-
- File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation()));
- assertTrue(contributionFile.exists());
- }
-
- public void testStoreDuplicatedContributionInRepository() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- String contributionId1 = CONTRIBUTION_001_ID;
- ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
- contributionService.contribute(contributionId1, contributionLocation, resolver, true);
- assertNotNull(contributionService.getContribution(contributionId1));
- String contributionId2 = CONTRIBUTION_002_ID;
- ModelResolver resolver2 = new ModelResolverImpl(getClass().getClassLoader());
- contributionService.contribute(contributionId2, contributionLocation, resolver2, true);
- assertNotNull(contributionService.getContribution(contributionId2));
- }
-
- public void testContributeFolder() throws Exception {
- File rootContributionFolder = new File(FOLDER_CONTRIBUTION);
- String contributionId = CONTRIBUTION_001_ID;
- //first rename the sca-contribution metadata file
- //File calculatorMetadataFile = new File("target/classes/calculator/sca-contribution.xml");
- //File metadataDirectory = new File("target/classes/META-INF/");
- //if (!metadataDirectory.exists()) {
- // FileHelper.forceMkdir(metadataDirectory);
- //}
- //FileHelper.copyFileToDirectory(calculatorMetadataFile, metadataDirectory);
- ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
- contributionService.contribute(contributionId, rootContributionFolder.toURL(), resolver, false);
- assertNotNull(contributionService.getContribution(contributionId));
- }
-
- public void testAddDeploymentComposites() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- String contributionId = CONTRIBUTION_001_ID;
- ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
- Contribution contribution = contributionService.contribute(contributionId, contributionLocation, resolver, false);
- assertNotNull(contributionService.getContribution(contributionId));
-
- String artifactId = "contributionComposite.composite";
- Composite composite = (new DefaultAssemblyFactory()).createComposite();
- composite.setName(new QName(null, "contributionComposite"));
- composite.setURI("contributionComposite.composite");
-
- contributionService.addDeploymentComposite(contribution, composite);
-
- List deployables = contributionService.getContribution(contributionId).getDeployables();
- Composite composite1 = (Composite)deployables.get(deployables.size() - 1);
- assertEquals("contributionComposite", composite1.getName().toString());
-
- DeployedArtifact artifact = null;
- contribution = contributionService.getContribution(contributionId);
- String id = artifactId.toString();
- for (DeployedArtifact a : contribution.getArtifacts()) {
- if (id.equals(a.getURI())) {
- artifact = a;
- break;
- }
- }
- Composite composite2 = (Composite)artifact.getModel();
- assertEquals("contributionComposite", composite2.getName().toString());
- }
-
-}
diff --git a/branches/sca-java-0.91/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/branches/sca-java-0.91/itest/contribution/src/test/resources/deployables/sample-calculator.jar Binary files differdeleted file mode 100644 index 0ca3a1b781..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/test/resources/deployables/sample-calculator.jar +++ /dev/null diff --git a/branches/sca-java-0.91/itest/contribution/src/test/resources/repository/sample-calculator.jar b/branches/sca-java-0.91/itest/contribution/src/test/resources/repository/sample-calculator.jar Binary files differdeleted file mode 100644 index 0ca3a1b781..0000000000 --- a/branches/sca-java-0.91/itest/contribution/src/test/resources/repository/sample-calculator.jar +++ /dev/null diff --git a/branches/sca-java-0.91/itest/conversations/pom.xml b/branches/sca-java-0.91/itest/conversations/pom.xml deleted file mode 100644 index e19ec9b07e..0000000000 --- a/branches/sca-java-0.91/itest/conversations/pom.xml +++ /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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-itest-conversations</artifactId> - <name>Apache Tuscany SCA Conversations Integration Tests</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</project> diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java deleted file mode 100644 index 31786588b2..0000000000 --- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test; - -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Remotable; - -@Remotable - -/** - * - */ -public interface AnotherService { - - public void setService(ServiceReference aServiceReference); - public void add(int anInt); - public int getCount(); - -} diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java deleted file mode 100644 index 027109787a..0000000000 --- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import junit.framework.Assert; - -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(AnotherService.class) -@Scope("CONVERSATION") - -public class AnotherServiceImpl implements AnotherService { - - // This is a simple pass-thru service used to test propogation - // of ServiceReference and maintenance of Session state. - - private ServiceReference aServiceReference; - - public void add(int anInt) { - - Assert.assertNotNull("AnotherServiceImpl - add ", aServiceReference); - ((ConversationsService) aServiceReference).add(anInt); - - } - - - public void initializeCount() { - - Assert.assertNotNull("AnotherServiceImpl - initializeCount ", aServiceReference); - ((ConversationsService) aServiceReference).initializeCount(); - - } - - - public void setService(ServiceReference aRef) { - - Assert.assertNotNull("AnotherServiceImpl - setService ", aRef); - aServiceReference = aRef; - - } - - - public int getCount() { - - Assert.assertNotNull("AnotherServiceImpl - getCount ", aServiceReference); - return ((ConversationsService) aServiceReference).getLocalCount(); - } - - -} - diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java deleted file mode 100644 index 5eb9ba3ace..0000000000 --- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - - -/** - * @author lamodeo - * - */ -public interface ConversationsCallback { - - public void callBackMessage(String aString); - public void callBackIncrement(String aString); - public void callBackEndSession(); - -} diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java deleted file mode 100644 index a23748bcd2..0000000000 --- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface ConversationsClient { - - public void run(); - public int count(); - -} diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java deleted file mode 100644 index 41463fa39a..0000000000 --- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.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 org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface ConversationsClient2 { - public String getDateTime(); - - -} diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java deleted file mode 100644 index 00c2a1c2f5..0000000000 --- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java +++ /dev/null @@ -1,490 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import java.io.File; -import java.text.DateFormat; - -import junit.framework.Assert; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ConversationEndedException; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(interfaces={ConversationsClient.class,ConversationsClient2.class}) - - -@Scope("CONVERSATION") -@ConversationAttributes(maxIdleTime="10 minutes", - singlePrincipal=false) - - -public class ConversationsClientImpl implements ConversationsClient, ConversationsClient2, ConversationsCallback { - - @Reference - protected ConversationsService aService; - @Reference - protected AnotherService anotherService; - @Reference - protected ConversationsLifeCycleService aLifeCycleService; - @Context - protected ComponentContext myContext; - @ConversationID - protected String conversationID; - - private Object monitor = new Object(); - private int count=0; - private String message; - private String initialState; - private int initialCount = 56; - private String dateTime; - private final static String markerFileName = "target/testConversations_test3_marker"; - - public void run() { - - // This tests various aspects of session lifecycle and maintenance of session state. - // None of these test are working due to various issues. - - /* test0() - This test verifies annotations and API's for ConversationID. - */ - test0(); // - Tuscany-1001. - - /* test1() - Test stateful callbacks. Verify that the client�s state is maintained throughout the execution of - all callback methods. - */ - test1(); // This test is working for MODULE scope. Cant claim succcess because it needs Conversation scope. - - /* test2() - Test each method of starting a session. Test @Init. - */ - test2(); // Tuscany-965, Tuscany-1001 - - /* test3() - Test each method of ending a session. Test @Destroy. - */ - test3(); // Tuscany-965, Tuscany-1001 - - /* test4() - Pass an existing service reference with an active session to another service. Verify the session is maintained - */ - test4(); // Tuscany-964, Tuscant-1001 - - /* test5() - Call the createServiceReferenceForSession() API to get a service reference for the active session. - Pass the service reference to another service. Verify the session is maintained. - */ - test5(); - - /* test6() - * Allow a session to timeout. - */ - test6(); // Tuscany-965, Tuscany-1001 - - - return; - } - - private void test0() - { - - // Verify that conversationID was injected. - Assert.assertNotNull("test0 - conversationID injected", conversationID); - System.out.println("ConversationID: " + conversationID); - - // - // The client may access the ConversationID by calling getConversationID on a Service Reference. - // This also verifies a session was created during injection of this Service Reference. - // - //FIXME Port to the 1.0 spec API - //Object aServicesSessionID =((ServiceReference)aService).getSessionID(); - //Assert.assertNotNull("test0 - ConversationID from service reference", aServicesSessionID); - - //FIXME Port to the 1.0 spec API - //Object aLifeCycleServicesSessionID =((ServiceReference)aLifeCycleService).getSessionID(); - //Assert.assertNotNull("test0 - ConversationID from LifeCycleService service reference", aLifeCycleServicesSessionID); - - // This will verify the @Init() is working for a session created during injection. See test2(). - aLifeCycleService.knockKnock("Hello"); - - } - - private void test1() - { - - // - // This test verifies that the state of the client is preserved across method calls. Each - // call to the service results in 2 callbacks. One to increment a count and the other to set a string. - // At the end of the test the count should equal 5 and the string should be set. Also the original strings - // values should be preserved. - // - // - initialState = "Initial State"; - - int numCalls = 0; - - for(int i=0; i < 10; i++) - { - aService.knockKnock("Knock Knock " + ++numCalls); - } - - // I want to drive multiple callbacks and then give them time to complete. Don't want to - // force serialization. After 20 seconds check the assertions. - - synchronized(monitor) - { - try - { - monitor.wait(20000L); - } - catch (Exception ex) - {ex.printStackTrace();} - } - - // Here we test for the expected state of several different variables. State needs to be maintained - // across method calls to the service. If the same client instance is used then the state should match - // the following assertions. - - // instance variable count should equal the number of calls to the backend service. count is incremented - // during callback processing. - Assert.assertEquals("Conversations - Test1 count", numCalls, count); - // The returned message should be like the following. - Assert.assertEquals("Conversations - Test1 message", true, message.startsWith("Who's There")); - // any initial state set prior to running the callbacks should be maintained. - Assert.assertEquals("Conversations - Test1 initialState", "Initial State", initialState); - Assert.assertEquals("Conversations - Test1 initialCount", 56, initialCount); - - return; - - } - - private void test2() - { - - // Verify the various methods to create a new Session. - // Sesssions can be started: - // - // 1) When a service reference is injected into a client. This is verified in test0(). - // 2) By the client calling newSession() API with and without a ConversationID. - // - // Verify init() is called prior to any business methods. This is performed in the Service when any - // business methos is called. - - Assert.assertNotNull("current composite context",myContext); - - // This tests creating a conversational session. And that @Init is run prior to business method. - ServiceReference aServRef = null; - //FIXME Port to the 1.0 spec API - //aServRef = myContext.newSession("ConversationsLifeCycleService"); - Assert.assertNotNull("Conversations - Test2 Service Reference 1 not returned", aServRef); - - //FIXME Port to the 1.0 spec API - //Get the session ID. - //Object aConversationID = aServRef.getSessionID(); - ConversationsLifeCycleService aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef; - aConversationsLifeCycleService.knockKnock("Hello"); - - //Create a new session this time specifying a session ID. Verify the seesion id is what was specified. - //FIXME Port to the 1.0 spec API - //aServRef = myContext.newSession("ConversationsLifeCycleService","Test2-12345"); - Assert.assertNotNull("Conversations - Test2 Service Reference 2 not returned", aServRef); - //FIXME Port to the 1.0 spec API - //Get the session ID. - //Object aConversationID2 = aServRef.getSessionID(); - //Assert.assertEquals("Conversations - Test2 Session not created with specified ConversationID", "Test2-12345", aConversationID2); - aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef; - aConversationsLifeCycleService.knockKnock("Hello"); - - //FIXME Port to the 1.0 spec API - //Assert.assertNotSame("Conversations - Test2 sessions are not different", aConversationID, aConversationID2); - - } - - private void test3() - { - - // Note: The @EndSesion and @EndsConversation anotations are not implemented. - // So #1 an #2 cannot be done. - - // - // Verify the various methods to end a session. - // Sesssions can be ended: - // - // 1) Server operation annotated with @EndsConversation. - // 2) Server operation calls an @EndSession annotated callback method. - // 3) Servers conversation lifetime times out. This is test6() so its not implimented in the test3 method. - // 4) The client calls ServiceReference.endSession(); - // - // Verify @Destroy annotated method get called after completion of the business - // method that called the endSession. - // - - ConversationsLifeCycleService aConversationsLifeCycleService; - Object aConversationID; - Assert.assertNotNull("current composite context",myContext); - ServiceReference aServRef; - this.removeMarkerFile(); - - // - // test3 variation #1 - Cannot be done annotation not implimented yet. 12/15/2006 - // - - //FIXME Port to the 1.0 spec API - //aServRef = myContext.newSession("ConversationsLifeCycleService"); - aServRef = null; - Assert.assertNotNull("Conversations - Test3-1 Service Reference not returned", aServRef); - - aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef; - aConversationsLifeCycleService.knockKnock("Hello"); - //FIXME Port to the 1.0 spec API - //aConversationID = aServRef.getSessionID(); - //Assert.assertNotNull("Conversations - Test3-1 ConversationID not found", aConversationID); - - //Call the business method annotated with @EndsConversation. - aConversationsLifeCycleService.endThisSession(); // This should also drive @Destroy method. - - // Verify session has ended. The ConversationID should be null; - //FIXME Port to the 1.0 spec API - //aConversationID = aServRef.getSessionID(); - //Assert.assertNull("Conversations - Test3-1 session not null after endSession()", aConversationID); - - // Verify Destroy was run. The baxckend service creates a marker file when @Destroy annotated method is run. - Assert.assertEquals("Conversations - Test3-1 @Destroy method not invoked", true, this.isMarkerFilePresent()); - this.removeMarkerFile(); - - // - // test3 variation #2 - Cannot be done annotation not implimented yet. 12/15/2006 - // - - //FIXME Port to the 1.0 spec API - //aServRef = myContext.newSession("ConversationsLifeCycleService"); - Assert.assertNotNull("Conversations - Test3-2 Service Reference not returned", aServRef); - - aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef; - aConversationsLifeCycleService.knockKnock("Hello"); - //FIXME Port to the 1.0 spec API - //aConversationID = aServRef.getSessionID(); - //Assert.assertNotNull("Conversations - Test3-2 ConversationID not found", aConversationID); - - //Call the business method that will invoke my @EndSession callback method. - aConversationsLifeCycleService.endThisSessionUsingCallback(); // This should also drive @Destroy method. - - // Verify session has ended. The ConversationID should be null; - //FIXME Port to the 1.0 spec API - //aConversationID = aServRef.getSessionID(); - //Assert.assertNull("Conversations - Test3-2 session not null after endSession()", aConversationID); - - // Verify Destroy was run. The baxckend service creates a marker file when @Destroy annotated method is run. - Assert.assertEquals("Conversations - Test3-2 @Destroy method not invoked", true, this.isMarkerFilePresent()); - this.removeMarkerFile(); - - // - // test3 variation #4 - Client calls endSession() - // - - //FIXME Port to the 1.0 spec API - //aServRef = myContext.newSession("ConversationsLifeCycleService"); - aServRef = null; - Assert.assertNotNull("Conversations - Test3-4 Service Reference not returned", aServRef); - - aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef; - aConversationsLifeCycleService.knockKnock("Hello"); - //FIXME Port to the 1.0 spec API - //aConversationID = aServRef.getSessionID(); - //Assert.assertNotNull("Conversations - Test3-4 ConversationID not found", aConversationID); - - //Call the endSession() API on the Service Reference. - //FIXME Port to the 1.0 spec API - //aServRef.endSession(); // This should also drive @Destroy method. - - // Verify session has ended. The ConversationID should be null; - //FIXME Port to the 1.0 spec API - //aConversationID = aServRef.getSessionID(); - //Assert.assertNull("Conversations - Test3-4 session not null after endSession()", aConversationID); - - // Verify Destroy was run. The baxckend service creates a marker file when @Destroy annotated method is run. - Assert.assertEquals("Conversations - Test3-4 @Destroy method not invoked", true, this.isMarkerFilePresent()); - this.removeMarkerFile(); - } - - public void test4() - { - - // - // This test uses the injected active session for the ConversationsService. It starts a conversation - // in this method building up state with a counter. It then passes this reference to another backend service adding - // additional state. It then returns and adds more state using original service and then performs the Assertions. - // - - aService.initializeCount(); - aService.add(1); - anotherService.setService((ServiceReference)aService); - anotherService.add(1); - anotherService.add(1); - aService.add(1); - aService.add(1); - int count = anotherService.getCount(); - - Assert.assertEquals("test4 - ConversationsClientImpl ", 5, count); - - return; - } - - - public void test5() - { - - // The first test verifies that the createServiceReferenceForSession(this) API is functioning. - // This is done in the backend serviced as it needs a single interface defined. The 2nd test - // uses the variant of this API when > 1 interfaces are implemented. - // - // The 2nd test obtains a service reference for myself and passes that reference to a backend service. - // The backend service then invokes the count() method on my service reference. It then returns - // the count that it retrieved. The test then asserts that the count returned from the backend - // service matches the client services internal state. - // - - Assert.assertNotNull("current composite context",myContext); - - boolean result = aService.createServiceReferenceForSelf(); - System.out.println("Laa: returned from createServiceReferenceForSelf() " + result); - Assert.assertEquals("test5 - createServiceReferenceForSelf",true,result); - - count = 6; - int returnCount = 0; - //FIXME Port to the 1.0 spec API - //ServiceReference myServiceReference = myContext.createServiceReferenceForSession(this,"ConversationsClient2"); - ServiceReference myServiceReference = null; - Assert.assertNotNull("test5 - createServiceReferenceForSession - myContext.createServiceReferenceForSession(this,ConversationsClient);", myServiceReference); - returnCount = aService.getCount(myServiceReference); - - Assert.assertEquals("test5 - createServiceReferenceForSession(this,ConversationsClient2)",count,returnCount); - String aRemoteDateTime = aService.getDateTime(myServiceReference); - Assert.assertEquals("test5 - createServiceReferenceForSession(this,ConversationsClient2 - dateTime)", dateTime, aRemoteDateTime); - - return; - } - - public void test6() - { - - // - // Create a session and allow it to timeout and verify that it did. - // Invoking a business method on a service that has timed out should result in - // a SessionEndedException. - // - - Assert.assertNotNull("current composite context",myContext); - - // This tests creating a conversational session. This service has a maxAge="5 seconds". - ServiceReference aServRef; - //FIXME Port to the 1.0 spec API - //aServRef = myContext.newSession("ConversationsLifeCycleService"); - aServRef = null; - Assert.assertNotNull("Conversations - Test6 Service Reference not returned", aServRef); - - // Run a business method. - ConversationsLifeCycleService aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef; - aConversationsLifeCycleService.knockKnock("Hello"); - - // - // wait 10 seconds so session will time out. - // - try { - Thread.sleep(10000L); - } - catch (InterruptedException ex) - { - ex.printStackTrace(); - } - - // Run a busineess method after timeout period has elapsed. - boolean sessionEnded = false; - try - { - aConversationsLifeCycleService.knockKnock("Hello"); - } - catch (ConversationEndedException sex) - { - sessionEnded = true; - } - - Assert.assertEquals("Conversations - Test6 Session did not timeout ", true, sessionEnded); - - return; - } - - - public synchronized void callBackIncrement(String aString) { - - count++; - System.out.println("Laa: callBackIncrement invoked on client. count = " + count); - - } - - public synchronized void callBackMessage(String aString) { - - message = aString; - System.out.println("Laa: callBackIMessage invoked on client. message = " + message); - - } - - // @EndSession - This is for test3() variation #2. - public void callBackEndSession() { - - System.out.println("Laa: callBackEndSession method invoked on client."); - - } - - public int count() - { - return this.count; - } - - public String getDateTime() { - - dateTime = DateFormat.getDateTimeInstance().toString(); - return dateTime; - - } - - private void removeMarkerFile() - { - // Make sure the marker file is not present before starting the test. - File aFile = new File(markerFileName); - if (aFile.exists()) - aFile.delete(); - } - - private boolean isMarkerFilePresent() - { - File aFile = new File(markerFileName); - return aFile.exists(); - } - - - -} diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java deleted file mode 100644 index bd18b48da2..0000000000 --- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -@Remotable -@Callback(ConversationsCallback.class) - -/** - * - */ -public interface ConversationsLifeCycleService { - - public String knockKnock(String aString); - public void endThisSession(); - public void endThisSessionUsingCallback(); - -} diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java deleted file mode 100644 index 7f38e356f6..0000000000 --- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import java.io.File; - -import junit.framework.Assert; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(ConversationsLifeCycleService.class) -@Scope("CONVERSATION") -@ConversationAttributes(maxAge="5 seconds") - -// This is a short-lived conversational service. - -public class ConversationsLifeCycleServiceImpl implements ConversationsLifeCycleService { - - @Callback - protected ConversationsCallback callback; - - private String state = "NOT READY"; - private final static String markerFileName = "target/testConversations_test3_marker"; - - - public String knockKnock(String aString) { - - // Prior to any business methods being invoked the state must have been set to READY using the @Init. - System.out.println("ConversationsLifeCycleServiceImpl.knockKnock - State = " + state); - Assert.assertEquals("ConversationsLifeCycleServiceImpl.knockKnock - not in READY state ", "READY", state); - - return "Who's There!"; - } - - @Init - public void init() - { - state = "READY"; - System.out.println("ConversationsLifeCycleServiceImpl.init()"); - } - - - @Destroy - public void destroy() - { - state = "DESTROYED"; - - File aFile = new File(markerFileName); - try - { - aFile.createNewFile(); - } - catch (Exception ex) - { - System.out.println("Error Creating " + markerFileName); - ex.printStackTrace(); - } - System.out.println("ConversationsLifeCycleServiceImpl.destroy()"); - } - -// @EndsConversation - public void endThisSession() { - //This method will end the current session by annotation. - System.out.println("ConversationsLifeCycleServiceImpl.endThisSession()"); - - } - - public void endThisSessionUsingCallback() { - - //This method will end the current session by a callback method annotated with @EndSession. - callback.callBackEndSession(); - System.out.println("ConversationsLifeCycleServiceImpl.endThisSessionUsingCallback()"); - } - -} - diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java deleted file mode 100644 index 6bdc1c5c03..0000000000 --- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test; - -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -@Remotable -@Callback(ConversationsCallback.class) - -/** - * - */ -public interface ConversationsService { - - public void knockKnock(String aString); - public void add(int anInt); - public void initializeCount(); - public int getCount(ServiceReference aServiceReference); - public int getLocalCount(); - public String getDateTime(ServiceReference aServiceReference); - public boolean createServiceReferenceForSelf(); - -} diff --git a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java b/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java deleted file mode 100644 index 45fc68308b..0000000000 --- a/branches/sca-java-0.91/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(ConversationsService.class) -@Scope("CONVERSATION") - -public class ConversationsServiceImpl implements ConversationsService { - - @Context - protected ComponentContext context; - - @Callback - protected ConversationsCallback callback; - private int count=0; - - public void knockKnock(String aString) { - - try - { - count++; - //System.out.println("ConversationsServiceImpl message received: " + aString); - callback.callBackMessage("Who's There " + count); - callback.callBackIncrement("Add one please"); - //System.out.println("ConversationsServiceImpl responses sent"); - return; - } - catch (Exception ex) - { - ex.printStackTrace(); - } - - } - - public int getCount(ServiceReference aServiceReference) - { - - // - // Invoke a method on the service reference and return back the result. - // - - int count=0; - try - { - count = ((ConversationsClient) aServiceReference).count(); - } - catch (Exception ex) - { - ex.printStackTrace(); - } - return count; - - } - - public int getLocalCount() - { - - // - // Return my localc instance count. This is used for test4. - // - - return count; - - } - - public String getDateTime(ServiceReference aServiceReference) - { - - // - // Invoke a method on the service reference and return back the result. - // - - String dateTime; - dateTime = ((ConversationsClient2) aServiceReference).getDateTime(); - return dateTime; - - } - - public void add(int anInt) { - - count +=anInt; - - } - - public void initializeCount() { - - count =0; - - } - - public boolean createServiceReferenceForSelf() { - - // This is done here because we need to test getting a ServiceReference - // from a component that implements a single interface. The client in this test - // impliments 2 interfaces to test the variant of this that takes interface name as an argumnet. - - boolean aBoolean = false; - - ServiceReference myServiceReference = null; - - try - { - myServiceReference = context.createSelfReference(ConversationsService.class); - System.out.println("Laa: Created Service Reference for Session:" + myServiceReference); - } - catch (Exception ex) - { - ex.printStackTrace(); - } - - - if (myServiceReference != null) - { - aBoolean = true; - System.out.println("Laa: Service Reference is not null"); - } - - return aBoolean; - } - - -} - diff --git a/branches/sca-java-0.91/itest/conversations/src/main/resources/ConversationsTest.composite b/branches/sca-java-0.91/itest/conversations/src/main/resources/ConversationsTest.composite deleted file mode 100644 index 93b44c260f..0000000000 --- a/branches/sca-java-0.91/itest/conversations/src/main/resources/ConversationsTest.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" - targetNamespace="http://conversations" - name="ConversationsTest"> - - <component name="ConversationsClient"> - <implementation.java class="org.apache.tuscany.sca.test.ConversationsClientImpl"/> - <reference name="aService" target="ConversationsService"/> - <reference name="anotherService" target="AnotherService"/> - <reference name="aLifeCycleService" target="ConversationLifeCycleService"/> - </component> - - <component name="ConversationsService"> - <implementation.java class="org.apache.tuscany.sca.test.ConversationsServiceImpl"/> - </component> - - <component name="AnotherService"> - <implementation.java class="org.apache.tuscany.sca.test.AnotherServiceImpl"/> - </component> - - <component name="ConversationLifeCycleService"> - <implementation.java class="org.apache.tuscany.sca.test.ConversationsLifeCycleServiceImpl"/> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java b/branches/sca-java-0.91/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java deleted file mode 100644 index af917d67f4..0000000000 --- a/branches/sca-java-0.91/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class ConversationsTest extends TestCase { - - private SCADomain domain; - private ConversationsClient aConversationsClient; - - public void testConversations() { - aConversationsClient.run(); - } - - protected void setUp() throws Exception { - domain = SCADomain.newInstance("ConversationsTest.composite"); - - aConversationsClient = - domain.getService(ConversationsClient.class, - "ConversationsClient/org.apache.tuscany.sca.test.ConversationsClient"); - - } - - protected void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/branches/sca-java-0.91/itest/databindings/common/pom.xml b/branches/sca-java-0.91/itest/databindings/common/pom.xml deleted file mode 100644 index ac603c1a39..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/pom.xml +++ /dev/null @@ -1,120 +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> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <artifactId>tuscany-itest-databindings-common</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Apache Tuscany Common elements of Databindings Integration Tests</name> - - <repositories> - <repository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>java.net</id> - <name>java.net Maven 1.x Repository</name> - <url>https://maven-repository.dev.java.net/nonav/repository</url> - <layout>legacy</layout> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>java.net</id> - <name>java.net Maven 1.x Repository</name> - <url>https://maven-repository.dev.java.net/repository</url> - <layout>legacy</layout> - </pluginRepository> - </pluginRepositories> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>velocity</groupId> - <artifactId>velocity</artifactId> - <version>1.4</version> - <scope>compile</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-test-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>target/sdo-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-plugin</artifactId> - <version>1.0-incubating-beta1</version> - <executions> - <execution> - <id>generate-sdo</id> - <phase>generate-sources</phase> - <configuration> - <schemaFiles> - <configuration> - <fileName>${basedir}/src/main/resources/generate/generate.xsd</fileName> - </configuration> - </schemaFiles> - <noNotification>true</noNotification> - <noContainment>true</noContainment> - <noUnsettable>true</noUnsettable> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/branches/sca-java-0.91/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java deleted file mode 100644 index 73dfebb73c..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java +++ /dev/null @@ -1,123 +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.generate; - -import java.io.FileInputStream; -import java.io.FileWriter; -import java.util.List; -import java.util.Properties; - -import org.apache.tuscany.generate.GenerateFactory; -import org.apache.tuscany.generate.GenerateType; -import org.apache.tuscany.generate.TemplateType; -import org.apache.tuscany.sdo.util.SDOUtil; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; - -import commonj.sdo.helper.HelperContext; -import commonj.sdo.helper.XMLDocument; - -/** - * Generates test files based on the information in a configuration files (generate.xml) - * and a set of velocity templates. The process is - * - * for each template - * for each file - * add a line to pom for code gen - * include the factory into the composite - * for each type - * add client iface method - * add client impl method - * add service iface method - * add service impl method - * add test method - * add wsdl type and method - * - * @version $Rev$ $Date$ - */ -public class Generate { - - /** - * Does all the hard work of running the velocity templates against the - * the list of types to test. Both the list of templates and the list of - * XSD files is held in the configuration file (generate.xsd) which lives in the - * resources/generate directory of the project being generated. - * - * @param projectBuildDir the path to the target dir of the project being generated. - */ - public static void generate(String projectBuildDir) { - System.out.println(">> Building project from dir: " + projectBuildDir); - FileInputStream fis = null; - - try { - // Load the config file into a stream - fis = new FileInputStream(projectBuildDir + "/classes/generate/generate.xml"); - - // Load the stream into SDO - // We are just using SDO as a conveniet way to parse the XML config file - HelperContext scope = SDOUtil.createHelperContext(); - GenerateFactory.INSTANCE.register(scope); - XMLDocument xmlDoc = scope.getXMLHelper().load(fis); - GenerateType generateType = (GenerateType)xmlDoc.getRootObject(); - - // Get the file list. This is the list of XSD that is passed into the - // the velocity templates. Each confiured file holds a list of types - // that the velocity templates expand into appropriate methods and method calls - List fileList = generateType.getInputFile(); - - //Intialise velocity ready to generate the various files - Properties p = new Properties(); - p.setProperty("file.resource.loader.path", projectBuildDir + "/classes/generate"); - Velocity.init(p); - VelocityContext context = new VelocityContext(); - context.put("fileList", fileList); - - List templateList = generateType.getTemplate(); - - // For each velocity template in the template list pass in the XSD file list - for ( Object item: templateList){ - TemplateType template = (TemplateType)item; - context.put("template", template); - String tmp = template.getTemplateName(); - String filename = projectBuildDir + "/" + template.getTemplateTargetDir() + "/" + tmp.substring(0,tmp.length() - 3); - FileWriter fw = new FileWriter(filename); - System.out.println(">> Processing " + template.getTemplateName() + " to " + filename); - Velocity.mergeTemplate(template.getTemplateName(), context, fw ); - fw.flush(); - fw.close(); - } - - } catch (Exception e) { - System.out.println("Exception : " + e.toString()); - e.printStackTrace(); - return; - } - } - - /** - * The mainline - * - * @param args the target directory where project in which files are being generated - */ - public static void main(String[] args) { - Generate gen = new Generate(); - gen.generate(args[0]); - } - -} diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm deleted file mode 100644 index b2346aa973..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm +++ /dev/null @@ -1,112 +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 $template.getJavaPackage(); - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; - -import ${template.getJavaPackage()}.GreeterService; - -// Data types -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) -import $file.getJavaPackage().$typeInstance.getTypeName(); -import $file.getJavaPackage().$file.getFactory(); -#end -#end - -/** - * Automatically generated test case. Calls the greeter client for a number of - * bindings and a number of data types. - * - * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $ - */ -public class DatabindingTestCase extends TestCase { - - private SCADomain domain; - private GreeterService greeterClient; - - /** - * Runs before each test method - */ - protected void setUp() throws Exception { - domain = SCADomain.newInstance("greeter.composite"); - super.setUp(); - } - - /** - * Runs after each test method - */ - protected void tearDown() { - domain.close(); - } - - /** - * Finds the SCA component that relates to the protocol being tested. This test - * always connects locally to the client component but the client component will - * connect to the back end component using the appropriate protocol - * - * @param ext the protcol required - */ - private void setUpClient(String ext) throws Exception { - greeterClient = domain.getService(GreeterService.class, ext + "GreeterServiceClient"); - } - - /** - * Invokes the SDO Greet service using web service bindings with SDO payload - */ - public void testWSGreet() throws Exception { - setUpClient("WS"); - greet(); - } - - /** - * Invokes the SDO Greet service using default bindings with SDO payload - */ - public void testDefaultGreet() throws Exception { - setUpClient("Default"); - greet(); - } - - /** - * A generic method which, regarless of which client is connected, sends out a - * series of requrests passing different data types. - */ - public void greet() { -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - // test $typeInstance.getTypeName() - { - $typeInstance.getTypeName() param = null; - $typeInstance.getCreateTypeCode() - $typeInstance.getTypeName() result = greeterClient.greet$typeInstance.getTypeName()(param); - $typeInstance.getResultComparison() - } -#end -#end - } - -} diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm deleted file mode 100644 index 88616cc997..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm +++ /dev/null @@ -1,103 +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. ---> -<wsdl:definitions targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services" - xmlns:tns="http://apache.org/tuscany/sca/itest/databinding/services" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="Greeter"> - - <wsdl:types> - <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" -#foreach($file in $fileList) - xmlns:$file.getPrefix()="$file.getNamespace()" -#end - targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services" - elementFormDefault="qualified"> - -#foreach($file in $fileList) - <xsd:import namespace="$file.getNamespace()" - schemaLocation="../xsd/$file.getFileName()" /> -#end - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - <element name="greet$typeInstance.getTypeName()"> - <complexType> - <sequence> - <element name="parm" type="$file.getPrefix():$typeInstance.getTypeName()" /> - </sequence> - </complexType> - </element> -#end -#end - </xsd:schema> - </wsdl:types> -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - <wsdl:message name="$typeInstance.getTypeName()Request"> - <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" /> - </wsdl:message> - <wsdl:message name="$typeInstance.getTypeName()Response"> - <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" /> - </wsdl:message> -#end -#end - - <wsdl:portType name="GreeterPortType"> -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - <wsdl:operation name="greet$typeInstance.getTypeName()"> - <wsdl:input message="tns:$typeInstance.getTypeName()Request" name="$typeInstance.getTypeName()RequestMsg" /> - <wsdl:output message="tns:$typeInstance.getTypeName()Response" name="$typeInstance.getTypeName()ResponseMsg" /> - </wsdl:operation> -#end -#end - </wsdl:portType> - - <wsdl:binding name="GreeterBinding" type="tns:GreeterPortType"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" /> -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - <wsdl:operation name="greet$typeInstance.getTypeName()"> - <wsdlsoap:operation soapAction="" /> - <wsdl:input name="$typeInstance.getTypeName()RequestMsg"> - <wsdlsoap:body use="literal" /> - </wsdl:input> - <wsdl:output name="$typeInstance.getTypeName()ResponseMsg"> - <wsdlsoap:body use="literal" /> - </wsdl:output> - </wsdl:operation> -#end -#end - </wsdl:binding> - - <wsdl:service name="GreeterService"> - <wsdl:port name="GreeterPort" binding="tns:GreeterBinding"> - <wsdlsoap:address location="http://localhost:8085/services/GreeterServiceWebServiceBinding" /> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm deleted file mode 100644 index b0e298b823..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm +++ /dev/null @@ -1,53 +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 $template.getJavaPackage(); - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) -import $file.getJavaPackage().$typeInstance.getTypeName(); -#end -#end - -import org.osoa.sca.annotations.Remotable; - -/** - * The automcatically generated interface to the service that reflects data objects - * that are sent to it - * - * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $ - */ -@Remotable -public interface GreeterService { - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - /** - * Take the provided data object, change it slightly and return it - * - * @param param the data object to be changed and returned - * @return the change data object - */ - $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param); -#end -#end - -} diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm deleted file mode 100644 index ee73db6152..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm +++ /dev/null @@ -1,42 +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 $template.getJavaPackage(); - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) -import $file.getJavaPackage().$typeInstance.getTypeName(); -#end -#end - -import org.osoa.sca.annotations.AllowsPassByReference; - -/** - * GreeterServiceClient - */ -@AllowsPassByReference -public interface GreeterServiceClient { -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param); -#end -#end -} diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm deleted file mode 100644 index 57827d27b9..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm +++ /dev/null @@ -1,65 +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 $template.getJavaPackage(); - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) -import $file.getJavaPackage().$typeInstance.getTypeName(); -#end -#end - -/** - * The automcatically generated service that simply forwards data objects on to - * the GreeterService and passes back the responses - * - * @version $Rev: 508831 $ $Date: 2007-02-18 00:12:31 +0000 (Sun, 18 Feb 2007) $ - */ -@Service(GreeterService.class) -public class GreeterServiceClientImpl implements GreeterService { - - /** - * the reference the the GreeterService that will - * change each data object slightly and return it - */ - private GreeterService service; - - @Reference - public void setGreeterService(GreeterService service) { - this.service = service; - } -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.itest.sdodatabinding.GreeterService#greet$typeInstance.getTypeName()($typeInstance.getTypeName() param) - */ - public $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param) { - return service.greet$typeInstance.getTypeName()(param); - } -#end -#end -} diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm deleted file mode 100644 index 1fd7509667..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm +++ /dev/null @@ -1,55 +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 $template.getJavaPackage(); - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) -import $file.getJavaPackage().$typeInstance.getTypeName(); -#end -#end - -import org.osoa.sca.annotations.Service; - -/** - * The automcatically generated service implementation that reflects data objects - * that are sent to it - * - * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $ - */ -@Service(GreeterService.class) -public class GreeterServiceImpl implements GreeterService { -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - /** - * Take the provided data object, change it slightly and return it - * - * @param param the data object to be changed and returned - * @return the change data object - */ - public $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param) { - $typeInstance.getModifyTypeCode() - return param; - } -#end -#end -} diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/generate.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/generate.xsd deleted file mode 100644 index 1fabedf55f..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/generate/generate.xsd +++ /dev/null @@ -1,61 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/generate" - xmlns:tns="http://www.apache.org/tuscany/generate"> - - <complexType name="TypeType"> - <sequence> - <element name="TypeName" type="string"/> - <element name="CreateTypeCode" type="string"/> - <element name="ModifyTypeCode" type="string"/> - <element name="ResultComparison" type="string"/> - </sequence> - </complexType> - - <complexType name="InputFileType"> - <sequence> - <element name="FileName" type="string"/> - <element name="FilePath" type="string"/> - <element name="JavaPackage" type="string"/> - <element name="Factory" type="string"/> - <element name="Namespace" type="string"/> - <element name="Prefix" type="string"/> - <element name="Type" type="tns:TypeType" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <complexType name="TemplateType"> - <sequence> - <element name="TemplateName" type="string"/> - <element name="TemplateTargetDir" type="string"/> - <element name="JavaPackage" type="string"/> - </sequence> - </complexType> - - <complexType name="GenerateType"> - <sequence> - <element name="Template" type="tns:TemplateType" maxOccurs="unbounded"/> - <element name="InputFile" type="tns:InputFileType" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <element name="Generate" type="tns:GenerateType"/> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/wsdl/Dummy.txt deleted file mode 100644 index 8927d725b6..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/wsdl/Dummy.txt +++ /dev/null @@ -1,4 +0,0 @@ -A dummy file that causes the target/classes/wsdl dir to be created in the generated test project. This is -required because the test generator must run in the process-resource phase, after generate.xml has been copied -into target. The generator needs to write out target/classes/wsdl and will fail the directory isn't there. So -this file just gets unpacked and forces the directory to be created. diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Annotation.xml deleted file mode 100644 index f1f4346e58..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Annotation.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. ---> -<tns:Annotation xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop Annotation.xsd"> - <SimpleTypeWithNameElement>SimpleTypeWithName</SimpleTypeWithNameElement> -</tns:Annotation> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Annotation.xsd deleted file mode 100644 index 1fae43eb09..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Annotation.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <annotation> - <appinfo>SDO 2.0.1</appinfo> - <documentation> - A schema that tests the presence of annotations in schema read by SDO - </documentation> - </annotation> - - <complexType name="AnnotationComplexType"> - <sequence> - <element name="SimpleTypeWithNameElement" type="string"/> - </sequence> - </complexType> - - <element name="Annotation" type="tns:AnnotationComplexType"/> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Attribute.xml deleted file mode 100644 index c20c80b658..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Attribute.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. ---> -<tns:Attribute xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop Attribute.xsd "> - <AttributeElement Attribute="Attribute"/> -</tns:Attribute> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Attribute.xsd deleted file mode 100644 index bd3db2e030..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Attribute.xsd +++ /dev/null @@ -1,39 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <complexType name="AttributeType"> - <sequence> - </sequence> - <attribute name="Attribute" type="string"/> - </complexType> - - <complexType name="AttributeComplexType"> - <sequence> - <element name="AttributeElement" type="tns:AttributeType"/> - </sequence> - </complexType> - - <element name="Attribute" type="tns:AttributeComplexType"/> - -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml deleted file mode 100644 index 30e4979dca..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeReference.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. ---> -<tns:AttributeReference xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeReference.xsd "> - <AttributeReferenceElement tns:ReferencedAttribute="AttributeReference"/> -</tns:AttributeReference> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd deleted file mode 100644 index e7738dcff7..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd +++ /dev/null @@ -1,40 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <attribute name="ReferencedAttribute" type="string"/> - - <complexType name="AttributeReferenceComplexType"> - <sequence> - </sequence> - <attribute ref="tns:ReferencedAttribute"/> - </complexType> - - <element name="AttributeReference"> - <complexType> - <sequence> - <element name="AttributeReferenceElement" type="tns:AttributeReferenceComplexType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml deleted file mode 100644 index 9552421e2d..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.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. ---> -<tns:AttributeWithDefaultValueElement xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithDefaultValue.xsd "> - <AttributeWithDefaultValueElement AttributeWithDefaultValue="AttributeWithDefaultValueDefaultValue"/> -</tns:AttributeWithDefaultValueElement> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd deleted file mode 100644 index c7b9655749..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <complexType name="AttributeWithDefaultValueType"> - <sequence> - </sequence> - <attribute name="AttributeWithDefaultValue" type="string" default="AttributeWithDefaultValueDefaultValue"/> - </complexType> - - <element name="AttributeWithDefaultValueElement"> - <complexType> - <sequence> - <element name="AttributeWithDefaultValueElement" type="tns:AttributeWithDefaultValueType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml deleted file mode 100644 index 5e5e7fbd55..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.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. ---> -<tns:AttributeWithFixedValueType xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithFixedValue.xsd "> - <AttributeWithFixedValueElement AttributeWithFixedValue="AttributeWithFixedValueFixedValue"/> -</tns:AttributeWithFixedValueType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd deleted file mode 100644 index 5c455c2ab5..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <complexType name="AttributeWithFixedValueType"> - <sequence> - </sequence> - <attribute name="AttributeWithFixedValue" type="string" fixed="AttributeWithFixedValueFixedValue"/> - </complexType> - - <element name="AttributeWithFixedValueType"> - <complexType> - <sequence> - <element name="AttributeWithFixedValueElement" type="tns:AttributeWithFixedValueType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml deleted file mode 100644 index 635e851632..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.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. ---> -<tns:AttributeWithSDOAliasName xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOAliasName.xsd "> - <AttributeWithSDOAliasNameElement AttributeWithSDOAliasName="AttributeWithSDOAliasName"/> -</tns:AttributeWithSDOAliasName> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd deleted file mode 100644 index 004dab4fbb..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <complexType name="AttributeWithSDOAliasNameType"> - <sequence> - </sequence> - <attribute name="AttributeWithSDOAliasName" sdo:aliasName="AttributeWithSDOAliasNameSDOAliasName" type="string"/> - </complexType> - - <element name="AttributeWithSDOAliasName"> - <complexType> - <sequence> - <element name="AttributeWithSDOAliasNameElement" type="tns:AttributeWithSDOAliasNameType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml deleted file mode 100644 index 136092951b..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.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. ---> -<tns:AttributeWithSDODataType xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDODataType.xsd "> - <AttributeWithSDODataTypeTypeElement AttributeWithSDODataType="AttributeWithSDODataType"/> -</tns:AttributeWithSDODataType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd deleted file mode 100644 index 796f08e1cf..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <complexType name="AttributeWithSDODataTypeType"> - <sequence> - </sequence> - <attribute name="AttributeWithSDODataType" sdo:dataType="string" type="string"/> - </complexType> - - <element name="AttributeWithSDODataType"> - <complexType> - <sequence> - <element name="AttributeWithSDODataTypeTypeElement" type="tns:AttributeWithSDODataTypeType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml deleted file mode 100644 index 927b94885c..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.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. ---> -<tns:AttributeWithSDOName xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOName.xsd "> - <AttributeWithSDONameElement AttributeWithSDOName="AttributeWithSDOName"/> -</tns:AttributeWithSDOName> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd deleted file mode 100644 index 93f83cd0a1..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <complexType name="AttributeWithSDONameType"> - <sequence> - </sequence> - <attribute name="AttributeWithSDOName" sdo:name="AttributeWithSDONameSDOName" type="string"/> - </complexType> - - <element name="AttributeWithSDOName"> - <complexType> - <sequence> - <element name="AttributeWithSDONameElement" type="tns:AttributeWithSDONameType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml deleted file mode 100644 index ea7db70595..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.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. ---> -<tns:AttributeWithSDOPropertySDOOppositePropertyType xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOPropertySDOOppositePropertyType.xsd "> - <AttributeWithSDOPropertySDOOppositePropertyTypeElement AttributeWithSDOPropertySDOOppositePropertyType="idvalue0"/> -</tns:AttributeWithSDOPropertySDOOppositePropertyType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd deleted file mode 100644 index c64323e7e1..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <complexType name="AttributeWithSDOPropertySDOOppositePropertyTypeType"> - <sequence> - </sequence> - <attribute name="AttributeWithSDOPropertySDOOppositePropertyType" type="IDREF" sdo:propertyType="tns:SimpleTypeWithNameType" sdo:oppositeProperty="tns:AttributeWithSDOPropertyType"/> - </complexType> - - <element name="AttributeWithSDOPropertySDOOppositePropertyType"> - <complexType> - <sequence> - <element name="AttributeWithSDOPropertySDOOppositePropertyTypeElement" type="tns:AttributeWithSDOPropertySDOOppositePropertyTypeType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml deleted file mode 100644 index 85c7d85fd4..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.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. ---> -<tns:AttributeWithSDOPropertyType xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOPropertyType.xsd "> - <AttributeWithSDOPropertyTypeElement AttributeWithSDOPropertyType="idvalue0"/> -</tns:AttributeWithSDOPropertyType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd deleted file mode 100644 index 543f276c50..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <complexType name="AttributeWithSDOPropertyTypeType"> - <sequence> - </sequence> - <attribute name="AttributeWithSDOPropertyType" type="IDREF" sdo:propertyType="tns:SimpleTypeWithNameType"/> - </complexType> - - <element name="AttributeWithSDOPropertyType"> - <complexType> - <sequence> - <element name="AttributeWithSDOPropertyTypeElement" type="tns:AttributeWithSDOPropertyTypeType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml deleted file mode 100644 index fcd281539b..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.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. ---> -<tns:AttributeWithSDOString xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOString.xsd "> - <AttributeWithSDOStringElement AttributeWithSDOString="AttributeWithSDOString"/> -</tns:AttributeWithSDOString> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd deleted file mode 100644 index 1610c2b861..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <complexType name="AttributeWithSDOStringType"> - <sequence> - </sequence> - <attribute name="AttributeWithSDOString" type="string" sdo:string="true"/> - </complexType> - - <element name="AttributeWithSDOString"> - <complexType> - <sequence> - <element name="AttributeWithSDOStringElement" type="tns:AttributeWithSDOStringType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml deleted file mode 100644 index 36a0760a61..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.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. ---> -<tns:BuiltInAnySimpleType xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInAnySimpleType.xsd "> - <anySimpleType>anySimpleType</anySimpleType> -</tns:BuiltInAnySimpleType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd deleted file mode 100644 index 999b72bb35..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInAnySimpleType"> - <complexType> - <sequence> - <element name="anySimpleType" type="anySimpleType" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml deleted file mode 100644 index 5849165fe0..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.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. ---> -<tns:BuiltInAnyType xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInAnyType.xsd "> - <anyType xsi:type="anyType"/> -</tns:BuiltInAnyType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd deleted file mode 100644 index 71dad561ca..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInAnyType"> - <complexType> - <sequence> - <element name="anyType" type="anyType" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml deleted file mode 100644 index 8acf9376d7..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.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. ---> -<tns:BuiltInAnyURI xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInAnyURI.xsd "> - <anyURI>http://tempuri.org</anyURI> -</tns:BuiltInAnyURI> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd deleted file mode 100644 index a49987c352..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInAnyURI"> - <complexType> - <sequence> - <element name="anyURI" type="anyURI" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml deleted file mode 100644 index a35b6e174a..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.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. ---> -<tns:BuildInBase64Binary xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInBase64Binary.xsd "> - <base64Binary>ABCDEF</base64Binary> -</tns:BuildInBase64Binary> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd deleted file mode 100644 index e1995890f9..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuildInBase64Binary"> - <complexType> - <sequence> - <element name="base64Binary" type="base64Binary" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml deleted file mode 100644 index 91cfce51b8..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml +++ /dev/null @@ -1,27 +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. ---> -<tns:BuiltInBoolean xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInBoolean.xsd "> - <boolean>true</boolean> - <boolean>false</boolean> - <boolean>1</boolean> - <boolean>0</boolean> -</tns:BuiltInBoolean> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd deleted file mode 100644 index a2f86ba8c5..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInBoolean"> - <complexType> - <sequence> - <element name="boolean" type="boolean" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml deleted file mode 100644 index 907474cd1b..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInByte.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. ---> -<tns:BuiltInByte xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInByte.xsd "> - <byte>127</byte> - <byte>-127</byte> -</tns:BuiltInByte> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd deleted file mode 100644 index a2f6bcfa77..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInByte"> - <complexType> - <sequence> - <element name="byte" type="byte" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml deleted file mode 100644 index c5820e1a2e..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDate.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. ---> -<tns:BuiltInDate xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDate.xsd "> - <date>2001-01-01</date> -</tns:BuiltInDate> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd deleted file mode 100644 index f4d596bfe3..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInDate"> - <complexType> - <sequence> - <element name="date" type="date" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml deleted file mode 100644 index 0debe2fec5..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.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. ---> -<tns:BuiltInDateTime xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDateTime.xsd "> - <dateTime>2001-12-31T12:00:00</dateTime> -</tns:BuiltInDateTime> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd deleted file mode 100644 index b5bcfdcfd4..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInDateTime"> - <complexType> - <sequence> - <element name="dateTime" type="dateTime" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml deleted file mode 100644 index 7f001254cc..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml +++ /dev/null @@ -1,23 +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. ---> -<tns:BuiltInDecimal xmlns:tns="http://www.apache.org/tuscany/interop" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDecimal.xsd "> - <decimal>-1.23456789</decimal> - <decimal>1.23456789</decimal> -</tns:BuiltInDecimal> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd deleted file mode 100644 index 8d4d106f59..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInDecimal"> - <complexType> - <sequence> - <element name="decimal" type="decimal" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml deleted file mode 100644 index f875b9f94d..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.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. ---> -<tns:BuiltInDouble xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDouble.xsd "> - <double>0.0</double> - <double>12.3E-4</double> -</tns:BuiltInDouble> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd deleted file mode 100644 index 4c8a39b06c..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInDouble"> - <complexType> - <sequence> - <element name="double" type="double" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml deleted file mode 100644 index 7d343d6dda..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.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. ---> -<tns:BuiltInDuration xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDuration.xsd "> - <duration>P1D</duration> -</tns:BuiltInDuration> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd deleted file mode 100644 index bb12bc04a9..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInDuration"> - <complexType> - <sequence> - <element name="duration" type="duration" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml deleted file mode 100644 index 7a81f3b0dd..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.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. ---> -<tns:BuiltInFloat xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInFloat.xsd "> - <float>0.0</float> -</tns:BuiltInFloat> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd deleted file mode 100644 index f0e1c21233..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInFloat"> - <complexType> - <sequence> - <element name="float" type="float" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml deleted file mode 100644 index d35568b3c9..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.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. ---> -<tns:BuiltInGDay xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGDay.xsd "> - <gDay>---01</gDay> -</tns:BuiltInGDay> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd deleted file mode 100644 index 92bd9a4b66..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInGDay"> - <complexType> - <sequence> - <element name="gDay" type="gDay" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml deleted file mode 100644 index 52cdfa8c4e..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.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. ---> -<tns:BuiltInGMonth xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGMonth.xsd "> - <gMonth>--01--</gMonth> -</tns:BuiltInGMonth> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd deleted file mode 100644 index 78d001a585..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInGMonth"> - <complexType> - <sequence> - <element name="gMonth" type="gMonth" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml deleted file mode 100644 index 2609a858f7..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.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. ---> -<tns:BuiltInGMonthDay xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGMonthDay.xsd "> - <gMonthDay>--01-01</gMonthDay> -</tns:BuiltInGMonthDay> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd deleted file mode 100644 index 38f6c55059..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInGMonthDay"> - <complexType> - <sequence> - <element name="gMonthDay" type="gMonthDay" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml deleted file mode 100644 index 7868a47ca3..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.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. ---> -<tns:BuiltInGYear xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGYear.xsd "> - <gYear>2001</gYear> -</tns:BuiltInGYear> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd deleted file mode 100644 index 0d65b124ff..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInGYear"> - <complexType> - <sequence> - <element name="gYear" type="gYear" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml deleted file mode 100644 index 3f5080d49f..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.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. ---> -<tns:BuiltInGYearMonth xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGYearMonth.xsd "> - <gYearMonth>2001-01</gYearMonth> -</tns:BuiltInGYearMonth> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd deleted file mode 100644 index 340555dc5f..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInGYearMonth"> - <complexType> - <sequence> - <element name="gYearMonth" type="gYearMonth" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml deleted file mode 100644 index 0deb7af980..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.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. ---> -<tns:BuiltInHexBinary xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInHexBinary.xsd "> - <hexBinary>0F00</hexBinary> -</tns:BuiltInHexBinary> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd deleted file mode 100644 index 8059fe6da0..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInHexBinary"> - <complexType> - <sequence> - <element name="hexBinary" type="hexBinary" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml deleted file mode 100644 index 06c92ce19b..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInID.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. ---> -<tns:BuiltInID xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInID.xsd "> - <ID>idvalue0</ID> -</tns:BuiltInID> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd deleted file mode 100644 index 7b1f02d1d4..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInID"> - <complexType> - <sequence> - <element name="ID" type="ID" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml deleted file mode 100644 index 9bc0cefd0f..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.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. ---> -<tns:BuiltInIDREF xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInIDREF.xsd "> - <IDREF>idvalue0</IDREF> -</tns:BuiltInIDREF> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd deleted file mode 100644 index 0c207983bc..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInIDREF"> - <complexType> - <sequence> - <element name="IDREF" type="IDREF" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml deleted file mode 100644 index f91b602f99..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.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. ---> -<tns:BuiltInIDREFS xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInIDREFS.xsd "> - <IDREFS>idvalue0</IDREFS> -</tns:BuiltInIDREFS> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd deleted file mode 100644 index b99bf01b73..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInIDREFS"> - <complexType> - <sequence> - <element name="IDREFS" type="IDREFS" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml deleted file mode 100644 index c99698e175..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInt.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. ---> -<tns:BuiltInInt xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInInt.xsd "> - <int>-2147483648</int> - <int>2147483647</int> -</tns:BuiltInInt> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd deleted file mode 100644 index b5b9b0d1eb..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInInt"> - <complexType> - <sequence> - <element name="int" type="int" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml deleted file mode 100644 index 80d22ce057..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.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. ---> -<tns:BuiltInInteger xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInInteger.xsd "> - <integer>-2147483648</integer> - <integer>2147483647</integer> -</tns:BuiltInInteger> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd deleted file mode 100644 index 4902935db5..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInInteger"> - <complexType> - <sequence> - <element name="integer" type="integer" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml deleted file mode 100644 index 664bf824b4..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.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. ---> -<tns:BuiltInLanguage xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInLanguage.xsd "> - <language>EN</language> -</tns:BuiltInLanguage> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd deleted file mode 100644 index 5d3658d224..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInLanguage"> - <complexType> - <sequence> - <element name="language" type="language" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml deleted file mode 100644 index c5861fa92a..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLong.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. ---> -<tns:BuiltInLong xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInLong.xsd "> - <long>-9223372036854775808</long> - <long>9223372036854775807</long> -</tns:BuiltInLong> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd deleted file mode 100644 index 0aa4710057..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd +++ /dev/null @@ -1,33 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - -<notation name="interop50" public="commonj.sdo"/> - - <element name="BuiltInLong"> - <complexType> - <sequence> - <element name="long" type="long" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml deleted file mode 100644 index 1f95950394..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.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. ---> -<tns:BuiltInNCName xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNCName.xsd "> - <NCName>NCName</NCName> -</tns:BuiltInNCName> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd deleted file mode 100644 index 6ee9c435db..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInNCName"> - <complexType> - <sequence> - <element name="NCName" type="NCName" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml deleted file mode 100644 index 0297f1aeb4..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.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. ---> -<tns:BuildInNMTOKEN xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNMTOKEN.xsd "> - <NMTOKEN>NMTOKEN</NMTOKEN> -</tns:BuildInNMTOKEN> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd deleted file mode 100644 index 56d027bdbb..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuildInNMTOKEN"> - <complexType> - <sequence> - <element name="NMTOKEN" type="NMTOKEN" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml deleted file mode 100644 index 81ba1069bd..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.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. ---> -<tns:BuiltInNMTOKENS xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNMTOKENS.xsd "> - <NMTOKENS>NMTOKENS</NMTOKENS> -</tns:BuiltInNMTOKENS> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd deleted file mode 100644 index 866ab73024..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInNMTOKENS"> - <complexType> - <sequence> - <element name="NMTOKENS" type="NMTOKENS" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml deleted file mode 100644 index 8bb3a08b94..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.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. ---> -<tns:BuiltInNOTATION xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNOTATION.xsd "> - <NOTATION>tns:BuiltInNotationNotation</NOTATION> -</tns:BuiltInNOTATION> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd deleted file mode 100644 index c7c62f812b..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd +++ /dev/null @@ -1,39 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <notation name="BuiltInNotationNotation" public="http://cwiki.apache.org/confluence/display/TUSCANY/Home"/> - - <element name="BuiltInNOTATION"> - <complexType> - <sequence> - <element name="NOTATION" maxOccurs="unbounded"> - <simpleType > - <restriction base="NOTATION"> - <enumeration value="tns:BuiltInNotationNotation"/> - </restriction> - </simpleType> - </element> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml deleted file mode 100644 index 8235718c5e..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInName.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. ---> -<tns:BuiltInName xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInName.xsd "> - <Name>Name</Name> -</tns:BuiltInName> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd deleted file mode 100644 index 36caba2f16..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInName"> - <complexType> - <sequence> - <element name="Name" type="Name" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml deleted file mode 100644 index 599c428a44..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.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. ---> -<tns:BuiltInNegativeInteger xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNegativeInteger.xsd "> - <negativeInteger>-1</negativeInteger> -</tns:BuiltInNegativeInteger> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd deleted file mode 100644 index 389d5a99f0..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInNegativeInteger"> - <complexType> - <sequence> - <element name="negativeInteger" type="negativeInteger" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml deleted file mode 100644 index 919c4a20ee..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.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. ---> -<tns:BuiltInNonNegativeInteger xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNonNegativeInteger.xsd "> - <nonNegativeInteger>0</nonNegativeInteger> -</tns:BuiltInNonNegativeInteger> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd deleted file mode 100644 index 59887078b5..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInNonNegativeInteger"> - <complexType> - <sequence> - <element name="nonNegativeInteger" type="nonNegativeInteger" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml deleted file mode 100644 index 79011f26ab..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.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. ---> -<tns:BuiltInNonPositiveInteger xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNonPositiveInteger.xsd "> - <nonPositiveInteger>-1</nonPositiveInteger> -</tns:BuiltInNonPositiveInteger> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd deleted file mode 100644 index 5de7d64d7b..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInNonPositiveInteger"> - <complexType> - <sequence> - <element name="nonPositiveInteger" type="nonPositiveInteger" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml deleted file mode 100644 index c40be9e18b..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.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. ---> -<tns:BuiltInNormalizedString xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNormalizedString.xsd "> - <normalizedString>normalizedString</normalizedString> -</tns:BuiltInNormalizedString> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd deleted file mode 100644 index d4a78787b8..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInNormalizedString"> - <complexType> - <sequence> - <element name="normalizedString" type="normalizedString" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml deleted file mode 100644 index c30434de66..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.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. ---> -<tns:BuiltInPositiveInteger xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInPositiveInteger.xsd "> - <positiveInteger>1</positiveInteger> -</tns:BuiltInPositiveInteger> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd deleted file mode 100644 index 5381590cd1..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInPositiveInteger"> - <complexType> - <sequence> - <element name="positiveInteger" type="positiveInteger" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml deleted file mode 100644 index 4cd6ea7e72..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInQName.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. ---> -<tns:BuiltInQName xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInQName.xsd "> - <QName>QName</QName> -</tns:BuiltInQName> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd deleted file mode 100644 index e8faf6225b..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInQName"> - <complexType> - <sequence> - <element name="QName" type="QName" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml deleted file mode 100644 index b4375467c4..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInShort.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. ---> -<tns:BuiltInShort xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInShort.xsd "> - <short>-32768</short> - <short>32767</short> -</tns:BuiltInShort> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd deleted file mode 100644 index a4f564d9b7..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInShort"> - <complexType> - <sequence> - <element name="short" type="short" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml deleted file mode 100644 index d30ab85530..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInString.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. ---> -<tns:BuiltInString xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInString.xsd "> - <string>string</string> -</tns:BuiltInString> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd deleted file mode 100644 index 8abb34b5a5..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInString"> - <complexType> - <sequence> - <element name="string" type="string" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml deleted file mode 100644 index 7fd9a061ae..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInTime.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. ---> -<tns:BuiltInTime xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInTime.xsd "> - <time>12:00:00</time> -</tns:BuiltInTime> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd deleted file mode 100644 index 1615976813..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInTime"> - <complexType> - <sequence> - <element name="time" type="time" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml deleted file mode 100644 index cd567ba528..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInToken.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. ---> -<tns:BuiltInToken xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInToken.xsd "> - <token>token</token> -</tns:BuiltInToken> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd deleted file mode 100644 index 0beaac571f..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInToken"> - <complexType> - <sequence> - <element name="token" type="token" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml deleted file mode 100644 index 025362defb..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.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. ---> -<tns:BuiltInUnsignedByte xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInUnsignedByte.xsd "> - <unsignedByte>0</unsignedByte> - <unsignedByte>255</unsignedByte> -</tns:BuiltInUnsignedByte> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd deleted file mode 100644 index d6d951fe5d..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInUnsignedByte"> - <complexType> - <sequence> - <element name="unsignedByte" type="unsignedByte" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml deleted file mode 100644 index 5736a8c121..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.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. ---> -<tns:BuiltInUnsignedInt xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInUnsignedInt.xsd "> - <unsignedInt>0</unsignedInt> - <unsignedInt>4294967295</unsignedInt> -</tns:BuiltInUnsignedInt> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd deleted file mode 100644 index 242be1d53b..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInUnsignedInt"> - <complexType> - <sequence> - <element name="unsignedInt" type="unsignedInt" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml deleted file mode 100644 index d728115a77..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.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. ---> -<tns:BuiltInUnsignedLong xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInUnsignedLong.xsd "> - <unsignedLong>0</unsignedLong> - <unsignedLong>18446744073709551615</unsignedLong> -</tns:BuiltInUnsignedLong> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd deleted file mode 100644 index 108e3a8619..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInUnsignedLong"> - <complexType> - <sequence> - <element name="unsignedLong" type="unsignedLong" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml deleted file mode 100644 index d4ffae5e17..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.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. ---> -<tns:BuiltInUnsignedShort xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInUnsignedShort.xsd "> - <unsignedShort>0</unsignedShort> - <unsignedShort>65535</unsignedShort> -</tns:BuiltInUnsignedShort> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd deleted file mode 100644 index 5ee5e0229e..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="BuiltInUnsignedShort"> - <complexType> - <sequence> - <element name="unsignedShort" type="unsignedShort" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml deleted file mode 100644 index 3d5aed5aa8..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml +++ /dev/null @@ -1,26 +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. ---> -<tns:ComplexTypeComplexContentRestrictingComplexType xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeComplexContentRestrictingComplexType.xsd "> - <ComplexTypeComplexContentRestrictingComplexTypeElement> - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> - </ComplexTypeComplexContentRestrictingComplexTypeElement> -</tns:ComplexTypeComplexContentRestrictingComplexType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd deleted file mode 100644 index e7b80ab11c..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <include schemaLocation="SimpleTypeWithName.xsd"/> - <include schemaLocation="ComplexTypeExtendingComplexType.xsd"/> - - <complexType name="ComplexTypeComplexContentRestrictingComplexTypeType"> - <complexContent> - <restriction base="tns:ComplexTypeExtendingComplexTypeType"> - <sequence> - <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/> - </sequence> - </restriction> - </complexContent> - </complexType> - - <element name="ComplexTypeComplexContentRestrictingComplexType"> - <complexType> - <sequence> - <element name="ComplexTypeComplexContentRestrictingComplexTypeElement" type="tns:ComplexTypeComplexContentRestrictingComplexTypeType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml deleted file mode 100644 index 2b4fe5594e..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml +++ /dev/null @@ -1,27 +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. ---> -<tns:ComplexTypeExtendingComplexType xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeExtendingComplexType.xsd "> - <ComplexTypeExtendingComplexTypeElement> - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> - <SimpleTypeWithNameExtended>SimpleTypeWithNameExtended</SimpleTypeWithNameExtended> - </ComplexTypeExtendingComplexTypeElement> -</tns:ComplexTypeExtendingComplexType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd deleted file mode 100644 index fc4deb63c2..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <include schemaLocation="ComplexTypeWithContent.xsd"/> - - <complexType name="ComplexTypeExtendingComplexTypeType"> - <complexContent> - <extension base="tns:ComplexTypeWithContentType"> - <sequence> - <element name="SimpleTypeWithNameExtended" type="string"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <element name="ComplexTypeExtendingComplexType"> - <complexType> - <sequence> - <element name="ComplexTypeExtendingComplexTypeElement" type="tns:ComplexTypeExtendingComplexTypeType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml deleted file mode 100644 index 03570f41d9..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.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. ---> -<tns:ComplexTypeExtendingSimpeType xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeExtendingSimpleType.xsd "> - <ComplexTypeExtendingSimpeTypeElement AddedByExtension="">ComplexTypeExtendingSimpeTypeElement</ComplexTypeExtendingSimpeTypeElement> -</tns:ComplexTypeExtendingSimpeType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd deleted file mode 100644 index c754502645..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <include schemaLocation="SimpleTypeWithName.xsd"/> - - <complexType name="ComplexTypeExtendingSimpleTypeType"> - <simpleContent> - <extension base="tns:SimpleTypeWithNameType"> - <attribute name="AddedByExtension" type="string"/> - </extension> - </simpleContent> - </complexType> - - <element name="ComplexTypeExtendingSimpeType"> - <complexType> - <sequence> - <element name="ComplexTypeExtendingSimpeTypeElement" type="tns:ComplexTypeExtendingSimpleTypeType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml deleted file mode 100644 index 4603793bfc..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.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. ---> -<tns:ComplexTypeSimpleContentRestrictingComplexType xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeSimpleContentRestrictingComplexType.xsd "> - <ComplexTypeSimpleContentRestrictingComplexTypeElement AddedByExtension="NCName">ComplexTypeSimpleContentRestrictingComplexTypeElement</ComplexTypeSimpleContentRestrictingComplexTypeElement> -</tns:ComplexTypeSimpleContentRestrictingComplexType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd deleted file mode 100644 index 4bcd2f8c46..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <include schemaLocation="ComplexTypeExtendingSimpleType.xsd"/> - - <complexType name="ComplexTypeSimpleContentRestrictingComplexTypeType"> - <simpleContent> - <restriction base="tns:ComplexTypeExtendingSimpleTypeType"> - <attribute name="AddedByExtension" type="NCName" /> - </restriction> - </simpleContent> - </complexType> - - <element name="ComplexTypeSimpleContentRestrictingComplexType"> - <complexType> - <sequence> - <element name="ComplexTypeSimpleContentRestrictingComplexTypeElement" type="tns:ComplexTypeSimpleContentRestrictingComplexTypeType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml deleted file mode 100644 index a6861f803a..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml +++ /dev/null @@ -1,27 +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. ---> -<tns:ComplexTypeWithAbstract xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithAbstract.xsd "> - <ComplexTypeWithAbstractExtensionElement> - <BaseElement>BaseElement</BaseElement> - <ExtensionElement>ExtensionElement</ExtensionElement> - </ComplexTypeWithAbstractExtensionElement> -</tns:ComplexTypeWithAbstract> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd deleted file mode 100644 index 8bb251cab2..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd +++ /dev/null @@ -1,47 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <complexType name="ComplexTypeWithAbstractType" abstract="true"> - <sequence> - <element name="BaseElement" type="string"/> - </sequence> - </complexType> - - <complexType name="ComplexTypeWithAbstractExtensionType"> - <complexContent> - <extension base="tns:ComplexTypeWithAbstractType"> - <sequence> - <element name="ExtensionElement" type="string"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <element name="ComplexTypeWithAbstract"> - <complexType> - <sequence> - <element name="ComplexTypeWithAbstractExtensionElement" type="tns:ComplexTypeWithAbstractExtensionType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml deleted file mode 100644 index 467ec007ed..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml +++ /dev/null @@ -1,30 +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. ---> -<tns:ComplexTypeWithCDATA xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithCDATA.xsd "> - <ComplexTypeWithCDATAElement> - Some - <![CDATA[some data and some <MoreXML></MoreXML>]]> - Mixed - <SimpleTypeWithName>SimpleType<![CDATA[some data and some <MoreXML></MoreXML>]]>WithName</SimpleTypeWithName> - Content - </ComplexTypeWithCDATAElement> -</tns:ComplexTypeWithCDATA> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd deleted file mode 100644 index 8d00646678..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd +++ /dev/null @@ -1,39 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <include schemaLocation="SimpleTypeWithName.xsd"/> - - <complexType name="ComplexTypeWithCDATAType" mixed="true"> - <sequence> - <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/> - </sequence> - </complexType> - - <element name="ComplexTypeWithCDATA"> - <complexType> - <sequence> - <element name="ComplexTypeWithCDATAElement" type="tns:ComplexTypeWithCDATAType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml deleted file mode 100644 index 7deafd798a..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml +++ /dev/null @@ -1,26 +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. ---> -<tns:ComplexTypeWithContent xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithContent.xsd "> - <ComplexTypeWithContentElement> - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> - </ComplexTypeWithContentElement> -</tns:ComplexTypeWithContent> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd deleted file mode 100644 index 72ac75fee0..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd +++ /dev/null @@ -1,37 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <complexType name="ComplexTypeWithContentType"> - <sequence> - <element name="SimpleTypeWithName" type="string"/> - </sequence> - </complexType> - - <element name="ComplexTypeWithContent"> - <complexType> - <sequence> - <element name="ComplexTypeWithContentElement" type="tns:ComplexTypeWithContentType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml deleted file mode 100644 index f6208f81b3..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml +++ /dev/null @@ -1,29 +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. ---> -<tns:ComplexTypeWithMixed xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithMixed.xsd "> - <ComplexTypeWithMixedElement> - Some - Mixed - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> - Content - </ComplexTypeWithMixedElement> -</tns:ComplexTypeWithMixed> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd deleted file mode 100644 index 1f26e13673..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd +++ /dev/null @@ -1,39 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <include schemaLocation="SimpleTypeWithName.xsd"/> - - <complexType name="ComplexTypeWithMixedType" mixed="true"> - <sequence> - <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/> - </sequence> - </complexType> - - <element name="ComplexTypeWithMixed"> - <complexType> - <sequence> - <element name="ComplexTypeWithMixedElement" type="tns:ComplexTypeWithMixedType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml deleted file mode 100644 index 97de7b98eb..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.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. ---> -<tns:ComplexTypeWithOpenAttributes xmlns:tns="http://www.apache.org/tuscany/interop" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithOpenAttributes.xsd "> - <ComplexTypeWithOpenAttributesElement SomeOpenAttribute="Some Open Attribute"> - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> - </ComplexTypeWithOpenAttributesElement> -</tns:ComplexTypeWithOpenAttributes> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd deleted file mode 100644 index 67716553d8..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <include schemaLocation="SimpleTypeWithName.xsd"/> - - <attribute name="SomeOpenAttribute" type="string"/> - - <complexType name="ComplexTypeWithOpenAttributesType"> - <sequence> - <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/> - </sequence> - <anyAttribute namespace="##any"/> - </complexType> - - <element name="ComplexTypeWithOpenAttributes"> - <complexType> - <sequence> - <element name="ComplexTypeWithOpenAttributesElement" type="tns:ComplexTypeWithOpenAttributesType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml deleted file mode 100644 index 5941348921..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml +++ /dev/null @@ -1,31 +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. ---> -<tns:ComplexTypeWithOpenContent xmlns:tns="http://www.apache.org/tuscany/interop" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithOpenContent.xsd "> - <ComplexTypeWithOpenContentElement> - <tns:ComplexTypeWithMixed> - <ComplexTypeWithMixedElement> - Some - Mixed - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> - Content - </ComplexTypeWithMixedElement> - </tns:ComplexTypeWithMixed> - </ComplexTypeWithOpenContentElement> -</tns:ComplexTypeWithOpenContent> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd deleted file mode 100644 index 24d5d09054..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd +++ /dev/null @@ -1,39 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <include schemaLocation="ComplexTypeWithMixed.xsd"/> - - <complexType name="ComplexTypeWithOpenContentType"> - <sequence> - <any namespace="##any"/> - </sequence> - </complexType> - - <element name="ComplexTypeWithOpenContent"> - <complexType> - <sequence> - <element name="ComplexTypeWithOpenContentElement" type="tns:ComplexTypeWithOpenContentType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml deleted file mode 100644 index f684d06a4d..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml +++ /dev/null @@ -1,30 +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. ---> -<tns:ComplexTypeWithOppositeProperty xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithOppositeProperty.xsd "> - <ComplexTypeReferencedDataObject DataObjectId="idvalue0"> - <SomeData>SomeData</SomeData> - </ComplexTypeReferencedDataObject> - <ComplexTypeReferencingDataObject AttributeWithSDOPropertyType="idvalue0" DataObjectId="idvalue1"> - <OppositeProperty>idvalue2</OppositeProperty> - </ComplexTypeReferencingDataObject> - <ComplexTypeWithOppositePropertyElement AttributeWithSDOPropertyType="idvalue1" DataObjectId="idvalue2"/> -</tns:ComplexTypeWithOppositeProperty> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd deleted file mode 100644 index de4a8a666d..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <complexType name="ComplexTypeReferencedDataObjectType"> - <sequence> - <element name="SomeData" type="string"/> - </sequence> - <attribute name="DataObjectId" type="ID"/> - </complexType> - - <complexType name="ComplexTypeReferencingDataObjectType"> - <sequence> - <element name="OppositeProperty" type="IDREF"/> - </sequence> - <attribute name="AttributeWithSDOPropertyType" type="IDREF" - sdo:propertyType="tns:ComplexTypeReferencedDataObjectType"/> - <attribute name="DataObjectId" type="ID"/> - </complexType> - - <complexType name="ComplexTypeWithOppositePropertyType"> - <sequence> - </sequence> - <attribute name="AttributeWithSDOPropertyType" type="IDREF" - sdo:propertyType="tns:ComplexTypeReferencingDataObjectType" - sdo:oppositeProperty="OppositeProperty"/> - <attribute name="DataObjectId" type="ID"/> - </complexType> - - <element name="ComplexTypeWithOppositeProperty"> - <complexType> - <sequence> - <element name="ComplexTypeReferencedDataObject" type="tns:ComplexTypeReferencedDataObjectType"/> - <element name="ComplexTypeReferencingDataObject" type="tns:ComplexTypeReferencingDataObjectType"/> - <element name="ComplexTypeWithOppositePropertyElement" type="tns:ComplexTypeWithOppositePropertyType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml deleted file mode 100644 index 242908bd27..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml +++ /dev/null @@ -1,26 +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. ---> -<tns:ComplexTypeWithSDOAliasName xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithSDOAliasName.xsd "> - <ComplexTypeWithSDOAliasNameElement> - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> - </ComplexTypeWithSDOAliasNameElement> -</tns:ComplexTypeWithSDOAliasName> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd deleted file mode 100644 index 4c00fbe295..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <complexType name="ComplexTypeWithSDOAliasNameType" sdo:aliasName="ComplexTypeWithSDOAliasNameTypeSDOAliasName"> - <sequence> - <element name="SimpleTypeWithName" type="string"/> - </sequence> - </complexType> - - <element name="ComplexTypeWithSDOAliasName"> - <complexType> - <sequence> - <element name="ComplexTypeWithSDOAliasNameElement" type="tns:ComplexTypeWithSDOAliasNameType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml deleted file mode 100644 index 925e8625d5..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml +++ /dev/null @@ -1,26 +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. ---> -<tns:ComplexTypeWithSDOName xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithSDOName.xsd "> - <ComplexTypeWithSDONameElement> - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> - </ComplexTypeWithSDONameElement> -</tns:ComplexTypeWithSDOName> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd deleted file mode 100644 index b12bec040b..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <complexType name="ComplexTypeWithSDONameType" sdo:name="ComplexTypeWithSDONameTypeSDOName"> - <sequence> - <element name="SimpleTypeWithName" type="string"/> - </sequence> - </complexType> - - <element name="ComplexTypeWithSDOName"> - <complexType> - <sequence> - <element name="ComplexTypeWithSDONameElement" type="tns:ComplexTypeWithSDONameType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml deleted file mode 100644 index c73708ce46..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml +++ /dev/null @@ -1,26 +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. ---> -<tns:ComplexTypeWithSDOSequence xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithSDOSequence.xsd "> - <ComplexTypeWithSDOSequenceElement> - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> - </ComplexTypeWithSDOSequenceElement> -</tns:ComplexTypeWithSDOSequence> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd deleted file mode 100644 index 795c3ea7d9..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd +++ /dev/null @@ -1,40 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <include schemaLocation="SimpleTypeWithName.xsd"/> - - <complexType name="ComplexTypeWithSDOSequenceType" sdo:sequence="true"> - <sequence> - <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType" /> - </sequence> - </complexType> - - <element name="ComplexTypeWithSDOSequence"> - <complexType> - <sequence> - <element name="ComplexTypeWithSDOSequenceElement" type="tns:ComplexTypeWithSDOSequenceType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml deleted file mode 100644 index 3ebdc89ae0..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.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. ---> -<tns:ComplexTypeWithoutContent xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithoutContent.xsd "> - <ComplexTypeWithoutContentElement/> -</tns:ComplexTypeWithoutContent> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd deleted file mode 100644 index 21546d0f67..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd +++ /dev/null @@ -1,33 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <complexType name="ComplexTypeWithoutContentType"/> - - <element name="ComplexTypeWithoutContent"> - <complexType> - <sequence> - <element name="ComplexTypeWithoutContentElement" type="tns:ComplexTypeWithoutContentType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml deleted file mode 100644 index 89657e42ca..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml +++ /dev/null @@ -1,26 +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. ---> -<tns:ComplexTypeWithoutName xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithoutName.xsd "> - <tns:ComplexTypeWithoutNameType> - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> - </tns:ComplexTypeWithoutNameType> -</tns:ComplexTypeWithoutName> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd deleted file mode 100644 index d01b4172e4..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd +++ /dev/null @@ -1,39 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="ComplexTypeWithoutNameType"> - <complexType> - <sequence> - <element name="SimpleTypeWithName" type="string"/> - </sequence> - </complexType> - </element> - - <element name="ComplexTypeWithoutName"> - <complexType> - <sequence> - <element ref="tns:ComplexTypeWithoutNameType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml deleted file mode 100644 index 82fd1eedaf..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml +++ /dev/null @@ -1,23 +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. ---> -<DefaultNamespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="DefaultNamespace.xsd"> - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> -</DefaultNamespace> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd deleted file mode 100644 index e1dcf06194..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd +++ /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. ---> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" > - - <!-- top level test type --> - <xsd:complexType name="DefaultNamespaceComplexType"> - <xsd:sequence> - <!-- simple types --> - <xsd:element name="SimpleTypeWithName" type="xsd:string"/> - - </xsd:sequence> - </xsd:complexType> - - <xsd:element name="Default" type="DefaultNamespaceComplexType"/> -</xsd:schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml deleted file mode 100644 index ebf03c9d5d..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml +++ /dev/null @@ -1,27 +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. ---> -<tns:ElementInAll xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementInAll.xsd "> - <ElementInAllElement> - <ElementInAllOne>ElementInAllOne</ElementInAllOne> - <ElementInAllTwo>ElementInAllTwo</ElementInAllTwo> - </ElementInAllElement> -</tns:ElementInAll> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd deleted file mode 100644 index 8b9ba5b4b8..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd +++ /dev/null @@ -1,40 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <complexType name="ComplexTypeElementInAllTestType"> - <all> - <element name="ElementInAllOne" type="string"/> - <element name="ElementInAllTwo" type="string"/> - </all> - </complexType> - - <element name="ElementInAll"> - <complexType> - <sequence> - <choice maxOccurs="3"> - <element name="ElementInAllElement" type="tns:ComplexTypeElementInAllTestType"/> - </choice> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml deleted file mode 100644 index 26466b1b39..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInChoice.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. ---> -<tns:ElementInChoice xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementInChoice.xsd "> - <Element1InChoice>Element1InChoice</Element1InChoice> - <Element2InChoice>Element2InChoice</Element2InChoice> -</tns:ElementInChoice> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd deleted file mode 100644 index ff418c56ab..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd +++ /dev/null @@ -1,48 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <group name="Group1"> - <sequence> - <element name="Element1InChoice" type="string" maxOccurs="2"/> - <element name="Element2InChoice" type="string" /> - </sequence> - </group> - - <group name="Group2"> - <sequence> - <element name="Element2InChoice" type="string" /> - <element name="Element1InChoice" type="string" maxOccurs="2"/> - </sequence> - </group> - - <element name="ElementInChoice"> - <complexType> - <sequence> - <choice maxOccurs="3"> - <group ref="tns:Group1"/> - <group ref="tns:Group2"/> - </choice> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml deleted file mode 100644 index 27bb1ce9cc..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml +++ /dev/null @@ -1,29 +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. ---> -<tns:ElementOfSDOChangeSummaryType xmlns:sdo="commonj.sdo" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSDOChangeSummaryType.xsd commonj.sdo datagraph.xsd "> - <ElementOfSDOChangeSummaryTypeElement> - <ChangeSummaryElement> - ChangeSummaryText - </ChangeSummaryElement> - </ElementOfSDOChangeSummaryTypeElement> -</tns:ElementOfSDOChangeSummaryType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd deleted file mode 100644 index 2bf1df8c99..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd +++ /dev/null @@ -1,34 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <import schemaLocation="datagraph.xsd" namespace="commonj.sdo"/> - - <element name="ElementOfSDOChangeSummaryType"> - <complexType> - <sequence> - <element name="ElementOfSDOChangeSummaryTypeElement" type="sdo:ChangeSummaryType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml deleted file mode 100644 index 9b5561ed43..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.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. ---> -<tns:ElementOfSimpleTypeWithDefault xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithDefault.xsd "> - <ElementOfSimpleTypeWithDefaultElement>ElementOfSimpleTypeWithDefaultDefault</ElementOfSimpleTypeWithDefaultElement> -</tns:ElementOfSimpleTypeWithDefault> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd deleted file mode 100644 index 0b4e7bdf45..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="ElementOfSimpleTypeWithDefault"> - <complexType> - <sequence> - <element name="ElementOfSimpleTypeWithDefaultElement" type="string" default="ElementOfSimpleTypeWithDefaultDefault" /> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml deleted file mode 100644 index f1b7cd264c..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.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. ---> -<tns:ElementOfSimpleTypeWithFixed xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithFixed.xsd "> - <ElementOfSimpleTypeWithFixedElement>ElementOfSimpleTypeWithFixedFixed</ElementOfSimpleTypeWithFixedElement> -</tns:ElementOfSimpleTypeWithFixed> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd deleted file mode 100644 index a2c8456257..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="ElementOfSimpleTypeWithFixed"> - <complexType> - <sequence> - <element name="ElementOfSimpleTypeWithFixedElement" type="string" fixed="ElementOfSimpleTypeWithFixedFixed" /> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml deleted file mode 100644 index 1f60b0423f..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.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. ---> -<tns:ElementOfSimpleTypeWithSDODataType xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithSDODataType.xsd "> - <ElementOfSimpleTypeWithSDODataTypeElement>ElementOfSimpleTypeWithSDODataTypeElement</ElementOfSimpleTypeWithSDODataTypeElement> -</tns:ElementOfSimpleTypeWithSDODataType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd deleted file mode 100644 index 21e55ab8c1..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd +++ /dev/null @@ -1,33 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - - <element name="ElementOfSimpleTypeWithSDODataType"> - <complexType> - <sequence> - <element name="ElementOfSimpleTypeWithSDODataTypeElement" type="string" sdo:dataType="string"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml deleted file mode 100644 index 30762f4912..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.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. ---> -<tns:ElementOfSimpleTypeWithSDOOppositePropertyType xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithSDOOppositePropertyType.xsd "> - <ElementOfSimpleTypeWithSDOOppositePropertyTypeElement>idvalue0</ElementOfSimpleTypeWithSDOOppositePropertyTypeElement> -</tns:ElementOfSimpleTypeWithSDOOppositePropertyType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd deleted file mode 100644 index 5bf35d0d70..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd +++ /dev/null @@ -1,33 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - - <element name="ElementOfSimpleTypeWithSDOOppositePropertyType"> - <complexType> - <sequence> - <element name="ElementOfSimpleTypeWithSDOOppositePropertyTypeElement" type="IDREF" sdo:propertyType="tns:SimpleTypeWithNameType" sdo:oppositeProperty="tns:ElementOfSimpleTypeWithSDOPropertyType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml deleted file mode 100644 index 2dd01e4090..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.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. ---> -<tns:ElementOfSimpleTypeWithSDOPropertyType xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithSDOPropertyType.xsd "> - <ElementOfSimpleTypeWithSDOPropertyTypeElement>idvalue0</ElementOfSimpleTypeWithSDOPropertyTypeElement> -</tns:ElementOfSimpleTypeWithSDOPropertyType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd deleted file mode 100644 index 6920cd8dd0..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <element name="ElementOfSimpleTypeWithSDOPropertyType"> - <complexType> - <sequence> - <element name="ElementOfSimpleTypeWithSDOPropertyTypeElement" type="IDREF" sdo:propertyType="tns:SimpleTypeWithNameType"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml deleted file mode 100644 index 6a526bdc47..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.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. ---> -<tns:ElementOfSimpleTypeWithSDOString xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithSDOString.xsd "> - <ElementOfSimpleTypeWithSDOStringElement>ElementOfSimpleTypeWithSDOStringElement</ElementOfSimpleTypeWithSDOStringElement> -</tns:ElementOfSimpleTypeWithSDOString> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd deleted file mode 100644 index 1117a95eb8..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <element name="ElementOfSimpleTypeWithSDOString"> - <complexType> - <sequence> - <element name="ElementOfSimpleTypeWithSDOStringElement" type="string" sdo:string="true"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml deleted file mode 100644 index ab91458bff..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml +++ /dev/null @@ -1,40 +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. ---> -<tns:ElementSubstitutionGroupBase xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementSubstitutionGroupBase.xsd "> - <ElementSubstitutionGroupBaseElement> - <ElementInSubstitutionGroupBase> - ElementInSubstitutionGroupBase - </ElementInSubstitutionGroupBase> - </ElementSubstitutionGroupBaseElement> - - <ElementSubstitutionUnrelated>Some Data</ElementSubstitutionUnrelated> - - <ElementSubstitutionGroupExtends> - <ElementInSubstitutionGroupBase> - ElementInSubstitutionGroupBase - </ElementInSubstitutionGroupBase> - <ElementInSubstitutionGroupExtends> - ElementInSubstitutionGroupExtends - </ElementInSubstitutionGroupExtends> - </ElementSubstitutionGroupExtends> - -</tns:ElementSubstitutionGroupBase> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd deleted file mode 100644 index 3e015843b5..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd +++ /dev/null @@ -1,52 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <complexType name="ComplexTypeSubstitutionGroupBaseType"> - <sequence> - <element name="ElementInSubstitutionGroupBase" type="string"/> - </sequence> - </complexType> - <element name="ElementSubstitutionGroupBaseElement" type="tns:ComplexTypeSubstitutionGroupBaseType"/> - - <element name="ElementSubstitutionGroupUnrelated" type="string" substitutionGroup="tns:ElementSubstitutionGroupBaseElement"/> - - <complexType name="ComplexTypeSubstitutionGroupExtendsType"> - <complexContent> - <extension base="tns:ComplexTypeSubstitutionGroupBaseType"> - <sequence> - <element name="ElementInSubstitutionGroupExtends" type="string"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <element name="ElementSubstitutionGroupExtends" type="tns:ComplexTypeSubstitutionGroupExtendsType" substitutionGroup="tns:ElementSubstitutionGroupBaseElement"/> - - <element name="ElementSubstitutionGroupBase"> - <complexType> - <sequence> - <element ref="tns:ElementSubstitutionGroupBaseElement" maxOccurs="unbounded" /> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml deleted file mode 100644 index b6d68fd08a..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.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. ---> -<tns:ElementWithMaxOccurs xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementWithMaxOccurs.xsd "> - <ElementWithMaxOccursElement>ElementWithMaxOccursElement1</ElementWithMaxOccursElement> - <ElementWithMaxOccursElement>ElementWithMaxOccursElement2</ElementWithMaxOccursElement> -</tns:ElementWithMaxOccurs> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd deleted file mode 100644 index d4453a4477..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="ElementWithMaxOccurs"> - <complexType> - <sequence> - <element name="ElementWithMaxOccursElement" type="string" maxOccurs="2"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml deleted file mode 100644 index 6de3adc937..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.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. ---> -<tns:ElementWithNillable xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementWithNillable.xsd "> - <ElementWithNillableElement>ElementWithNillableElement</ElementWithNillableElement> -</tns:ElementWithNillable> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd deleted file mode 100644 index 786ab226da..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="ElementWithNillable"> - <complexType> - <sequence> - <element name="ElementWithNillableElement" type="string" nillable="true" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml deleted file mode 100644 index 64093aa803..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.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. ---> -<tns:ElementWithSDOAliasName xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementWithSDOAliasName.xsd "> - <ElementWithSDOAliasName>ElementWithSDOAliasName</ElementWithSDOAliasName> -</tns:ElementWithSDOAliasName> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd deleted file mode 100644 index 01f4c2b1ef..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <element name="ElementWithSDOAliasName"> - <complexType> - <sequence> - <element name="ElementWithSDOAliasName" sdo:aliasName="ElementWithSDOAliasNameSDOAliasName" type="string"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml deleted file mode 100644 index 774646f682..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.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. ---> -<tns:ElementWithSDOName xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementWithSDOName.xsd "> - <ElementWithSDONameElement>ElementWithSDONameElement</ElementWithSDONameElement> -</tns:ElementWithSDOName> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd deleted file mode 100644 index 34da37564c..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <element name="ElementWithSDOName"> - <complexType> - <sequence> - <element name="ElementWithSDONameElement" sdo:name="ElementWithSDONameSDOName" type="string"/> - </sequence> - </complexType> - </element> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml deleted file mode 100644 index a1fb3aa803..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.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. ---> -<tns:GlobalElementComplexType xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop GlobalElementComplexType.xsd"> - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> -</tns:GlobalElementComplexType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd deleted file mode 100644 index 8eb7a4fce4..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <complexType name="GlobalElementComplexTypeComplexType"> - <sequence> - <element name="SimpleTypeWithName" type="string"/> - </sequence> - </complexType> - - <element name="GlobalElementComplexType" type="tns:GlobalElementComplexTypeComplexType"/> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml deleted file mode 100644 index f68eb1939d..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.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. ---> -<GlobalElementSimpleType xmlns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop GlobalElementSimpleType.xsd"> - GlobalElementSimpleType -</GlobalElementSimpleType> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd deleted file mode 100644 index b9f77e6658..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd +++ /dev/null @@ -1,26 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - - <element name="GlobalElementSimpleType" type="string"/> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Import.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Import.xml deleted file mode 100644 index fd28850050..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Import.xml +++ /dev/null @@ -1,30 +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. ---> -<tns:Import xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:imp="http://www.apache.org/tuscany/interop/import" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop Import.xsd"> - - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> - <Imported> - <AnElement>SomeString</AnElement> - <AnotherElement>SomeString</AnotherElement> - </Imported> -</tns:Import> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Import.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Import.xsd deleted file mode 100644 index eae93fd44a..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Import.xsd +++ /dev/null @@ -1,40 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:imp="http://www.apache.org/tuscany/interop/import" - xmlns:sdo="commonj.sdo" - xmlns:sdoJava="commonj.sdo"> - - <include schemaLocation="SimpleTypeWithName.xsd"/> - <import schemaLocation="ImportedSchema.xsd" - namespace="http://www.apache.org/tuscany/interop/import"/> - - <!-- top level test type --> - <complexType name="ImportComplexType"> - <sequence> - <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/> - <element name="Imported" type="imp:ImportedComplexType"/> - </sequence> - </complexType> - - <element name="Import" type="tns:ImportComplexType"/> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd deleted file mode 100644 index a7e568decf..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd +++ /dev/null @@ -1,33 +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. ---> - -<xsd:schema - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:imp="http://www.apache.org/tuscany/interop/import" - targetNamespace="http://www.apache.org/tuscany/interop/import"> - - <xsd:complexType name="ImportedComplexType"> - <xsd:sequence> - <xsd:element name="AnElement" type="xsd:string"/> - <xsd:element name="AnotherElement" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - -</xsd:schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Include.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Include.xml deleted file mode 100644 index d4b9e24fa6..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Include.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. ---> -<tns:Include xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop Include.xsd"> - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> -</tns:Include> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Include.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Include.xsd deleted file mode 100644 index 34ff314a19..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Include.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <include schemaLocation="../xsd/SimpleTypeWithName.xsd"/> - - <!-- top level test type --> - <complexType name="IncludeComplexType"> - <sequence> - <!-- simple types --> - <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/> - - </sequence> - </complexType> - - <element name="IncludeElement" type="tns:IncludeComplexType"/> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Interop.xsd deleted file mode 100644 index ae22ab2c44..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Interop.xsd +++ /dev/null @@ -1,138 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - -<!-- Causes SDO generator to crash - <include schemaLocation="../xsd/Annotation.xsd"/> ---> - <include schemaLocation="../xsd/Attribute.xsd"/> - <include schemaLocation="../xsd/AttributeReference.xsd"/> -<!-- - <include schemaLocation="AttributeWithDefaultValue.xsd"/> - <include schemaLocation="AttributeWithFixedValue.xsd"/> - <include schemaLocation="AttributeWithSDOAliasName.xsd"/> - <include schemaLocation="AttributeWithSDODataType.xsd"/> - <include schemaLocation="AttributeWithSDOName.xsd"/> - <include schemaLocation="AttributeWithSDOPropertySDOOppositePropertyType.xsd"/> - <include schemaLocation="AttributeWithSDOPropertyType.xsd"/> - <include schemaLocation="AttributeWithSDOString.xsd"/> - <include schemaLocation="BuiltInAnySimpleType.xsd"/> - <include schemaLocation="BuiltInAnyType.xsd"/> - <include schemaLocation="BuiltInAnyURI.xsd"/> - <include schemaLocation="BuiltInBase64Binary.xsd"/> - <include schemaLocation="BuiltInBoolean.xsd"/> - <include schemaLocation="BuiltInByte.xsd"/> - <include schemaLocation="BuiltInDate.xsd"/> - <include schemaLocation="BuiltInDateTime.xsd"/> - <include schemaLocation="BuiltInDecimal.xsd"/> - <include schemaLocation="BuiltInDouble.xsd"/> - <include schemaLocation="BuiltInDuration.xsd"/> - <include schemaLocation="BuiltInFloat.xsd"/> - <include schemaLocation="BuiltInGDay.xsd"/> - <include schemaLocation="BuiltInGMonth.xsd"/> - <include schemaLocation="BuiltInGMonthDay.xsd"/> - <include schemaLocation="BuiltInGYear.xsd"/> - <include schemaLocation="BuiltInGYearMonth.xsd"/> - <include schemaLocation="BuiltInHexBinary.xsd"/> - <include schemaLocation="BuiltInID.xsd"/> - <include schemaLocation="BuiltInIDREF.xsd"/> - <include schemaLocation="BuiltInIDREFS.xsd"/> - <include schemaLocation="BuiltInInt.xsd"/> - <include schemaLocation="BuiltInInteger.xsd"/> - <include schemaLocation="BuiltInLanguage.xsd"/> - <include schemaLocation="BuiltInLong.xsd"/> - <include schemaLocation="BuiltInNCName.xsd"/> - <include schemaLocation="BuiltInNMTOKEN.xsd"/> - <include schemaLocation="BuiltInNMTOKENS.xsd"/> - <include schemaLocation="BuiltInNOTATION.xsd"/> - <include schemaLocation="BuiltInName.xsd"/> - <include schemaLocation="BuiltInNegativeInteger.xsd"/> - <include schemaLocation="BuiltInNonNegativeInteger.xsd"/> - <include schemaLocation="BuiltInNonPositiveInteger.xsd"/> - <include schemaLocation="BuiltInNormalizedString.xsd"/> - <include schemaLocation="BuiltInPositiveInteger.xsd"/> - <include schemaLocation="BuiltInQName.xsd"/> - <include schemaLocation="BuiltInShort.xsd"/> - <include schemaLocation="BuiltInString.xsd"/> - <include schemaLocation="BuiltInTime.xsd"/> - <include schemaLocation="BuiltInToken.xsd"/> - <include schemaLocation="BuiltInUnsignedByte.xsd"/> - <include schemaLocation="BuiltInUnsignedInt.xsd"/> - <include schemaLocation="BuiltInUnsignedLong.xsd"/> - <include schemaLocation="BuiltInUnsignedShort.xsd"/> - <include schemaLocation="ComplexTypeComplexContentRestrictingComplexType.xsd"/> - <include schemaLocation="ComplexTypeExtendingComplexType.xsd"/> - <include schemaLocation="ComplexTypeExtendingSimpleType.xsd"/> - <include schemaLocation="ComplexTypeSimpleContentRestrictingComplexType.xsd"/> - <include schemaLocation="ComplexTypeWithAbstract.xsd"/> - <include schemaLocation="ComplexTypeWithCDATA.xsd"/> ---> - <include schemaLocation="../xsd/ComplexTypeWithContent.xsd"/> -<!-- - <include schemaLocation="ComplexTypeWithMixed.xsd"/> - <include schemaLocation="ComplexTypeWithOpenAttributes.xsd"/> - <include schemaLocation="ComplexTypeWithOpenContent.xsd"/> - <include schemaLocation="ComplexTypeWithOppositeProperty.xsd"/> - <include schemaLocation="ComplexTypeWithSDOAliasName.xsd"/> - <include schemaLocation="ComplexTypeWithSDOName.xsd"/> - <include schemaLocation="ComplexTypeWithSDOSequence.xsd"/> - <include schemaLocation="ComplexTypeWithoutContent.xsd"/> - <include schemaLocation="ComplexTypeWithoutName.xsd"/> - <include schemaLocation="DefaultNamespace.xsd"/> - <include schemaLocation="ElementInAll.xsd"/> - <include schemaLocation="ElementInChoice.xsd"/> - <include schemaLocation="ElementOfSDOChangeSummaryType.xsd"/> - <include schemaLocation="ElementOfSimpleTypeWithDefault.xsd"/> - <include schemaLocation="ElementOfSimpleTypeWithFixed.xsd"/> - <include schemaLocation="ElementOfSimpleTypeWithSDODataType.xsd"/> - <include schemaLocation="ElementOfSimpleTypeWithSDOOppositePropertyType.xsd"/> - <include schemaLocation="ElementOfSimpleTypeWithSDOPropertyType.xsd"/> - <include schemaLocation="ElementOfSimpleTypeWithSDOString.xsd"/> - <include schemaLocation="ElementSubstitutionGroupBase.xsd"/> - <include schemaLocation="ElementWithMaxOccurs.xsd"/> - <include schemaLocation="ElementWithNillable.xsd"/> - <include schemaLocation="ElementWithSDOAliasName.xsd"/> - <include schemaLocation="ElementWithSDOName.xsd"/> - <include schemaLocation="GlobalElementComplexType.xsd"/> - <include schemaLocation="GlobalElementSimpleType.xsd"/> - <include schemaLocation="Import.xsd"/> - <include schemaLocation="ImportedSchema.xsd"/> ---> - <include schemaLocation="../xsd/Include.xsd"/> -<!-- - <include schemaLocation="Notation.xsd"/> - <include schemaLocation="SDOJavaPackage.xsd"/> ---> - <include schemaLocation="../xsd/SimpleTypeWithAbstract.xsd"/> -<!-- - <include schemaLocation="SimpleTypeWithExtendedInstanceClass.xsd"/> - <include schemaLocation="SimpleTypeWithInstanceClass.xsd"/> - <include schemaLocation="SimpleTypeWithList.xsd"/> ---> - <include schemaLocation="../xsd/SimpleTypeWithName.xsd"/> -<!-- - <include schemaLocation="SimpleTypeWithSDOName.xsd"/> - <include schemaLocation="SimpleTypeWithUnion.xsd"/> - <include schemaLocation="SimpleTypeWithoutName.xsd"/> - <include schemaLocation="TargetNamespace.xsd"/> ---> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Notation.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Notation.xml deleted file mode 100644 index b75ac6500a..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Notation.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. ---> -<tns:Notation xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop Notation.xsd "> -tns:Tuscany -</tns:Notation> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Notation.xsd deleted file mode 100644 index 6ad019cb81..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Notation.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <notation name="Tuscany" public="http://cwiki.apache.org/TUSCANY/"/> - <notation name="PHP_SCA_SDO" public="http://pecl.php.net/package/sca_sdo/"/> - - <simpleType name="NotationSimpleType"> - <restriction base="NOTATION"> - <enumeration value="tns:Tuscany"/> - <enumeration value="tns:PHP_SCA_SDO"/> - </restriction> - </simpleType> - - <element name="Notation" type="tns:NotationSimpleType"/> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Person.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Person.xsd deleted file mode 100644 index 5f5021b15e..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/Person.xsd +++ /dev/null @@ -1,30 +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. ---> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://apache.org/tuscany/sca/itest/databinding/types"> - - <xsd:complexType name="PersonType"> - <xsd:sequence> - <xsd:element name="firstName" type="xsd:string" /> - <xsd:element name="lastName" type="xsd:string" /> - <xsd:element name="greeting" type="xsd:string" /> - </xsd:sequence> - </xsd:complexType> -</xsd:schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml deleted file mode 100644 index 6c5ad88ff4..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.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. ---> -<tns:SDOJavaPackage xmlns:p="commonj.sdo" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop interop05.xsd"> - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> -</tns:SDOJavaPackage> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd deleted file mode 100644 index 6b7e39b334..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd +++ /dev/null @@ -1,39 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdoJava="commonj.sdo/java" - sdoJava:package="org.apache.tuscany"> - - <!-- should be a reference to the real schema wherever that is going to be --> - <import schemaLocation="sdoJava.xsd" namespace="commonj.sdo/java"/> - - <!-- top level test type --> - <complexType name="SDOJavaPackageComplexType"> - <sequence> - <!-- simple types --> - <element name="SimpleTypeWithName" type="string"/> - - </sequence> - </complexType> - - <element name="SDOJavaPackage" type="tns:SDOJavaPackageComplexType"/> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml deleted file mode 100644 index f9d4a24a49..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.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. ---> -<tns:SimpleTypeWithAbstract xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithAbstract.xsd "> - <SimpleTypeWithAbstractExtensionElement>SimpleTypeWithAbstractExtensionElement</SimpleTypeWithAbstractExtensionElement> -</tns:SimpleTypeWithAbstract> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd deleted file mode 100644 index f649e2ba83..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd +++ /dev/null @@ -1,40 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <!--simpleType name="SimpleTypeWithAbstractType" abstract="true"--> - <simpleType name="SimpleTypeWithAbstractType" > - <restriction base="string"/> - </simpleType> - - <simpleType name="SimpleTypeWithAbstractExtensionType"> - <restriction base="tns:SimpleTypeWithAbstractType"/> - </simpleType> - - <complexType name="SimpleTypeWithAbstractComplexType"> - <sequence> - <element name="SimpleTypeWithAbstractExtensionElement" type="tns:SimpleTypeWithAbstractExtensionType"/> - </sequence> - </complexType> - - <element name="SimpleTypeWithAbstract" type="tns:SimpleTypeWithAbstractComplexType"/> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml deleted file mode 100644 index 410df4b7e4..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.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. ---> -<tns:SimpleTypeWithExtendedInstanceClass xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithExtendedInstanceClass.xsd "> - <SimpleTypeWithExtendedInstanceClassElement>SimpleTypeWithExtendedInstanceClassElement</SimpleTypeWithExtendedInstanceClassElement> -</tns:SimpleTypeWithExtendedInstanceClass> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd deleted file mode 100644 index 36629e8295..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdoJava="commonj.sdo"> - - <simpleType name="SimpleTypeWithExtendedInstanceClassType" sdoJava:extendedInstanceClass="String"> - <restriction base="string"/> - </simpleType> - - <complexType name="SimpleTypeWithExtendedInstanceClassComplexType"> - <sequence> - <element name="SimpleTypeWithExtendedInstanceClassElement" type="tns:SimpleTypeWithExtendedInstanceClassType"/> - </sequence> - </complexType> - - <element name="SimpleTypeWithExtendedInstanceClass" type="SimpleTypeWithExtendedInstanceClassComplexType"> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml deleted file mode 100644 index 7b74867c03..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.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. ---> -<tns:SimpleTypeWithInstanceClass xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithInstanceClass.xsd "> - <SimpleTypeWithInstanceClassElement>SimpleTypeWithInstanceClassElement</SimpleTypeWithInstanceClassElement> -</tns:SimpleTypeWithInstanceClass> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd deleted file mode 100644 index 7a08de84be..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd +++ /dev/null @@ -1,37 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdoJava="commonj.sdo"> - - <simpleType name="SimpleTypeWithInstanceClassType" sdoJava:instanceClass="String"> - <restriction base="string"/> - </simpleType> - - - <complexType name="SimpleTypeWithInstanceClassComplexType"> - <sequence> - <element name="SimpleTypeWithInstanceClassElement" type="tns:SimpleTypeWithInstanceClassType"/> - </sequence> - </complexType> - - <element name="SimpleTypeWithInstanceClass" type="SimpleTypeWithInstanceClassComplexType"> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml deleted file mode 100644 index 708d526f44..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.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. ---> -<tns:SimpleTypeWithList xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithList.xsd "> - <SimpleTypeWithListElement>listmember1 listmember2</SimpleTypeWithListElement> -</tns:SimpleTypeWithList> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd deleted file mode 100644 index 681cf7d5af..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd +++ /dev/null @@ -1,37 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdoJava="commonj.sdo"> - - <simpleType name="SimpleTypeWithListType"> - <list itemType="string"/> - </simpleType> - - - <complexType name="SimpleTypeWithListComplexType"> - <sequence> - <element name="SimpleTypeWithListElement" type="tns:SimpleTypeWithListType"/> - </sequence> - </complexType> - - <element name="SimpleTypeWithList" type="SimpleTypeWithListComplexType"> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml deleted file mode 100644 index e404ac86b7..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.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. ---> -<tns:SimpleTypeWithName xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithName.xsd "> - <SimpleTypeWithNameElement>SimpleTypeWithNameElement</SimpleTypeWithNameElement> -</tns:SimpleTypeWithName> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd deleted file mode 100644 index af0431f048..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <simpleType name="SimpleTypeWithNameType"> - <restriction base="string"/> - </simpleType> - - <complexType name="SimpleTypeWithNameComplexType"> - <sequence> - <element name="SimpleTypeWithNameElement" type="tns:SimpleTypeWithNameType"/> - </sequence> - </complexType> - - <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameComplexType"/> - -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml deleted file mode 100644 index c86a0f6bcb..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.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. ---> -<tns:SimpleTypeWithSDOName xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithSDOName.xsd "> - <SimpleTypeWithSDONameElement>SimpleTypeWithSDONameElement</SimpleTypeWithSDONameElement> -</tns:SimpleTypeWithSDOName> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd deleted file mode 100644 index 89b00a36cc..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd +++ /dev/null @@ -1,37 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdo="commonj.sdo"> - - <simpleType name="SimpleTypeWithSDONameType" sdo:name="SimpleTypeWithSDONameTypeSDOName"> - <restriction base="string"/> - </simpleType> - - - <complexType name="SimpleTypeWithSDONameComplexType"> - <sequence> - <element name="SimpleTypeWithSDONameElement" type="tns:SimpleTypeWithSDONameType"/> - </sequence> - </complexType> - - <element name="SimpleTypeWithSDOName" type="tns:SimpleTypeWithSDONameComplexType"/> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml deleted file mode 100644 index 399b0d8175..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.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. ---> -<tns:SimpleTypeWithUnion xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithUnion.xsd "> - <SimpleTypeWithUnionElement>EN</SimpleTypeWithUnionElement> - <SimpleTypeWithUnionElement>01:02:03</SimpleTypeWithUnionElement> -</tns:SimpleTypeWithUnion> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd deleted file mode 100644 index fee04b9f24..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd +++ /dev/null @@ -1,46 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:sdoJava="commonj.sdo"> - - <simpleType name="SimpleTypeWithUnionType"> - <union> - <simpleType> - <restriction base="language"> - </restriction> - </simpleType> - <simpleType> - <restriction base="time"> - </restriction> - </simpleType> - </union> - </simpleType> - - - <complexType name="SimpleTypeWithUnionComplexType"> - <sequence> - <element name="SimpleTypeWithUnionElement" type="tns:SimpleTypeWithUnionType" minOccurs="2" maxOccurs="2"/> - </sequence> - </complexType> - - <element name="SimpleTypeWithUnion" type="SimpleTypeWithUnionComplexType"> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml deleted file mode 100644 index bc8cf35368..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml +++ /dev/null @@ -1,26 +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. ---> - <SimpleTypeWithoutName xmlns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithoutName.xsd"> - <SimpleTypeWithoutNameElement> - SimpleTypeWithoutName - </SimpleTypeWithoutNameElement> -</SimpleTypeWithoutName> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd deleted file mode 100644 index 536aa822de..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd +++ /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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <element name="SimpleTypeWithoutNameElement"> - <simpleType> - <restriction base="string"/> - </simpleType> - </element> - - - <complexType name="SimpleTypeWithoutNameComplexType"> - <sequence> - <element ref="tns:SimpleTypeWithoutNameElement"/> - </sequence> - </complexType> - - <element name="SimpleTypeWithoutName" type="SimpleTypeWithoutNameComplexType"> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml deleted file mode 100644 index da2929776e..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/TargetNamespace.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. ---> -<tns:TargetNamespace xmlns:tns="http://www.apache.org/tuscany/interop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.apache.org/tuscany/interop TargetNamespace.xsd"> - <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName> -</tns:TargetNamespace> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd deleted file mode 100644 index ace5427786..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd +++ /dev/null @@ -1,34 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/tuscany/interop" - xmlns:tns="http://www.apache.org/tuscany/interop"> - - <!-- top level test type --> - <complexType name="TargetNamespaceComplexType"> - <sequence> - <!-- simple types --> - <element name="SimpleTypeWithName" type="string"/> - - </sequence> - </complexType> - - <element name="TargetNamespace" type="tns:TargetNamespaceComplexType"/> -</schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/datagraph.xsd deleted file mode 100644 index e6b9697a8d..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/datagraph.xsd +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -/** - * <copyright> - * - * Service Data Objects - * Version 2.1.0 - * Licensed Materials - * - * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, - * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., - * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, - * 2005, 2006. All rights reserved. - * - * </copyright> - * - */ ---> - -<xsd:schema - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:sdo="commonj.sdo" - xmlns:sdoJava="commonj.sdo/java" - targetNamespace="commonj.sdo"> - - <xsd:element name="datagraph" type="sdo:DataGraphType"/> - - <xsd:complexType name="DataGraphType"> - <xsd:complexContent> - <xsd:extension base="sdo:BaseDataGraphType"> - <xsd:sequence> - <xsd:any minOccurs="0" maxOccurs="1" namespace="##other" processContents="lax"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="BaseDataGraphType" abstract="true"> - <xsd:sequence> - <xsd:element name="models" type="sdo:ModelsType" minOccurs="0"/> - <xsd:element name="xsd" type="sdo:XSDType" minOccurs="0"/> - <xsd:element name="changeSummary" type="sdo:ChangeSummaryType" minOccurs="0"/> - </xsd:sequence> - <xsd:anyAttribute namespace="##other" processContents="lax"/> - </xsd:complexType> - - <xsd:complexType name="ModelsType"> - <xsd:annotation> - <xsd:documentation> - Expected type is emof:Package. - </xsd:documentation> - </xsd:annotation> - <xsd:sequence> - <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="XSDType"> - <xsd:annotation> - <xsd:documentation> - Expected type is xsd:schema. - </xsd:documentation> - </xsd:annotation> - <xsd:sequence> - <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/2001/XMLSchema" processContents="lax"/> - </xsd:sequence> - </xsd:complexType> - -<!-- FB TEMP --> - <xsd:simpleType name="ChangeSummaryType" sdoJava:instanceClass="commonj.sdo.ChangeSummary"> - <xsd:restriction base="xsd:string"/> - </xsd:simpleType> -<!-- - <xsd:complexType name="ChangeSummaryType"> - <xsd:sequence> - <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/> - </xsd:sequence> - <xsd:attribute name="create" type="xsd:string"/> - <xsd:attribute name="delete" type="xsd:string"/> - <xsd:attribute name="logging" type="xsd:boolean"/> - </xsd:complexType> ---> - - <xsd:attribute name="ref" type="xsd:string"/> - <xsd:attribute name="unset" type="xsd:string"/> - -</xsd:schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd deleted file mode 100644 index 7387568942..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -/** - * <copyright> - * - * Service Data Objects - * Version 2.1.0 - * Licensed Materials - * - * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, - * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., - * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, - * 2005, 2006. All rights reserved. - * - * </copyright> - * - */ ---> - -<xsd:schema - targetNamespace="commonj.sdo/java" - xmlns:sdoJava="commonj.sdo/java" - xmlns:sdo="commonj.sdo" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - -<xsd:import namespace="commonj.sdo" schemaLocation="sdoModel.xsd"/> - -<!-- - These attributes are used to customize the Java mapping of - XSD to SDO Types and Properties. ---> - -<xsd:attribute name="package" type="xsd:string" /> -<xsd:attribute name="instanceClass" type="xsd:string" /> -<xsd:attribute name="extendedInstanceClass" type="xsd:string" /> -<xsd:attribute name="nestedInterfaces" type="xsd:boolean" /> - -<!-- - Global properties used in open content for - the Java binding of SDO Types and Properties. ---> - -<xsd:attribute name="javaClass" type="sdo:String"/> - -<!-- JavaInfo deprecated in 2.1.0 --> -<xsd:complexType name="JavaInfo"> - <xsd:attribute name="javaClass" type="sdo:String"/> -</xsd:complexType> - -<!-- - The Java object data types. ---> - -<xsd:simpleType name="BooleanObject" sdoJava:instanceClass="java.lang.Boolean"> - <xsd:restriction base="xsd:boolean"/> -</xsd:simpleType> - -<xsd:simpleType name="ByteObject" sdoJava:instanceClass="java.lang.Byte"> - <xsd:restriction base="xsd:byte"/> -</xsd:simpleType> - -<xsd:simpleType name="CharacterObject" sdoJava:instanceClass="java.lang.Character"> - <xsd:restriction base="xsd:string"/> -</xsd:simpleType> - -<xsd:simpleType name="DoubleObject" sdoJava:instanceClass="java.lang.Double"> - <xsd:restriction base="xsd:double"/> -</xsd:simpleType> - -<xsd:simpleType name="FloatObject" sdoJava:instanceClass="java.lang.Float"> - <xsd:restriction base="xsd:float"/> -</xsd:simpleType> - -<xsd:simpleType name="IntObject" sdoJava:instanceClass="java.lang.Integer"> - <xsd:restriction base="xsd:int"/> -</xsd:simpleType> - -<xsd:simpleType name="LongObject" sdoJava:instanceClass="java.lang.Long"> - <xsd:restriction base="xsd:long"/> -</xsd:simpleType> - -<xsd:simpleType name="ShortObject" sdoJava:instanceClass="java.lang.Short"> - <xsd:restriction base="xsd:short"/> -</xsd:simpleType> - -</xsd:schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd deleted file mode 100644 index c5aabc9cc8..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd +++ /dev/null @@ -1,221 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -/** - * <copyright> - * - * Service Data Objects - * Version 2.1.0 - * Licensed Materials - * - * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, - * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., - * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, - * 2005, 2006. All rights reserved. - * - * </copyright> - * - */ - ---> - -<xsd:schema - targetNamespace="commonj.sdo" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sdo="commonj.sdo" - xmlns:sdoXML="commonj.sdo/xml" - xmlns:sdoJava="commonj.sdo/java" - elementFormDefault="qualified" - xsi:schemaLocation="commonj.sdo/xml sdoXML.xsd - commonj.sdo/java sdoJava.xsd"> - -<xsd:include schemaLocation="datagraph.xsd"/> - -<!-- Root element for defining several Types in one document. - Is not part of the model. ---> -<xsd:element name="types" type="sdo:Types"/> -<xsd:complexType name="Types"> - <xsd:sequence> - <xsd:element name="type" type="sdo:Type" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> -</xsd:complexType> - -<!-- Any data object may be serialized with this element, - with xsi:type to declare the - actual type of the DataObject serialized. ---> -<xsd:element name="dataObject" type="xsd:anyType"/> - -<!-- Model Types - SDO Type and Property are defined in terms of themselves. ---> -<xsd:element name="type" type="sdo:Type"/> -<xsd:complexType name="Type"> - <xsd:sequence> - <xsd:element name="baseType" type="sdo:URI" - minOccurs="0" maxOccurs="unbounded" - sdoXML:propertyType="sdo:Type" /> - <xsd:element name="property" type="sdo:Property" - minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="aliasName" type="sdo:String" - minOccurs="0" maxOccurs="unbounded" /> - <xsd:any namespace="##other" processContents="lax" - minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:ID" sdoXML:dataType="sdo:String"/> - <xsd:attribute name="uri" type="sdo:URI"/> - <xsd:attribute name="dataType" type="sdo:Boolean"/> - <xsd:attribute name="open" type="sdo:Boolean"/> - <xsd:attribute name="sequenced" type="sdo:Boolean"/> - <xsd:attribute name="abstract" type="sdo:Boolean"/> - <xsd:anyAttribute namespace="##any" processContents="lax"/> -</xsd:complexType> - -<xsd:complexType name="Property"> - <xsd:sequence> - <xsd:element name="aliasName" type="sdo:String" - minOccurs="0" maxOccurs="unbounded" /> - <xsd:any namespace="##other" processContents="lax" - minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - <xsd:attribute name="name" type="sdo:String"/> - <xsd:attribute name="many" type="sdo:Boolean"/> - <xsd:attribute name="containment" type="sdo:Boolean"/> - <xsd:attribute name="default" type="sdo:String"/> - <xsd:attribute name="readOnly" type="sdo:Boolean"/> - <xsd:attribute name="type" type="sdo:URI" sdoXML:propertyType="sdo:Type"/> - <xsd:attribute name="opposite" type="sdo:URI" sdoXML:propertyType="sdo:Property"/> - <xsd:attribute name="nullable" type="sdo:Boolean"/> - <xsd:anyAttribute namespace="##any" processContents="lax"/> -</xsd:complexType> - -<!-- Special Types --> -<xsd:complexType name="DataObject" abstract="true"/> - -<!-- TextType deprecated in 2.1.0 --> - <xsd:complexType name="TextType" abstract="true"> - <xsd:sequence> - <xsd:element name="text" minOccurs="0" maxOccurs="unbounded" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - -<!-- ChangeSummaryType is defined in datagraph.xsd. - Although declared there as a ComplexType, - at the model level it is treated as a SimpleType - with a special XML serialization. ---> - -<!-- Data Types --> -<xsd:simpleType name="Boolean" sdoJava:instanceClass="boolean"> - <xsd:restriction base="xsd:boolean"/> -</xsd:simpleType> - -<xsd:simpleType name="Byte" sdoJava:instanceClass="byte"> - <xsd:restriction base="xsd:byte"/> -</xsd:simpleType> - -<xsd:simpleType name="Bytes" sdoJava:instanceClass="byte[]"> - <xsd:restriction base="xsd:hexBinary"/> -</xsd:simpleType> - -<xsd:simpleType name="Character" sdoJava:instanceClass="char"> - <xsd:restriction base="xsd:string"/> -</xsd:simpleType> - -<xsd:simpleType name="Date" sdoJava:instanceClass="java.util.Date"> - <xsd:restriction base="xsd:dateTime"/> -</xsd:simpleType> - -<xsd:simpleType name="DateTime" sdoJava:instanceClass="java.lang.String"> - <xsd:restriction base="xsd:dateTime"/> -</xsd:simpleType> - -<xsd:simpleType name="Day" sdoJava:instanceClass="java.lang.String"> - <xsd:restriction base="xsd:gDay"/> -</xsd:simpleType> - -<xsd:simpleType name="Decimal" sdoJava:instanceClass="java.math.BigDecimal"> - <xsd:restriction base="xsd:decimal"/> -</xsd:simpleType> - -<xsd:simpleType name="Double" sdoJava:instanceClass="double"> - <xsd:restriction base="xsd:double"/> -</xsd:simpleType> - -<xsd:simpleType name="Duration" sdoJava:instanceClass="java.lang.String"> - <xsd:restriction base="xsd:duration"/> -</xsd:simpleType> - -<xsd:simpleType name="Float" sdoJava:instanceClass="float"> - <xsd:restriction base="xsd:float"/> -</xsd:simpleType> - -<xsd:simpleType name="Int" sdoJava:instanceClass="int"> - <xsd:restriction base="xsd:int"/> -</xsd:simpleType> - -<xsd:simpleType name="Integer" sdoJava:instanceClass="java.math.BigInteger"> - <xsd:restriction base="xsd:integer"/> -</xsd:simpleType> - -<xsd:simpleType name="Long" sdoJava:instanceClass="long"> - <xsd:restriction base="xsd:long"/> -</xsd:simpleType> - -<xsd:simpleType name="Month" sdoJava:instanceClass="java.lang.String"> - <xsd:restriction base="xsd:gMonth"/> -</xsd:simpleType> - -<xsd:simpleType name="MonthDay" sdoJava:instanceClass="java.lang.String"> - <xsd:restriction base="xsd:gMonthDay"/> -</xsd:simpleType> - -<xsd:simpleType name="Object" sdoJava:instanceClass="java.lang.Object"> - <!-- Only the schema for schemas is allowed to restrict anySimpleType. - <xsd:restriction base="xsd:anySimpleType"/> - The equivalent declaration is a union of the predefined XSD data types. - --> - <xsd:union memberTypes="xsd:anyURI xsd:base64Binary xsd:boolean xsd:byte - xsd:date xsd:dateTime xsd:decimal xsd:double xsd:duration xsd:ENTITIES xsd:ENTITY xsd:float - xsd:gDay xsd:gMonth xsd:gMonthDay xsd:gYear xsd:gYearMonth xsd:hexBinary xsd:ID xsd:IDREF xsd:IDREFS - xsd:int xsd:integer xsd:language xsd:long xsd:Name xsd:NCName xsd:negativeInteger - xsd:NMTOKEN xsd:NMTOKENS xsd:nonNegativeInteger xsd:nonPositiveInteger - xsd:normalizedString xsd:NOTATION xsd:positiveInteger xsd:QName xsd:short xsd:string - xsd:time xsd:token xsd:unsignedByte xsd:unsignedInt xsd:unsignedLong xsd:unsignedShort"/> -</xsd:simpleType> - -<xsd:simpleType name="Short" sdoJava:instanceClass="short"> - <xsd:restriction base="xsd:short"/> -</xsd:simpleType> - -<xsd:simpleType name="String" sdoJava:instanceClass="java.lang.String"> - <xsd:restriction base="xsd:string"/> -</xsd:simpleType> - -<xsd:simpleType name="Strings" sdoJava:instanceClass="java.util.List"> - <xsd:restriction base="xsd:string"/> -</xsd:simpleType> - -<xsd:simpleType name="Time" sdoJava:instanceClass="java.lang.String"> - <xsd:restriction base="xsd:time"/> -</xsd:simpleType> - -<xsd:simpleType name="Year" sdoJava:instanceClass="java.lang.String"> - <xsd:restriction base="xsd:gYear"/> -</xsd:simpleType> - -<xsd:simpleType name="YearMonth" sdoJava:instanceClass="java.lang.String"> - <xsd:restriction base="xsd:gYearMonth"/> -</xsd:simpleType> - -<xsd:simpleType name="YearMonthDay" sdoJava:instanceClass="java.lang.String"> - <xsd:restriction base="xsd:date"/> -</xsd:simpleType> - -<xsd:simpleType name="URI" sdoJava:instanceClass="java.lang.String"> - <xsd:restriction base="xsd:anyURI"/> -</xsd:simpleType> - -</xsd:schema> diff --git a/branches/sca-java-0.91/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/branches/sca-java-0.91/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java deleted file mode 100644 index 131e11012a..0000000000 --- a/branches/sca-java-0.91/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java +++ /dev/null @@ -1,52 +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.generate; - -import junit.framework.TestCase; - - -/** - * - */ -public class GenerateTestCase extends TestCase { - - private Generate generator = null; - private static boolean initalised = false; - - protected void setUp() throws Exception { - if (!initalised) { - generator = new Generate(); - initalised = true; - } - } - - protected void tearDown() { - - } - - /** - * Invokes the Generate class to generate databinding test classes and resources. - * - * @throws Exception - */ - public void testGenerate() throws Exception { - // generator.generate(); - } -} diff --git a/branches/sca-java-0.91/itest/databindings/config.png b/branches/sca-java-0.91/itest/databindings/config.png Binary files differdeleted file mode 100644 index 7912019e9d..0000000000 --- a/branches/sca-java-0.91/itest/databindings/config.png +++ /dev/null diff --git a/branches/sca-java-0.91/itest/databindings/config.svg b/branches/sca-java-0.91/itest/databindings/config.svg deleted file mode 100644 index aaf027e2df..0000000000 --- a/branches/sca-java-0.91/itest/databindings/config.svg +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- - * 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. ---> - -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="744.09448819" - height="1052.3622047" - id="svg3168" - sodipodi:version="0.32" - inkscape:version="0.44" - sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings" - sodipodi:docname="config.svg"> - <defs - id="defs3170" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - gridtolerance="10000" - guidetolerance="10" - objecttolerance="10" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.7" - inkscape:cx="375" - inkscape:cy="748.57143" - inkscape:document-units="px" - inkscape:current-layer="layer1" - inkscape:window-width="990" - inkscape:window-height="664" - inkscape:window-x="103" - inkscape:window-y="84" /> - <metadata - id="metadata3173"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> - <flowRoot - xml:space="preserve" - id="flowRoot3194" - inkscape:export-xdpi="52.84" - inkscape:export-ydpi="52.84"><flowRegion - id="flowRegion3196"><rect - id="rect3198" - width="505.71429" - height="531.42859" - x="94.285713" - y="83.790756" /></flowRegion><flowPara - id="flowPara3200"><tns:Generate ...></flowPara><flowPara - id="flowPara3202"> <Template></flowPara><flowPara - id="flowPara3204"> <TemplateName>greeter.composite.vm</TemplateName></flowPara><flowPara - id="flowPara3206"> <TemplateTargetDir>classes</TemplateTargetDir></flowPara><flowPara - id="flowPara3208"> </Template></flowPara><flowPara - id="flowPara3210"> ...</flowPara><flowPara - id="flowPara3212"> </flowPara><flowPara - id="flowPara3214"> <InputFile></flowPara><flowPara - id="flowPara3216"> <FileName>Person.xsd</FileName></flowPara><flowPara - id="flowPara3218"> <FilePath>xsd</FilePath></flowPara><flowPara - id="flowPara3220"> <JavaPackage>org.apache.tuscany.sca.itest.databinding.types</JavaPackage></flowPara><flowPara - id="flowPara3222"> <Factory>TypesFactory</Factory></flowPara><flowPara - id="flowPara3224"> <Namespace>http://apache.org/tuscany/sca/itest/databinding/types</Namespace></flowPara><flowPara - id="flowPara3226"> <Prefix>p</Prefix></flowPara><flowPara - id="flowPara3228"> <Type></flowPara><flowPara - id="flowPara3230"> <TypeName>PersonType</TypeName></flowPara><flowPara - id="flowPara3232"> <CreateTypeCode></flowPara><flowPara - id="flowPara3234"> TypesFactory factory = TypesFactory.INSTANCE;</flowPara><flowPara - id="flowPara3236"> param = factory.createPersonType();</flowPara><flowPara - id="flowPara3238"> param.setFirstName("George");</flowPara><flowPara - id="flowPara3240"> param.setLastName("Doors");</flowPara><flowPara - id="flowPara3242"> </CreateTypeCode></flowPara><flowPara - id="flowPara3244"> <ModifyTypeCode></flowPara><flowPara - id="flowPara3246"> param.setGreeting("Hello");</flowPara><flowPara - id="flowPara3248"> </ModifyTypeCode></flowPara><flowPara - id="flowPara3250"> <ResultComparison></flowPara><flowPara - id="flowPara3252"> assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting());</flowPara><flowPara - id="flowPara3254"> </ResultComparison></flowPara><flowPara - id="flowPara3256"> </Type></flowPara><flowPara - id="flowPara3258"> </InputFile></flowPara><flowPara - id="flowPara3260"> ...</flowPara><flowPara - id="flowPara3262"></flowPara><flowPara - id="flowPara3264"></tns:Generate></flowPara></flowRoot> </g> -</svg> diff --git a/branches/sca-java-0.91/itest/databindings/databinding.png b/branches/sca-java-0.91/itest/databindings/databinding.png Binary files differdeleted file mode 100644 index 76a9c71b7d..0000000000 --- a/branches/sca-java-0.91/itest/databindings/databinding.png +++ /dev/null diff --git a/branches/sca-java-0.91/itest/databindings/databinding.svg b/branches/sca-java-0.91/itest/databindings/databinding.svg deleted file mode 100644 index d6850ccf7d..0000000000 --- a/branches/sca-java-0.91/itest/databindings/databinding.svg +++ /dev/null @@ -1,242 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- - * 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. ---> - -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1052.3622" - height="744.09448" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.44" - sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings" - sodipodi:docname="databinding.svg" - version="1.0" - inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings\databinding.png" - inkscape:export-xdpi="52.84" - inkscape:export-ydpi="52.84"> - <defs - id="defs4"> - <marker - inkscape:stockid="Arrow2Lend" - orient="auto" - refY="0.0" - refX="0.0" - id="Arrow2Lend" - style="overflow:visible;"> - <path - id="path3078" - style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;" - d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " - transform="scale(1.1) rotate(180) translate(1,0)" /> - </marker> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - gridtolerance="10000" - guidetolerance="10" - objecttolerance="10" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1.4" - inkscape:cx="499.13602" - inkscape:cy="337.74555" - inkscape:document-units="px" - inkscape:current-layer="layer1" - inkscape:window-width="1180" - inkscape:window-height="775" - inkscape:window-x="36" - inkscape:window-y="42" /> - <metadata - id="metadata7"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> - <g - id="g2997" - transform="matrix(1.084673,0,0,0.856154,-21.78728,27.4907)"> - <rect - rx="15.307091" - ry="15.260983" - y="192.00233" - x="258.31146" - height="360.71414" - width="495.71429" - id="rect2067" - style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.07541251;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <flowRoot - id="flowRoot2954" - xml:space="preserve"><flowRegion - id="flowRegion2956"><rect - y="212.66591" - x="281.42856" - height="61.42857" - width="170" - id="rect2958" /></flowRegion><flowPara - id="flowPara2960">GreeterService</flowPara></flowRoot> </g> - <rect - style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect2988" - width="115.66247" - height="85.862968" - x="312.05917" - y="258.59619" - rx="6.9961648" - ry="7.1230249" /> - <flowRoot - xml:space="preserve" - id="flowRoot2966" - transform="translate(44.4684,52.65764)"><flowRegion - id="flowRegion2968"><rect - id="rect2970" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara2972">DefaultGreeter</flowPara><flowPara - id="flowPara2019">ServiceClient</flowPara></flowRoot> <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 294.90867,290.44317 L 328.24371,290.44317 L 334.30462,303.57515 L 327.23356,315.69699 L 294.90867,315.69699 L 302.48482,303.57515 L 294.90867,290.44317 z " - id="path3017" /> - <path - style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 408.16111,288.60489 L 441.49615,288.60489 L 447.55706,301.73687 L 440.486,313.85871 L 408.16111,313.85871 L 415.73726,301.73687 L 408.16111,288.60489 z " - id="path3019" /> - <rect - style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect1985" - width="115.66247" - height="85.862968" - x="642.96918" - y="315.88455" - rx="6.9961648" - ry="7.1230249" /> - <flowRoot - xml:space="preserve" - id="flowRoot1987" - transform="translate(375.3784,109.946)"><flowRegion - id="flowRegion1989"><rect - id="rect1991" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara1993">GreeterService</flowPara><flowPara - id="flowPara2017">Component</flowPara></flowRoot> <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 625.81867,347.73153 L 659.15371,347.73153 L 665.21462,360.86351 L 658.14356,372.98535 L 625.81867,372.98535 L 633.39482,360.86351 L 625.81867,347.73153 z " - id="path1997" /> - <rect - style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect2001" - width="115.66247" - height="85.862968" - x="313.68344" - y="371.59885" - rx="6.9961648" - ry="7.1230249" /> - <flowRoot - xml:space="preserve" - id="flowRoot2003" - transform="translate(46.09269,165.6602)"><flowRegion - id="flowRegion2005"><rect - id="rect2007" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara2009">WSGreeter</flowPara><flowPara - id="flowPara2021">ServiceClient</flowPara></flowRoot> <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 296.53296,403.44581 L 329.868,403.44581 L 335.92891,416.57779 L 328.85785,428.69963 L 296.53296,428.69963 L 304.10911,416.57779 L 296.53296,403.44581 z " - id="path2013" /> - <path - style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 409.7854,401.60753 L 443.12044,401.60753 L 449.18135,414.73951 L 442.11029,426.86135 L 409.7854,426.86135 L 417.36155,414.73951 L 409.7854,401.60753 z " - id="path2015" /> - <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2Lend);stroke-opacity:1" - d="M 447.14297,301.23734 L 527.11201,301.95163 L 526.12473,354.09448 L 626.8265,354.80877" - id="path2039" /> - <path - style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 463.87333,395.75343 L 516.54902,395.75343 L 526.12641,417.42827 L 514.95279,437.43583 L 463.87333,437.43583 L 475.84509,417.42827 L 463.87333,395.75343 z " - id="path3108" - inkscape:transform-center-y="-33.571429" - inkscape:transform-center-x="31.706144" /> - <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 535.3019,397.182 L 577.70287,397.182 L 585.41213,416.99969 L 576.41799,435.29297 L 535.3019,435.29297 L 544.93849,416.99969 L 535.3019,397.182 z " - id="path3110" /> - <flowRoot - xml:space="preserve" - id="flowRoot3112" - transform="matrix(0.778099,0,0,0.884748,255.7727,214.0266)"><flowRegion - id="flowRegion3114"><rect - id="rect3116" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara3120">WS</flowPara><flowPara - id="flowPara3124">Reference</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot3128" - transform="matrix(0.778099,0,0,0.884748,324.368,215.5376)"><flowRegion - id="flowRegion3130"><rect - id="rect3132" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara3134">WS</flowPara><flowPara - id="flowPara3136">Service</flowPara></flowRoot> <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)" - d="M 447.85714,415.52305 L 475.71429,415.52305" - id="path3138" /> - <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)" - d="M 525.71429,417.66591 L 543.57143,417.66591" - id="path3140" /> - <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)" - d="M 585.71429,416.23734 L 599.28571,416.23734 L 600,364.80877 L 629.28571,364.80877" - id="path3142" /> - </g> -</svg> diff --git a/branches/sca-java-0.91/itest/databindings/interop.png b/branches/sca-java-0.91/itest/databindings/interop.png Binary files differdeleted file mode 100644 index 005e0f24ea..0000000000 --- a/branches/sca-java-0.91/itest/databindings/interop.png +++ /dev/null diff --git a/branches/sca-java-0.91/itest/databindings/interop.svg b/branches/sca-java-0.91/itest/databindings/interop.svg deleted file mode 100644 index 03897c6d09..0000000000 --- a/branches/sca-java-0.91/itest/databindings/interop.svg +++ /dev/null @@ -1,352 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- - * 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. ---> - -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1052.3622" - height="744.09448" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.44" - sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings" - sodipodi:docname="interop.svg" - version="1.0" - inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings\interop.png" - inkscape:export-xdpi="52.84" - inkscape:export-ydpi="52.84"> - <defs - id="defs4"> - <marker - inkscape:stockid="Arrow2Lend" - orient="auto" - refY="0.0" - refX="0.0" - id="Arrow2Lend" - style="overflow:visible;"> - <path - id="path3078" - style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;" - d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " - transform="scale(1.1) rotate(180) translate(1,0)" /> - </marker> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - gridtolerance="10000" - guidetolerance="10" - objecttolerance="10" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1.4" - inkscape:cx="428.95418" - inkscape:cy="356.33178" - inkscape:document-units="px" - inkscape:current-layer="g2997" - inkscape:window-width="1234" - inkscape:window-height="800" - inkscape:window-x="27" - inkscape:window-y="108" /> - <metadata - id="metadata7"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> - <g - id="g2997" - transform="matrix(0.979246,0,0,1.158467,-105.7257,-23.34339)"> - <rect - rx="25.230545" - ry="12.196672" - y="179.85953" - x="146.34595" - height="288.28497" - width="817.08154" - id="rect2067" - style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.87776983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <flowRoot - id="flowRoot2954" - xml:space="preserve" - transform="translate(-102.7603,-25.12021)"><flowRegion - id="flowRegion2956"><rect - y="212.66591" - x="281.42856" - height="61.42857" - width="170" - id="rect2958" /></flowRegion><flowPara - id="flowPara2960">InteropGreeterService</flowPara></flowRoot> </g> - <rect - style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect3332" - width="115.66247" - height="85.862968" - x="77.514153" - y="231.09024" - rx="6.9961648" - ry="7.1230249" /> - <flowRoot - xml:space="preserve" - id="flowRoot3334" - transform="translate(-185.0766,21.58025)"><flowRegion - id="flowRegion3336"><rect - id="rect3338" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara3340">SDO</flowPara><flowPara - id="flowPara3379">DefaultGreeter</flowPara><flowPara - id="flowPara2019">ServiceClient</flowPara></flowRoot> <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 60.363662,262.93721 L 93.698702,262.93721 L 99.759609,276.06919 L 92.688552,288.19103 L 60.363662,288.19103 L 67.939812,276.06919 L 60.363662,262.93721 z " - id="path3343" /> - <path - style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 173.6161,261.09893 L 206.95114,261.09893 L 213.01205,274.23091 L 205.94099,286.35275 L 173.6161,286.35275 L 181.19225,274.23091 L 173.6161,261.09893 z " - id="path3345" /> - <rect - style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect1985" - width="115.66247" - height="85.862968" - x="681.65045" - y="289.48157" - rx="6.9961648" - ry="7.1230249" /> - <flowRoot - xml:space="preserve" - id="flowRoot1987" - transform="translate(423.3454,80.68594)"><flowRegion - id="flowRegion1989"><rect - id="rect1991" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara1993">SDO</flowPara><flowPara - id="flowPara3399">GreeterService</flowPara><flowPara - id="flowPara2017">Component</flowPara></flowRoot> <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 664.49995,321.32854 L 697.83499,321.32854 L 703.8959,334.46052 L 696.82484,346.58236 L 664.49995,346.58236 L 672.0761,334.46052 L 664.49995,321.32854 z " - id="path1997" /> - <rect - style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect2001" - width="115.66247" - height="85.862968" - x="76.281281" - y="356.23575" - rx="6.9961648" - ry="7.1230249" /> - <flowRoot - xml:space="preserve" - id="flowRoot2003" - transform="translate(-185.5951,150.2971)"><flowRegion - id="flowRegion2005"><rect - id="rect2007" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara2009">SDO</flowPara><flowPara - id="flowPara3401">WSGreeter</flowPara><flowPara - id="flowPara2021">ServiceClient</flowPara></flowRoot> <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 59.130809,388.08271 L 92.465849,388.08271 L 98.526759,401.21469 L 91.455699,413.33653 L 59.130809,413.33653 L 66.706959,401.21469 L 59.130809,388.08271 z " - id="path2013" /> - <path - style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 172.38325,386.24443 L 205.71829,386.24443 L 211.7792,399.37641 L 204.70814,411.49825 L 172.38325,411.49825 L 179.9594,399.37641 L 172.38325,386.24443 z " - id="path2015" /> - <path - style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 226.47114,380.39017 L 271.82375,380.39017 L 280.06966,400.95073 L 270.44943,419.92971 L 226.47114,419.92971 L 236.77856,400.95073 L 226.47114,380.39017 z " - id="path3108" - inkscape:transform-center-y="-31.845711" - inkscape:transform-center-x="27.298337" /> - <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 286.59013,381.79328 L 328.89058,381.79328 L 336.58156,401.62413 L 327.60875,419.92957 L 286.59013,419.92957 L 296.20387,401.62413 L 286.59013,381.79328 z " - id="path3110" /> - <flowRoot - xml:space="preserve" - id="flowRoot3112" - transform="matrix(0.654898,0,0,0.869049,51.92158,201.8882)"><flowRegion - id="flowRegion3114"><rect - id="rect3116" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara3120">WS</flowPara><flowPara - id="flowPara3124">Reference</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot3128" - transform="matrix(0.654898,0,0,0.869049,112.0605,203.3723)"><flowRegion - id="flowRegion3130"><rect - id="rect3132" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara3134">WS</flowPara><flowPara - id="flowPara3136">Service</flowPara></flowRoot> <rect - style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect3381" - width="115.66247" - height="85.862968" - x="376.54059" - y="229.73444" - rx="6.9961648" - ry="7.1230249" /> - <flowRoot - xml:space="preserve" - id="flowRoot3383" - transform="translate(113.9499,20.22444)"><flowRegion - id="flowRegion3385"><rect - id="rect3387" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara3389">JAXB</flowPara><flowPara - id="flowPara3391">DefaultGreeter</flowPara><flowPara - id="flowPara3393">ServiceClient</flowPara></flowRoot> <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 359.39009,261.5814 L 392.72513,261.5814 L 398.78604,274.71338 L 391.71498,286.83522 L 359.39009,286.83522 L 366.96624,274.71338 L 359.39009,261.5814 z " - id="path3395" /> - <path - style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 472.64253,259.74312 L 505.97757,259.74312 L 512.03848,272.8751 L 504.96742,284.99694 L 472.64253,284.99694 L 480.21868,272.8751 L 472.64253,259.74312 z " - id="path3397" /> - <rect - style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect3403" - width="115.66247" - height="85.862968" - x="375.19193" - y="355.69083" - rx="6.9961648" - ry="7.1230249" /> - <flowRoot - xml:space="preserve" - id="flowRoot3405" - transform="translate(112.6012,146.1808)"><flowRegion - id="flowRegion3407"><rect - id="rect3409" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara3411">JAXB</flowPara><flowPara - id="flowPara3413">WSGreeter</flowPara><flowPara - id="flowPara3415">ServiceClient</flowPara></flowRoot> <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 358.0414,387.53779 L 391.37644,387.53779 L 397.43735,400.66977 L 390.36629,412.79161 L 358.0414,412.79161 L 365.61755,400.66977 L 358.0414,387.53779 z " - id="path3417" /> - <path - style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 471.29384,385.69951 L 504.62888,385.69951 L 510.68979,398.83149 L 503.61873,410.95333 L 471.29384,410.95333 L 478.86999,398.83149 L 471.29384,385.69951 z " - id="path3419" /> - <path - style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 531.84342,380.87285 L 577.19603,380.87285 L 585.44194,401.43341 L 575.82171,420.41239 L 531.84342,420.41239 L 542.15084,401.43341 L 531.84342,380.87285 z " - id="path3421" - inkscape:transform-center-y="-31.845711" - inkscape:transform-center-x="27.298337" /> - <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 591.96241,382.27596 L 634.26286,382.27596 L 641.95384,402.10681 L 632.98103,420.41225 L 591.96241,420.41225 L 601.57615,402.10681 L 591.96241,382.27596 z " - id="path3423" /> - <flowRoot - xml:space="preserve" - id="flowRoot3425" - transform="matrix(0.654898,0,0,0.869049,357.2939,202.3709)"><flowRegion - id="flowRegion3427"><rect - id="rect3429" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara3431">WS</flowPara><flowPara - id="flowPara3433">Reference</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot3435" - transform="matrix(0.654898,0,0,0.869049,417.4328,203.855)"><flowRegion - id="flowRegion3437"><rect - id="rect3439" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara3441">WS</flowPara><flowPara - id="flowPara3443">Service</flowPara></flowRoot> <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 212.14286,274.09448 L 366.42857,274.80877" - id="path3447" /> - <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 512.14286,272.66591 L 599.28571,272.66591 L 599.28571,325.52305 L 665.71429,325.52305" - id="path3453" /> - <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 210.71429,399.80877 L 235.71429,399.80877" - id="path3455" /> - <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 278.57143,401.23734 L 295.71429,401.23734" - id="path3459" /> - <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 336.42857,401.95163 L 365.71429,401.95163" - id="path3461" /> - <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 510.71429,399.80877 L 540.71429,399.80877" - id="path3463" /> - <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 585,401.95163 L 600.71429,401.95163" - id="path3465" /> - <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 641.42857,402.66591 L 657.14286,402.66591 L 657.85714,339.09448 L 669.28571,339.09448" - id="path3467" /> - </g> -</svg> diff --git a/branches/sca-java-0.91/itest/databindings/interop/pom.xml b/branches/sca-java-0.91/itest/databindings/interop/pom.xml deleted file mode 100644 index ffee182521..0000000000 --- a/branches/sca-java-0.91/itest/databindings/interop/pom.xml +++ /dev/null @@ -1,190 +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> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <artifactId>tuscany-itest-databindings-interop</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Apache Tuscany Interoperability Databindings Integration Test</name> - - <repositories> - <repository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>java.net</id> - <name>java.net Maven 1.x Repository</name> - <url>https://maven-repository.dev.java.net/nonav/repository</url> - <layout>legacy</layout> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>java.net</id> - <name>java.net Maven 1.x Repository</name> - <url>https://maven-repository.dev.java.net/repository</url> - <layout>legacy</layout> - </pluginRepository> - </pluginRepositories> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.1</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>jaxws-rt</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings-common</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings-sdo</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings-jaxb</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-java-runtime</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-http-jetty</artifactId> - <version>${pom.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings-common</artifactId> - <version>${project.version}</version> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/classes</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-test-source</id> - <phase>process-resources</phase> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <configuration> - <mainClass>org.apache.tuscany.sca.itest.generate.Generate</mainClass> - <arguments> - <argument>${project.build.directory}</argument> - </arguments> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm deleted file mode 100644 index 7bdfc57924..0000000000 --- a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm +++ /dev/null @@ -1,113 +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 $template.getJavaPackage(); - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import ${template.getJavaPackage()}.GreeterService; - -// Data types -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) -import $file.getJavaPackage().$typeInstance.getTypeName(); -import $file.getJavaPackage().$file.getFactory(); -#end -#end - -/** - * Automatically generated test case. Calls the greeter client for a number of - * bindings and a number of data types. - * - * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $ - */ -public class InteropDatabindingTestCase extends TestCase { - - private static boolean initalised = false; - private GreeterService greeterClient; - private static SCADomain domain; - - /** - * Runs before each test method - */ - protected void setUp() throws Exception { - if (!initalised) { - domain = SCADomain.newInstance("interopgreeter.composite"); - super.setUp(); - initalised = true; - } - } - - /** - * Runs after each test method - */ - protected void tearDown() { - - } - - /** - * Finds the SCA component that relates to the protocol being tested. This test - * always connects locally to the client component but the client component will - * connect to the back end component using the appropriate protocol - * - * @param ext the protcol required - */ - private void setUpClient(String ext) throws Exception { - greeterClient = domain.getService(GreeterService.class, "SDO" + ext + "GreeterServiceClient"); - } - - /** - * Invokes the SDO Greet service using web service bindings with SDO payload - */ - public void testWSGreet() throws Exception { - setUpClient("WS"); - greet(); - } - - /** - * Invokes the SDO Greet service using default bindings with SDO payload - */ - public void testDefaultGreet() throws Exception { - setUpClient("Default"); - greet(); - } - - /** - * A generic method which, regarless of which client is connected, sends out a - * series of requrests passing different data types. - */ - public void greet() { -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - // test $typeInstance.getTypeName() - { - $typeInstance.getTypeName() param = null; - $typeInstance.getCreateTypeCode() - $typeInstance.getTypeName() result = greeterClient.greet$typeInstance.getTypeName()(param); - $typeInstance.getResultComparison() - } -#end -#end - } - -} diff --git a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm deleted file mode 100644 index 38bfccce0c..0000000000 --- a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm +++ /dev/null @@ -1,103 +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. ---> -<wsdl:definitions targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services/jaxb" - xmlns:tns="http://apache.org/tuscany/sca/itest/databinding/services/jaxb" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="Greeter"> - - <wsdl:types> - <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" -#foreach($file in $fileList) - xmlns:$file.getPrefix()="$file.getNamespace()" -#end - targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services/jaxb" - elementFormDefault="qualified"> - -#foreach($file in $fileList) - <xsd:import namespace="$file.getNamespace()" - schemaLocation="../xsd/$file.getFileName()" /> -#end - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - <element name="greet$typeInstance.getTypeName()"> - <complexType> - <sequence> - <element name="parm" type="$file.getPrefix():$typeInstance.getTypeName()" /> - </sequence> - </complexType> - </element> -#end -#end - </xsd:schema> - </wsdl:types> -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - <wsdl:message name="$typeInstance.getTypeName()Request"> - <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" /> - </wsdl:message> - <wsdl:message name="$typeInstance.getTypeName()Response"> - <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" /> - </wsdl:message> -#end -#end - - <wsdl:portType name="GreeterPortType"> -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - <wsdl:operation name="greet$typeInstance.getTypeName()"> - <wsdl:input message="tns:$typeInstance.getTypeName()Request" name="$typeInstance.getTypeName()RequestMsg" /> - <wsdl:output message="tns:$typeInstance.getTypeName()Response" name="$typeInstance.getTypeName()ResponseMsg" /> - </wsdl:operation> -#end -#end - </wsdl:portType> - - <wsdl:binding name="GreeterBinding" type="tns:GreeterPortType"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" /> -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - <wsdl:operation name="greet$typeInstance.getTypeName()"> - <wsdlsoap:operation soapAction="" /> - <wsdl:input name="$typeInstance.getTypeName()RequestMsg"> - <wsdlsoap:body use="literal" /> - </wsdl:input> - <wsdl:output name="$typeInstance.getTypeName()ResponseMsg"> - <wsdlsoap:body use="literal" /> - </wsdl:output> - </wsdl:operation> -#end -#end - </wsdl:binding> - - <wsdl:service name="GreeterService"> - <wsdl:port name="GreeterPort" binding="tns:GreeterBinding"> - <wsdlsoap:address location="http://localhost:8085/services/JAXBGreeterServiceWebServiceBinding" /> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm deleted file mode 100644 index 6f02af4c9d..0000000000 --- a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm +++ /dev/null @@ -1,103 +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. ---> -<wsdl:definitions targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services/sdo" - xmlns:tns="http://apache.org/tuscany/sca/itest/databinding/services/sdo" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="Greeter"> - - <wsdl:types> - <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" -#foreach($file in $fileList) - xmlns:$file.getPrefix()="$file.getNamespace()" -#end - targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services/sdo" - elementFormDefault="qualified"> - -#foreach($file in $fileList) - <xsd:import namespace="$file.getNamespace()" - schemaLocation="../xsd/$file.getFileName()" /> -#end - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - <element name="greet$typeInstance.getTypeName()"> - <complexType> - <sequence> - <element name="parm" type="$file.getPrefix():$typeInstance.getTypeName()" /> - </sequence> - </complexType> - </element> -#end -#end - </xsd:schema> - </wsdl:types> -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - <wsdl:message name="$typeInstance.getTypeName()Request"> - <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" /> - </wsdl:message> - <wsdl:message name="$typeInstance.getTypeName()Response"> - <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" /> - </wsdl:message> -#end -#end - - <wsdl:portType name="GreeterPortType"> -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - <wsdl:operation name="greet$typeInstance.getTypeName()"> - <wsdl:input message="tns:$typeInstance.getTypeName()Request" name="$typeInstance.getTypeName()RequestMsg" /> - <wsdl:output message="tns:$typeInstance.getTypeName()Response" name="$typeInstance.getTypeName()ResponseMsg" /> - </wsdl:operation> -#end -#end - </wsdl:portType> - - <wsdl:binding name="GreeterBinding" type="tns:GreeterPortType"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" /> -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - <wsdl:operation name="greet$typeInstance.getTypeName()"> - <wsdlsoap:operation soapAction="" /> - <wsdl:input name="$typeInstance.getTypeName()RequestMsg"> - <wsdlsoap:body use="literal" /> - </wsdl:input> - <wsdl:output name="$typeInstance.getTypeName()ResponseMsg"> - <wsdlsoap:body use="literal" /> - </wsdl:output> - </wsdl:operation> -#end -#end - </wsdl:binding> - - <wsdl:service name="GreeterService"> - <wsdl:port name="GreeterPort" binding="tns:GreeterBinding"> - <wsdlsoap:address location="http://localhost:8085/services/SDOGreeterServiceWebServiceBinding" /> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/generate.xml b/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/generate.xml deleted file mode 100644 index 8453dd56b4..0000000000 --- a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/generate.xml +++ /dev/null @@ -1,159 +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. ---> -<tns:Generate xmlns:tns="http://www.apache.org/tuscany/generate" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.example.org/generate generate.xsd "> - - <Template> - <TemplateName>InteropDatabindingTestCase.java.vm</TemplateName> - <TemplateTargetDir>../src/test/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir> - <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage> - </Template> - <Template> - <TemplateName>interopgreeter.composite.vm</TemplateName> - <TemplateTargetDir>classes</TemplateTargetDir> - </Template> - <Template> - <TemplateName>SDOGreeter.wsdl.vm</TemplateName> - <TemplateTargetDir>classes/wsdl</TemplateTargetDir> - </Template> - <Template> - <TemplateName>JAXBGreeter.wsdl.vm</TemplateName> - <TemplateTargetDir>classes/wsdl</TemplateTargetDir> - </Template> - <InputFile> - <FileName>Person.xsd</FileName> - <FilePath>xsd</FilePath> - <JavaPackage>org.apache.tuscany.sca.itest.databinding.types</JavaPackage> - <Factory>TypesFactory</Factory> - <Namespace>http://apache.org/tuscany/sca/itest/databinding/types</Namespace> - <Prefix>p</Prefix> - <Type> - <TypeName>PersonType</TypeName> - <CreateTypeCode> - TypesFactory factory = TypesFactory.INSTANCE; - param = factory.createPersonType(); - param.setFirstName("George"); - param.setLastName("Doors"); - </CreateTypeCode> - <ModifyTypeCode> - param.setGreeting("Hello"); - </ModifyTypeCode> - <ResultComparison> - assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting()); - </ResultComparison> - </Type> - </InputFile> - <InputFile> - <FileName>Interop.xsd</FileName> - <FilePath>xsd</FilePath> - <JavaPackage>org.apache.tuscany.interop</JavaPackage> - <Factory>InteropFactory</Factory> - <Namespace>http://www.apache.org/tuscany/interop</Namespace> - <Prefix>i</Prefix> - <!-- Type> - <TypeName>AnnotationComplexType</TypeName> - <CreateTypeCode> - InteropFactory factory = InteropFactory.INSTANCE; - param = factory.createAnnotationComplexType(); - param.setSimpleTypeWithNameElement("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setSimpleTypeWithNameElement("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement()); - </ResultComparison> - </Type--> - <Type> - <TypeName>AttributeComplexType</TypeName> - <CreateTypeCode> - InteropFactory factory = InteropFactory.INSTANCE; - org.apache.tuscany.interop.AttributeType attrib = factory.createAttributeType(); - attrib.setAttribute("SomeText"); - param = factory.createAttributeComplexType(); - param.setAttributeElement(attrib); - </CreateTypeCode> - <ModifyTypeCode> - param.getAttributeElement().setAttribute("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute()); - </ResultComparison> - </Type> - <Type> - <TypeName>AttributeReferenceComplexType</TypeName> - <CreateTypeCode> - InteropFactory factory = InteropFactory.INSTANCE; - param = factory.createAttributeReferenceComplexType(); - - param.setReferencedAttribute("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setReferencedAttribute("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute()); - </ResultComparison> - </Type> - <Type> - <TypeName>SimpleTypeWithAbstractComplexType</TypeName> - <CreateTypeCode> - InteropFactory factory = InteropFactory.INSTANCE; - param = factory.createSimpleTypeWithAbstractComplexType(); - param.setSimpleTypeWithAbstractExtensionElement("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement()); - </ResultComparison> - </Type> - <Type> - <TypeName>SimpleTypeWithNameComplexType</TypeName> - <CreateTypeCode> - InteropFactory factory = InteropFactory.INSTANCE; - param = factory.createSimpleTypeWithNameComplexType(); - param.setSimpleTypeWithNameElement("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setSimpleTypeWithNameElement("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement()); - </ResultComparison> - </Type> - <Type> - <TypeName>ComplexTypeWithContentType</TypeName> - <CreateTypeCode> - InteropFactory factory = InteropFactory.INSTANCE; - param = factory.createComplexTypeWithContentType(); - param.setSimpleTypeWithName("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setSimpleTypeWithName("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName()); - </ResultComparison> - </Type> - </InputFile> -</tns:Generate> diff --git a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm deleted file mode 100644 index 36797fde57..0000000000 --- a/branches/sca-java-0.91/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm +++ /dev/null @@ -1,78 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance" - xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" - name="InteropGreeterService"> - - <!-- SDO factory classes --> - #foreach( $file in $fileList ) - <dbsdo:import.sdo factory="$file.getJavaPackage().$file.getFactory()"/> - #end - - <!-- Default binding test --> - <component name="SDODefaultGreeterServiceClient"> - <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" /> - <reference name="greeterService" target="JAXBDefaultGreeterServiceClient"/> - </component> - - <component name="JAXBDefaultGreeterServiceClient"> - <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" /> - <reference name="greeterService" target="SDODefaultGreeterServiceComponent"/> - </component> - - <component name="SDODefaultGreeterServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceImpl" /> - </component> - - <!-- WS binding test --> - <component name="SDOWSGreeterServiceClient"> - <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" /> - </component> - - <reference name="JAXBWSGreeterServiceReference" promote="SDOWSGreeterServiceClient/greeterService"> - <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.interface(GreeterPortType)"/> - <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.port(GreeterService/GreeterPort)"/> - </reference> - - <service name="JAXBWSGreeterService" promote="JAXBWSGreeterServiceClient"> - <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.interface(GreeterPortType)"/> - <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.port(GreeterService/GreeterPort)"/> - </service> - - <component name="JAXBWSGreeterServiceClient"> - <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" /> - </component> - - <reference name="SDOWSGreeterServiceReference" promote="JAXBWSGreeterServiceClient/greeterService"> - <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.interface(GreeterPortType)"/> - <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.port(GreeterService/GreeterPort)"/> - </reference> - - <service name="SDOWSGreeterService" promote="SDOWSGreeterServiceComponent"> - <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.interface(GreeterPortType)"/> - <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.port(GreeterService/GreeterPort)"/> - </service> - - <component name="SDOWSGreeterServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceImpl" /> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/databindings/jaxbgen/pom.xml b/branches/sca-java-0.91/itest/databindings/jaxbgen/pom.xml deleted file mode 100644 index cdef3e5d87..0000000000 --- a/branches/sca-java-0.91/itest/databindings/jaxbgen/pom.xml +++ /dev/null @@ -1,218 +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> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <artifactId>tuscany-itest-databindings-jaxb</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Apache Tuscany JAXB Databinding Integration Test</name> - - <repositories> - <repository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>java.net</id> - <name>java.net Maven 1.x Repository</name> - <url>https://maven-repository.dev.java.net/nonav/repository</url> - <layout>legacy</layout> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>java.net</id> - <name>java.net Maven 1.x Repository</name> - <url>https://maven-repository.dev.java.net/repository</url> - <layout>legacy</layout> - </pluginRepository> - </pluginRepositories> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings-common</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-java-runtime</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-http-jetty</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.1</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>jaxws-rt</artifactId> - <version>2.1</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings-common</artifactId> - <version>${project.version}</version> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/classes</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-test-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>target/jaxws-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-test-source</id> - <phase>process-resources</phase> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <configuration> - <mainClass>org.apache.tuscany.sca.itest.generate.Generate</mainClass> - <arguments> - <argument>${project.build.directory}</argument> - </arguments> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxws-maven-plugin</artifactId> - <executions> - <execution> - <phase>process-resources</phase> - <goals> - <goal>wsimport</goal> - </goals> - </execution> - </executions> - <configuration> - <packageName>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</packageName> - <wsdlDirectory>${project.build.directory}/classes/wsdl</wsdlDirectory> - <wsdlFiles> - <wsdlFile>Greeter.wsdl</wsdlFile> - </wsdlFiles> - <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> - <verbose>true</verbose> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/branches/sca-java-0.91/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/branches/sca-java-0.91/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml deleted file mode 100644 index 8381a164ea..0000000000 --- a/branches/sca-java-0.91/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml +++ /dev/null @@ -1,172 +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. ---> -<tns:Generate xmlns:tns="http://www.apache.org/tuscany/generate" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.example.org/generate generate.xsd "> - - - <Template> - <TemplateName>GreeterService.java.vm</TemplateName> - <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir> - <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage> - </Template> - <Template> - <TemplateName>GreeterServiceImpl.java.vm</TemplateName> - <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir> - <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage> - </Template> - <Template> - <TemplateName>GreeterServiceClient.java.vm</TemplateName> - <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir> - <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage> - </Template> - <Template> - <TemplateName>GreeterServiceClientImpl.java.vm</TemplateName> - <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir> - <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage> - </Template> - <Template> - <TemplateName>DatabindingTestCase.java.vm</TemplateName> - <TemplateTargetDir>../src/test/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir> - <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage> - </Template> - <Template> - <TemplateName>Greeter.wsdl.vm</TemplateName> - <TemplateTargetDir>classes/wsdl</TemplateTargetDir> - </Template> - <InputFile> - <FileName>Person.xsd</FileName> - <FilePath>xsd</FilePath> - <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</JavaPackage> - <Factory>ObjectFactory</Factory> - <Namespace>http://apache.org/tuscany/sca/itest/databinding/types</Namespace> - <Prefix>p</Prefix> - <Type> - <TypeName>PersonType</TypeName> - <CreateTypeCode> - ObjectFactory factory = new ObjectFactory(); - param = factory.createPersonType(); - param.setFirstName("George"); - param.setLastName("Doors"); - </CreateTypeCode> - <ModifyTypeCode> - param.setGreeting("Hello"); - </ModifyTypeCode> - <ResultComparison> - assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting()); - </ResultComparison> - </Type> - </InputFile> - <InputFile> - <FileName>Interop.xsd</FileName> - <FilePath>xsd</FilePath> - <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</JavaPackage> - <Factory>ObjectFactory</Factory> - <Namespace>http://www.apache.org/tuscany/interop</Namespace> - <Prefix>i</Prefix> - <!-- Type> - <TypeName>AnnotationComplexType</TypeName> - <CreateTypeCode> - ObjectFactory factory = new ObjectFactory(); - param = factory.createAnnotationComplexType(); - param.setSimpleTypeWithNameElement("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setSimpleTypeWithNameElement("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement()); - </ResultComparison> - </Type--> - <Type> - <TypeName>AttributeComplexType</TypeName> - <CreateTypeCode> - ObjectFactory factory = new ObjectFactory(); - org.apache.tuscany.sca.itest.jaxbdatabinding.generated.AttributeType attrib = factory.createAttributeType(); - attrib.setAttribute("SomeText"); - param = factory.createAttributeComplexType(); - param.setAttributeElement(attrib); - </CreateTypeCode> - <ModifyTypeCode> - param.getAttributeElement().setAttribute("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute()); - </ResultComparison> - </Type> - <Type> - <TypeName>AttributeReferenceComplexType</TypeName> - <CreateTypeCode> - ObjectFactory factory = new ObjectFactory(); - param = factory.createAttributeReferenceComplexType(); - - param.setReferencedAttribute("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setReferencedAttribute("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute()); - </ResultComparison> - </Type> - <Type> - <TypeName>SimpleTypeWithAbstractComplexType</TypeName> - <CreateTypeCode> - ObjectFactory factory = new ObjectFactory(); - param = factory.createSimpleTypeWithAbstractComplexType(); - param.setSimpleTypeWithAbstractExtensionElement("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement()); - </ResultComparison> - </Type> - <Type> - <TypeName>SimpleTypeWithNameComplexType</TypeName> - <CreateTypeCode> - ObjectFactory factory = new ObjectFactory(); - param = factory.createSimpleTypeWithNameComplexType(); - param.setSimpleTypeWithNameElement("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setSimpleTypeWithNameElement("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement()); - </ResultComparison> - </Type> - <Type> - <TypeName>ComplexTypeWithContentType</TypeName> - <CreateTypeCode> - ObjectFactory factory = new ObjectFactory(); - param = factory.createComplexTypeWithContentType(); - param.setSimpleTypeWithName("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setSimpleTypeWithName("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName()); - </ResultComparison> - </Type> - </InputFile> -</tns:Generate> diff --git a/branches/sca-java-0.91/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/branches/sca-java-0.91/itest/databindings/jaxbgen/src/main/resources/greeter.composite deleted file mode 100644 index 520a68e9b8..0000000000 --- a/branches/sca-java-0.91/itest/databindings/jaxbgen/src/main/resources/greeter.composite +++ /dev/null @@ -1,50 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- name="JAXBGreeterService">
-
- <!-- Clients to test the services -->
- <component name="DefaultGreeterServiceClient">
- <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />
- <reference name="greeterService" target="JAXBGreeterServiceComponent"/>
- </component>
-
- <component name="WSGreeterServiceClient">
- <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />
- </component>
-
- <reference name="JAXBGreeterServiceWSReference" promote="WSGreeterServiceClient/greeterService">
- <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/>
- <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/>
- </reference>
-
- <!-- The greeter service -->
- <service name="JAXBGreeterService" promote="JAXBGreeterServiceComponent">
- <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/>
- <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/>
- <reference>JAXBGreeterServiceComponent</reference>
- </service>
-
- <!-- Components used to implement the services -->
- <component name="JAXBGreeterServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceImpl" />
- </component>
-</composite>
diff --git a/branches/sca-java-0.91/itest/databindings/pom.xml b/branches/sca-java-0.91/itest/databindings/pom.xml deleted file mode 100644 index acf83b1b32..0000000000 --- a/branches/sca-java-0.91/itest/databindings/pom.xml +++ /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. ---> -<project> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings</artifactId> - <name>Apache Tuscany SCA Databindings Integration Tests</name> - <version>0.91-incubating-SNAPSHOT</version> - - - <packaging>pom</packaging> - <build> - <defaultGoal>install</defaultGoal> - </build> - <modules> - <module>common</module> - <module>sdogen</module> - <module>jaxbgen</module> - <module>interop</module> - </modules> -</project> diff --git a/branches/sca-java-0.91/itest/databindings/readme.html b/branches/sca-java-0.91/itest/databindings/readme.html deleted file mode 100644 index 24a44e4ed7..0000000000 --- a/branches/sca-java-0.91/itest/databindings/readme.html +++ /dev/null @@ -1,157 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<!-- - * 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. ---> - -<html> -<head> - <meta http-equiv="Content-Type" content= - "text/html; charset=us-ascii"> - <meta http-equiv="Content-Style-Type" content="text/css"> - - <title>Tuscany SCA Integration Test Databindings</title> - <!-- LINK rel="stylesheet" href="ait.css" type="text/css" --> - <link rel="stylesheet" href="../../css/base.css" type="text/css"> -</head> - -<body> -<h3>Tuscany SCA Integation Test Databindings </h3> - -<h4>Overview</h4> - -<p> -This integration test tests the Tuscany SCA databinding implementation by passing various data structures -across various bindings using the supported databindings. There are tests for the individual databindings -which exercise various bindings with the same databinding at client and server ends of each binding. There -is also an integration test which exercises the transformer chains by specifying different databindings at -client and server ends of the binding. -</p> -<p> -In doing this testing it is apparent that there is a lot of repetition in creating client, services, idl and -type for each of the data types for each of the bindings for each of the databindings. To reduce the amount -of effort required to maintain the tests as new types, bindings and databindings are added the test cases -themselves are generated from configuration files. -</p> - -<h4>Test Structure</h4> - -Databindings/Common - hold files common across all tests <br/> -Databindings/Interop - test the transformer chains with combinations of databindings<br/> -Databindings/sdogen and jaxbgen - test each databindings independently<br/> - -<h4>Test Generation</h4> -<p> -To reduce the amount of manual effort involved in building and maintaining tests cases the test cases -themselves are generated at run time using a set of velocity templates. Each test module has a generate.xml -file in the resources/generate directory which tells the generator what to do. The file looks like this. -</p> -<img src="config.png"> -<p> -Each <Template> element describes a velocit template to use in the test. The generator process is to expand -each velocity template provided with all of the types specified in the <InputFile> sections. -</p> -<p> -Each <InputFile> element describes a schema file used in the test. It also contains a description of each -data type that will be tested. The generator then arranges for the databinding being tested to generate -appropriate Java classes to represent the type at runtime. The individual databinding tests use the following -flow. -</p> - -Create data object at client<br/> -Client passes data object to server<br/> -Server modifies data object<br/> -Server returns modified data object to client<br/> -Client tests that modified data object is as expected<br/> -<p> -Hence the CreateTypeCode, ModifyTypeCode and ResultComparison elements which contain the type specific code -that is used in the tests. -</p> - -<h4>The Common Directory</h4> -<p> -The common directory contains the information that is common across all of the tests. This includes the -common velocity templates and the source for the generator that reads the config.xml for each test. Common -also contains all of the data type schema as these are common across all tests. Each test pom is written so -that the contents of the common project are expanded into the tests target directory before the test starts. -In this way all of the common elements are available for the test generation phase and at test runtime. -</p> - -<h4>Individual Databinding Tests</h4> -<p> -The individual databinding tests, for example, sdogen and jaxbgen, are mostly empty as their content is -generated at runtime. The configuration and any test specific templates can be found in the resources/generate -directory. Some files are hand crafted for each test and live in their static position in the tests directory -structure. -</p> -<p> -Each test uses the same scenario -</p> -<img src="databinding.png"> -<p> -The interface exposed by the greeter service provides a greet method for each data type being tested, for -example, -</p> -<code> -PersonType greetPersonType(PersonType param);<br/> -AttributeComplexType greetAttributeComplexType(AttributeComplexType param);<br/> -AttributeReferenceComplexType greetAttributeReferenceComplexType(AttributeReferenceComplexType param);<br/> -</code> -<p> -These methods are taken from the SDO databinding test and hence PersonType, AttributeComplexType, etc. will -have been generated by the SDO static type generator. -</p> -<p> -Hence this tests a single databinding across a variety of data types and a variety of bindings. New bindings -be tested by extending the composite. Be datatypes can be tested by updating the confix.xml file. -</p> -<h4>Databinding Interoperability Tests</h4> -<p> -This test uses the generated client, services and types from the individual databinding tests. It does not -regenerate them and you will see a dependency in the interop test pom on the other databinding tests. Is also -has some generate elements because the composite file must currently have import statements for all of the -SDO factories required during tested. -</p> -<p> -The scenario used here is, -</p> -<img src="interop.png"> -<p> -A chain of components is built up for each binding. Each component, drawn from the the inidividual databinding -tests, tests the full range of datatypes. The client components are designed so that they can be chained together -and so tranformations across different databindings is tests. The service component simply changes the data -content and returns it as before. -</p> -<h4>Building And Running The Tests</h4> -<p> -The tests can be built by doing the following. -</p> -<code> -cd sca/itest/databindings <br/> -mvn -</code> -<p> -The only modification to this process is required if a new input file is added to the tests suite. In this -case you will need to edit the config.xml files as appropriate but run mvn twice. This may sound a little -odd but currently the sdo test uses its pom file to generate the require SDO types. As the test is self -generating the pom file will not be updated to include the new type file until the second time it's run. The -aim is at some point to remove this feature from the pom. -</p> - - -</body> -</html> diff --git a/branches/sca-java-0.91/itest/databindings/sdogen/pom.xml b/branches/sca-java-0.91/itest/databindings/sdogen/pom.xml deleted file mode 100644 index 67c975f523..0000000000 --- a/branches/sca-java-0.91/itest/databindings/sdogen/pom.xml +++ /dev/null @@ -1,225 +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> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <artifactId>tuscany-itest-databindings-sdo</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Apache Tuscany SDO Databinding Integration Test</name> - - <repositories> - <repository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>java.net</id> - <name>java.net Maven 1.x Repository</name> - <url>https://maven-repository.dev.java.net/nonav/repository</url> - <layout>legacy</layout> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>java.net</id> - <name>java.net Maven 1.x Repository</name> - <url>https://maven-repository.dev.java.net/repository</url> - <layout>legacy</layout> - </pluginRepository> - </pluginRepositories> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-databinding</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-java-runtime</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings-common</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-http-jetty</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings-common</artifactId> - <version>${project.version}</version> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/classes</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-test-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>target/sdo-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-test-source</id> - <phase>process-resources</phase> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <configuration> - <mainClass>org.apache.tuscany.sca.itest.generate.Generate</mainClass> - <arguments> - <argument>${project.build.directory}</argument> - </arguments> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-plugin</artifactId> - <version>1.0-incubating-beta1</version> - <executions> - <execution> - <id>generate-sdo</id> - <phase>process-resources</phase> - <configuration> - <schemaFiles> - <configuration> - <fileName>${project.build.directory}/classes/wsdl/Greeter.wsdl</fileName> - <javaPackage>org.apache.tuscany.sca.itest.databinding.services</javaPackage> - </configuration> - <configuration> - <fileName>${project.build.directory}/classes/xsd/Person.xsd</fileName> - <javaPackage>org.apache.tuscany.sca.itest.databinding.types</javaPackage> - </configuration> - <configuration> - <fileName>${project.build.directory}/classes/xsd/Interop.xsd</fileName> - <javaPackage>org.apache.tuscany.interop</javaPackage> - </configuration> - </schemaFiles> - <noNotification>true</noNotification> - <noContainment>true</noContainment> - <noUnsettable>true</noUnsettable> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/generate.xml deleted file mode 100644 index 5487b113e8..0000000000 --- a/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/generate.xml +++ /dev/null @@ -1,173 +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. ---> -<tns:Generate xmlns:tns="http://www.apache.org/tuscany/generate" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.example.org/generate generate.xsd "> - <Template> - <TemplateName>pom.xml.vm</TemplateName> - <TemplateTargetDir>..</TemplateTargetDir> - </Template> - <Template> - <TemplateName>greeter.composite.vm</TemplateName> - <TemplateTargetDir>classes</TemplateTargetDir> - </Template> - <Template> - <TemplateName>GreeterService.java.vm</TemplateName> - <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir> - <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage> - </Template> - <Template> - <TemplateName>GreeterServiceImpl.java.vm</TemplateName> - <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir> - <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage> - </Template> - <Template> - <TemplateName>GreeterServiceClientImpl.java.vm</TemplateName> - <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir> - <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage> - </Template> - <Template> - <TemplateName>DatabindingTestCase.java.vm</TemplateName> - <TemplateTargetDir>../src/test/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir> - <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage> - </Template> - <Template> - <TemplateName>Greeter.wsdl.vm</TemplateName> - <TemplateTargetDir>classes/wsdl</TemplateTargetDir> - </Template> - <InputFile> - <FileName>Person.xsd</FileName> - <FilePath>xsd</FilePath> - <JavaPackage>org.apache.tuscany.sca.itest.databinding.types</JavaPackage> - <Factory>TypesFactory</Factory> - <Namespace>http://apache.org/tuscany/sca/itest/databinding/types</Namespace> - <Prefix>p</Prefix> - <Type> - <TypeName>PersonType</TypeName> - <CreateTypeCode> - TypesFactory factory = TypesFactory.INSTANCE; - param = factory.createPersonType(); - param.setFirstName("George"); - param.setLastName("Doors"); - </CreateTypeCode> - <ModifyTypeCode> - param.setGreeting("Hello"); - </ModifyTypeCode> - <ResultComparison> - assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting()); - </ResultComparison> - </Type> - </InputFile> - <InputFile> - <FileName>Interop.xsd</FileName> - <FilePath>xsd</FilePath> - <JavaPackage>org.apache.tuscany.interop</JavaPackage> - <Factory>InteropFactory</Factory> - <Namespace>http://www.apache.org/tuscany/interop</Namespace> - <Prefix>i</Prefix> - <!-- Type> - <TypeName>AnnotationComplexType</TypeName> - <CreateTypeCode> - InteropFactory factory = InteropFactory.INSTANCE; - param = factory.createAnnotationComplexType(); - param.setSimpleTypeWithNameElement("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setSimpleTypeWithNameElement("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement()); - </ResultComparison> - </Type--> - <Type> - <TypeName>AttributeComplexType</TypeName> - <CreateTypeCode> - InteropFactory factory = InteropFactory.INSTANCE; - org.apache.tuscany.interop.AttributeType attrib = factory.createAttributeType(); - attrib.setAttribute("SomeText"); - param = factory.createAttributeComplexType(); - param.setAttributeElement(attrib); - </CreateTypeCode> - <ModifyTypeCode> - param.getAttributeElement().setAttribute("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute()); - </ResultComparison> - </Type> - <Type> - <TypeName>AttributeReferenceComplexType</TypeName> - <CreateTypeCode> - InteropFactory factory = InteropFactory.INSTANCE; - param = factory.createAttributeReferenceComplexType(); - - param.setReferencedAttribute("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setReferencedAttribute("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute()); - </ResultComparison> - </Type> - <Type> - <TypeName>SimpleTypeWithAbstractComplexType</TypeName> - <CreateTypeCode> - InteropFactory factory = InteropFactory.INSTANCE; - param = factory.createSimpleTypeWithAbstractComplexType(); - param.setSimpleTypeWithAbstractExtensionElement("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement()); - </ResultComparison> - </Type> - <Type> - <TypeName>SimpleTypeWithNameComplexType</TypeName> - <CreateTypeCode> - InteropFactory factory = InteropFactory.INSTANCE; - param = factory.createSimpleTypeWithNameComplexType(); - param.setSimpleTypeWithNameElement("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setSimpleTypeWithNameElement("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement()); - </ResultComparison> - </Type> - <Type> - <TypeName>ComplexTypeWithContentType</TypeName> - <CreateTypeCode> - InteropFactory factory = InteropFactory.INSTANCE; - param = factory.createComplexTypeWithContentType(); - param.setSimpleTypeWithName("SomeText"); - </CreateTypeCode> - <ModifyTypeCode> - param.setSimpleTypeWithName("SomeChangedText");; - </ModifyTypeCode> - <ResultComparison> - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName()); - </ResultComparison> - </Type> - </InputFile> -</tns:Generate> diff --git a/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm deleted file mode 100644 index 9494d70f96..0000000000 --- a/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm +++ /dev/null @@ -1,56 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance" - xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" - name="SDOGreeterService"> - - <!-- SDO factory classes --> - <dbsdo:import.sdo factory="org.apache.tuscany.sca.itest.databinding.services.ServicesFactory"/> - #foreach( $file in $fileList ) - <dbsdo:import.sdo factory="$file.getJavaPackage().$file.getFactory()"/> - #end - - <!-- Clients to test the services --> - <component name="DefaultGreeterServiceClient"> - <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" /> - <reference name="greeterService" target="SDOGreeterServiceComponent"/> - </component> - - <component name="WSGreeterServiceClient"> - <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" /> - </component> - - <reference name="SDOGreeterServiceWSReference" promote="WSGreeterServiceClient/greeterService"> - <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/> - <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/> - </reference> - - <!-- The greeter service --> - <service name="SDOGreeterService" promote="SDOGreeterServiceComponent"> - <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/> - <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/> - </service> - - <component name="SDOGreeterServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceImpl" /> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm b/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm deleted file mode 100644 index b8389c1e92..0000000000 --- a/branches/sca-java-0.91/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm +++ /dev/null @@ -1,223 +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> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <artifactId>tuscany-itest-databindings-sdo</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Apache Tuscany SDO Databinding Integration Test</name> - - <repositories> - <repository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>java.net</id> - <name>java.net Maven 1.x Repository</name> - <url>https://maven-repository.dev.java.net/nonav/repository</url> - <layout>legacy</layout> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>java.net</id> - <name>java.net Maven 1.x Repository</name> - <url>https://maven-repository.dev.java.net/repository</url> - <layout>legacy</layout> - </pluginRepository> - </pluginRepositories> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-databinding</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-java-runtime</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings-common</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-http-jetty</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest-databindings-common</artifactId> - <version>${project.version}</version> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/classes</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-test-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>target/sdo-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-test-source</id> - <phase>process-resources</phase> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <configuration> - <mainClass>org.apache.tuscany.sca.itest.generate.Generate</mainClass> - <arguments> - <argument>${project.build.directory}</argument> - </arguments> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-plugin</artifactId> - <version>1.0-incubating-beta1</version> - <executions> - <execution> - <id>generate-sdo</id> - <phase>process-resources</phase> - <configuration> - <schemaFiles> - <configuration> - <fileName>${project.build.directory}/classes/wsdl/Greeter.wsdl</fileName> - <javaPackage>org.apache.tuscany.sca.itest.databinding.services</javaPackage> - </configuration> - #foreach( $file in $fileList ) - <configuration> - <fileName>${project.build.directory}/classes/$file.getFilePath()/$file.getFileName()</fileName> - <javaPackage>$file.getJavaPackage()</javaPackage> - </configuration> - #end - </schemaFiles> - <noNotification>true</noNotification> - <noContainment>true</noContainment> - <noUnsettable>true</noUnsettable> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/pom.xml b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/pom.xml deleted file mode 100644 index b10be05e52..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/pom.xml +++ /dev/null @@ -1,189 +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>
- <parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
- <version>0.91-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>iTest-exceptions-crossBinding-ws</artifactId>
- <packaging>jar</packaging>
- <name>Test Suite Exception Handling cross bindings WS</name>
- <!-- JAX-WS temporary only until java.net maven2 repo is ready-->
- <repositories>
- <repository>
- <id>java.net</id>
- <url>https://maven-repository.dev.java.net/nonav/repository/</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
- <dependencies>
- <!-- Required extensions -->
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>${scaKernelVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.idl</groupId>
- <artifactId>tuscany-wsdl</artifactId>
- <version>${scaKernelVersion}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>tuscany-axis2</artifactId>
- <scope>runtime</scope>
- <version>${scaKernelVersion}</version>
- </dependency>
-
- - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.2</version> - <scope>test</scope> - </dependency> - <dependency>
- <groupId>org.apache.tuscany.sca.services</groupId>
- <artifactId>tuscany-http-jetty</artifactId>
- <scope>runtime</scope>
- <version>${scaKernelVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-jaxb</artifactId>
- <version>${scaKernelVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>databinding-axiom</artifactId>
- <version>${scaKernelVersion}</version>
- </dependency>
- <!-- End of Required extensions -->
- <!-- sun's jax-ws -->
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>2.1</version>
- </dependency>
- <!-- you will need to install these on your internal repo - https://jax-ws.dev.java.net/2.1/ download binary - mvn install:install-file "-DgroupId=com.sun.xml.ws" "-DartifactId=http" "-Dversion=2.1" "-Dpackaging=jar" "-Dfile=jaxws-ri\lib\http.jar" - mvn install:install-file "-DgroupId=com.sun.xml.ws" "-DartifactId=resolver" "-Dversion=2.1" "-Dpackaging=jar" "-Dfile=jaxws-ri\lib\resolver.jar" - -->
- <!-- - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>http</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>resolver</artifactId> - <version>2.1</version> - </dependency> --->
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- </dependency>
- <!-- ENDOF sun's jax-ws -->
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <!-- Sun's JAX-WS Generation -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-jaxb</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>
- <verbose>true</verbose>
- <packageName>org.apache.tuscany.sca.test.exceptions.impl.jaxb</packageName>
- <keep>true</keep>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- </dependencies>
- </plugin>
- <!-- SDO Generation -->
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>1.0-incubating-beta1</version>
- <executions>
- <execution>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl</schemaFile>
- <noNotification>true</noNotification>
- <noContainer>true</noContainer>
- <noUnsettable>true</noUnsettable>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca.extensions.axis2.plugins</groupId>
- <artifactId>tuscany-plugin-wsdl2java</artifactId>
- <version>${scaKernelVersion}</version>
- <executions>
- <execution>
- <configuration>
- <wsdlFile>${basedir}/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl</wsdlFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java deleted file mode 100644 index 2c9b2d25cb..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions.impl; - -import org.apache.tuscany.api.annotation.DataType; -import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest; -import org.osoa.sca.annotations.Remotable; - -/** - * - */ -@Remotable -@DataType(name = "javax.xml.bind.JAXBElement") -public interface StockExceptionTestJAXB extends StockExceptionTest { - -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java deleted file mode 100644 index 65751175fb..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions.impl; - -import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault; -import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault_Exception; -import org.apache.tuscany.sca.test.exceptions.impl.jaxb.MarketClosedFault; -import org.apache.tuscany.sca.test.exceptions.impl.jaxb.ObjectFactory; -import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer; -import org.apache.tuscany.sca.test.exceptions.impl.jaxb.TestNotDeclaredAtSourceFault; -import org.osoa.sca.annotations.Service; - -/** - * - */ -@Service(StockExceptionTestJAXB.class) -public class StockExchangeJaxB implements StockExceptionTestJAXB { - - /** - * - */ - public StockExchangeJaxB() { - - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest#stockQuoteOffer(org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer) - */ - public StockOffer stockQuoteOffer(StockOffer input) throws InvalidSymbolFault_Exception, MarketClosedFault, TestNotDeclaredAtSourceFault{ - - System.out.println("stockQuoteOffer '" + input + "'"); - - String symbol = input.getSymbol(); - if ("IBM".equals(symbol)) { - input.setPrice(99.00F); - return input; - - } - else if ("CLOSED".equals(input.getName())) { - throw new MarketClosedFault("TO LATE!", 3); - - } else if( "testNotDeclaredAtSourceTest".equals(input.getName())){ - - throw new TestNotDeclaredAtSourceFault("not declared", "fault info"); - - } - ObjectFactory jaxbOjectFactory = new ObjectFactory(); - - InvalidSymbolFault faultinfo = jaxbOjectFactory.createInvalidSymbolFault(); - - faultinfo.setOffer(input); - - throw new InvalidSymbolFault_Exception("bad symbol", faultinfo); - - } - -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java deleted file mode 100644 index 5f65d293ea..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions.impl; - -import java.rmi.RemoteException; - -import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException; -import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException; - -import stockexceptiontestservice.scatesttool.StockOffer; - -public interface StockTraderSDO { - - StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException; - - void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException; - - Object testNotDeclaredAtSourceTest(); - -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java deleted file mode 100644 index 7d303887e7..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions.impl; - -import java.rmi.RemoteException; - -import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException; -import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException; -import org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -import stockexceptiontestservice.scatesttool.ScatesttoolFactory; -import stockexceptiontestservice.scatesttool.StockOffer; - -/** - * - */ -@Service(StockTraderSDO.class) -public class StockTraderSDOImpl implements StockTraderSDO { - - private StockExceptionTest exchangeJaxb; - - /** - * - */ - - public StockTraderSDOImpl() { - // TODO Auto-generated constructor stub - } - - @Reference - public void setExchangeJaxb(StockExceptionTest exchangeJaxb) { - this.exchangeJaxb = exchangeJaxb; - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO#tradingTest() - */ - public StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException { - StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer(); - stockOffer.setName("IBM"); - stockOffer.setSymbol("IBM"); - stockOffer.setPrice(100.00F); // offer to buy at max $100.00 - - StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer); - - return stockOfferAccepted; - - } - - public void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException, - MarketClosedSDOException { - StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer(); - // set up for a InvalidSymbolSDOException - stockOffer.setName(""); - stockOffer.setSymbol("IBM0"); - - stockOffer.setPrice(11.0F); // offer to buy at max $100.00 - exchangeJaxb.stockQuoteOffer(stockOffer); - - } - - public void marketClosedSDOExceptionTest() { - StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer(); - - // set up for a MarketClosedSDOException - stockOffer.setName("CLOSED"); - stockOffer.setSymbol("MBI"); - stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00 - try { - StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer); - stockOfferAccepted.getPrice(); // the price actually bought. - } catch (RemoteException e) { - - e.printStackTrace(); - } catch (InvalidSymbolSDOException e) { - - e.printStackTrace(); - } catch (MarketClosedSDOException e) { - - e.printStackTrace(); - } - } - - public Object testNotDeclaredAtSourceTest() { - StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer(); - - // set up for a MarketClosedSDOException - stockOffer.setName("testNotDeclaredAtSourceTest"); - stockOffer.setSymbol("TNDAS"); - stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00 - try { - return exchangeJaxb.stockQuoteOffer(stockOffer); - - } catch (Exception e) { - return e; - - } - - } - -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java deleted file mode 100644 index e9df6ba473..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions.sdohandgen; - -import javax.xml.namespace.QName; - -import stockexceptiontestservice.scatesttool.InvalidSymbolFault; - -/** - * - */ -public class InvalidSymbolSDOException extends Exception { - - public static final QName FAULT_ELEMENT = new QName("http://scatesttool.stockexceptiontestservice", "InvalidSymbolFault"); - - /** - * - */ - public InvalidSymbolSDOException() { - - } - - /** - * @param message - * @param faultInfo - */ - public InvalidSymbolSDOException(String message, InvalidSymbolFault faultInfo) { - super(message); - this.faultInfo = faultInfo; - - } - - /** - * @param cause - */ - public InvalidSymbolSDOException(InvalidSymbolFault faultInfo, Throwable cause) { - super(cause); - this.faultInfo = faultInfo; - - } - - /** - * @param message - * @param cause - */ - public InvalidSymbolSDOException(String message, InvalidSymbolFault faultInfo, Throwable cause) { - super(message, cause); - this.faultInfo = faultInfo; - - } - - // *** Below was hand added ... tooling needs to do this ***/ - - /** - * Java type that goes as soapenv:Fault detail element. - */ - private InvalidSymbolFault faultInfo; - - /** - * @return returns fault bean: - * org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault - */ - public InvalidSymbolFault getFaultInfo() { - return faultInfo; - } - -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java deleted file mode 100644 index 39b702afe3..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions.sdohandgen; - -import javax.xml.namespace.QName; - -/** - * - */ -public class MarketClosedSDOException extends Exception { - public static final QName FAULT_ELEMENT = - new QName("http://scatesttool.stockexceptiontestservice", "MarketClosedFault"); - - - /** - * Java type that goes as soapenv:Fault detail element. - */ - private int faultInfo; - - /** - * - */ - public MarketClosedSDOException() { - - } - - /** - * @param message - */ - public MarketClosedSDOException(String message, int faultInfo) { - super(message); - this.faultInfo = faultInfo; - } - - /** - * @param cause - */ - public MarketClosedSDOException(int faultInfo, Throwable cause) { - super(cause); - this.faultInfo = faultInfo; - } - - /** - * @param message - * @param cause - */ - public MarketClosedSDOException(String message, int faultInfo, Throwable cause) { - super(message, cause); - this.faultInfo = faultInfo; - } - - /** - * @return returns fault bean: int - */ - public int getFaultInfo() { - return faultInfo; - } - -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java deleted file mode 100644 index 7b4b3a0f29..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java +++ /dev/null @@ -1,50 +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. - */ -/** - * StockExceptionTest.java - * - * This file was auto-generated from WSDL - * by the Apache Axis2 version: #axisVersion# #today# - */ -package org.apache.tuscany.sca.test.exceptions.sdohandgen; - -import org.apache.tuscany.api.annotation.DataType; -import org.osoa.sca.annotations.Remotable; - -import stockexceptiontestservice.scatesttool.StockOffer; - -import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException; - -/* - * StockExceptionTest java interface - */ - -@Remotable -@DataType(name = "commonj.sdo.DataObject") -public interface StockExceptionTest { - - /** - * Auto generated method signatures - * - * @param param0 - */ - StockOffer stockQuoteOffer(StockOffer param0) - throws java.rmi.RemoteException, InvalidSymbolSDOException, MarketClosedSDOException; - -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite deleted file mode 100644 index f955ba093c..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite +++ /dev/null @@ -1,26 +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" - name="ExceptionTest"> - - <include name="intracomposite" scdlLocation="intracomposite.composite"/> - -</composite> diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite deleted file mode 100644 index f385ebb47d..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite +++ /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 name="intracomposite" xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"> - <dbsdo:import.sdo factory="stockexceptiontestservice.scatesttool.ScatesttoolFactory"/> - - <service name="exchangeJaxbService"> - <interface.java class="org.apache.tuscany.sca.test.exceptions.impl.StockExceptionTestJAXB"/> - <binding.ws wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)" wsdlLocation="http://scatesttool.stockexceptiontestservice wsdl/StockExceptionTest.wsdl"/> - <reference>exchangeJaxbComponent</reference> - </service> - - <component name="exchangeJaxbComponent"> - <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockExchangeJaxB"/> - </component> - - <component name="stockTraderSDOComponent"> - <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDOImpl"/> - <reference name="exchangeJaxb">stockTraderSDOReference</reference> - </component> - - <reference name="stockTraderSDOReference"> - <interface.java class="org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest"/> - <binding.ws wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)" wsdlLocation="http://scatesttool.stockexceptiontestservice wsdl/StockExceptionTest.wsdl"/> - </reference> -</composite> diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl deleted file mode 100644 index d70cdad313..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl +++ /dev/null @@ -1,141 +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.
- -->
-<wsdl:definitions targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns:impl="http://scatesttool.stockexceptiontestservice"
- xmlns:tns="http://scatesttool.stockexceptiontestservice" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="StockExceptionTest">
- <wsdl:types>
- <schema targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <complexType name="StockOffer">
- <sequence>
- <element name="symbol" minOccurs="1" type="xsd:string" />
- <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response -->
- <element name="name" minOccurs="0" type="xsd:string" />
- </sequence>
- </complexType>
-
- <element name="stockQuoteOffer">
- <complexType>
- <sequence>
- <element name="input" minOccurs="0" type="tns:StockOffer" />
- </sequence>
- </complexType>
- </element>
- <element name="stockQuoteOfferResponse">
- <complexType>
- <sequence>
- <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />
- </sequence>
- </complexType>
- </element>
-
- <!-- Faults -->
- <element name="InvalidSymbolFault">
- <complexType>
- <sequence>
- <element name="message" minOccurs="1" type="xsd:string" />
- <element name="offer" minOccurs="1" type="tns:StockOffer" />
- </sequence>
- </complexType>
- </element>
-
- <element name="MarketClosedFault">
- <complexType>
- <sequence>
- <element name="message" minOccurs="1" type="xsd:string" />
- </sequence>
- </complexType>
- </element>
-
- </schema>
- </wsdl:types>
-
-
- <wsdl:message name="stockQuoteOfferRequest">
- <wsdl:part element="tns:stockQuoteOffer" name="parameters" />
- </wsdl:message>
-
- <wsdl:message name="stockQuoteOfferResponse">
- <wsdl:part element="tns:stockQuoteOfferResponse" name="parameters" />
- </wsdl:message>
-
- <wsdl:message name="InvalidSymbolFault">
- <wsdl:part element="tns:InvalidSymbolFault" name="fault" />
- </wsdl:message>
-
- <wsdl:message name="MarketClosedFault">
- <wsdl:part element="tns:MarketClosedFault" name="fault" />
- </wsdl:message>
-
-
- <wsdl:portType name="StockExceptionTest">
- <wsdl:operation name="stockQuoteOffer">
- <wsdl:input message="tns:stockQuoteOfferRequest" name="stockQuoteOfferRequest" />
-
- <wsdl:output message="tns:stockQuoteOfferResponse" name="stockQuoteOfferResponse" />
-<!--
- <wsdl:fault message="tns:InvalidSymbolFault" name="InvalidSymbolException" />
-
- <wsdl:fault message="tns:MarketClosedFault" name="MarketClosedException" />
--->
- </wsdl:operation>
-
-
- </wsdl:portType>
-
- <wsdl:binding name="StockExceptionTestServiceSoapBinding" type="tns:StockExceptionTest">
- <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> -->
-
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-
- <wsdl:operation name="stockQuoteOffer">
- <wsdlsoap:operation soapAction="" />
-
- <wsdl:input name="stockQuoteOfferRequest">
- <wsdlsoap:body use="literal" />
- </wsdl:input>
-
- <wsdl:output name="stockQuoteOfferResponse">
- <wsdlsoap:body use="literal" />
- </wsdl:output>
-<!--
- <wsdl:fault name="InvalidSymbolException">
- <wsdlsoap:fault name="InvalidSymbolException" use="literal" />
- </wsdl:fault>
-
- <wsdl:fault name="MarketClosedException">
- <wsdlsoap:fault name="MarketClosedException" use="literal" />
- </wsdl:fault>
--->
- </wsdl:operation>
-
-
- </wsdl:binding>
-
- <wsdl:service name="StockExceptionTestService">
- <wsdl:port binding="tns:StockExceptionTestServiceSoapBinding" name="StockExceptionTestServiceSoapPort">
- <wsdlsoap:address location="http://localhost:8085/StockExceptionTestService/services/StockExceptionTestService" />
-
- </wsdl:port>
-
- </wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl deleted file mode 100644 index 40e87953b6..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl +++ /dev/null @@ -1,148 +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.
- -->
-<wsdl:definitions targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns:impl="http://scatesttool.stockexceptiontestservice"
- xmlns:tns="http://scatesttool.stockexceptiontestservice" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="StockExceptionTest">
- <wsdl:types>
- <schema targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <complexType name="StockOffer">
- <sequence>
- <element name="symbol" minOccurs="1" type="xsd:string" />
- <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response -->
- <element name="name" minOccurs="0" type="xsd:string" />
- </sequence>
- </complexType>
-
- <element name="stockQuoteOffer">
- <complexType>
- <sequence>
- <element name="input" minOccurs="0" type="tns:StockOffer" />
- </sequence>
- </complexType>
- </element>
- <element name="stockQuoteOfferResponse">
- <complexType>
- <sequence>
- <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />
- </sequence>
- </complexType>
- </element>
-
- <!-- Faults -->
- <element name="InvalidSymbolFault">
- <complexType>
- <sequence>
- <element name="message" minOccurs="1" type="xsd:string" />
- <element name="offer" minOccurs="1" type="tns:StockOffer" />
- </sequence>
- </complexType>
- </element>
-
- <element name="MarketClosedFault" type="xsd:int" />
-
- <element name="TestNotDeclaredAtSourceFault" type="xsd:string" />
-
- </schema>
- </wsdl:types>
-
-
- <wsdl:message name="stockQuoteOfferRequest">
- <wsdl:part element="tns:stockQuoteOffer" name="parameters" />
- </wsdl:message>
-
- <wsdl:message name="stockQuoteOfferResponse">
- <wsdl:part element="tns:stockQuoteOfferResponse" name="parameters" />
- </wsdl:message>
-
- <wsdl:message name="InvalidSymbolFault">
- <wsdl:part element="tns:InvalidSymbolFault" name="fault" />
- </wsdl:message>
-
- <wsdl:message name="MarketClosedFault">
- <wsdl:part element="tns:MarketClosedFault" name="fault" />
- </wsdl:message>
-
- <wsdl:message name="TestNotDeclaredAtSourceFault">
- <wsdl:part element="tns:TestNotDeclaredAtSourceFault" name="fault" />
- </wsdl:message>
-
-
- <wsdl:portType name="StockExceptionTest">
- <wsdl:operation name="stockQuoteOffer">
- <wsdl:input message="tns:stockQuoteOfferRequest" name="stockQuoteOfferRequest" />
-
- <wsdl:output message="tns:stockQuoteOfferResponse" name="stockQuoteOfferResponse" />
-
- <wsdl:fault message="tns:InvalidSymbolFault" name="InvalidSymbolException" />
-
- <wsdl:fault message="tns:MarketClosedFault" name="MarketClosedException" />
-
- <wsdl:fault message="tns:TestNotDeclaredAtSourceFault" name="TestNotDeclaredAtSourceException" />
- </wsdl:operation>
-
-
- </wsdl:portType>
-
- <wsdl:binding name="StockExceptionTestServiceSoapBinding" type="tns:StockExceptionTest">
- <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> -->
-
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-
- <wsdl:operation name="stockQuoteOffer">
- <wsdlsoap:operation soapAction="" />
-
- <wsdl:input name="stockQuoteOfferRequest">
- <wsdlsoap:body use="literal" />
- </wsdl:input>
-
- <wsdl:output name="stockQuoteOfferResponse">
- <wsdlsoap:body use="literal" />
- </wsdl:output>
-
- <wsdl:fault name="InvalidSymbolException">
- <wsdlsoap:fault name="InvalidSymbolException" use="literal" />
- </wsdl:fault>
-
- <wsdl:fault name="MarketClosedException">
- <wsdlsoap:fault name="MarketClosedException" use="literal" />
- </wsdl:fault>
-
- <wsdl:fault name="TestNotDeclaredAtSourceException">
- <wsdlsoap:fault name="TestNotDeclaredAtSourceException" use="literal" />
- </wsdl:fault>
-
-
-
- </wsdl:operation>
-
-
- </wsdl:binding>
-
- <wsdl:service name="StockExceptionTestService">
- <wsdl:port binding="tns:StockExceptionTestServiceSoapBinding" name="StockExceptionTestServiceSoapPort">
- <wsdlsoap:address location="http://localhost:8085/services/exchangeJaxbService" />
-
- </wsdl:port>
-
- </wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd deleted file mode 100644 index 9759647cfe..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd +++ /dev/null @@ -1,65 +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. - --> - <schema targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:tns="http://scatesttool.stockexceptiontestservice" - > - <complexType name="StockOffer"> - <sequence> - <element name="symbol" minOccurs="1" type="xsd:string" /> - <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response --> - <element name="name" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - - <element name="stockQuoteOffer"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="tns:StockOffer" /> - </sequence> - </complexType> - </element> - <element name="stockQuoteOfferResponse"> - <complexType> - <sequence> - <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" /> - </sequence> - </complexType> - </element> - - <!-- Faults --> - <element name="InvalidSymbolFault"> - <complexType> - <sequence> - <element name="message" minOccurs="1" type="xsd:string" /> - <element name="offer" minOccurs="1" type="tns:StockOffer" /> - </sequence> - </complexType> - </element> - - <element name="MarketClosedFault"> - <complexType> - <sequence> - <element name="message" minOccurs="1" type="xsd:string" /> - </sequence> - </complexType> - </element> - - </schema>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java deleted file mode 100644 index ee4076394b..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test.exceptions; - -import junit.framework.TestCase; - -import org.apache.tuscany.api.SCARuntime; -import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO; -import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException; -import org.apache.tuscany.spi.databinding.TransformationException; -import org.osoa.sca.CompositeContext; -import org.osoa.sca.CurrentCompositeContext; - -import stockexceptiontestservice.scatesttool.InvalidSymbolFault; -import stockexceptiontestservice.scatesttool.StockOffer; - -public class IntraCompositeTestCase extends TestCase { - private StockTraderSDO stockTrader; - - private CompositeContext context; - - public void testTrading() { - try { - StockOffer sp = stockTrader.testTrading(); - assertNotNull(sp); - assertEquals(99.00F, sp.getPrice()); - assertEquals("IBM", sp.getSymbol()); - } catch (Exception e) { - - e.printStackTrace(); - fail(e + ""); - - } - - } - - public void testInvalidSymbolSDOException() { - try { - stockTrader.testInvalidSymbolSDOException(); - fail("Expected InvalidSymbolSDOException"); - } catch (InvalidSymbolSDOException e) { - InvalidSymbolFault isf = e.getFaultInfo(); - - assertNotNull(isf); - StockOffer sp = isf.getOffer(); - assertEquals(11.00F, sp.getPrice()); - assertEquals("IBM0", sp.getSymbol()); - - } catch (Exception e) { - e.printStackTrace(); - fail("Expected InvalidSymbolSDOException" + e); - - } - } - - public void _testNotDeclaredAtSourceException() { - - Object ret = stockTrader.testNotDeclaredAtSourceTest(); - - assertNotNull(ret); - - assertEquals(TransformationException.class, ret.getClass()); - - } - - @Override - protected void setUp() throws Exception { - SCARuntime.start("ExceptionTest.composite"); - - context = CurrentCompositeContext.getContext(); - assertNotNull(context); - stockTrader = context.locateService(StockTraderSDO.class, "stockTraderSDOComponent"); - - assertNotNull(context); - } - - @Override - protected void tearDown() throws Exception { - SCARuntime.stop(); - } -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/pom.xml b/branches/sca-java-0.91/itest/exceptions-cross-binding/pom.xml deleted file mode 100644 index e1b5f9b539..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding/pom.xml +++ /dev/null @@ -1,161 +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>
- <parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
- <version>0.91-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>iTest-exceptions-crossBinding</artifactId>
- <packaging>jar</packaging>
- <name>Test Suite Exception Handling cross bindings</name>
- <!-- JAX-WS temporary only until java.net maven2 repo is ready-->
- <repositories>
- <repository>
- <id>java.net</id>
- <url>https://maven-repository.dev.java.net/nonav/repository/</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
- <dependencies>
- <!-- Required extensions -->
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>${scaKernelVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-jaxb</artifactId>
- <version>${scaKernelVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>databinding-axiom</artifactId>
- <version>${scaKernelVersion}</version>
- </dependency>
- <!-- End of Required extensions -->
- <!-- sun's jax-ws -->
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>2.1</version>
- </dependency>
- <!-- you will need to install these on your internal repo - https://jax-ws.dev.java.net/2.1/ download binary - mvn install:install-file "-DgroupId=com.sun.xml.ws" "-DartifactId=http" "-Dversion=2.1" "-Dpackaging=jar" "-Dfile=jaxws-ri\lib\http.jar" - mvn install:install-file "-DgroupId=com.sun.xml.ws" "-DartifactId=resolver" "-Dversion=2.1" "-Dpackaging=jar" "-Dfile=jaxws-ri\lib\resolver.jar" - -->
- <!-- - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>http</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>resolver</artifactId> - <version>2.1</version> - </dependency> --->
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- </dependency>
- <!-- ENDOF sun's jax-ws -->
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <!-- Sun's JAX-WS Generation -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-jaxb</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>
- <verbose>true</verbose>
- <packageName>org.apache.tuscany.sca.test.exceptions.impl.jaxb</packageName>
- <keep>true</keep>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- </dependencies>
- </plugin>
- <!-- SDO Generation -->
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>1.0-incubating-beta1</version>
- <executions>
- <execution>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl</schemaFile>
- <noNotification>true</noNotification>
- <noContainer>true</noContainer>
- <noUnsettable>true</noUnsettable>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca.extensions.axis2.plugins</groupId>
- <artifactId>tuscany-plugin-wsdl2java</artifactId>
- <version>${scaKernelVersion}</version>
- <executions>
- <execution>
- <configuration>
- <wsdlFile>${basedir}/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl</wsdlFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java deleted file mode 100644 index 2c9b2d25cb..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions.impl; - -import org.apache.tuscany.api.annotation.DataType; -import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest; -import org.osoa.sca.annotations.Remotable; - -/** - * - */ -@Remotable -@DataType(name = "javax.xml.bind.JAXBElement") -public interface StockExceptionTestJAXB extends StockExceptionTest { - -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java deleted file mode 100644 index 65751175fb..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions.impl; - -import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault; -import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault_Exception; -import org.apache.tuscany.sca.test.exceptions.impl.jaxb.MarketClosedFault; -import org.apache.tuscany.sca.test.exceptions.impl.jaxb.ObjectFactory; -import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer; -import org.apache.tuscany.sca.test.exceptions.impl.jaxb.TestNotDeclaredAtSourceFault; -import org.osoa.sca.annotations.Service; - -/** - * - */ -@Service(StockExceptionTestJAXB.class) -public class StockExchangeJaxB implements StockExceptionTestJAXB { - - /** - * - */ - public StockExchangeJaxB() { - - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest#stockQuoteOffer(org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer) - */ - public StockOffer stockQuoteOffer(StockOffer input) throws InvalidSymbolFault_Exception, MarketClosedFault, TestNotDeclaredAtSourceFault{ - - System.out.println("stockQuoteOffer '" + input + "'"); - - String symbol = input.getSymbol(); - if ("IBM".equals(symbol)) { - input.setPrice(99.00F); - return input; - - } - else if ("CLOSED".equals(input.getName())) { - throw new MarketClosedFault("TO LATE!", 3); - - } else if( "testNotDeclaredAtSourceTest".equals(input.getName())){ - - throw new TestNotDeclaredAtSourceFault("not declared", "fault info"); - - } - ObjectFactory jaxbOjectFactory = new ObjectFactory(); - - InvalidSymbolFault faultinfo = jaxbOjectFactory.createInvalidSymbolFault(); - - faultinfo.setOffer(input); - - throw new InvalidSymbolFault_Exception("bad symbol", faultinfo); - - } - -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java deleted file mode 100644 index 5f65d293ea..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions.impl; - -import java.rmi.RemoteException; - -import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException; -import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException; - -import stockexceptiontestservice.scatesttool.StockOffer; - -public interface StockTraderSDO { - - StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException; - - void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException; - - Object testNotDeclaredAtSourceTest(); - -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java deleted file mode 100644 index 7d303887e7..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions.impl; - -import java.rmi.RemoteException; - -import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException; -import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException; -import org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -import stockexceptiontestservice.scatesttool.ScatesttoolFactory; -import stockexceptiontestservice.scatesttool.StockOffer; - -/** - * - */ -@Service(StockTraderSDO.class) -public class StockTraderSDOImpl implements StockTraderSDO { - - private StockExceptionTest exchangeJaxb; - - /** - * - */ - - public StockTraderSDOImpl() { - // TODO Auto-generated constructor stub - } - - @Reference - public void setExchangeJaxb(StockExceptionTest exchangeJaxb) { - this.exchangeJaxb = exchangeJaxb; - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO#tradingTest() - */ - public StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException { - StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer(); - stockOffer.setName("IBM"); - stockOffer.setSymbol("IBM"); - stockOffer.setPrice(100.00F); // offer to buy at max $100.00 - - StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer); - - return stockOfferAccepted; - - } - - public void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException, - MarketClosedSDOException { - StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer(); - // set up for a InvalidSymbolSDOException - stockOffer.setName(""); - stockOffer.setSymbol("IBM0"); - - stockOffer.setPrice(11.0F); // offer to buy at max $100.00 - exchangeJaxb.stockQuoteOffer(stockOffer); - - } - - public void marketClosedSDOExceptionTest() { - StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer(); - - // set up for a MarketClosedSDOException - stockOffer.setName("CLOSED"); - stockOffer.setSymbol("MBI"); - stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00 - try { - StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer); - stockOfferAccepted.getPrice(); // the price actually bought. - } catch (RemoteException e) { - - e.printStackTrace(); - } catch (InvalidSymbolSDOException e) { - - e.printStackTrace(); - } catch (MarketClosedSDOException e) { - - e.printStackTrace(); - } - } - - public Object testNotDeclaredAtSourceTest() { - StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer(); - - // set up for a MarketClosedSDOException - stockOffer.setName("testNotDeclaredAtSourceTest"); - stockOffer.setSymbol("TNDAS"); - stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00 - try { - return exchangeJaxb.stockQuoteOffer(stockOffer); - - } catch (Exception e) { - return e; - - } - - } - -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java deleted file mode 100644 index e9df6ba473..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions.sdohandgen; - -import javax.xml.namespace.QName; - -import stockexceptiontestservice.scatesttool.InvalidSymbolFault; - -/** - * - */ -public class InvalidSymbolSDOException extends Exception { - - public static final QName FAULT_ELEMENT = new QName("http://scatesttool.stockexceptiontestservice", "InvalidSymbolFault"); - - /** - * - */ - public InvalidSymbolSDOException() { - - } - - /** - * @param message - * @param faultInfo - */ - public InvalidSymbolSDOException(String message, InvalidSymbolFault faultInfo) { - super(message); - this.faultInfo = faultInfo; - - } - - /** - * @param cause - */ - public InvalidSymbolSDOException(InvalidSymbolFault faultInfo, Throwable cause) { - super(cause); - this.faultInfo = faultInfo; - - } - - /** - * @param message - * @param cause - */ - public InvalidSymbolSDOException(String message, InvalidSymbolFault faultInfo, Throwable cause) { - super(message, cause); - this.faultInfo = faultInfo; - - } - - // *** Below was hand added ... tooling needs to do this ***/ - - /** - * Java type that goes as soapenv:Fault detail element. - */ - private InvalidSymbolFault faultInfo; - - /** - * @return returns fault bean: - * org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault - */ - public InvalidSymbolFault getFaultInfo() { - return faultInfo; - } - -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java deleted file mode 100644 index 39b702afe3..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions.sdohandgen; - -import javax.xml.namespace.QName; - -/** - * - */ -public class MarketClosedSDOException extends Exception { - public static final QName FAULT_ELEMENT = - new QName("http://scatesttool.stockexceptiontestservice", "MarketClosedFault"); - - - /** - * Java type that goes as soapenv:Fault detail element. - */ - private int faultInfo; - - /** - * - */ - public MarketClosedSDOException() { - - } - - /** - * @param message - */ - public MarketClosedSDOException(String message, int faultInfo) { - super(message); - this.faultInfo = faultInfo; - } - - /** - * @param cause - */ - public MarketClosedSDOException(int faultInfo, Throwable cause) { - super(cause); - this.faultInfo = faultInfo; - } - - /** - * @param message - * @param cause - */ - public MarketClosedSDOException(String message, int faultInfo, Throwable cause) { - super(message, cause); - this.faultInfo = faultInfo; - } - - /** - * @return returns fault bean: int - */ - public int getFaultInfo() { - return faultInfo; - } - -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java deleted file mode 100644 index 7b4b3a0f29..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java +++ /dev/null @@ -1,50 +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. - */ -/** - * StockExceptionTest.java - * - * This file was auto-generated from WSDL - * by the Apache Axis2 version: #axisVersion# #today# - */ -package org.apache.tuscany.sca.test.exceptions.sdohandgen; - -import org.apache.tuscany.api.annotation.DataType; -import org.osoa.sca.annotations.Remotable; - -import stockexceptiontestservice.scatesttool.StockOffer; - -import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException; - -/* - * StockExceptionTest java interface - */ - -@Remotable -@DataType(name = "commonj.sdo.DataObject") -public interface StockExceptionTest { - - /** - * Auto generated method signatures - * - * @param param0 - */ - StockOffer stockQuoteOffer(StockOffer param0) - throws java.rmi.RemoteException, InvalidSymbolSDOException, MarketClosedSDOException; - -} diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite deleted file mode 100644 index f955ba093c..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite +++ /dev/null @@ -1,26 +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" - name="ExceptionTest"> - - <include name="intracomposite" scdlLocation="intracomposite.composite"/> - -</composite> diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite deleted file mode 100644 index da10f8881e..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/intracomposite.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" xmlns:foo="http://foo" - xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" name="intracomposite"> - - <component name="stockTraderSDOComponent"> - <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDOImpl" /> - <reference name="exchangeJaxb">exchangeJaxbComponent</reference> - </component> - - <component name="exchangeJaxbComponent"> - <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockExchangeJaxB" /> - </component> - - <!-- Move to the end to verify the fix for TUSCANY-1165 --> - <dbsdo:import.sdo factory="stockexceptiontestservice.scatesttool.ScatesttoolFactory" /> - -</composite> diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl deleted file mode 100644 index d70cdad313..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl +++ /dev/null @@ -1,141 +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.
- -->
-<wsdl:definitions targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns:impl="http://scatesttool.stockexceptiontestservice"
- xmlns:tns="http://scatesttool.stockexceptiontestservice" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="StockExceptionTest">
- <wsdl:types>
- <schema targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <complexType name="StockOffer">
- <sequence>
- <element name="symbol" minOccurs="1" type="xsd:string" />
- <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response -->
- <element name="name" minOccurs="0" type="xsd:string" />
- </sequence>
- </complexType>
-
- <element name="stockQuoteOffer">
- <complexType>
- <sequence>
- <element name="input" minOccurs="0" type="tns:StockOffer" />
- </sequence>
- </complexType>
- </element>
- <element name="stockQuoteOfferResponse">
- <complexType>
- <sequence>
- <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />
- </sequence>
- </complexType>
- </element>
-
- <!-- Faults -->
- <element name="InvalidSymbolFault">
- <complexType>
- <sequence>
- <element name="message" minOccurs="1" type="xsd:string" />
- <element name="offer" minOccurs="1" type="tns:StockOffer" />
- </sequence>
- </complexType>
- </element>
-
- <element name="MarketClosedFault">
- <complexType>
- <sequence>
- <element name="message" minOccurs="1" type="xsd:string" />
- </sequence>
- </complexType>
- </element>
-
- </schema>
- </wsdl:types>
-
-
- <wsdl:message name="stockQuoteOfferRequest">
- <wsdl:part element="tns:stockQuoteOffer" name="parameters" />
- </wsdl:message>
-
- <wsdl:message name="stockQuoteOfferResponse">
- <wsdl:part element="tns:stockQuoteOfferResponse" name="parameters" />
- </wsdl:message>
-
- <wsdl:message name="InvalidSymbolFault">
- <wsdl:part element="tns:InvalidSymbolFault" name="fault" />
- </wsdl:message>
-
- <wsdl:message name="MarketClosedFault">
- <wsdl:part element="tns:MarketClosedFault" name="fault" />
- </wsdl:message>
-
-
- <wsdl:portType name="StockExceptionTest">
- <wsdl:operation name="stockQuoteOffer">
- <wsdl:input message="tns:stockQuoteOfferRequest" name="stockQuoteOfferRequest" />
-
- <wsdl:output message="tns:stockQuoteOfferResponse" name="stockQuoteOfferResponse" />
-<!--
- <wsdl:fault message="tns:InvalidSymbolFault" name="InvalidSymbolException" />
-
- <wsdl:fault message="tns:MarketClosedFault" name="MarketClosedException" />
--->
- </wsdl:operation>
-
-
- </wsdl:portType>
-
- <wsdl:binding name="StockExceptionTestServiceSoapBinding" type="tns:StockExceptionTest">
- <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> -->
-
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-
- <wsdl:operation name="stockQuoteOffer">
- <wsdlsoap:operation soapAction="" />
-
- <wsdl:input name="stockQuoteOfferRequest">
- <wsdlsoap:body use="literal" />
- </wsdl:input>
-
- <wsdl:output name="stockQuoteOfferResponse">
- <wsdlsoap:body use="literal" />
- </wsdl:output>
-<!--
- <wsdl:fault name="InvalidSymbolException">
- <wsdlsoap:fault name="InvalidSymbolException" use="literal" />
- </wsdl:fault>
-
- <wsdl:fault name="MarketClosedException">
- <wsdlsoap:fault name="MarketClosedException" use="literal" />
- </wsdl:fault>
--->
- </wsdl:operation>
-
-
- </wsdl:binding>
-
- <wsdl:service name="StockExceptionTestService">
- <wsdl:port binding="tns:StockExceptionTestServiceSoapBinding" name="StockExceptionTestServiceSoapPort">
- <wsdlsoap:address location="http://localhost:8085/StockExceptionTestService/services/StockExceptionTestService" />
-
- </wsdl:port>
-
- </wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl deleted file mode 100644 index 33b830c856..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl +++ /dev/null @@ -1,148 +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.
- -->
-<wsdl:definitions targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns:impl="http://scatesttool.stockexceptiontestservice"
- xmlns:tns="http://scatesttool.stockexceptiontestservice" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="StockExceptionTest">
- <wsdl:types>
- <schema targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <complexType name="StockOffer">
- <sequence>
- <element name="symbol" minOccurs="1" type="xsd:string" />
- <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response -->
- <element name="name" minOccurs="0" type="xsd:string" />
- </sequence>
- </complexType>
-
- <element name="stockQuoteOffer">
- <complexType>
- <sequence>
- <element name="input" minOccurs="0" type="tns:StockOffer" />
- </sequence>
- </complexType>
- </element>
- <element name="stockQuoteOfferResponse">
- <complexType>
- <sequence>
- <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />
- </sequence>
- </complexType>
- </element>
-
- <!-- Faults -->
- <element name="InvalidSymbolFault">
- <complexType>
- <sequence>
- <element name="message" minOccurs="1" type="xsd:string" />
- <element name="offer" minOccurs="1" type="tns:StockOffer" />
- </sequence>
- </complexType>
- </element>
-
- <element name="MarketClosedFault" type="xsd:int" />
-
- <element name="TestNotDeclaredAtSourceFault" type="xsd:string" />
-
- </schema>
- </wsdl:types>
-
-
- <wsdl:message name="stockQuoteOfferRequest">
- <wsdl:part element="tns:stockQuoteOffer" name="parameters" />
- </wsdl:message>
-
- <wsdl:message name="stockQuoteOfferResponse">
- <wsdl:part element="tns:stockQuoteOfferResponse" name="parameters" />
- </wsdl:message>
-
- <wsdl:message name="InvalidSymbolFault">
- <wsdl:part element="tns:InvalidSymbolFault" name="fault" />
- </wsdl:message>
-
- <wsdl:message name="MarketClosedFault">
- <wsdl:part element="tns:MarketClosedFault" name="fault" />
- </wsdl:message>
-
- <wsdl:message name="TestNotDeclaredAtSourceFault">
- <wsdl:part element="tns:TestNotDeclaredAtSourceFault" name="fault" />
- </wsdl:message>
-
-
- <wsdl:portType name="StockExceptionTest">
- <wsdl:operation name="stockQuoteOffer">
- <wsdl:input message="tns:stockQuoteOfferRequest" name="stockQuoteOfferRequest" />
-
- <wsdl:output message="tns:stockQuoteOfferResponse" name="stockQuoteOfferResponse" />
-
- <wsdl:fault message="tns:InvalidSymbolFault" name="InvalidSymbolException" />
-
- <wsdl:fault message="tns:MarketClosedFault" name="MarketClosedException" />
-
- <wsdl:fault message="tns:TestNotDeclaredAtSourceFault" name="TestNotDeclaredAtSourceException" />
- </wsdl:operation>
-
-
- </wsdl:portType>
-
- <wsdl:binding name="StockExceptionTestServiceSoapBinding" type="tns:StockExceptionTest">
- <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> -->
-
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-
- <wsdl:operation name="stockQuoteOffer">
- <wsdlsoap:operation soapAction="" />
-
- <wsdl:input name="stockQuoteOfferRequest">
- <wsdlsoap:body use="literal" />
- </wsdl:input>
-
- <wsdl:output name="stockQuoteOfferResponse">
- <wsdlsoap:body use="literal" />
- </wsdl:output>
-
- <wsdl:fault name="InvalidSymbolException">
- <wsdlsoap:fault name="InvalidSymbolException" use="literal" />
- </wsdl:fault>
-
- <wsdl:fault name="MarketClosedException">
- <wsdlsoap:fault name="MarketClosedException" use="literal" />
- </wsdl:fault>
-
- <wsdl:fault name="TestNotDeclaredAtSourceException">
- <wsdlsoap:fault name="TestNotDeclaredAtSourceException" use="literal" />
- </wsdl:fault>
-
-
-
- </wsdl:operation>
-
-
- </wsdl:binding>
-
- <wsdl:service name="StockExceptionTestService">
- <wsdl:port binding="tns:StockExceptionTestServiceSoapBinding" name="StockExceptionTestServiceSoapPort">
- <wsdlsoap:address location="http://localhost:8085/StockExceptionTestService/services/StockExceptionTestService" />
-
- </wsdl:port>
-
- </wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd deleted file mode 100644 index 9759647cfe..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd +++ /dev/null @@ -1,65 +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. - --> - <schema targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:tns="http://scatesttool.stockexceptiontestservice" - > - <complexType name="StockOffer"> - <sequence> - <element name="symbol" minOccurs="1" type="xsd:string" /> - <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response --> - <element name="name" minOccurs="0" type="xsd:string" /> - </sequence> - </complexType> - - <element name="stockQuoteOffer"> - <complexType> - <sequence> - <element name="input" minOccurs="0" type="tns:StockOffer" /> - </sequence> - </complexType> - </element> - <element name="stockQuoteOfferResponse"> - <complexType> - <sequence> - <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" /> - </sequence> - </complexType> - </element> - - <!-- Faults --> - <element name="InvalidSymbolFault"> - <complexType> - <sequence> - <element name="message" minOccurs="1" type="xsd:string" /> - <element name="offer" minOccurs="1" type="tns:StockOffer" /> - </sequence> - </complexType> - </element> - - <element name="MarketClosedFault"> - <complexType> - <sequence> - <element name="message" minOccurs="1" type="xsd:string" /> - </sequence> - </complexType> - </element> - - </schema>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/branches/sca-java-0.91/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java deleted file mode 100644 index c589c5611c..0000000000 --- a/branches/sca-java-0.91/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test.exceptions; - -import junit.framework.TestCase; - -import org.apache.tuscany.api.SCARuntime; -import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO; -import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException; -import org.apache.tuscany.spi.databinding.TransformationException; -import org.osoa.sca.CompositeContext; -import org.osoa.sca.CurrentCompositeContext; - -import stockexceptiontestservice.scatesttool.InvalidSymbolFault; -import stockexceptiontestservice.scatesttool.StockOffer; - -public class IntraCompositeTestCase extends TestCase { - private StockTraderSDO stockTrader; - - private CompositeContext context; - - public void testTrading() { - try { - StockOffer sp = stockTrader.testTrading(); - assertNotNull(sp); - assertEquals(99.00F, sp.getPrice()); - assertEquals("IBM", sp.getSymbol()); - } catch (Exception e) { - - e.printStackTrace(); - fail(e + ""); - - } - - } - - public void testInvalidSymbolSDOException() { - try { - stockTrader.testInvalidSymbolSDOException(); - fail("Expected InvalidSymbolSDOException"); - } catch (InvalidSymbolSDOException e) { - InvalidSymbolFault isf = e.getFaultInfo(); - - assertNotNull(isf); - StockOffer sp = isf.getOffer(); - assertEquals(11.00F, sp.getPrice()); - assertEquals("IBM0", sp.getSymbol()); - - } catch (Exception e) { - e.printStackTrace(); - fail("Expected InvalidSymbolSDOException" + e); - - } - } - - public void testNotDeclaredAtSourceException() { - - Object ret = stockTrader.testNotDeclaredAtSourceTest(); - - assertNotNull(ret); - - assertEquals(TransformationException.class, ret.getClass()); - - } - - @Override - protected void setUp() throws Exception { - SCARuntime.start("ExceptionTest.composite"); - - context = CurrentCompositeContext.getContext(); - assertNotNull(context); - stockTrader = context.locateService(StockTraderSDO.class, "stockTraderSDOComponent"); - - assertNotNull(context); - } - - @Override - protected void tearDown() throws Exception { - SCARuntime.stop(); - } -} diff --git a/branches/sca-java-0.91/itest/exceptions/pom.xml b/branches/sca-java-0.91/itest/exceptions/pom.xml deleted file mode 100644 index e2144e9dbb..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?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>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-itest-exceptions</artifactId> - <name>Apache Tuscany Exceptions Integration Tests</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</project> diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java deleted file mode 100644 index e90289a07d..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions; - - -public class Checked extends Exception { - - /** - * - */ - public Checked() { - - } - - /** - * @param message - */ - public Checked(String message) { - super(message); - - } - - /** - * @param cause - */ - public Checked(Throwable cause) { - super(cause); - - } - - /** - * @param message - * @param cause - */ - public Checked(String message, Throwable cause) { - super(message, cause); - - } - -} diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java deleted file mode 100644 index 0d14240513..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions; - -public interface ExceptionHandler { - - public abstract void testing(); - - public abstract Checked getTheBad(); - - public abstract String getTheGood(); - - public abstract UnChecked getTheUgly(); - -}
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java deleted file mode 100644 index 80073e7679..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions; - -public interface ExceptionThrower { - public static final String SO_THEY_SAY = "All is good that ends good."; - - public String theGood() throws org.apache.tuscany.sca.test.exceptions.Checked; - - public String theBad() throws org.apache.tuscany.sca.test.exceptions.Checked; - - public String theUgly() throws org.apache.tuscany.sca.test.exceptions.Checked; - -} diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java deleted file mode 100644 index 1a439711dd..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions; - -public class UnChecked extends RuntimeException { - - /** - * - */ - public UnChecked() { - - } - - /** - * @param message - */ - public UnChecked(String message) { - super(message); - - } - - /** - * @param cause - */ - public UnChecked(Throwable cause) { - super(cause); - - } - - /** - * @param message - * @param cause - */ - public UnChecked(String message, Throwable cause) { - super(message, cause); - - } - -} diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java deleted file mode 100644 index 32a23c5e7d..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions.impl; - -import org.apache.tuscany.sca.test.exceptions.Checked; -import org.apache.tuscany.sca.test.exceptions.ExceptionHandler; -import org.apache.tuscany.sca.test.exceptions.ExceptionThrower; -import org.apache.tuscany.sca.test.exceptions.UnChecked; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; - -@Scope("COMPOSITE") -public class ExceptionHandlerImpl implements ExceptionHandler { - static final String INIT = "INIT"; - - private ExceptionThrower exceptionThrower; - - private String theGood; - - private Checked theBad; - - private UnChecked theUgly; - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.exceptions.impl.ExceptionHandler#testing() - */ - public void testing() { - - assert exceptionThrower != null : "'exceptionThrower' never wired"; - String result = INIT; - try { - theGood = result = exceptionThrower.theGood(); - assert result == ExceptionThrower.SO_THEY_SAY; - } catch (Throwable e) { - assert result == INIT; - assert false; - e.printStackTrace(); - } - - result = INIT; - try { - result = exceptionThrower.theBad(); - // incredible - assert false : "Expected 'Check' Exception"; - - } catch (Checked e) { - // This is good... - assert result == INIT; - theBad = e; - } catch (Throwable t) { - // This is not so good. - t.printStackTrace(); - assert result == INIT; - assert false : "Got wrong exception '" + t.getClass().getName(); - } - - result = INIT; - try { - result = exceptionThrower.theUgly(); - // incredible - assert false : "Expected 'UnCheck' Exception"; - - } catch (Checked e) { - // This is not so good... - assert false : "Got wrong exception '" + e.getClass().getName(); - assert result == INIT; - } catch (UnChecked e) { - theUgly = e; - - } catch (Throwable t) { - // This is not good. - assert false; - assert result == INIT; - - System.out.println(ExceptionThrower.SO_THEY_SAY + " " + INIT); - } - - } - - @Reference - public void setExceptionThrower(ExceptionThrower exceptionThrower) { - this.exceptionThrower = exceptionThrower; - } - - public String getTheGood() { - return theGood; - } - - public Checked getTheBad() { - return theBad; - } - - public UnChecked getTheUgly() { - return theUgly; - } - - public ExceptionThrower getExceptionThrower() { - return exceptionThrower; - } - -} diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java deleted file mode 100644 index c1b7c23d5d..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.exceptions.impl; - -import org.apache.tuscany.sca.test.exceptions.Checked; -import org.apache.tuscany.sca.test.exceptions.ExceptionThrower; -import org.apache.tuscany.sca.test.exceptions.UnChecked; - -/** - * @author rineholt - * - */ -public class ExceptionThrowerImpl implements ExceptionThrower { - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.exceptions.ExceptionThrower#theBad() - */ - public String theBad() throws Checked { - - throw new Checked("theBad"); - - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.exceptions.ExceptionThrower#theGood() - */ - public String theGood() throws Checked { - - return SO_THEY_SAY; - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.exceptions.ExceptionThrower#theUgly() - */ - public String theUgly() throws Checked { - - throw new UnChecked("theUgly"); - } - -} diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/resources/ExceptionTest.composite b/branches/sca-java-0.91/itest/exceptions/src/main/resources/ExceptionTest.composite deleted file mode 100644 index a725864d30..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/main/resources/ExceptionTest.composite +++ /dev/null @@ -1,27 +0,0 @@ -<?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" - targetNamespace = "http://foo" - name="ExceptionTest"> - - <include name="foo:intracomposite"/> - -</composite> diff --git a/branches/sca-java-0.91/itest/exceptions/src/main/resources/intracomposite.composite b/branches/sca-java-0.91/itest/exceptions/src/main/resources/intracomposite.composite deleted file mode 100644 index efe1c5e207..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/main/resources/intracomposite.composite +++ /dev/null @@ -1,34 +0,0 @@ -<?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" - targetNamespace="http://foo" - name="intracomposite"> - - <component name="main"> - <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionHandlerImpl"/> - <reference name="exceptionThrower" target="exceptionThrower"/> - </component> - - <component name="exceptionThrower"> - <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionThrowerImpl"/> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/branches/sca-java-0.91/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java deleted file mode 100644 index 4f719a26c4..0000000000 --- a/branches/sca-java-0.91/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test.exceptions; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class IntraCompositeTestCase extends TestCase { - - private SCADomain domain; - private ExceptionHandler exceptionHandler; - - public void testALL() { - exceptionHandler.testing(); - assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood() ); - assertNotNull(exceptionHandler.getTheBad()); - assertEquals( Checked.class, exceptionHandler.getTheBad().getClass()); - assertNotNull(exceptionHandler.getTheUgly()); - assertEquals( UnChecked.class, exceptionHandler.getTheUgly().getClass()); - - } - - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("ExceptionTest.composite"); - exceptionHandler = domain.getService(ExceptionHandler.class, "main"); - } - - @Override - protected void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/branches/sca-java-0.91/itest/extended-api/pom.xml b/branches/sca-java-0.91/itest/extended-api/pom.xml deleted file mode 100644 index 4b910efcfb..0000000000 --- a/branches/sca-java-0.91/itest/extended-api/pom.xml +++ /dev/null @@ -1,51 +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>0.91-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-itest-extended-api</artifactId>
- <name>Apache Tuscany SCA Extended API Integration Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.91-incubating-SNAPSHOT</version>
- </dependency>
- - <dependency> -
- <groupId>org.apache.tuscany.sca</groupId> -
- <artifactId>tuscany-implementation-java-runtime</artifactId> -
- <version>0.91-incubating-SNAPSHOT</version> -
- <scope>runtime</scope> -
- </dependency> -
- </dependencies>
-</project>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java b/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java deleted file mode 100644 index 869565af17..0000000000 --- a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test.extended; - -public interface BasicService { - - int negate(int theInt); - int delegateNegate(int theInt); - -} diff --git a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java b/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java deleted file mode 100644 index c54af93c05..0000000000 --- a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test.extended; - -public interface MathService { - - int negate(int theInt); - -} diff --git a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java deleted file mode 100644 index 523d238f2e..0000000000 --- a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test.extended.impl; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.test.extended.BasicService; -import org.apache.tuscany.sca.test.extended.MathService; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; - -@Service(BasicService.class) -public class BasicServiceImpl implements BasicService { - - @Context - protected ComponentContext context; - - public int negate(int theInt) { - return -theInt; - } - - public int delegateNegate(int theInt) { - SCADomain domain = SCADomain.connect("sca://local"); - MathService service = domain.getService(MathService.class, "MathServiceComponent"); - return service.negate(theInt); - } - - -} diff --git a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java deleted file mode 100644 index ab4300a7dd..0000000000 --- a/branches/sca-java-0.91/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test.extended.impl; - -import org.apache.tuscany.sca.test.extended.MathService; -import org.osoa.sca.annotations.Service; - -@Service(MathService.class) -public class MathServiceImpl implements MathService { - - public int negate(int theInt) { - return -theInt; - } - -} diff --git a/branches/sca-java-0.91/itest/extended-api/src/main/resources/BasicService.composite b/branches/sca-java-0.91/itest/extended-api/src/main/resources/BasicService.composite deleted file mode 100644 index 128b33b16f..0000000000 --- a/branches/sca-java-0.91/itest/extended-api/src/main/resources/BasicService.composite +++ /dev/null @@ -1,29 +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"
- targetNamespace="http://foo"
- name="BasicServiceComposite">
-
- <component name="BasicServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.test.extended.impl.BasicServiceImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.91/itest/extended-api/src/main/resources/MathService.composite b/branches/sca-java-0.91/itest/extended-api/src/main/resources/MathService.composite deleted file mode 100644 index 8e99d3da60..0000000000 --- a/branches/sca-java-0.91/itest/extended-api/src/main/resources/MathService.composite +++ /dev/null @@ -1,29 +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"
- targetNamespace="http://foo"
- name="MathServiceComposite">
-
- <component name="MathServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.test.extended.impl.MathServiceImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.91/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/branches/sca-java-0.91/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java deleted file mode 100644 index 526e079f03..0000000000 --- a/branches/sca-java-0.91/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test.extended; - -import static org.junit.Assert.assertEquals; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.osoa.sca.ServiceRuntimeException; - -public class ServiceLocateTestCase { - - private SCADomain domain; - - /** - * Test description: Locate a service using Domain.getService() from an - * unmanaged client and invoke a method on that service - */ - @Test - public void unmanagedLocateService() { - BasicService service = domain.getService(BasicService.class, "BasicServiceComponent"); - assertEquals(-99, service.negate(99)); - } - - /** - * Test description: Locate a service using Domain.getService() from an - * managed client. A service is located from this unmanaged test client and a method - * is invoked. The method implementation of the service will also use Domain.getService - */ - @Test - public void managedLocateService() { - BasicService service = domain.getService(BasicService.class, "BasicServiceComponent"); - assertEquals(-99, service.delegateNegate(99)); - } - - /** - * Test description: Attempt to locate a service with an invalid name. - */ - @Test(expected = ServiceRuntimeException.class) - public void badComponentName() { - domain.getService(BasicService.class, "IvalidServiceName"); - } - - @Before - public void init() throws Exception { - domain = SCADomain.newInstance("http://localhost", "/", "BasicService.composite", "MathService.composite"); - } - - @After - public void destroy() throws Exception { - domain.close(); - } - -} diff --git a/branches/sca-java-0.91/itest/interop-soap-client/pom.xml b/branches/sca-java-0.91/itest/interop-soap-client/pom.xml deleted file mode 100644 index f7b544172e..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-client/pom.xml +++ /dev/null @@ -1,77 +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> - <parent> - <groupId>org.apache.tuscany.testing</groupId> - <artifactId>tuscany-interop-clients</artifactId> - <version>0.1-integration-incubating-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>interop-client-webserviceInteropDoc</artifactId> - <packaging>jar</packaging> - <name>Tuscany Interop Testing - Clients - InteropDoc</name> - - <properties> - <ws.type>axis2</ws.type> - </properties> - - - <build> - <plugins> - <plugin> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-plugin</artifactId> - <version>1.0-incubating-beta1</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.extensions.axis2.plugins</groupId> - <artifactId>tuscany-plugin-wsdl2java</artifactId> - <version>${sca.version}</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-0.91/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java b/branches/sca-java-0.91/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java deleted file mode 100644 index 1b3a6a6c1d..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java +++ /dev/null @@ -1,49 +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.Scope; -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) -//FIXME workaround for JIRA TUSCANY-41 -@Scope("COMPOSITE") -public class LoopbackInteropDocServiceComponentImpl implements DocTestPortType { - - public ComplexDocument ComplexDocument(ComplexDocument param0) throws RemoteException { - return param0; - } - - public SimpleDocument1 SimpleDocument(SimpleDocument1 param4) throws RemoteException { - return param4; - } - - public SingleTag SingleTag(SingleTag param2) throws RemoteException { - return param2; - } -} diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/README.txt b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/README.txt deleted file mode 100644 index 9b26d1690a..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/README.txt +++ /dev/null @@ -1,35 +0,0 @@ -Apache Tuscany M1 build (May, 2006) -=================================== - -http://incubator.apache.org/tuscany/ - -Tuscany is an effort undergoing incubation at the Apache Software Foundation -(ASF), sponsored by the Web Services PMC. - -Incubation is required of all newly accepted projects until a further review -indicates that the infrastructure, communications, and decision making process -have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness or -stability of the code, it does indicate that the project has yet to be fully -endorsed by the ASF. - - -Support -------- - -Any problem with this release can be reported to the Tuscany mailing list -or in the JIRA issue tracker. - -Mailing list subscription: - tuscany-dev-subscribe@ws.apache.org - -Jira: - http://issues.apache.org/jira/browse/Tuscany - - -Thank you for using Tuscany! - - -The Tuscany Team. - diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/sca/default.scdl b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/sca/default.scdl deleted file mode 100644 index d286a5137f..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/sca/default.scdl +++ /dev/null @@ -1,50 +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="interop.client">
-<!--
- <import.sdo factory="org.soapinterop.SoapinteropFactory"/>
- <import.wsdl wsdlLocation="wsdl/interopdoc.wsdl"/>
- -->
- <!-- import.sdo location="wsdl/interopdoc.wsdl" -->
- <dbsdo:import.sdo factory="org.soapinterop.SoapinteropFactory"/>
-
- <component name="LoopbackInteropDocService">
- <implementation.java class="org.apache.tuscany.test.interop.client.LoopbackInteropDocServiceComponentImpl"/>
- </component>
-
- <reference name="RemoteInteropDocService">
- <!-- 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)" location="wsdl/interopdoc.wsdl"/>
- </reference>
-
- <reference name="LocalHostInteropDocService">
- <!-- 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)"
- location="wsdl/interopdoc.wsdl"/>
- </reference>
-
-</composite>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl deleted file mode 100644 index fb208f56ab..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl +++ /dev/null @@ -1,39 +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. ---> -<!-- Axis2 based WebService binding extension --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT" - name="org.apache.tuscany.binding.axis2.WebServiceBinding"> - - <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT"> - <group>axis2</group> - <name>axis2-kernel</name> - <version>SNAPSHOT</version> - </dependency> - - <component name="webservice.bindingLoader"> - <system:implementation.system class="org.apache.tuscany.binding.axis2.WebServiceBindingLoader"/> - </component> - - <component name="webservice.axis2.bindingBuilder"> - <system:implementation.system class="org.apache.tuscany.binding.axis2.Axis2BindingBuilder"/> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl deleted file mode 100644 index 92a6be450f..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl +++ /dev/null @@ -1,50 +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:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT" - name="org.apache.tuscany.databinding.Axiom"> - - <component name="databinding.axiom"> - <system:implementation.system class="org.apache.tuscany.databinding.axiom.AxiomDataBinding" /> - </component> - - <component name="transformer.XMLStreamReader2OMElement"> - <system:implementation.system class="org.apache.tuscany.databinding.axiom.XMLStreamReader2OMElement" /> - </component> - - <component name="transformer.OMElement2XMLStreamReader"> - <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2XMLStreamReader" /> - </component> - - <component name="transformer.String2OMElement"> - <system:implementation.system class="org.apache.tuscany.databinding.axiom.String2OMElement" /> - </component> - - <component name="transformer.OMElement2String"> - <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2String" /> - </component> - - <component name="transformer.Object2OMElement"> - <system:implementation.system class="org.apache.tuscany.databinding.axiom.Object2OMElement" /> - </component> - - <component name="transformer.OMElement2Object"> - <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2Object" /> - </component> -</composite> diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl deleted file mode 100644 index 61753384b4..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl +++ /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. ---> -<!-- - import.sdo configuration - - $Rev: 431086 $ $Date: 2006-08-12 13:58:17 -0700 (Sat, 12 Aug 2006) $ ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT" - name="org.apache.tuscany.databinding.sdo"> - - <!-- import.sdo element loader implementations --> - <component name="elementLoader.import.sdo"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.ImportSDOLoader"/> - </component> - - <component name="databinding.sdo"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.SDODataBinding" /> - </component> - - <component name="transformer.DataObject2String"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2String"/> - </component> - <component name="transformer.DataObject2XMLStreamReader"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2XMLStreamReader"/> - </component> - <component name="transformer.XMLDocument2String"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2String"/> - </component> - <component name="transformer.String2DataObject"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.String2DataObject"/> - </component> - <component name="transformer.XMLDocument2XMLStreamReader"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2XMLStreamReader"/> - </component> - <component name="transformer.XMLStreamReader2DataObject"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2DataObject"/> - </component> - <component name="transformer.XMLStreamReader2XMLDocument"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2XMLDocument"/> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl deleted file mode 100644 index 84538dab8b..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl +++ /dev/null @@ -1,55 +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. ---> -<!-- - Default system configuration for the launcher environment. - - $Rev: 440894 $ $Date: 2006-09-06 15:52:01 -0700 (Wed, 06 Sep 2006) $ ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT" - name="org.apache.tuscany.idl.WSDL"> - - <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT"> - <group>wsdl4j</group> - <name>wsdl4j</name> - <version>1.5.2</version> - </dependency> - <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT"> - <group>org.apache.ws.commons</group> - <name>XmlSchema</name> - <version>SNAPSHOT</version> - </dependency> - - <component name="interface.wsdl.Loader"> - <system:implementation.system class="org.apache.tuscany.idl.wsdl.InterfaceWSDLLoader" /> - </component> - - <component name="wsdl.Registry"> - <system:implementation.system class="org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistryImpl" initLevel="40" /> - </component> - - <component name="xmlSchema.registry"> - <system:implementation.system class="org.apache.tuscany.idl.wsdl.XMLSchemaRegistryImpl" initLevel="35" /> - </component> - - <component name="interface.wsdl.Introspector"> - <system:implementation.system class="org.apache.tuscany.idl.wsdl.InterfaceWSDLIntrospectorImpl" initLevel="40" /> - </component> - -</composite>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl deleted file mode 100644 index bda64f749e..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl +++ /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. ---> -<composite name="test.extensions" xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"> - <include name="org.apache.tuscany.interface.wsdl" scdlLocation="includes/interface.wsdl.scdl"/> - <include name="org.apache.tuscany.databinding.axiom" scdlLocation="includes/databinding.axiom.scdl"/> - <include name="org.apache.tuscany.databinding.sdo" scdlLocation="includes/databinding.sdo.scdl"/> - <include name="org.apache.tuscany.binding.axis2" scdlLocation="includes/binding.axis2.scdl"/> -</composite> diff --git a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl b/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl deleted file mode 100644 index 89a8a2e3de..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl +++ /dev/null @@ -1,185 +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"/> - <!-- 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-0.91/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java b/branches/sca-java-0.91/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java deleted file mode 100644 index 6b74f04283..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java +++ /dev/null @@ -1,155 +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.apache.tuscany.test.SCATestCase; -import org.osoa.sca.CompositeContext; -import org.osoa.sca.CurrentCompositeContext; -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 SCATestCase { - - private DataFactory dataFactory; - - private DocTestPortType interopDoc; - - public InteropDocClientTestCase(){}; - - public void testSingleTag() throws RemoteException { - - // 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 { - - // 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 { - - // 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 - - } - - protected void setUp() throws Exception { - - setApplicationSCDL(LoopbackInteropDocServiceComponentImpl.class, "META-INF/sca/default.scdl"); - - addExtension("test.extensions", getClass().getClassLoader().getResource("META-INF/tuscany/extensions/test-extensions.scdl")); - /* - addExtension("org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry", getClass().getClassLoader().getResource( - - "META-INF/tuscany/interface.wsdl.scdl")); - - addExtension("org.apache.tuscany.idl.wsdl.InterfaceWSDLIntrospector", getClass().getClassLoader().getResource( - "META-INF/tuscany/interface.wsdl.scdl")); - - - - addExtension("org.apache.tuscany.binding.axis2.WebServiceBinding", getClass().getClassLoader().getResource( - "META-INF/tuscany/binding.axis2.scdl")); - addExtension("org.apache.tuscany.databinding.sdo", getClass().getClassLoader().getResource("META-INF/tuscany/databinding.sdo.scdl")); - */ - super.setUp(); - - // Get the SDO DataFactory - dataFactory = DataFactory.INSTANCE; - - // Locate the service to test - interopDoc = locateInteropDocService(); - - } - - /** - * 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"; - - CompositeContext compositeContext = CurrentCompositeContext.getContext(); - - return (DocTestPortType) compositeContext.locateService(DocTestPortType.class, interopLocation + "InteropDocService"); - } - -} diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/pom.xml b/branches/sca-java-0.91/itest/interop-soap-round2-client/pom.xml deleted file mode 100644 index 979c649592..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-round2-client/pom.xml +++ /dev/null @@ -1,77 +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> - <parent> - <groupId>org.apache.tuscany.testing</groupId> - <artifactId>tuscany-interop-clients</artifactId> - <version>0.1-integration-incubating-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>interop-client-webserviceSOAPRound2</artifactId> - <packaging>jar</packaging> - <name>Tuscany Interop Testing - Clients - SOAP Builders Round 2 Interop Test</name> - - <properties> - <ws.type>axis2</ws.type> - </properties> - - - <build> - <plugins> - <plugin> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-plugin</artifactId> - <version>1.0-incubating-beta1</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.extensions.axis2.plugins</groupId> - <artifactId>tuscany-plugin-wsdl2java</artifactId> - <version>${sdo.version}</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-0.91/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java deleted file mode 100644 index 079d3aefeb..0000000000 --- a/branches/sca-java-0.91/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. - */ - - -/** - * @author rineholt - * - */ -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-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/README.txt b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/README.txt deleted file mode 100644 index 9b26d1690a..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/README.txt +++ /dev/null @@ -1,35 +0,0 @@ -Apache Tuscany M1 build (May, 2006) -=================================== - -http://incubator.apache.org/tuscany/ - -Tuscany is an effort undergoing incubation at the Apache Software Foundation -(ASF), sponsored by the Web Services PMC. - -Incubation is required of all newly accepted projects until a further review -indicates that the infrastructure, communications, and decision making process -have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness or -stability of the code, it does indicate that the project has yet to be fully -endorsed by the ASF. - - -Support -------- - -Any problem with this release can be reported to the Tuscany mailing list -or in the JIRA issue tracker. - -Mailing list subscription: - tuscany-dev-subscribe@ws.apache.org - -Jira: - http://issues.apache.org/jira/browse/Tuscany - - -Thank you for using Tuscany! - - -The Tuscany Team. - diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/sca/default.scdl b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/sca/default.scdl deleted file mode 100644 index 0ed260399c..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/sca/default.scdl +++ /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-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl deleted file mode 100644 index fb208f56ab..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/binding.axis2.scdl +++ /dev/null @@ -1,39 +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. ---> -<!-- Axis2 based WebService binding extension --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT" - name="org.apache.tuscany.binding.axis2.WebServiceBinding"> - - <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT"> - <group>axis2</group> - <name>axis2-kernel</name> - <version>SNAPSHOT</version> - </dependency> - - <component name="webservice.bindingLoader"> - <system:implementation.system class="org.apache.tuscany.binding.axis2.WebServiceBindingLoader"/> - </component> - - <component name="webservice.axis2.bindingBuilder"> - <system:implementation.system class="org.apache.tuscany.binding.axis2.Axis2BindingBuilder"/> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl deleted file mode 100644 index 21df676937..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.axiom.scdl +++ /dev/null @@ -1,50 +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:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT" - name="org.apache.tuscany.databinding.Axiom"> - - <component name="databinding.axiom"> - <system:implementation.system class="org.apache.tuscany.databinding.axiom.AxiomDataBinding" /> - </component> - - <component name="transformer.XMLStreamReader2OMElement"> - <system:implementation.system class="org.apache.tuscany.databinding.axiom.XMLStreamReader2OMElement" /> - </component> - - <component name="transformer.OMElement2XMLStreamReader"> - <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2XMLStreamReader" /> - </component> - - <component name="transformer.String2OMElement"> - <system:implementation.system class="org.apache.tuscany.databinding.axiom.String2OMElement" /> - </component> - - <component name="transformer.OMElement2String"> - <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2String" /> - </component> - - <component name="transformer.Object2OMElement"> - <system:implementation.system class="org.apache.tuscany.databinding.axiom.Object2OMElement" /> - </component> - - <component name="transformer.OMElement2Object"> - <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2Object" /> - </component> -</composite> diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl deleted file mode 100644 index 61753384b4..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/databinding.sdo.scdl +++ /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. ---> -<!-- - import.sdo configuration - - $Rev: 431086 $ $Date: 2006-08-12 13:58:17 -0700 (Sat, 12 Aug 2006) $ ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT" - name="org.apache.tuscany.databinding.sdo"> - - <!-- import.sdo element loader implementations --> - <component name="elementLoader.import.sdo"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.ImportSDOLoader"/> - </component> - - <component name="databinding.sdo"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.SDODataBinding" /> - </component> - - <component name="transformer.DataObject2String"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2String"/> - </component> - <component name="transformer.DataObject2XMLStreamReader"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2XMLStreamReader"/> - </component> - <component name="transformer.XMLDocument2String"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2String"/> - </component> - <component name="transformer.String2DataObject"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.String2DataObject"/> - </component> - <component name="transformer.XMLDocument2XMLStreamReader"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2XMLStreamReader"/> - </component> - <component name="transformer.XMLStreamReader2DataObject"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2DataObject"/> - </component> - <component name="transformer.XMLStreamReader2XMLDocument"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2XMLDocument"/> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl deleted file mode 100644 index 84538dab8b..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/includes/interface.wsdl.scdl +++ /dev/null @@ -1,55 +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. ---> -<!-- - Default system configuration for the launcher environment. - - $Rev: 440894 $ $Date: 2006-09-06 15:52:01 -0700 (Wed, 06 Sep 2006) $ ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT" - name="org.apache.tuscany.idl.WSDL"> - - <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT"> - <group>wsdl4j</group> - <name>wsdl4j</name> - <version>1.5.2</version> - </dependency> - <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT"> - <group>org.apache.ws.commons</group> - <name>XmlSchema</name> - <version>SNAPSHOT</version> - </dependency> - - <component name="interface.wsdl.Loader"> - <system:implementation.system class="org.apache.tuscany.idl.wsdl.InterfaceWSDLLoader" /> - </component> - - <component name="wsdl.Registry"> - <system:implementation.system class="org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistryImpl" initLevel="40" /> - </component> - - <component name="xmlSchema.registry"> - <system:implementation.system class="org.apache.tuscany.idl.wsdl.XMLSchemaRegistryImpl" initLevel="35" /> - </component> - - <component name="interface.wsdl.Introspector"> - <system:implementation.system class="org.apache.tuscany.idl.wsdl.InterfaceWSDLIntrospectorImpl" initLevel="40" /> - </component> - -</composite>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl deleted file mode 100644 index 1e8c3b1589..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/META-INF/tuscany/extensions/test-extensions.scdl +++ /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. ---> -<composite name="test.extensions" xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"> - <include name="org.apache.tuscany.interface.wsdl" scdlLocation="includes/interface.wsdl.scdl"/> - <include name="org.apache.tuscany.databinding.axiom" scdlLocation="includes/databinding.axiom.scdl"/> - <include name="org.apache.tuscany.databinding.sdo" scdlLocation="includes/databinding.sdo.scdl"/> - <include name="org.apache.tuscany.binding.axis2" scdlLocation="includes/binding.axis2.scdl"/> -</composite> diff --git a/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl deleted file mode 100644 index e08039cedb..0000000000 --- a/branches/sca-java-0.91/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-0.91/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/branches/sca-java-0.91/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java deleted file mode 100644 index da70d5b3a6..0000000000 --- a/branches/sca-java-0.91/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 SCATestCase { - - 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-0.91/itest/interop-soap-service/pom.xml b/branches/sca-java-0.91/itest/interop-soap-service/pom.xml deleted file mode 100644 index c18e9e0ff3..0000000000 --- a/branches/sca-java-0.91/itest/interop-soap-service/pom.xml +++ /dev/null @@ -1,109 +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> - <parent> - <groupId>org.apache.tuscany.testing</groupId> - <artifactId>tuscany-interop-services</artifactId> - <version>0.1-integration-incubating-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>interop-service-webserviceInteropDoc</artifactId> - <packaging>war</packaging> - <name>Tuscany Interop Testing - Services - InteropDoc</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca.runtime</groupId> - <artifactId>webapp</artifactId> - <version>${sca.version}</version> - <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar --> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca.runtime</groupId> - <artifactId>webapp-host</artifactId> - <version>${sca.version}</version> - <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar --> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca.services.idl</groupId> - <artifactId>tuscany-wsdl</artifactId> - <version>${sca.version}</version> - <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar --> - </dependency> - - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-api</artifactId> - <version>SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-impl</artifactId> - <version>SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-plugin</artifactId> - <version>1.0-incubating-beta1</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.extensions.axis2.plugins</groupId> - <artifactId>tuscany-plugin-wsdl2java</artifactId> - <version>${sca.version}</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-0.91/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java b/branches/sca-java-0.91/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-0.91/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-0.91/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl b/branches/sca-java-0.91/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl deleted file mode 100644 index 820c26ca34..0000000000 --- a/branches/sca-java-0.91/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-0.91/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl b/branches/sca-java-0.91/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl deleted file mode 100644 index 3fbc73616e..0000000000 --- a/branches/sca-java-0.91/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-0.91/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-0.91/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 8cf95fb789..0000000000 --- a/branches/sca-java-0.91/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-0.91/itest/interop-soap-service/t.bat b/branches/sca-java-0.91/itest/interop-soap-service/t.bat deleted file mode 100755 index 0f83dedc37..0000000000 --- a/branches/sca-java-0.91/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-0.91/itest/interop-xsq-client/pom.xml b/branches/sca-java-0.91/itest/interop-xsq-client/pom.xml deleted file mode 100644 index c31cce8fc3..0000000000 --- a/branches/sca-java-0.91/itest/interop-xsq-client/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> - <parent> - <groupId>org.apache.tuscany.testing</groupId> - <artifactId>tuscany-interop-clients</artifactId> - <version>0.1-integration-incubating-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>interop-client-webserviceXSQ</artifactId> - <packaging>jar</packaging> - <name>Tuscany Interop Testing - Clients - webserviceXSQ</name> - <properties> - <ws.type>axis2</ws.type> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>always</forkMode> - <argLine>-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=3720,server=y,suspend=y</argLine> - </configuration> - </plugin> - </plugins> - </build> - - - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca.services.idl</groupId> - <artifactId>tuscany-wsdl</artifactId> - <version>${sca.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - - -</project> diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/main/resources/META-INF/README.txt b/branches/sca-java-0.91/itest/interop-xsq-client/src/main/resources/META-INF/README.txt deleted file mode 100644 index 9b26d1690a..0000000000 --- a/branches/sca-java-0.91/itest/interop-xsq-client/src/main/resources/META-INF/README.txt +++ /dev/null @@ -1,35 +0,0 @@ -Apache Tuscany M1 build (May, 2006) -=================================== - -http://incubator.apache.org/tuscany/ - -Tuscany is an effort undergoing incubation at the Apache Software Foundation -(ASF), sponsored by the Web Services PMC. - -Incubation is required of all newly accepted projects until a further review -indicates that the infrastructure, communications, and decision making process -have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness or -stability of the code, it does indicate that the project has yet to be fully -endorsed by the ASF. - - -Support -------- - -Any problem with this release can be reported to the Tuscany mailing list -or in the JIRA issue tracker. - -Mailing list subscription: - tuscany-dev-subscribe@ws.apache.org - -Jira: - http://issues.apache.org/jira/browse/Tuscany - - -Thank you for using Tuscany! - - -The Tuscany Team. - diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/java/interop/ClientTestCase.java b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/java/interop/ClientTestCase.java deleted file mode 100644 index f2a7b198a1..0000000000 --- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/java/interop/ClientTestCase.java +++ /dev/null @@ -1,77 +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 interop; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import org.apache.tuscany.test.SCATestCase; -import org.osoa.sca.CompositeContext; -import org.osoa.sca.CurrentCompositeContext; - -/** - * This client program shows how to create an SCA runtime, start it, locate a - * simple HelloWorld service component and invoke it. - */ -public class ClientTestCase extends SCATestCase { - private Object serviceProxy; - - // old tc - // public void testGetQuote() throws ConfigurationException, - // SecurityException, NoSuchMethodException, IllegalArgumentException, - // IllegalAccessException, InvocationTargetException { - // - // TuscanyRuntime tuscany = new TuscanyRuntime("getQuote", null); - // tuscany.start(); - // ModuleContext moduleContext = CurrentModuleContext.getContext(); - // - // Object serviceProxy = moduleContext.locateService("webserviceXSQ"); - // Method m = serviceProxy.getClass().getMethod("GetQuote", new Class[] { - // String.class }); - // - // String sqResponse = (String) m.invoke(serviceProxy, "IBM"); - // - // assertTrue(sqResponse.startsWith("<StockQuotes><Stock><Symbol>IBM</Symbol>")); - // - // tuscany.stop(); - // } - - public void testGetQuote() throws IllegalArgumentException, IllegalAccessException, - InvocationTargetException, SecurityException, NoSuchMethodException { - Method m = serviceProxy.getClass().getMethod("GetQuote", new Class[] {String.class}); - - String sqResponse = (String)m.invoke(serviceProxy, "IBM"); - - assertTrue(sqResponse.startsWith("<StockQuotes><Stock><Symbol>IBM</Symbol>")); - - } - - @Override - protected void setUp() throws Exception { - setApplicationSCDL(getClass(), "META-INF/sca/test.scdl"); - - addExtension("test.exts", getClass().getClassLoader() - .getResource("META-INF/tuscany/test-extensions.scdl")); - - super.setUp(); - CompositeContext compositeContext = CurrentCompositeContext.getContext(); - serviceProxy = compositeContext.locateService(Object.class, "webserviceXSQ"); - } - -} diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/sca/test.scdl b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/sca/test.scdl deleted file mode 100644 index 22b3b90623..0000000000 --- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/sca/test.scdl +++ /dev/null @@ -1,31 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance" - name="composite.webserviceXSQ"> - <dbsdo:import.sdo xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" location="wsdl/sq.wsdl"/> - - <reference name="webserviceXSQ"> - <interface.wsdl interface="http://www.webserviceX.NET/#wsdl.interface(StockQuoteSoap)" wsdli:wsdlLocation="http://www.webserviceX.NET/ wsdl/sq.wsdl" /> - <binding.ws endpoint="http://www.webserviceX.NET/#wsdl.endpoint(StockQuote/StockQuoteSoap)" - location="wsdl/sq.wsdl" /> - </reference> - -</composite> diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/binding.axis2.scdl b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/binding.axis2.scdl deleted file mode 100644 index fb208f56ab..0000000000 --- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/binding.axis2.scdl +++ /dev/null @@ -1,39 +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. ---> -<!-- Axis2 based WebService binding extension --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT" - name="org.apache.tuscany.binding.axis2.WebServiceBinding"> - - <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT"> - <group>axis2</group> - <name>axis2-kernel</name> - <version>SNAPSHOT</version> - </dependency> - - <component name="webservice.bindingLoader"> - <system:implementation.system class="org.apache.tuscany.binding.axis2.WebServiceBindingLoader"/> - </component> - - <component name="webservice.axis2.bindingBuilder"> - <system:implementation.system class="org.apache.tuscany.binding.axis2.Axis2BindingBuilder"/> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.axiom.scdl b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.axiom.scdl deleted file mode 100644 index e4fe956e61..0000000000 --- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.axiom.scdl +++ /dev/null @@ -1,52 +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:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
- name="org.apache.tuscany.databinding.Axiom">
-
- <component name="databinding.axiom">
- <system:implementation.system class="org.apache.tuscany.databinding.axiom.AxiomDataBinding" />
- </component>
-
- <!-- Transformers -->
- <component name="transformer.XMLStreamReader2OMElement">
- <system:implementation.system class="org.apache.tuscany.databinding.axiom.XMLStreamReader2OMElement" />
- </component>
-
- <component name="transformer.OMElement2XMLStreamReader">
- <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2XMLStreamReader" />
- </component>
-
- <component name="transformer.String2OMElement">
- <system:implementation.system class="org.apache.tuscany.databinding.axiom.String2OMElement" />
- </component>
-
- <component name="transformer.OMElement2String">
- <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2String" />
- </component>
-
- <component name="transformer.Object2OMElement">
- <system:implementation.system class="org.apache.tuscany.databinding.axiom.Object2OMElement" />
- </component>
-
- <component name="transformer.OMElement2Object">
- <system:implementation.system class="org.apache.tuscany.databinding.axiom.OMElement2Object" />
- </component>
-
-</composite>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.sdo.scdl b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.sdo.scdl deleted file mode 100644 index 61753384b4..0000000000 --- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/databinding.sdo.scdl +++ /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. ---> -<!-- - import.sdo configuration - - $Rev: 431086 $ $Date: 2006-08-12 13:58:17 -0700 (Sat, 12 Aug 2006) $ ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT" - name="org.apache.tuscany.databinding.sdo"> - - <!-- import.sdo element loader implementations --> - <component name="elementLoader.import.sdo"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.ImportSDOLoader"/> - </component> - - <component name="databinding.sdo"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.SDODataBinding" /> - </component> - - <component name="transformer.DataObject2String"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2String"/> - </component> - <component name="transformer.DataObject2XMLStreamReader"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2XMLStreamReader"/> - </component> - <component name="transformer.XMLDocument2String"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2String"/> - </component> - <component name="transformer.String2DataObject"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.String2DataObject"/> - </component> - <component name="transformer.XMLDocument2XMLStreamReader"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2XMLStreamReader"/> - </component> - <component name="transformer.XMLStreamReader2DataObject"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2DataObject"/> - </component> - <component name="transformer.XMLStreamReader2XMLDocument"> - <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2XMLDocument"/> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/interface.wsdl.scdl b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/interface.wsdl.scdl deleted file mode 100644 index 84538dab8b..0000000000 --- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/interface.wsdl.scdl +++ /dev/null @@ -1,55 +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. ---> -<!-- - Default system configuration for the launcher environment. - - $Rev: 440894 $ $Date: 2006-09-06 15:52:01 -0700 (Wed, 06 Sep 2006) $ ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT" - name="org.apache.tuscany.idl.WSDL"> - - <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT"> - <group>wsdl4j</group> - <name>wsdl4j</name> - <version>1.5.2</version> - </dependency> - <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT"> - <group>org.apache.ws.commons</group> - <name>XmlSchema</name> - <version>SNAPSHOT</version> - </dependency> - - <component name="interface.wsdl.Loader"> - <system:implementation.system class="org.apache.tuscany.idl.wsdl.InterfaceWSDLLoader" /> - </component> - - <component name="wsdl.Registry"> - <system:implementation.system class="org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistryImpl" initLevel="40" /> - </component> - - <component name="xmlSchema.registry"> - <system:implementation.system class="org.apache.tuscany.idl.wsdl.XMLSchemaRegistryImpl" initLevel="35" /> - </component> - - <component name="interface.wsdl.Introspector"> - <system:implementation.system class="org.apache.tuscany.idl.wsdl.InterfaceWSDLIntrospectorImpl" initLevel="40" /> - </component> - -</composite>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/test-extensions.scdl b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/test-extensions.scdl deleted file mode 100644 index 355b663a1b..0000000000 --- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/META-INF/tuscany/test-extensions.scdl +++ /dev/null @@ -1,29 +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:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
- name="test.extensions">
-
- <include name="org.apache.tuscany.databinding.axiom" scdlLocation="databinding.axiom.scdl"/>
- <include name="org.apache.tuscany.databinding.sdo" scdlLocation="databinding.sdo.scdl"/>
- <include name="org.apache.tuscany.interface.wsdl" scdlLocation="interface.wsdl.scdl"/>
- <include name="org.apache.tuscany.binding.axis2" scdlLocation="binding.axis2.scdl"/>
-
-
-</composite>
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/wsdl/sq.wsdl b/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/wsdl/sq.wsdl deleted file mode 100644 index 0408a60297..0000000000 --- a/branches/sca-java-0.91/itest/interop-xsq-client/src/test/resources/wsdl/sq.wsdl +++ /dev/null @@ -1,142 +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. ---> -<wsdl:definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tns="http://www.webserviceX.NET/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://www.webserviceX.NET/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <s:schema elementFormDefault="qualified" targetNamespace="http://www.webserviceX.NET/"> - <s:element name="GetQuote"> - <s:complexType> - <s:sequence> - <s:element minOccurs="0" maxOccurs="1" name="symbol" type="s:string" /> - </s:sequence> - </s:complexType> - - </s:element> - <s:element name="GetQuoteResponse"> - <s:complexType> - <s:sequence> - <s:element minOccurs="0" maxOccurs="1" name="GetQuoteResult" type="s:string" /> - </s:sequence> - </s:complexType> - </s:element> - <s:element name="string" nillable="true" type="s:string" /> - - </s:schema> - </wsdl:types> - <wsdl:message name="GetQuoteSoapIn"> - <wsdl:part name="parameters" element="tns:GetQuote" /> - </wsdl:message> - <wsdl:message name="GetQuoteSoapOut"> - <wsdl:part name="parameters" element="tns:GetQuoteResponse" /> - </wsdl:message> - <wsdl:message name="GetQuoteHttpGetIn"> - - <wsdl:part name="symbol" type="s:string" /> - </wsdl:message> - <wsdl:message name="GetQuoteHttpGetOut"> - <wsdl:part name="Body" element="tns:string" /> - </wsdl:message> - <wsdl:message name="GetQuoteHttpPostIn"> - <wsdl:part name="symbol" type="s:string" /> - </wsdl:message> - <wsdl:message name="GetQuoteHttpPostOut"> - - <wsdl:part name="Body" element="tns:string" /> - </wsdl:message> - <wsdl:portType name="StockQuoteSoap"> - <wsdl:operation name="GetQuote"> - <documentation xmlns="http://schemas.xmlsoap.org/wsdl/">Get Stock quote for a company Symbol</documentation> - <wsdl:input message="tns:GetQuoteSoapIn" /> - <wsdl:output message="tns:GetQuoteSoapOut" /> - </wsdl:operation> - - </wsdl:portType> - <wsdl:portType name="StockQuoteHttpGet"> - <wsdl:operation name="GetQuote"> - <documentation xmlns="http://schemas.xmlsoap.org/wsdl/">Get Stock quote for a company Symbol</documentation> - <wsdl:input message="tns:GetQuoteHttpGetIn" /> - <wsdl:output message="tns:GetQuoteHttpGetOut" /> - </wsdl:operation> - </wsdl:portType> - - <wsdl:portType name="StockQuoteHttpPost"> - <wsdl:operation name="GetQuote"> - <documentation xmlns="http://schemas.xmlsoap.org/wsdl/">Get Stock quote for a company Symbol</documentation> - <wsdl:input message="tns:GetQuoteHttpPostIn" /> - <wsdl:output message="tns:GetQuoteHttpPostOut" /> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="StockQuoteSoap" type="tns:StockQuoteSoap"> - - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" /> - <wsdl:operation name="GetQuote"> - <soap:operation soapAction="http://www.webserviceX.NET/GetQuote" style="document" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - - </wsdl:operation> - </wsdl:binding> - <wsdl:binding name="StockQuoteHttpGet" type="tns:StockQuoteHttpGet"> - <http:binding verb="GET" /> - <wsdl:operation name="GetQuote"> - <http:operation location="/GetQuote" /> - <wsdl:input> - <http:urlEncoded /> - </wsdl:input> - - <wsdl:output> - <mime:mimeXml part="Body" /> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:binding name="StockQuoteHttpPost" type="tns:StockQuoteHttpPost"> - <http:binding verb="POST" /> - <wsdl:operation name="GetQuote"> - <http:operation location="/GetQuote" /> - - <wsdl:input> - <mime:content type="application/x-www-form-urlencoded" /> - </wsdl:input> - <wsdl:output> - <mime:mimeXml part="Body" /> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="StockQuote"> - - <wsdl:port name="StockQuoteSoap" binding="tns:StockQuoteSoap"> - <soap:address location="http://www.webservicex.net/stockquote.asmx" /> - </wsdl:port> - <wsdl:port name="StockQuoteHttpGet" binding="tns:StockQuoteHttpGet"> - <http:address location="http://www.webservicex.net/stockquote.asmx" /> - </wsdl:port> - <wsdl:port name="StockQuoteHttpPost" binding="tns:StockQuoteHttpPost"> - <http:address location="http://www.webservicex.net/stockquote.asmx" /> - </wsdl:port> - - </wsdl:service> -</wsdl:definitions> diff --git a/branches/sca-java-0.91/itest/operation-overloading/pom.xml b/branches/sca-java-0.91/itest/operation-overloading/pom.xml deleted file mode 100644 index c65cbad1c0..0000000000 --- a/branches/sca-java-0.91/itest/operation-overloading/pom.xml +++ /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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-itest-operation-overloading</artifactId> - <name>Apache Tuscany Operation Overloading Integration Tests</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</project> diff --git a/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java deleted file mode 100644 index f630f9904f..0000000000 --- a/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.opoverload; - - -/** - * - */ -//@AllowsPassByReference -public interface OverloadASourceTarget { - final String opName = "operationA:"; - - String operationA(); - - String operationA(int parm1); - - String operationA(int parm1, String parm2); - - String operationA(String parm1, int parm2); - - String operationA(String string); - - String[] operationAall(); - -}
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java deleted file mode 100644 index d0f78c409f..0000000000 --- a/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.opoverload.impl; - -import java.util.ArrayList; - -import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * - */ -@Service(OverloadASourceTarget.class) -public class OverloadASource implements OverloadASourceTarget{ - public OverloadASourceTarget overloadASourceTarget; - /** - * - */ - public OverloadASource() { - - } - /** - * @return - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA() - */ - public String[] operationAall() { - assert overloadASourceTarget != null : "reference overloadASourceTarget is null"; - ArrayList<String> ret = new ArrayList<String>(); - ret.add(overloadASourceTarget.operationA()); - ret.add(overloadASourceTarget.operationA(11)); - ret.add(overloadASourceTarget.operationA("eleven")); - ret.add(overloadASourceTarget.operationA(3,"three")); - ret.add(overloadASourceTarget.operationA("four",4)); - return (String[]) ret.toArray(new String[ret.size()]); - } - - - /** - * @return - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA() - */ - public String operationA() { - assert overloadASourceTarget != null : "reference overloadASourceTarget is null"; - return overloadASourceTarget.operationA(); - } - /** - * @param parm1 - * @return - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int) - */ - public String operationA(int parm1) { - assert overloadASourceTarget != null : "reference overloadASourceTarget is null"; - return overloadASourceTarget.operationA(parm1); - } - /** - * @param parm1 - * @param parm2 - * @return - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int, java.lang.String) - */ - public String operationA(int parm1, String parm2) { - assert overloadASourceTarget != null : "reference overloadASourceTarget is null"; - return overloadASourceTarget.operationA(parm1, parm2); - } - public String operationA(String string) { - assert overloadASourceTarget != null : "reference overloadASourceTarget is null"; - return overloadASourceTarget.operationA(string); - } - /** - * @param parm1 - * @param parm2 - * @return - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(java.lang.String, int) - */ - public String operationA(String parm1, int parm2) { - assert overloadASourceTarget != null : "reference overloadASourceTarget is null"; - return overloadASourceTarget.operationA(parm1, parm2); - } - - @Reference - public void setOverloadASourceTarget(OverloadASourceTarget overloadASourceTarget) { - assert overloadASourceTarget != null : "reference overloadASourceTarget is set tonull"; - this.overloadASourceTarget = overloadASourceTarget; - } - -} diff --git a/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java deleted file mode 100644 index e83952e573..0000000000 --- a/branches/sca-java-0.91/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.test.opoverload.impl; - -import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget; -import org.osoa.sca.annotations.Service; - -/** - * - */ -@Service(OverloadASourceTarget.class) -public class OverloadATarget implements OverloadASourceTarget { - - /** - * - */ - public OverloadATarget() { - - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int) - */ - public String operationA(int parm1) { - final String ret = opName + parm1; - out(ret); - return ret; - - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int, - * java.lang.String) - */ - public String operationA(int parm1, String parm2) { - final String ret = opName + parm1 + parm2; - out(ret); - return ret; - - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA() - */ - public String operationA() { - out(opName); - return opName; - - } - - public String operationA(String parm1, int parm2) { - final String ret = opName + parm1 + parm2; - out(ret); - return ret; - } - - public String operationA(String parm1) { - final String ret = opName + parm1; - out(ret); - return ret; - } - - private void out(String msg) { - - java.lang.System.out.println(msg); - } - - public String[] operationAall() { - throw new IllegalArgumentException("not supported"); - - } - -} diff --git a/branches/sca-java-0.91/itest/operation-overloading/src/main/resources/OperationOverload.composite b/branches/sca-java-0.91/itest/operation-overloading/src/main/resources/OperationOverload.composite deleted file mode 100644 index cbf5aa2078..0000000000 --- a/branches/sca-java-0.91/itest/operation-overloading/src/main/resources/OperationOverload.composite +++ /dev/null @@ -1,34 +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://foo" - xmlns:foo="http://foo" - name="OperationOverload"> - - <component name="OverloadASourceComponent"> - <implementation.java class="org.apache.tuscany.sca.test.opoverload.impl.OverloadASource" /> - <reference name="overloadASourceTarget" target="OverloadATargetComponent"/> - </component> - - <component name="OverloadATargetComponent"> - <implementation.java class="org.apache.tuscany.sca.test.opoverload.impl.OverloadATarget" /> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/branches/sca-java-0.91/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java deleted file mode 100644 index 3129b03ff3..0000000000 --- a/branches/sca-java-0.91/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test.opoverload.impl; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget; - -public class OverloadATestCase extends TestCase { - - private SCADomain domain; - private OverloadASourceTarget overloadA; - - public void testOperationAall() { - String[] result= overloadA.operationAall(); - assertEquals(5, result.length); - assertEquals(OverloadASourceTarget.opName , result[0]); - assertEquals(OverloadASourceTarget.opName + 11, result[1]); - assertEquals(OverloadASourceTarget.opName + "eleven", result[2]); - assertEquals(OverloadASourceTarget.opName + 3 + "three", result[3]); - assertEquals(OverloadASourceTarget.opName + "four" + 4, result[4]); - } - -// public void testOperationAInt() { -// String result= overloadA.operationA(29); -// assertEquals(OverloadASourceTarget.opName + 29, result); -// } -// -// public void testOperationAString() { -// String result= overloadA.operationA("rick:-)"); -// assertEquals(OverloadASourceTarget.opName + "rick:-)", result); -// } -// -// public void testOperationAIntString() { -// String result= overloadA.operationA(123, "Tuscany"); -// assertEquals(OverloadASourceTarget.opName +123+ "Tuscany", result); -// } -// -// public void testOperationStringInt() { -// String result= overloadA.operationA("StringInt", 77); -// assertEquals(OverloadASourceTarget.opName + "StringInt" + 77, result); -// } -// - - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("OperationOverload.composite"); - overloadA = domain.getService(OverloadASourceTarget.class, "OverloadASourceComponent"); - } - - @Override - protected void tearDown() throws Exception { - domain.close(); - } -} diff --git a/branches/sca-java-0.91/itest/pom.xml b/branches/sca-java-0.91/itest/pom.xml deleted file mode 100644 index 743ef121f8..0000000000 --- a/branches/sca-java-0.91/itest/pom.xml +++ /dev/null @@ -1,75 +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-sca</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-itest</artifactId> - <packaging>pom</packaging> - <name>Apache Tuscany SCA Integration Tests</name> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>callback-api</module> - <module>callback-basic</module> - <module>callback-complex-type</module> - <module>callback-id</module> - <module>callback-set-callback</module> - <module>callback-set-conversation</module> - <module>contribution</module> - <module>conversations</module> - <module>databindings</module> - <module>exceptions</module> - <module>extended-api</module> - <module>operation-overloading</module> - <module>properties</module> - <module>recursive</module> - <module>wsdl</module> - </modules> - </profile> - - </profiles> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.2</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.2</version> - <scope>test</scope> - </dependency> - </dependencies> - -</project> diff --git a/branches/sca-java-0.91/itest/properties/pom.xml b/branches/sca-java-0.91/itest/properties/pom.xml deleted file mode 100644 index 560fb56ef2..0000000000 --- a/branches/sca-java-0.91/itest/properties/pom.xml +++ /dev/null @@ -1,84 +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>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-itest-properties</artifactId> - <name>Apache Tuscany Properties Integration Tests</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-databinding</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-sdo</artifactId>
- <version>0.91-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-beta1</version>
- <executions>
- <execution>
- <id>generate-customer-sdo</id>
- <phase>generate-sources</phase>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/customer.xsd</schemaFile>
- <javaPackage>com.example.customer.sdo</javaPackage>
- <noNotification>true</noNotification>
- <noContainer>true</noContainer>
- <noUnsettable>true</noUnsettable>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build> -</project> diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java deleted file mode 100644 index 667b854c10..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java +++ /dev/null @@ -1,27 +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; - -public interface ABCDComponent { - String getA(); - String getB(); - String getC(); - String getD(); -} - diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java deleted file mode 100644 index 51d4d9b3cb..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java +++ /dev/null @@ -1,55 +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; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; - -@Scope("COMPOSITE") -public class ABCDComponentImpl implements ABCDComponent { - private ABComponent abComponent; - private CDComponent cdComponent; - - @Reference - public void setAb(ABComponent component) { - this.abComponent = component; - } - - @Reference - public void setCd(CDComponent component) { - this.cdComponent = component; - } - - public String getA() { - return this.abComponent.getA(); - } - - public String getB() { - return this.abComponent.getB(); - } - - public String getC() { - return this.cdComponent.getC(); - } - - public String getD() { - return this.cdComponent.getD(); - } -} diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java deleted file mode 100644 index c33c140aec..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java +++ /dev/null @@ -1,35 +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; - -import java.util.Collection; - -import org.osoa.sca.annotations.Remotable; -@Remotable -public interface ABComponent { - - String getA(); - String getB(); - String getZ(); - int getIntValue(); - String getF(); - Collection<String> getManyStringValues(); - Collection<Integer> getManyIntegers(); -} diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java deleted file mode 100644 index b78d6380ef..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java +++ /dev/null @@ -1,98 +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; - -import java.util.Collection; - -import org.osoa.sca.annotations.Property; - -public class ABComponentImpl implements ABComponent { - - private String aProperty; - private String bProperty; - private int intValue; - private Collection<String> manyStringValues; - private Collection<Integer> manyIntegerValues; - private String zProperty; - private String fProperty; - - @Property(name="xpath") - public void setZProperty(final String value) { - this.zProperty = value; - } - - @Property(name="foobar") - public void setManyStringValues(final Collection<String> value) { - this.manyStringValues = value; - } - - @Property(name="fooInts") - public void setManyIntegers(final Collection<Integer> value) { - this.manyIntegerValues = value; - } - - @Property - public void setA(final String A) { - this.aProperty = A; - } - - @Property - public void setB(final String B) { - this.bProperty = B; - } - - @Property - public void setF(final String F) { - this.fProperty = F; - } - - @Property - public void setOne(final int value) { - this.intValue = value; - } - - public String getA() { - return this.aProperty; - } - - public String getB() { - return this.bProperty; - } - - public int getIntValue() { - return this.intValue; - } - - public String getZ() { - return this.zProperty; - } - - public String getF() { - return this.fProperty; - } - - public Collection<String> getManyStringValues() { - return manyStringValues; - } - - public Collection<Integer> getManyIntegers() { - return manyIntegerValues; - } -} diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java deleted file mode 100644 index cd3046c62c..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java +++ /dev/null @@ -1,33 +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; - -import java.util.Collection; - -public interface CDComponent { - - String getC(); - String getC2(); - String getD(); - String getNoSource(); - String getFileProperty(); - Collection<String> getManyValuesFileProperty(); - int getOverrideValue(); -} diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java deleted file mode 100644 index aec71d30f9..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java +++ /dev/null @@ -1,97 +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; - -import java.util.Collection; - -import org.osoa.sca.annotations.Property; - -public class CDComponentImpl implements CDComponent { - - private String cProperty; - private String dProperty; - private String nosource; - private String fileProperty; - private Collection<String> manyValuesFileProperty; - private int overrideNumber; - private String cProperty2; - - @Property(name="nonFileProperty") - public void setC2(final String value) { - this.cProperty2 = value; - } - @Property(name="two") - public void setOverrideNumber(final int value) { - this.overrideNumber = value; - } - - @Property(name="fileProperty") - public void setFileProp(final String value) { - this.fileProperty = value; - } - - @Property(name="manyValuesFileProperty") - public void setFileManyValueProp(final Collection<String> values) { - this.manyValuesFileProperty = values; - } - - @Property - public void setC(final String C) { - this.cProperty = C; - } - - @Property - public void setD(final String D) { - this.dProperty = D; - } - - @Property - public void setNosource(final String value) { - this.nosource = value; - } - - public String getFileProperty() { - return this.fileProperty; - } - - public String getC() { - return this.cProperty; - } - - public String getC2() { - return this.cProperty2; - } - - public String getD() { - return this.dProperty; - } - - public String getNoSource() { - return this.nosource; - } - - public int getOverrideValue() { - return this.overrideNumber; - } - public Collection<String> getManyValuesFileProperty() { - return this.manyValuesFileProperty; - } -} - diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java deleted file mode 100644 index 56820279d6..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java +++ /dev/null @@ -1,88 +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;
-
-public class ComplexPropertyBean {
-
- protected int integerNumber = 25;
- public float floatNumber = 50;
- public double doubleNumber = 75;
- public int[] intArray = null;
- public double[] doubleArray = null;
- protected String[] stringArray = null;
-
- ComplexPropertyBean numberSet;
- public ComplexPropertyBean[] numberSetArray = null;
-
- public ComplexPropertyBean() {
-
- }
-
- public double getDoubleNumber() {
- return doubleNumber;
- }
-
- public void setDoubleNumber(double doubleNumber) {
- this.doubleNumber = doubleNumber;
- }
-
- public float getFloatNumber() {
- return floatNumber;
- }
-
- public void setFloatNumber(float floatNumber) {
- this.floatNumber = floatNumber;
- }
-
- public int getIntegerNumber() {
- return integerNumber;
- }
-
- public void setIntegerNumber(int integerNumber) {
- this.integerNumber = integerNumber;
- }
-
- public ComplexPropertyBean getNumberSet() {
- return numberSet;
- }
-
- public void setNumberSet(ComplexPropertyBean numberSet) {
- this.numberSet = numberSet;
- }
-
- public String toString() {
- return Double.toString(integerNumber) + " - " +
- Double.toString(floatNumber) + " - " +
- Double.toString(doubleNumber) + " \n" +
- ((intArray == null ) ? "" : intArray[0] + " - " + intArray[1] + " \n " ) +
- ((doubleArray == null ) ? "" : doubleArray[0] + " - " + doubleArray[1] + " \n " ) +
- ((stringArray == null ) ? "" : stringArray[0] + " - " + stringArray[1] + " \n " ) +
- ((numberSetArray == null ) ? "" : numberSetArray[0] + " - " + numberSetArray[1] + " \n " ) +
- ((numberSet == null ) ? "" : numberSet.toString());
- }
-
- public String[] getStringArray() {
- return stringArray;
- }
-
- public void setStringArray(String[] stringArray) {
- this.stringArray = stringArray;
- }
-}
diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java deleted file mode 100644 index 116cdef48f..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java +++ /dev/null @@ -1,25 +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; - -public interface OverrideService { - -} diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java deleted file mode 100644 index a36bb5e419..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java +++ /dev/null @@ -1,24 +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; - -public class OverrideServiceImpl implements OverrideService { - -} diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java deleted file mode 100644 index 459cf2be09..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java +++ /dev/null @@ -1,36 +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; - -import java.util.Collection; - -import commonj.sdo.DataObject; - - -public interface PropertyComponent { - public String getLocation(); - public String getYear(); - public ComplexPropertyBean getComplexPropertyOne(); - public ComplexPropertyBean getComplexPropertyTwo(); - public ComplexPropertyBean getComplexPropertyThree(); - public Collection<ComplexPropertyBean> getComplexPropertyFour(); - public DataObject getSdoProperty(); - public DataObject getCustomerSdo(); -} diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java deleted file mode 100644 index cdf381a553..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java +++ /dev/null @@ -1,99 +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; - -import java.util.Collection; - -import org.osoa.sca.annotations.Property; - -import com.example.customer.sdo.impl.CustomerImpl; -import commonj.sdo.DataObject; - -public class PropertyComponentImpl implements PropertyComponent { - - @Property - protected CustomerImpl customerSdo; - - @Property - protected DataObject sdoProperty; - - @Property - protected ComplexPropertyBean complexPropertyOne; - - @Property - protected ComplexPropertyBean complexPropertyTwo; - - @Property - protected ComplexPropertyBean complexPropertyThree; - - @Property - protected Collection<ComplexPropertyBean> complexPropertyFour; - - @Property(name = "location") - protected String location = "RTP"; - - @Property(name = "year") - protected String year = "2006"; - - public String getLocation(){ - return location; - } - - public String getYear(){ - return year; - } - - public ComplexPropertyBean getComplexPropertyOne() { - //System.out.println(complexPropertyOne); - return complexPropertyOne; - } - - public ComplexPropertyBean getComplexPropertyTwo() { - //System.out.println(complexPropertyTwo); - return complexPropertyTwo; - } - - public ComplexPropertyBean getComplexPropertyThree() { - //System.out.println(complexPropertyThree); - return complexPropertyThree; - } - - public Collection<ComplexPropertyBean> getComplexPropertyFour() { - //System.out.println(complexPropertyThree); - return complexPropertyFour; - } - - public DataObject getSdoProperty() { - return sdoProperty; - } - - public void setSdoProperty(DataObject sdoProperty) { - System.out.println("Reached here da machi"); - this.sdoProperty = sdoProperty; - } - - public CustomerImpl getCustomerSdo() { - return customerSdo; - } - - public void setCustomerSdo(CustomerImpl customerSdo) { - this.customerSdo = customerSdo; - } -} diff --git a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java deleted file mode 100644 index f20d295a06..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java +++ /dev/null @@ -1,24 +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; - -public interface PropertyService { - -} diff --git a/branches/sca-java-0.91/itest/properties/src/main/resources/OuterPropertyTest.composite b/branches/sca-java-0.91/itest/properties/src/main/resources/OuterPropertyTest.composite deleted file mode 100644 index 43853d46a5..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/resources/OuterPropertyTest.composite +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * 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"
- targetNamespace="http://foo"
- name="OuterPropertyTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <component name="OuterComponent">
- <implementation.composite name="foo:PropertyTest"/>
- <property name="number">125</property>
- <property name="complex" type="foo:MyComplexType">
- <foo:MyComplexValue xsi:type="foo:MyComplexType" >
- <foo:a>Overriden A</foo:a>
- <foo:b>Overriden B</foo:b>
- <foo:c>Overriden C</foo:c>
- <foo:d>Overriden D</foo:d>
- <foo:x>
- <foo:y>Overriden Y</foo:y>
- <foo:z>Overriden Z</foo:z>
- </foo:x>
- </foo:MyComplexValue>
- </property>
- </component>
-</composite>
-
diff --git a/branches/sca-java-0.91/itest/properties/src/main/resources/PropertyTest.composite b/branches/sca-java-0.91/itest/properties/src/main/resources/PropertyTest.composite deleted file mode 100644 index 137e4d1a78..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/resources/PropertyTest.composite +++ /dev/null @@ -1,212 +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 - * 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="PropertyTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <service name="ProperterTestService" promote="ABComponent"> - <interface.java interface="org.apache.tuscany.sca.itest.ABComponent"/> - </service> - - <dbsdo:import.sdo location="customer.xsd" /> - <dbsdo:import.sdo factory="com.example.customer.sdo.SdoFactory" /> - - <property name="number" type="xsd:int">1</property> - <property name="complex" type="foo:MyComplexType" > - <foo:MyComplexValue xsi:type="foo:MyComplexType" > - <foo:a>a</foo:a> - <foo:b>b</foo:b> - <foo:c>c</foo:c> - <foo:d>d</foo:d> - <foo:x> - <foo:y>y</foo:y> - <foo:z>z</foo:z> - </foo:x> - </foo:MyComplexValue> - </property> - - <property name="moreComplex" type="foo:MyMoreComplexType"> - <foo:MyMoreComplexValue xsi:type="foo:MyMoreComplexType"> - <foo:numberSetArray> - <foo:integerNumber>1</foo:integerNumber> - <foo:floatNumber>11</foo:floatNumber> - <foo:doubleNumber>111</foo:doubleNumber> - </foo:numberSetArray> - <foo:numberSetArray> - <foo:integerNumber>2</foo:integerNumber> - <foo:floatNumber>22</foo:floatNumber> - <foo:doubleNumber>222</foo:doubleNumber> - </foo:numberSetArray> - <foo:stringArray>TestString_1</foo:stringArray> - <foo:intArray>10</foo:intArray> - <foo:stringArray>TestString_2</foo:stringArray> - <foo:intArray>20</foo:intArray> - <foo:integerNumber>27</foo:integerNumber> - <foo:floatNumber>79.34</foo:floatNumber> - <foo:doubleNumber>184.52</foo:doubleNumber> - <foo:doubleArray>50.05</foo:doubleArray> - <foo:doubleArray>25.52</foo:doubleArray> - <foo:numberSet> - <foo:integerNumber>54</foo:integerNumber> - <foo:floatNumber>158.68</foo:floatNumber> - <foo:doubleNumber>369.04</foo:doubleNumber> - </foo:numberSet> - </foo:MyMoreComplexValue> - </property> - - <component name="ABCDComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.ABCDComponentImpl"/> - <reference name="ab" target="ABComponent"/> - <reference name="cd" target="CDComponent"/> - </component> - - <component name="ABComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.ABComponentImpl"/> - <property name="a" source="$complex/foo:MyComplexValue/foo:a"/> - <property name="b" source="$complex/foo:MyComplexValue/foo:b"/> - <property name="f" source="$complex/foo:MyComplexValue/foo:a">f</property> - <property name="xpath" source="$complex/foo:MyComplexValue/foo:x/*[local-name()='z']"/> - <property name="one" source="$number"/> - <property name="foobar" many="true">"Apache" "Tuscany" "Java SCA"</property> - <property name="fooInts" many="true">123 456 789</property> - </component> - - - <component name="CDComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.CDComponentImpl"/> - <property name="c" source="$complex/foo:MyComplexValue/foo:c"/> - <property name="d" source="$complex/foo:MyComplexValue/foo:d"/> - <property name="nosource">aValue</property> - <property name="fileProperty" file="fileProperty.txt"/> - <property name="manyValuesFileProperty" many="true" file="manyValuesFileProperty.txt"/> - <property name="nonFileProperty" file="fileProperty.txt" source="$complex/foo:MyComplexValue/foo:c"/> - <property name="two" source="$number">25</property> - </component> - - <component name="PropertyComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.PropertyComponentImpl"/> - <property name="complexPropertyOne" source="$moreComplex"></property> - <property name="complexPropertyTwo"> - <foo:MyAnotherComplexValue> - <foo:stringArray>TestString_1</foo:stringArray> - <foo:stringArray>TestString_2</foo:stringArray> - <foo:intArray>10</foo:intArray> - <foo:integerNumber>27</foo:integerNumber> - <foo:floatNumber>79.34</foo:floatNumber> - <foo:doubleArray>25.52</foo:doubleArray> - <foo:doubleNumber>184.52</foo:doubleNumber> - <foo:doubleArray>50.05</foo:doubleArray> - <foo:intArray>20</foo:intArray> - <foo:numberSetArray> - <foo:integerNumber>1</foo:integerNumber> - <foo:floatNumber>11</foo:floatNumber> - <foo:doubleNumber>111</foo:doubleNumber> - </foo:numberSetArray> - <foo:numberSetArray> - <foo:integerNumber>2</foo:integerNumber> - <foo:floatNumber>22</foo:floatNumber> - <foo:doubleNumber>222</foo:doubleNumber> - </foo:numberSetArray> - <foo:numberSet> - <foo:integerNumber>54</foo:integerNumber> - <foo:floatNumber>158.68</foo:floatNumber> - <foo:doubleNumber>369.04</foo:doubleNumber> - </foo:numberSet> - </foo:MyAnotherComplexValue> - </property> - <property name="complexPropertyThree" element="foo:PropertyThreeElement"> - <foo:PropertyThreeElement> - <foo:stringArray>TestElementString_1</foo:stringArray> - <foo:stringArray>TestElementString_2</foo:stringArray> - <foo:intArray>10</foo:intArray> - <foo:integerNumber>27</foo:integerNumber> - <foo:floatNumber>79.34</foo:floatNumber> - <foo:doubleArray>25.52</foo:doubleArray> - <foo:doubleNumber>184.52</foo:doubleNumber> - <foo:doubleArray>50.05</foo:doubleArray> - <foo:intArray>20</foo:intArray> - <foo:numberSetArray> - <foo:integerNumber>1</foo:integerNumber> - <foo:floatNumber>11</foo:floatNumber> - <foo:doubleNumber>111</foo:doubleNumber> - </foo:numberSetArray> - <foo:numberSetArray> - <foo:integerNumber>2</foo:integerNumber> - <foo:floatNumber>22</foo:floatNumber> - <foo:doubleNumber>222</foo:doubleNumber> - </foo:numberSetArray> - <foo:numberSet> - <foo:integerNumber>54</foo:integerNumber> - <foo:floatNumber>158.68</foo:floatNumber> - <foo:doubleNumber>369.04</foo:doubleNumber> - </foo:numberSet> - </foo:PropertyThreeElement> - </property> - <property name="complexPropertyFour" element="foo:PropertyFourElement" many="true"> - <foo:PropertyFourElement> - <foo:integerNumber>1</foo:integerNumber> - <foo:floatNumber>11.11</foo:floatNumber> - <foo:doubleNumber>111.111</foo:doubleNumber> - <foo:numberSet> - <foo:integerNumber>11</foo:integerNumber> - <foo:floatNumber>1111.1111</foo:floatNumber> - <foo:doubleNumber>11111.11111</foo:doubleNumber> - </foo:numberSet> - </foo:PropertyFourElement> - <foo:PropertyFourElement> - <foo:integerNumber>2</foo:integerNumber> - <foo:floatNumber>22.22</foo:floatNumber> - <foo:doubleNumber>222.222</foo:doubleNumber> - <foo:numberSet> - <foo:integerNumber>22</foo:integerNumber> - <foo:floatNumber>2222.2222</foo:floatNumber> - <foo:doubleNumber>22222.22222</foo:doubleNumber> - </foo:numberSet> - </foo:PropertyFourElement> - <foo:PropertyFourElement> - <foo:integerNumber>3</foo:integerNumber> - <foo:floatNumber>33.33</foo:floatNumber> - <foo:doubleNumber>333.333</foo:doubleNumber> - <foo:numberSet> - <foo:integerNumber>33</foo:integerNumber> - <foo:floatNumber>3333.3333</foo:floatNumber> - <foo:doubleNumber>33333.33333</foo:doubleNumber> - </foo:numberSet> - </foo:PropertyFourElement> - </property> - <property name="sdoProperty" type="cust:Customer"> - <cust:customer> - <cust:firstName>Firstly Name</cust:firstName> - <cust:middleName>Middler Name</cust:middleName> - <cust:lastName>Lasting Name</cust:lastName> - </cust:customer> - </property> - <property name="customerSdo" type="cust:Customer"> - <cust:customer> - <cust:firstName>Sdo Firstly Name</cust:firstName> - <cust:middleName>Sdo Middler Name</cust:middleName> - <cust:lastName>Sdo Lasting Name</cust:lastName> - </cust:customer> - </property> - </component> -</composite> - diff --git a/branches/sca-java-0.91/itest/properties/src/main/resources/customer.xsd b/branches/sca-java-0.91/itest/properties/src/main/resources/customer.xsd deleted file mode 100644 index 8861d7e7b8..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/resources/customer.xsd +++ /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.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.com/Customer" targetNamespace="http://www.example.com/Customer">
-
- <xsd:element name="customer" type="Customer"/>
- <xsd:complexType name="Customer">
- <xsd:sequence>
- <xsd:element name="firstName" type="xsd:string"/>
- <xsd:element name="middleName" type="xsd:string"/>
- <xsd:element name="lastName" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:schema>
diff --git a/branches/sca-java-0.91/itest/properties/src/main/resources/fileProperty.txt b/branches/sca-java-0.91/itest/properties/src/main/resources/fileProperty.txt deleted file mode 100644 index 0d3d9ead83..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/resources/fileProperty.txt +++ /dev/null @@ -1,21 +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. ---> - -<filePropertyTest>fileValue</filePropertyTest> diff --git a/branches/sca-java-0.91/itest/properties/src/main/resources/manyValuesFileProperty.txt b/branches/sca-java-0.91/itest/properties/src/main/resources/manyValuesFileProperty.txt deleted file mode 100644 index 450f397b30..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/main/resources/manyValuesFileProperty.txt +++ /dev/null @@ -1,23 +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.
--->
-
-<manyFilePropertyValues>
- "fileValueOne" "fileValueTwo" "fileValueThree" "fileValueFour"
-</manyFilePropertyValues>
diff --git a/branches/sca-java-0.91/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/branches/sca-java-0.91/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java deleted file mode 100644 index b2ac537dec..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java +++ /dev/null @@ -1,92 +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;
-
-import static junit.framework.Assert.assertEquals;
-
-import java.util.Iterator;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class OuterPropertyTestCase {
-
- private static SCADomain domain;
- private static ABComponent outerABService;
-
- @BeforeClass
- public static void init() throws Exception {
- domain = SCADomain.newInstance("OuterPropertyTest.composite");
- outerABService = domain.getService(ABComponent.class, "OuterComponent");
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- domain.close();
- }
-
- @Test
- public void testOverridenA() {
- assertEquals("Overriden A", outerABService.getA());
- }
-
- @Test
- public void testOverridenB() {
- assertEquals("Overriden B", outerABService.getB());
- }
-
- @Test
- public void testOverridenF() {
- assertEquals("Overriden A", outerABService.getF());
- }
-
- @Test
- public void testOverridenZ() {
- assertEquals("Overriden Z", outerABService.getZ());
- }
-
- @Test
- public void testOverridenIntValue() {
- assertEquals(125, outerABService.getIntValue());
- }
-
- @Test
- public void testDefaultValue() {
- assertEquals(125, outerABService.getIntValue());
- }
-
- @Test
- public void testManySimpleStringValues() {
- Iterator<String> iterator = outerABService.getManyStringValues().iterator();
- assertEquals("Apache", iterator.next());
- assertEquals("Tuscany", iterator.next());
- assertEquals("Java SCA", iterator.next());
- }
-
- @Test
- public void testManySimpleIntegerValues() {
- Iterator<Integer> iterator = outerABService.getManyIntegers().iterator();
- assertEquals(123, iterator.next().intValue());
- assertEquals(456, iterator.next().intValue());
- assertEquals(789, iterator.next().intValue());
- }
-}
diff --git a/branches/sca-java-0.91/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/branches/sca-java-0.91/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java deleted file mode 100644 index a01700920f..0000000000 --- a/branches/sca-java-0.91/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java +++ /dev/null @@ -1,208 +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; - -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; - -import java.util.Iterator; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -import commonj.sdo.DataObject; - -public class PropertyTestCase { - private static SCADomain domain; - private static ABComponent abService; - private static CDComponent cdService; - private static ABCDComponent abcdService; - private static PropertyComponent propertyService; - - @Test - public void testA() { - assertEquals("a", abService.getA()); - } - - @Test - public void testB() { - assertEquals("b", abService.getB()); - } - - @Test - public void testC() { - assertEquals("c", cdService.getC()); - } - - @Test - public void testC2() { - assertEquals("c", cdService.getC2()); - } - - @Test - public void testD() { - assertEquals("d", cdService.getD()); - } - - @Test - public void testF() { - assertEquals("a", abService.getF()); - } - - @Test - public void testZ() { - assertEquals("z", abService.getZ()); - } - - @Test - public void testIntValue() { - assertEquals(1, abService.getIntValue()); - } - - @Test - public void testDefaultValue() { - assertEquals(1, abService.getIntValue()); - } - - @Test - public void testDefaultValueOverride() { - assertEquals(1, cdService.getOverrideValue()); - } - - @Test - public void testNoSource() { - assertEquals("aValue", cdService.getNoSource()); - } - - @Test - public void testFileProperty() { - assertEquals("fileValue", cdService.getFileProperty()); - } - - @Test - public void testManyValuesFileProperty() { - Iterator<String> iterator = cdService.getManyValuesFileProperty().iterator(); - iterator.next(); - String secondValue = iterator.next(); - assertEquals(4, cdService.getManyValuesFileProperty().size()); - assertEquals("fileValueTwo", secondValue); - } - - @Test - public void testABCD() { - assertEquals("a", abcdService.getA()); - assertEquals("b", abcdService.getB()); - assertEquals("c", abcdService.getC()); - assertEquals("d", abcdService.getD()); - } - - @Test - public void testDefaultProperty() { - assertEquals("RTP", propertyService.getLocation()); - assertEquals("2006", propertyService.getYear()); - - } - - @Test - public void testManySimpleStringValues() { - Iterator<String> iterator = abService.getManyStringValues().iterator(); - assertEquals("Apache", iterator.next()); - assertEquals("Tuscany", iterator.next()); - assertEquals("Java SCA", iterator.next()); - } - - @Test - public void testManySimpleIntegerValues() { - Iterator<Integer> iterator = abService.getManyIntegers().iterator(); - assertEquals(123, iterator.next().intValue()); - assertEquals(456, iterator.next().intValue()); - assertEquals(789, iterator.next().intValue()); - } - - @Test - public void testComplexPropertyOne() { - ComplexPropertyBean propBean = propertyService.getComplexPropertyOne(); - assertNotNull(propBean); - assertEquals("TestString_1", propBean.getStringArray()[0]); - assertEquals(2, propBean.numberSetArray[1].integerNumber); - } - - @Test - public void testComplexPropertyTwo() { - ComplexPropertyBean propBean = propertyService.getComplexPropertyTwo(); - assertNotNull(propBean); - assertEquals(10, propBean.intArray[0]); - assertEquals((float)22, propBean.numberSetArray[1].floatNumber); - } - - @Test - public void testComplexPropertyThree() { - ComplexPropertyBean propBean = propertyService.getComplexPropertyThree(); - assertNotNull(propBean); - assertEquals("TestElementString_1", propBean.stringArray[0]); - assertEquals((float)22, propBean.numberSetArray[1].floatNumber); - } - - @Test - public void testComplexPropertyFour() { - Object[] propBeanCollection = propertyService.getComplexPropertyFour().toArray(); - assertNotNull(propBeanCollection); - assertEquals(1, ((ComplexPropertyBean)propBeanCollection[0]).getIntegerNumber()); - assertEquals(222.222, ((ComplexPropertyBean)propBeanCollection[1]).getDoubleNumber()); - assertEquals(33, ((ComplexPropertyBean)propBeanCollection[2]).getNumberSet().getIntegerNumber()); - } - - @Test - public void testSDOProperty1() { - DataObject dataObject = propertyService.getSdoProperty(); - assertNotNull(dataObject); - assertEquals("Firstly Name", dataObject.get("firstName")); - assertEquals("Middler Name", dataObject.getString("middleName")); - assertEquals("Lasting Name", dataObject.getString("lastName")); - } - - @Test - public void testSDOProperty2() { - DataObject dataObject = propertyService.getCustomerSdo(); - assertNotNull(dataObject); - assertEquals("Sdo Firstly Name", dataObject.get("firstName")); - assertEquals("Sdo Middler Name", dataObject.getString("middleName")); - assertEquals("Sdo Lasting Name", dataObject.getString("lastName")); - } - - @BeforeClass - public static void init() throws Exception { - try { - domain = SCADomain.newInstance("PropertyTest.composite"); - } catch ( Exception e ) { e.printStackTrace(); } - abService = domain.getService(ABComponent.class, "ABComponent"); - cdService = domain.getService(CDComponent.class, "CDComponent"); - abcdService = domain.getService(ABCDComponent.class, "ABCDComponent"); - propertyService = - domain.getService(PropertyComponent.class, "PropertyComponent"); - } - - @AfterClass - public static void destroy() throws Exception { - domain.close(); - } -} diff --git a/branches/sca-java-0.91/itest/recursive/pom.xml b/branches/sca-java-0.91/itest/recursive/pom.xml deleted file mode 100644 index 85934a8122..0000000000 --- a/branches/sca-java-0.91/itest/recursive/pom.xml +++ /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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-itest-recursive</artifactId> - <name>Apache Tuscany SCA Recursive Composition Integration Tests</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</project> diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/CompositeClient.java b/branches/sca-java-0.91/itest/recursive/src/main/java/composite/CompositeClient.java deleted file mode 100644 index 5edc305970..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/CompositeClient.java +++ /dev/null @@ -1,42 +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 composite; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * Simple client program that invokes the components that we wired together. - * - * @version $Rev$ $Date$ - */ -public class CompositeClient { - - public static void main(String[] args) throws Exception { - SCADomain domain = SCADomain.newInstance("OuterComposite.composite"); - - Source source = domain.getService(Source.class, "SourceComponent"); - - System.out.println("Main thread " + Thread.currentThread()); - source.clientMethod("Client.main"); - Thread.sleep(500); - - domain.close(); - } -} diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/Source.java b/branches/sca-java-0.91/itest/recursive/src/main/java/composite/Source.java deleted file mode 100644 index d0efcc1df1..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/Source.java +++ /dev/null @@ -1,24 +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 composite; - -public interface Source { - - void clientMethod(String arg); -} diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/SourceCallback.java b/branches/sca-java-0.91/itest/recursive/src/main/java/composite/SourceCallback.java deleted file mode 100644 index baa95a8e39..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/SourceCallback.java +++ /dev/null @@ -1,24 +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 composite; - -public interface SourceCallback { - - void receiveResult(String result); -} diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/SourceImpl.java b/branches/sca-java-0.91/itest/recursive/src/main/java/composite/SourceImpl.java deleted file mode 100644 index b9a0c7ff74..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/SourceImpl.java +++ /dev/null @@ -1,55 +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 composite; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - - -@Service(Source.class) -@Scope("COMPOSITE") -public class SourceImpl implements Source, SourceCallback { - - private Target targetReference; - private Target targetReference2; - - @Reference - public void setTargetReference(Target target) { - this.targetReference = target; - } - - @Reference - public void setTargetReference2(Target target) { - this.targetReference2 = target; - } - - public void clientMethod(String arg) { - System.out.println("Source: " + arg + " -> Source.clientMethod"); - targetReference.someMethod(arg + " -> Source.clientMethod"); - - System.out.println("Source: " + arg + " => Source.clientMethod2"); - targetReference2.someMethod(arg + " => Source.clientMethod2"); - } - - public void receiveResult(String result) { - System.out.println("Work thread " + Thread.currentThread()); - System.out.println("Result: " + result); - } -} diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/Target.java b/branches/sca-java-0.91/itest/recursive/src/main/java/composite/Target.java deleted file mode 100644 index 9a8f68a7fa..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/Target.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 composite; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.OneWay; - - -@Callback(SourceCallback.class) -public interface Target { - - @OneWay - void someMethod(String arg); -} diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/TargetImpl.java b/branches/sca-java-0.91/itest/recursive/src/main/java/composite/TargetImpl.java deleted file mode 100644 index 86686e9233..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/java/composite/TargetImpl.java +++ /dev/null @@ -1,41 +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 composite; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - - -@Service(Target.class) -@Scope("COMPOSITE") -public class TargetImpl implements Target { - - private SourceCallback sourceCallback; - - @Callback - public void setSourceCallback(SourceCallback sourceCallback) { - this.sourceCallback = sourceCallback; - } - - public void someMethod(String arg) { - System.out.println("Target: " + arg); - sourceCallback.receiveResult(arg + " -> Target.someMethod"); - } -} diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentAImpl.java b/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentAImpl.java deleted file mode 100644 index f513949105..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentAImpl.java +++ /dev/null @@ -1,41 +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 sample; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * @version $Rev$ $Date$ - */ -@Service(Service1.class) -public class ComponentAImpl implements Service1 { - - @Reference(name = "Reference1", required = false) - protected Service1 ref; - - public String track(String source) { - if (ref != null) { - return ref.track(source + "-->ComponentA"); - } - return source + "-->ComponentA"; - } - -} diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentCImpl.java b/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentCImpl.java deleted file mode 100644 index 586a9ee6a7..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentCImpl.java +++ /dev/null @@ -1,41 +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 sample; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * @version $Rev$ $Date$ - */ -@Service(Service1.class) -public class ComponentCImpl implements Service1 { - - @Reference(name = "Reference1", required = false) - protected Service1 ref; - - public String track(String source) { - if (ref != null) { - return ref.track(source + "-->ComponentC"); - } - return source + "-->ComponentC"; - } - -} diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentEImpl.java b/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentEImpl.java deleted file mode 100644 index dbf2735aa7..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentEImpl.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 sample; - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; - -/** - * @version $Rev$ $Date$ - */ -public class ComponentEImpl implements Service1 { - @Property(name = "Property1") - protected String prefix; - - @Reference(name = "Reference1") - protected Service1 ref; - - public String track(String source) { - return ref.track(source + "-->ComponentE"); - } -} diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentFImpl.java b/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentFImpl.java deleted file mode 100644 index 5e136e536c..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/ComponentFImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package sample; - -import org.osoa.sca.annotations.Reference; - -/** - * @version $Rev$ $Date$ - */ -public class ComponentFImpl implements Service1 { - - private Service1 ref; - - public String track(String source) { - if (ref != null) { - return ref.track(source + "-->ComponentF"); - } else { - System.err.println("Reference1 is not wired..."); - return source + "-->ComponentF"; - } - } - - @Reference(name = "Reference1") - public void setComponentA(Service1 ref) { - this.ref = ref; - } - -} diff --git a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/Service1.java b/branches/sca-java-0.91/itest/recursive/src/main/java/sample/Service1.java deleted file mode 100644 index 81bdce79f1..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/java/sample/Service1.java +++ /dev/null @@ -1,27 +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 sample; - -/** - * @version $Rev$ $Date$ - */ -public interface Service1 { - String track(String source); -} diff --git a/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite1.composite b/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite1.composite deleted file mode 100644 index 56fd7c621f..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite1.composite +++ /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" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="Composite1"> - - <component name="ComponentA"> - <implementation.java class="sample.ComponentAImpl"/> - </component> - - <component name="ComponentB"> - <!-- Implemented by Composite3 --> - <implementation.composite name="sample:Composite3"/> - - <!-- Wired to ComponentA --> - <reference name="Reference1" target="ComponentA"/> - - <property name="Property1">ABC</property> - </component> - - <!-- ComponentB.Service1 is promoted --> - <service name="Service1" promote="ComponentB/Service1" /> - -</composite> diff --git a/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite2.composite b/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite2.composite deleted file mode 100644 index 377f14bd4d..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite2.composite +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://sample" xmlns:sample="http://sample" - name="Composite2"> - - <component name="ComponentC"> - <implementation.java class="sample.ComponentCImpl" /> - - <!-- Wired to ComponentD.Service1 --> - <reference name="Reference1" target="ComponentD/Service1" /> - </component> - - <component name="ComponentD"> - <!-- Implemented by Composite3 --> - <implementation.composite name="sample:Composite3" /> - - <!-- The property value is "XYZ" --> - <property name="Property1">XYZ</property> - </component> - - <!-- ComponentD.Reference1 is promoted --> - <reference name="Reference1" promote="ComponentD/Reference1" /> - -</composite> diff --git a/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite3.composite b/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite3.composite deleted file mode 100644 index 6c81b28d1c..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/resources/Composite3.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" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Composite3"> - - <component name="ComponentE"> - <implementation.java class="sample.ComponentEImpl" /> - <reference name="Reference1" target="ComponentF/Service1" /> - - <!-- The property is from the composite Property1 --> - <property name="Property1" source="$Property1" /> - </component> - - <component name="ComponentF"> - <implementation.java class="sample.ComponentFImpl" /> - </component> - - <service name="Service1" promote="ComponentE/Service1" /> - - <reference name="Reference1" promote="ComponentF/Reference1"> - <!-- - <binding.sca /> - --> - </reference> - - <property name="Property1" type="xsd:string">123</property> - -</composite> diff --git a/branches/sca-java-0.91/itest/recursive/src/main/resources/InnerComposite.composite b/branches/sca-java-0.91/itest/recursive/src/main/resources/InnerComposite.composite deleted file mode 100644 index 3376ac8ff5..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/resources/InnerComposite.composite +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License. - --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="InnerComposite"> - - <service name="InnerSourceService" promote="InnerSourceComponent"> - <interface.java interface="composite.Source"/> - </service> - - <component name="InnerSourceComponent"> - <implementation.java class="composite.SourceImpl"/> - </component> - - <reference name="targetComponentRef" promote="InnerSourceComponent/targetReference"> - <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/> - </reference> - - <reference name="targetComponentRef2" promote="InnerSourceComponent/targetReference2"> - <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/> - </reference> - -</composite> diff --git a/branches/sca-java-0.91/itest/recursive/src/main/resources/InnerComposite2.composite b/branches/sca-java-0.91/itest/recursive/src/main/resources/InnerComposite2.composite deleted file mode 100644 index c9eff4fa9d..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/resources/InnerComposite2.composite +++ /dev/null @@ -1,33 +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="InnerComposite2"> - - <service name="InnerTargetService" promote="InnerTargetComponent"> - <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/> - </service> - - <component name="InnerTargetComponent"> - <implementation.java class="composite.TargetImpl"/> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/recursive/src/main/resources/OuterComposite.composite b/branches/sca-java-0.91/itest/recursive/src/main/resources/OuterComposite.composite deleted file mode 100644 index cb1c1e13d4..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/main/resources/OuterComposite.composite +++ /dev/null @@ -1,39 +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="OuterComposite"> - - <component name="SourceComponent"> - <implementation.composite name="sample:InnerComposite"/> - <reference name="targetComponentRef" target="TargetComponent"/> - <reference name="targetComponentRef2" target="TargetComponent2/InnerTargetService"/> - </component> - - <component name="TargetComponent"> - <implementation.java class="composite.TargetImpl"/> - </component> - - <component name="TargetComponent2"> - <implementation.composite name="sample:InnerComposite2"/> - </component> - -</composite> diff --git a/branches/sca-java-0.91/itest/recursive/src/test/java/composite/CompositeTestCase.java b/branches/sca-java-0.91/itest/recursive/src/test/java/composite/CompositeTestCase.java deleted file mode 100644 index f81b02faef..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/test/java/composite/CompositeTestCase.java +++ /dev/null @@ -1,49 +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 composite; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class CompositeTestCase extends TestCase { - - private SCADomain domain; - private Source source; - - protected void setUp() throws Exception { - domain = SCADomain.newInstance("OuterComposite.composite"); - source = domain.getService(Source.class, "SourceComponent"); - } - - protected void tearDown() throws Exception { - domain.close(); - } - - public void test() throws Exception { - try { - System.out.println("Main thread " + Thread.currentThread()); - source.clientMethod("Client.main"); - System.out.println("Sleeping ..."); - Thread.sleep(1000); - } catch (Throwable t) { - t.printStackTrace(); - } - } -} diff --git a/branches/sca-java-0.91/itest/recursive/src/test/java/sample/RecursiveCompositeTest.java b/branches/sca-java-0.91/itest/recursive/src/test/java/sample/RecursiveCompositeTest.java deleted file mode 100644 index 45f16b38c6..0000000000 --- a/branches/sca-java-0.91/itest/recursive/src/test/java/sample/RecursiveCompositeTest.java +++ /dev/null @@ -1,50 +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 sample; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class RecursiveCompositeTest extends TestCase { - - private SCADomain domain; - private Service1 tracker, tracker2; - - protected void setUp() throws Exception { - domain = SCADomain.newInstance("http://localhost", "/", "Composite1.composite", "Composite2.composite"); - tracker = domain.getService(Service1.class, "ComponentC"); - tracker2 = domain.getService(Service1.class, "ComponentB"); - - } - - protected void tearDown() throws Exception { - domain.close(); - } - - public void test() throws Exception { - try { - System.out.println("Main thread " + Thread.currentThread()); - System.out.println(tracker.track("Client")); - System.out.println(tracker2.track("Client")); - } catch (Throwable t) { - t.printStackTrace(); - } - } -} diff --git a/branches/sca-java-0.91/itest/wsdl/pom.xml b/branches/sca-java-0.91/itest/wsdl/pom.xml deleted file mode 100644 index 90501ed247..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/pom.xml +++ /dev/null @@ -1,135 +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>0.91-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-itest-wsdl</artifactId> - <name>Apache Tuscany WSDL Integration Tests</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-wsdl</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-http-jetty</artifactId> - <version>0.91-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-impl</artifactId> - <version>1.0-incubating-beta1</version> - <scope>compile</scope> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>target/sdo-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-plugin</artifactId> - <version>1.0-incubating-beta1</version> - <executions> - <execution> - <id>generate-sdo</id> - <phase>generate-sources</phase> - <configuration> - <schemaFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</schemaFile> - <javaPackage>com.bigbank.account</javaPackage> - <prefix>Account</prefix> - <noNotification>true</noNotification> - <noContainer>true</noContainer> - <noUnsettable>true</noUnsettable> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java deleted file mode 100644 index 265b11f7dd..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java +++ /dev/null @@ -1,92 +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 bigbank.account.services.accountdata; - -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Remotable; - -@Remotable -@AllowsPassByReference -public interface AccountDataService { - - /** - * Auto generated method signatures - * - * @param param0* - * @param param1* - * @param param2 - */ - public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException; - - /** - * Auto generated method signatures - * - * @param param4 - */ - public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4) throws java.rmi.RemoteException; - - /** - * Auto generated method signatures - * - * @param param6* - * @param param7 - */ - public float deposit(java.lang.String param6, float param7) throws java.rmi.RemoteException; - - /** - * Auto generated method signatures - * - * @param param9* - * @param param10* - * @param param11 - */ - public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11) - throws java.rmi.RemoteException; - - /** - * Auto generated method signatures - * - * @param param13* - * @param param14 - */ - public com.bigbank.account.StockSummary sellStock(int param13, int param14) throws java.rmi.RemoteException; - - /** - * Auto generated method signatures - * - * @param param16* - * @param param17 - */ - public float withdraw(java.lang.String param16, float param17) throws java.rmi.RemoteException; - - /** - * Auto generated method signatures - * - * @param param19 - */ - public com.bigbank.account.AccountReport getAccountReport(int param19) throws java.rmi.RemoteException; - - /** - * Auto generated method signatures - * - * @param param0 - */ - public com.bigbank.account.AccountLog getAccountLog(int param0) throws java.rmi.RemoteException; - -} diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java deleted file mode 100644 index 1e87899b01..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java +++ /dev/null @@ -1,80 +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 bigbank.account.services.accountdata; - -import java.rmi.RemoteException; - -import org.osoa.sca.annotations.Service; - -import com.bigbank.account.AccountFactory; -import com.bigbank.account.AccountLog; -import com.bigbank.account.AccountReport; -import com.bigbank.account.CustomerProfileData; -import com.bigbank.account.StockSummary; - -@Service(AccountDataService.class) -public class AccountDataServiceImpl implements AccountDataService { - - public CustomerProfileData getCustomerProfile(String logonID) throws RemoteException { - - return null; - } - - public AccountReport getAccountReport(int customerID) { - - return null; - } - - public CustomerProfileData createAccount(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings) - throws RemoteException { - CustomerProfileData data = AccountFactory.INSTANCE.createCustomerProfileData(); - data.setLoginID(customerProfile.getLoginID()); - data.setAddress(customerProfile.getAddress()); - data.setEmail(customerProfile.getEmail()); - data.setFirstName(customerProfile.getFirstName()); - data.setId(customerProfile.getId()); - data.setLastName(customerProfile.getLastName()); - data.setPassword(customerProfile.getPassword()); - return data; - } - - public float deposit(String param6, float param7) throws RemoteException { - - return 0; - } - - public StockSummary purchaseStock(int param0, StockSummary stock) throws RemoteException { - - return null; - } - - public StockSummary sellStock(int param13, int param14) throws RemoteException { - - return null; - } - - public float withdraw(String param16, float param17) throws RemoteException { - - return 0; - } - - public AccountLog getAccountLog(final int customerID) throws RemoteException { - throw new RemoteException("This method should not be called"); - } -} diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java deleted file mode 100644 index 694227d7fb..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java +++ /dev/null @@ -1,79 +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 bigbank.account.services.accountdata; - -import java.rmi.RemoteException; - -import org.osoa.sca.annotations.Reference; - -import com.bigbank.account.AccountLog; -import com.bigbank.account.AccountReport; -import com.bigbank.account.CustomerProfileData; -import com.bigbank.account.StockSummary; - -public class AccountServiceClientImpl implements AccountDataService { - - AccountDataService accountService; - - @Reference - public void setAccountService(AccountDataService accountService) { - this.accountService = accountService; - } - - public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException { - return accountService.createAccount(param9, param10, param11); - } - - public float deposit(String param6, float param7) throws RemoteException { - - return 0; - } - - public AccountLog getAccountLog(int param0) throws RemoteException { - - return null; - } - - public AccountReport getAccountReport(int param19) throws RemoteException { - - return null; - } - - public CustomerProfileData getCustomerProfile(String param4) throws RemoteException { - - return null; - } - - public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException { - - return null; - } - - public StockSummary sellStock(int param13, int param14) throws RemoteException { - - return null; - } - - public float withdraw(String param16, float param17) throws RemoteException { - - return 0; - } - -} diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java deleted file mode 100644 index 462a718c44..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java +++ /dev/null @@ -1,79 +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 bigbank.account.services.accountdata; - -import java.rmi.RemoteException; - -import org.osoa.sca.annotations.Reference; - -import com.bigbank.account.AccountLog; -import com.bigbank.account.AccountReport; -import com.bigbank.account.CustomerProfileData; -import com.bigbank.account.StockSummary; - -public class Component2aImpl implements AccountDataService { - - AccountDataService accountService; - - @Reference - public void setAccountService(AccountDataService accountService) { - this.accountService = accountService; - } - - public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException { - return accountService.createAccount(param9, param10, param11); - } - - public float deposit(String param6, float param7) throws RemoteException { - - return 0; - } - - public AccountLog getAccountLog(int param0) throws RemoteException { - - return null; - } - - public AccountReport getAccountReport(int param19) throws RemoteException { - - return null; - } - - public CustomerProfileData getCustomerProfile(String param4) throws RemoteException { - - return null; - } - - public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException { - - return null; - } - - public StockSummary sellStock(int param13, int param14) throws RemoteException { - - return null; - } - - public float withdraw(String param16, float param17) throws RemoteException { - - return 0; - } - -} diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java deleted file mode 100644 index 17dbc27060..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java +++ /dev/null @@ -1,79 +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 bigbank.account.services.accountdata; - -import java.rmi.RemoteException; - -import org.osoa.sca.annotations.Reference; - -import com.bigbank.account.AccountLog; -import com.bigbank.account.AccountReport; -import com.bigbank.account.CustomerProfileData; -import com.bigbank.account.StockSummary; - -public class Component2bImpl implements AccountDataService { - - AccountDataService accountService; - - @Reference - public void setAccountService(AccountDataService accountService) { - this.accountService = accountService; - } - - public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException { - return accountService.createAccount(param9, param10, param11); - } - - public float deposit(String param6, float param7) throws RemoteException { - - return 0; - } - - public AccountLog getAccountLog(int param0) throws RemoteException { - - return null; - } - - public AccountReport getAccountReport(int param19) throws RemoteException { - - return null; - } - - public CustomerProfileData getCustomerProfile(String param4) throws RemoteException { - - return null; - } - - public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException { - - return null; - } - - public StockSummary sellStock(int param13, int param14) throws RemoteException { - - return null; - } - - public float withdraw(String param16, float param17) throws RemoteException { - - return 0; - } - -} diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java deleted file mode 100644 index 90bf276834..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java +++ /dev/null @@ -1,79 +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 bigbank.account.services.accountdata; - -import java.rmi.RemoteException; - -import org.osoa.sca.annotations.Reference; - -import com.bigbank.account.AccountLog; -import com.bigbank.account.AccountReport; -import com.bigbank.account.CustomerProfileData; -import com.bigbank.account.StockSummary; - -public class Component3aImpl implements AccountDataService { - - AccountDataService accountService; - - @Reference - public void setAccountService(AccountDataService accountService) { - this.accountService = accountService; - } - - public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException { - return accountService.createAccount(param9, param10, param11); - } - - public float deposit(String param6, float param7) throws RemoteException { - - return 0; - } - - public AccountLog getAccountLog(int param0) throws RemoteException { - - return null; - } - - public AccountReport getAccountReport(int param19) throws RemoteException { - - return null; - } - - public CustomerProfileData getCustomerProfile(String param4) throws RemoteException { - - return null; - } - - public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException { - - return null; - } - - public StockSummary sellStock(int param13, int param14) throws RemoteException { - - return null; - } - - public float withdraw(String param16, float param17) throws RemoteException { - - return 0; - } - -} diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java deleted file mode 100644 index b76ef600e0..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java +++ /dev/null @@ -1,79 +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 bigbank.account.services.accountdata; - -import java.rmi.RemoteException; - -import org.osoa.sca.annotations.Reference; - -import com.bigbank.account.AccountLog; -import com.bigbank.account.AccountReport; -import com.bigbank.account.CustomerProfileData; -import com.bigbank.account.StockSummary; - -public class Component3bImpl implements AccountDataService { - - AccountDataService accountService; - - @Reference - public void setAccountService(AccountDataService accountService) { - this.accountService = accountService; - } - - public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException { - return accountService.createAccount(param9, param10, param11); - } - - public float deposit(String param6, float param7) throws RemoteException { - - return 0; - } - - public AccountLog getAccountLog(int param0) throws RemoteException { - - return null; - } - - public AccountReport getAccountReport(int param19) throws RemoteException { - - return null; - } - - public CustomerProfileData getCustomerProfile(String param4) throws RemoteException { - - return null; - } - - public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException { - - return null; - } - - public StockSummary sellStock(int param13, int param14) throws RemoteException { - - return null; - } - - public float withdraw(String param16, float param17) throws RemoteException { - - return 0; - } - -} diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java deleted file mode 100644 index e747eb041f..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java +++ /dev/null @@ -1,98 +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 bigbank.account.services.accountdata; - -import java.rmi.RemoteException; - -/** - * This interface allows access to a customer's id from the data service. - */ -public interface CustomerIdService { - - /* - * Return -1 if purchaseLotNumber not found - */ - public int getCustomerIdByPurchaseLotNumber(int purchaseLotNumber) throws RemoteException; - - /* - * Return -1 if account not found - */ - public int getCustomerIdByAccount(String account) throws RemoteException; - - // TODO (isilval) Fix this !!! - // Apparently, configuration can't deal with extends so I am adding the contents of AccountDataService here - - /** - * Auto generated method signatures - * - * @param param0* - * @param param1* - * @param param2 - */ - public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException; - - /** - * Auto generated method signatures - * - * @param param4 - */ - public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4) throws java.rmi.RemoteException; - - /** - * Auto generated method signatures - * - * @param param6* - * @param param7 - */ - public float deposit(java.lang.String param6, float param7) throws java.rmi.RemoteException; - - /** - * Auto generated method signatures - * - * @param param9* - * @param param10* - * @param param11 - */ - public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11) - throws java.rmi.RemoteException; - - /** - * Auto generated method signatures - * - * @param param13* - * @param param14 - */ - public com.bigbank.account.StockSummary sellStock(int param13, int param14) throws java.rmi.RemoteException; - - /** - * Auto generated method signatures - * - * @param param16* - * @param param17 - */ - public float withdraw(java.lang.String param16, float param17) throws java.rmi.RemoteException; - - /** - * Auto generated method signatures - * - * @param param19 - */ - public com.bigbank.account.AccountReport getAccountReport(int param19) throws java.rmi.RemoteException; - -} diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index c9076ebba6..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java +++ /dev/null @@ -1,33 +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 helloworld; - -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(HelloWorldService.class) -public class HelloWorldImpl implements HelloWorldService { - - public String getGreetings(String name) { - return "Hi " + name; - } - -} diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index bd527ff8e2..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,33 +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 helloworld; - -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Service; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -@Service -public interface HelloWorldService { - - public String getGreetings(String name); -} - diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java deleted file mode 100644 index d706517b76..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package helloworld; - -import org.osoa.sca.annotations.Scope; - -/** - * This client program shows how to create an SCA runtime, start it, - * locate the HelloWorld service and invoke it. - */ -@Scope("COMPOSITE") -public class HelloWorldServiceComponent implements HelloWorldService { - - HelloWorldService helloWorldService; - - public String getGreetings(String name) { - return helloWorldService.getGreetings(name); - } - - public HelloWorldService getHelloWorldService() { - return helloWorldService; - } - - public void setHelloWorldService(HelloWorldService helloWorldService) { - this.helloWorldService = helloWorldService; - } -}
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java deleted file mode 100644 index 9d147dc013..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.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 org.apache.tuscany.sca.itest; - -import helloworld.HelloWorldService; - -import org.osoa.sca.annotations.Reference; - -public class Component2aImpl implements HelloWorldService { - - private HelloWorldService comp; - - @Reference - public void setComp(HelloWorldService comp) { - this.comp = comp; - } - public String getGreetings(String s) { - return comp.getGreetings(s); - } - -} diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java deleted file mode 100644 index 7556e02b36..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java +++ /dev/null @@ -1,39 +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; - -import helloworld.HelloWorldService; - -import org.osoa.sca.annotations.Reference; - -public class Component2bImpl implements HelloWorldService { - - private HelloWorldService comp; - - @Reference - public void setComp(HelloWorldService comp) { - this.comp = comp; - } - - public String getGreetings(String s) { - return comp.getGreetings(s); - } - -} diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java deleted file mode 100644 index e7031ff41c..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java +++ /dev/null @@ -1,39 +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; - -import helloworld.HelloWorldService; - -import org.osoa.sca.annotations.Reference; - -public class Component3aImpl implements HelloWorldService { - - private HelloWorldService comp; - - @Reference - public void setComp(HelloWorldService comp) { - this.comp = comp; - } - - public String getGreetings(String s) { - return comp.getGreetings(s); - } - -} diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java deleted file mode 100644 index 7a049ed7b0..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java +++ /dev/null @@ -1,39 +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; - -import helloworld.HelloWorldService; - -import org.osoa.sca.annotations.Reference; - -public class Component3bImpl implements HelloWorldService { - - private HelloWorldService comp; - - @Reference - public void setComp(HelloWorldService comp) { - this.comp = comp; - } - - public String getGreetings(String s) { - return comp.getGreetings(s); - } - -} diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/SDOWSDLTest.composite b/branches/sca-java-0.91/itest/wsdl/src/main/resources/SDOWSDLTest.composite deleted file mode 100644 index 447824bad5..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/SDOWSDLTest.composite +++ /dev/null @@ -1,344 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance" name="SDOWSDLTest"> - - <dbsdo:import.sdo xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" - factory="com.bigbank.account.AccountFactory" /> - - <service name="AccountService1a2a3a4a" promote="Component2a3a4a"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2a3a4a"/> - </service> - <service name="AccountService1a2a3a4b" promote="Component2a3a4b"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2a3a4b"/> - </service> - <service name="AccountService1a2a3b4a" promote="Component2a3b4a"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2a3b4a"/> - </service> - <service name="AccountService1a2a3b4b" promote="Component2a3b4b"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2a3b4b"/> - </service> - <service name="AccountService1a2b3a4a" promote="Component2b3a4a"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3a4a"/> - </service> - <service name="AccountService1a2b3a4b" promote="Component2b3a4b"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3a4b"/> - </service> - <service name="AccountService1a2b3b4a" promote="Component2b3b4a"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3b4a"/> - </service> - <service name="AccountService1a2b3b4b" promote="Component2b3b4b"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3b4b"/> - </service> - <service name="AccountService1b2a3a4a" promote="Component2a3a4a"> - <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3a4a"/> - </service> - <service name="AccountService1b2a3a4b" promote="Component2a3a4b"> - <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3a4b"/> - </service> - <service name="AccountService1b2a3b4a" promote="Component2a3b4a"> - <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3b4a"/> - </service> - <service name="AccountService1b2a3b4b" promote="Component2a3b4b"> - <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3b4b"/> - </service> - <service name="AccountService1b2b3a4a" promote="Component2b3a4a"> - <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3a4a"/> - </service> - <service name="AccountService1b2b3a4b" promote="Component2b3a4b"> - <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3a4b"/> - </service> - <service name="AccountService1b2b3b4a" promote="Component2b3b4a"> - <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3b4a"/> - </service> - <service name="AccountService1b2b3b4b" promote="Component2b3b4b"> - <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3b4b"/> - </service> - - <component name="Component2a3a4a"> - <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" /> - <reference name="accountService" target="Component3a4a"/> - </component> - <component name="Component2a3a4b"> - <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" /> - <reference name="accountService" target="Component3a4b"/> - </component> - <component name="Component2a3b4a"> - <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" /> - <reference name="accountService" target="Component3b4a"/> - </component> - <component name="Component2a3b4b"> - <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" /> - <reference name="accountService" target="Component3b4b"/> - </component> - - <component name="Component2b3a4a"> - <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" /> - <reference name="accountService" target="Component3a4a"/> - </component> - <component name="Component2b3a4b"> - <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" /> - <reference name="accountService" target="Component3a4b"/> - </component> - <component name="Component2b3b4a"> - <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" /> - <reference name="accountService" target="Component3b4a"/> - </component> - <component name="Component2b3b4b"> - <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" /> - <reference name="accountService" target="Component3b4b"/> - </component> - - <component name="Component3a4a"> - <implementation.java class="bigbank.account.services.accountdata.Component3aImpl" /> - </component> - <reference name="Component3a4aRef" promote="Component3a4a/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService" /> - </reference> - - <component name="Component3a4b"> - <implementation.java class="bigbank.account.services.accountdata.Component3aImpl" /> - </component> - <reference name="Component3a4bRef" promote="Component3a4b/accountService"> - <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService" /> - </reference> - - <component name="Component3b4a"> - <implementation.java class="bigbank.account.services.accountdata.Component3bImpl" /> - </component> - <reference name="Component3b4aRef" promote="Component3b4a/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService" /> - </reference> - - <component name="Component3b4b"> - <implementation.java class="bigbank.account.services.accountdata.Component3bImpl" /> - </component> - <reference name="Component3b4bRef" promote="Component3b4b/accountService"> - <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService" /> - </reference> - - <!-- target service --> - - <service name="AccountService" promote="AccountServiceComponent"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService"/> - </service> - - <component name="AccountServiceComponent"> - <implementation.java class="bigbank.account.services.accountdata.AccountDataServiceImpl" /> - </component> - - <!-- test client --> - - <component name="AccountServiceClient"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="AccountServiceRef" promote="AccountServiceClient/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"/> - </reference> - - <!-- clients --> - - <component name="Client1a2a3a4a"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1a2a3a4a" promote="Client1a2a3a4a/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1a2a3a4a" /> - </reference> - - <component name="Client1a2a3a4b"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl"/> - </component> - - <reference name="ClientRef1a2a3a4b" promote="Client1a2a3a4b/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1a2a3a4b" /> - </reference> - - <component name="Client1a2a3b4a"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1a2a3b4a" promote="Client1a2a3b4a/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1a2a3b4a" /> - </reference> - - <component name="Client1a2a3b4b"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1a2a3b4b" promote="Client1a2a3b4b/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1a2a3b4b" /> - </reference> - - <component name="Client1a2b3a4a"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1a2b3a4a" promote="Client1a2b3a4a/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1a2b3a4a" /> - </reference> - - <component name="Client1a2b3a4b"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1a2b3a4b" promote="Client1a2b3a4b/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1a2b3a4b" /> - </reference> - - <component name="Client1a2b3b4a"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1a2b3b4a" promote="Client1a2b3b4a/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1a2b3b4a" /> - </reference> - - <component name="Client1a2b3b4b"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1a2b3b4b" promote="Client1a2b3b4b/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1a2b3b4b" /> - </reference> - - <component name="Client1b2a3a4a"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1b2a3a4a" promote="Client1b2a3a4a/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1b2a3a4a" /> - </reference> - - <component name="Client1b2a3a4b"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1b2a3a4b" promote="Client1b2a3a4b/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1b2a3a4b" /> - </reference> - - <component name="Client1b2a3b4a"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1b2a3b4a" promote="Client1b2a3b4a/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1b2a3b4a" /> - </reference> - - <component name="Client1b2a3b4b"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1b2a3b4b" promote="Client1b2a3b4b/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1b2a3b4b" /> - </reference> - - <component name="Client1b2b3a4a"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1b2b3a4a" promote="Client1b2b3a4a/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1b2b3a4a" /> - </reference> - - <component name="Client1b2b3a4b"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1b2b3a4b" promote="Client1b2b3a4b/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1b2b3a4b" /> - </reference> - - <component name="Client1b2b3b4a"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1b2b3b4a" promote="Client1b2b3b4a/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1b2b3b4a" /> - </reference> - - <component name="Client1b2b3b4b"> - <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" /> - </component> - - <reference name="ClientRef1b2b3b4b" promote="Client1b2b3b4b/accountService"> - <interface.java interface="bigbank.account.services.accountdata.AccountDataService" /> - <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" - uri="http://localhost:8085/AccountService1b2b3b4b" /> - </reference> - -</composite> diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/WSDLTest.composite b/branches/sca-java-0.91/itest/wsdl/src/main/resources/WSDLTest.composite deleted file mode 100644 index 2024578dae..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/WSDLTest.composite +++ /dev/null @@ -1,371 +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="WSDLTest"> - - <service name="HelloWorldService1a2a3a4a" promote="Component2a3a4a" > - <interface.java interface="helloworld.HelloWorldService" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3a4a"/> - </service> - <service name="HelloWorldService1a2a3a4b" promote="Component2a3a4b" > - <interface.java interface="helloworld.HelloWorldService" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3a4b"/> - </service> - <service name="HelloWorldService1a2a3b4a" promote="Component2a3b4a" > - <interface.java interface="helloworld.HelloWorldService" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3b4a"/> - </service> - <service name="HelloWorldService1a2a3b4b" promote="Component2a3b4b" > - <interface.java interface="helloworld.HelloWorldService" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3b4b"/> - </service> - <service name="HelloWorldService1a2b3a4a" promote="Component2b3a4a" > - <interface.java interface="helloworld.HelloWorldService" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3a4a"/> - </service> - <service name="HelloWorldService1a2b3a4b" promote="Component2b3a4b" > - <interface.java interface="helloworld.HelloWorldService" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3a4b"/> - </service> - <service name="HelloWorldService1a2b3b4a" promote="Component2b3b4a" > - <interface.java interface="helloworld.HelloWorldService" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3b4a"/> - </service> - <service name="HelloWorldService1a2b3b4b" promote="Component2b3b4b" > - <interface.java interface="helloworld.HelloWorldService" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3b4b"/> - </service> - - <service name="HelloWorldService1b2a3a4a" promote="Component2a3a4a" > - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3a4a"/> - </service> - <service name="HelloWorldService1b2a3a4b" promote="Component2a3a4b" > - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3a4b"/> - </service> - <service name="HelloWorldService1b2a3b4a" promote="Component2a3b4a" > - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3b4a"/> - </service> - <service name="HelloWorldService1b2a3b4b" promote="Component2a3b4b" > - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3b4b"/> - </service> - <service name="HelloWorldService1b2b3a4a" promote="Component2b3a4a" > - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3a4a"/> - </service> - <service name="HelloWorldService1b2b3a4b" promote="Component2b3a4b" > - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3a4b"/> - </service> - <service name="HelloWorldService1b2b3b4a" promote="Component2b3b4a" > - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3b4a"/> - </service> - <service name="HelloWorldService1b2b3b4b" promote="Component2b3b4b" > - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3b4b"/> - </service> - - <component name="Component2a3a4a"> - <implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/> - <reference name="comp" target="Component3a4a" /> - </component> - <component name="Component2a3a4b"> - <implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/> - <reference name="comp" target="Component3a4b" /> - </component> - <component name="Component2a3b4a"> - <implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/> - <reference name="comp" target="Component3b4a" /> - </component> - <component name="Component2a3b4b"> - <implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/> - <reference name="comp" target="Component3b4b" /> - </component> - - <component name="Component2b3a4a"> - <implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/> - <reference name="comp" target="Component3a4a" /> - </component> - <component name="Component2b3a4b"> - <implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/> - <reference name="comp" target="Component3a4b" /> - </component> - <component name="Component2b3b4a"> - <implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/> - <reference name="comp" target="Component3b4a" /> - </component> - <component name="Component2b3b4b"> - <implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/> - <reference name="comp" target="Component3b4b" /> - </component> - - <component name="Component3a4a"> - <implementation.java class="org.apache.tuscany.sca.itest.Component3aImpl"/> - <reference name="comp" /> - </component> - <reference name="Component3a4aRef" promote="Component3a4a/comp" > - <interface.java interface="helloworld.HelloWorldService" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldWebService" /> - </reference> - - <component name="Component3a4b"> - <implementation.java class="org.apache.tuscany.sca.itest.Component3aImpl"/> - <reference name="comp" /> - </component> - <reference name="Component3a4bRef" promote="Component3a4b/comp" > - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldWebService" /> - </reference> - - <component name="Component3b4a"> - <implementation.java class="org.apache.tuscany.sca.itest.Component3bImpl"/> - <reference name="comp" /> - </component> - <reference name="Component3b4aRef" promote="Component3b4a/comp" > - <interface.java interface="helloworld.HelloWorldService" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldWebService" /> - </reference> - - <component name="Component3b4b"> - <implementation.java class="org.apache.tuscany.sca.itest.Component3bImpl"/> - <reference name="comp" /> - </component> - <reference name="Component3b4bRef" promote="Component3b4b/comp" > - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldWebService" /> - </reference> - - -<!-- the servive --> - - <service name="HelloWorldWebService" promote="HelloWorldServiceComponent" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldWebService"/> - </service> - - <component name="HelloWorldServiceComponent"> - <implementation.java class="helloworld.HelloWorldImpl" /> - </component> - -<!-- the clients --> - - <component name="Client1a2a3a4a"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1a2a3a4a" promote="Client1a2a3a4a/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1a2a3a4a" /> - </reference> - - <component name="Client1a2a3a4b"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1a2a3a4b" promote="Client1a2a3a4b/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1a2a3a4b" /> - </reference> - - <component name="Client1a2a3b4a"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1a2a3b4a" promote="Client1a2a3b4a/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1a2a3b4a" /> - </reference> - - <component name="Client1a2a3b4b"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1a2a3b4b" promote="Client1a2a3b4b/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1a2a3b4b" /> - </reference> - - <component name="Client1a2b3a4a"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1a2b3a4a" promote="Client1a2b3a4a/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1a2b3a4a" /> - </reference> - - <component name="Client1a2b3a4b"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1a2b3a4b" promote="Client1a2b3a4b/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1a2b3a4b" /> - </reference> - - <component name="Client1a2b3b4a"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1a2b3b4a" promote="Client1a2b3b4a/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1a2b3b4a" /> - </reference> - - <component name="Client1a2b3b4b"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1a2b3b4b" promote="Client1a2b3b4b/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1a2b3b4b" /> - </reference> - - <component name="Client1b2a3a4a"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1b2a3a4a" promote="Client1b2a3a4a/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1b2a3a4a" /> - </reference> - - <component name="Client1b2a3a4b"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1b2a3a4b" promote="Client1b2a3a4b/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1b2a3a4b" /> - </reference> - - <component name="Client1b2a3b4a"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1b2a3b4a" promote="Client1b2a3b4a/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1b2a3b4a" /> - </reference> - - <component name="Client1b2a3b4b"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1b2a3b4b" promote="Client1b2a3b4b/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1b2a3b4b" /> - </reference> - - <component name="Client1b2b3a4a"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1b2b3a4a" promote="Client1b2b3a4a/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1b2b3a4a" /> - </reference> - - <component name="Client1b2b3a4b"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1b2b3a4b" promote="Client1b2b3a4b/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"/> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1b2b3a4b" /> - </reference> - - <component name="Client1b2b3b4a"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1b2b3b4a" promote="Client1b2b3b4a/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1b2b3b4a" /> - </reference> - - <component name="Client1b2b3b4b"> - <implementation.java class="helloworld.HelloWorldServiceComponent"/> - <reference name="helloWorldService" /> - </component> - - <reference name="ClientRef1b2b3b4b" promote="Client1b2b3b4b/helloWorldService" > - <!-- interface.java interface="helloworld.HelloWorldService" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" - uri="http://localhost:8085/HelloWorldService1b2b3b4b" /> - </reference> - -</composite> diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType b/branches/sca-java-0.91/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType deleted file mode 100644 index aa91a713d9..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> - -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"> - - <service name="Component2Service"> - <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)" - wsdli:wsdlLocation="http://www.bigbank.com/account wsdl/AccountService.wsdl" /> - </service> - -</componentType> -
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType b/branches/sca-java-0.91/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType deleted file mode 100644 index 57b1d66e9c..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> - -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"> - - <service name="Component3Service"> - <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)" - wsdli:wsdlLocation="http://www.bigbank.com/account wsdl/AccountService.wsdl" /> - </service> - -</componentType> -
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType b/branches/sca-java-0.91/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType deleted file mode 100644 index de8307b8c2..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> - -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"> - - <service name="Component2Service"> - <!-- interface.java interface="org.apache.tuscany.sca.itest.Component" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" wsdli:wsdlLocation="http://helloworld wsdl/helloworld.wsdl" /> - </service> - -</componentType> -
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType b/branches/sca-java-0.91/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType deleted file mode 100644 index de8307b8c2..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> - -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"> - - <service name="Component2Service"> - <!-- interface.java interface="org.apache.tuscany.sca.itest.Component" / --> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" wsdli:wsdlLocation="http://helloworld wsdl/helloworld.wsdl" /> - </service> - -</componentType> -
\ No newline at end of file diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl b/branches/sca-java-0.91/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl deleted file mode 100644 index 9bd1d71a0e..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl +++ /dev/null @@ -1,467 +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. ---> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:account="http://www.bigbank.com/account" - targetNamespace="http://www.bigbank.com/account" - name="AccountService"> - - <wsdl:types> - <xsd:schema targetNamespace="http://www.bigbank.com/account" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:account="http://www.bigbank.com/account" - - > <!-- xmlns:sdojava="commonj.sdo/java" sdojava:package="org.apache.tuscany.samples.bigbank.account" --> - - -<!-- <xsd:complexType name="DataGraphRoot"> - <xsd:sequence> - <xsd:element name="customerProfileData" type="account:CustomerProfileData" maxOccurs="unbounded" minOccurs="0" /> - <xsd:element name="StockSummaries" type="account:StockSummary" maxOccurs="unbounded" minOccurs="0" /> - <xsd:element name="AccountSummaries" type="account:AccountSummary" maxOccurs="unbounded" minOccurs="0" /> - <xsd:element name="StockLogEntries" type="account:StockLogEntry" maxOccurs="unbounded" minOccurs="0" /> - <xsd:element name="AccountLogEntries" type="account:AccountLogEntry" maxOccurs="unbounded" minOccurs="0" /> - </xsd:sequence> - </xsd:complexType>--> - - - <xsd:element name="getAccountReport"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="customerID" - type="xsd:int" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="getAccountReportResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="accountReport" - type="account:AccountReport" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:complexType name="AccountReport"> - <xsd:sequence> - <xsd:element name="accountSummaries" - type="account:AccountSummary" maxOccurs="unbounded" /> - <xsd:element name="stockSummaries" - type="account:StockSummary" maxOccurs="unbounded" /> - - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="AccountSummary"> - <xsd:attribute name="accountNumber" type="xsd:string" /> - <xsd:attribute name="accountType" type="xsd:string" /> - <xsd:attribute name="balance" type="xsd:float" /> - </xsd:complexType> - - <xsd:complexType name="StockSummary"> - <!-- xsd:attribute name="id" type="xsd:int" / --> - <xsd:attribute name="purchaseLotNumber" type="xsd:int" /> - <!-- unique id for this purchase --> - <xsd:attribute name="symbol" type="xsd:string" /> - <xsd:attribute name="quantity" type="xsd:int" /> - <xsd:attribute name="purchaseDate" type="xsd:dateTime" /> - <xsd:attribute name="purchasePrice" type="xsd:float" /> - <xsd:attribute name="currentPrice" type="xsd:float" /> - <xsd:attribute name="company" type="xsd:string" /> - <xsd:attribute name="highPrice" type="xsd:float" /> - <xsd:attribute name="lowPrice" type="xsd:float" /> - - </xsd:complexType> - - <!-- Profile in data base --> - <xsd:element name="getCustomerProfile"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="loginID" type="xsd:string" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:complexType name="CustomerProfileData"> - <xsd:sequence> - <xsd:element name="firstName" type="xsd:string" /> - <xsd:element name="lastName" type="xsd:string" /> - <xsd:element name="address" type="xsd:string" /> - <xsd:element name="email" type="xsd:string" /> - <xsd:element name="loginID" type="xsd:string" /> - <xsd:element name="password" type="xsd:string" /> - <xsd:element name="id" type="xsd:int" /> - </xsd:sequence> - </xsd:complexType> - - <xsd:element name="getCustomerProfileResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="customerProfile" - type="account:CustomerProfileData" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="withdraw"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="accountNumber" - type="xsd:string" /> - <xsd:element name="amount" type="xsd:float" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="withdrawResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="balance" type="xsd:float" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="deposit"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="accountNumber" - type="xsd:string" /> - <xsd:element name="amount" type="xsd:float" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="depositResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="balance" type="xsd:float" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="purchaseStock"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="id" type="xsd:int" /> - <xsd:element name="stock" type="account:StockSummary" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="purchaseStockResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="purchaseSummary" - type="account:StockSummary" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - - - <xsd:element name="sellStock"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="purchaseLotNumber" - type="xsd:int" /><!-- unique id for this purchase --> - <xsd:element name="quantity" type="xsd:int" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="createAccount"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="customerProfile" - type="account:CustomerProfileData" /> - <xsd:element name="createSavings" - type="xsd:boolean" /> - <xsd:element name="createCheckings" - type="xsd:boolean" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="createAccountResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="customerProfile" - type="account:CustomerProfileData" /> - </xsd:sequence> - </xsd:complexType> - - </xsd:element> - - <xsd:element name="getAccountLog"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="customerID" - type="xsd:int" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="getAccountLogResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="accountLog" - type="account:AccountLog" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:complexType name="AccountLog"> - <xsd:sequence> - <xsd:element name="accountLogEntries" - type="account:AccountLogEntry" maxOccurs="unbounded" /> - <xsd:element name="stockLogEntries" - type="account:StockLogEntry" maxOccurs="unbounded" /> - - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="AccountLogEntry"> - <xsd:attribute name="logSeqNo" type="xsd:int" /> - <xsd:attribute name="id" type="xsd:int" /> - <xsd:attribute name="accountNumber" type="xsd:string" /> - <xsd:attribute name="actionType" type="xsd:string" /> - <xsd:attribute name="amount" type="xsd:float" /> - </xsd:complexType> - - <xsd:complexType name="StockLogEntry"> - <xsd:attribute name="logSeqNo" type="xsd:int" /> - <xsd:attribute name="id" type="xsd:int" /> - <xsd:attribute name="symbol" type="xsd:string" /> - <xsd:attribute name="quantity" type="xsd:int" /> - <xsd:attribute name="actionType" type="xsd:string" /> - <xsd:attribute name="purchaseLotNumber" type="xsd:int" /> - </xsd:complexType> - - </xsd:schema> - </wsdl:types> - <wsdl:message name="getAccountReportRequest"> - <wsdl:part element="account:getAccountReport" - name="getAccountReportRequest" /> - </wsdl:message> - <wsdl:message name="getAccountReportResponse"> - <wsdl:part element="account:getAccountReportResponse" - name="getAccountReportResponse" /> - </wsdl:message> - - <wsdl:message name="getCustomerProfileRequest"> - <wsdl:part element="account:getCustomerProfile" - name="getCustomerProfile" /> - </wsdl:message> - <wsdl:message name="getCustomerProfileResponse"> - <wsdl:part element="account:getCustomerProfileResponse" - name="getCustomerProfileResponse" /> - </wsdl:message> - - <wsdl:message name="withdrawRequest"> - <wsdl:part element="account:withdraw" name="withdrawRequest" /> - </wsdl:message> - - <wsdl:message name="withdrawResponse"> - <wsdl:part element="account:withdrawResponse" - name="withdrawResponse" /> - </wsdl:message> - - <wsdl:message name="depositRequest"> - <wsdl:part element="account:deposit" name="depositRequest" /> - </wsdl:message> - - <wsdl:message name="depositResponse"> - <wsdl:part element="account:depositResponse" - name="depositResponse" /> - </wsdl:message> - - <wsdl:message name="purchaseStockRequest"> - <wsdl:part element="account:purchaseStock" - name="purchaseStockRequest" /> - </wsdl:message> - - <wsdl:message name="purchaseStockResponse"> - <wsdl:part element="account:purchaseStockResponse" - name="purchaseStockResponse" /> - </wsdl:message> - - <wsdl:message name="sellStockRequest"> - <wsdl:part element="account:sellStock" name="sellStockRequest" /> - </wsdl:message> - - <wsdl:message name="createAccountRequest"> - <wsdl:part element="account:createAccount" name="createAccountRequest" /> - </wsdl:message> - - <wsdl:message name="createAccountResponse"> - <wsdl:part element="account:createAccountResponse" name="createAccountResponse" /> - </wsdl:message> - - <wsdl:message name="getAccountLogRequest"> - <wsdl:part element="account:getAccountLog" - name="getAccountLogRequest" /> - </wsdl:message> - - <wsdl:message name="getAccountLogResponse"> - <wsdl:part element="account:getAccountLogResponse" - name="getAccountLogResponse" /> - </wsdl:message> - - <wsdl:portType name="AccountService"> - <wsdl:operation name="getAccountReport"> - <wsdl:input message="account:getAccountReportRequest" /> - <wsdl:output message="account:getAccountReportResponse" /> - </wsdl:operation> - - <wsdl:operation name="getCustomerProfile"> - <wsdl:input message="account:getCustomerProfileRequest" /> - <wsdl:output message="account:getCustomerProfileResponse" /> - </wsdl:operation> - - <wsdl:operation name="withdraw"> - <wsdl:input message="account:withdrawRequest" /> - <wsdl:output message="account:withdrawResponse" /> - </wsdl:operation> - - <wsdl:operation name="deposit"> - <wsdl:input message="account:depositRequest" /> - <wsdl:output message="account:depositResponse" /> - </wsdl:operation> - - <wsdl:operation name="purchaseStock"> - <wsdl:input message="account:purchaseStockRequest" /> - <wsdl:output message="account:purchaseStockResponse" /> - </wsdl:operation> - - <wsdl:operation name="sellStock"> - <wsdl:input message="account:sellStockRequest" /> - <wsdl:output message="account:purchaseStockResponse" /> - </wsdl:operation> - - - <wsdl:operation name="createAccount"> - <wsdl:input message="account:createAccountRequest" /> - <wsdl:output message="account:createAccountResponse" /> - </wsdl:operation> - - <wsdl:operation name="getAccountLog"> - <wsdl:input message="account:getAccountLogRequest" /> - <wsdl:output message="account:getAccountLogResponse" /> - </wsdl:operation> - - </wsdl:portType> - - - - <wsdl:binding name="AccountServiceSOAP" type="account:AccountService"> - <soap:binding style="document" - transport="http://schemas.xmlsoap.org/soap/http" /> - <wsdl:operation name="getAccountReport"> - <soap:operation - soapAction="http://www.bigbank.com/account/getAccountReport" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="getCustomerProfile"> - <soap:operation - soapAction="http://www.bigbank.com/account/getCustomerProfile" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - - <wsdl:operation name="withdraw"> - <soap:operation - soapAction="http://www.bigbank.com/account/withdraw" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - - <wsdl:operation name="deposit"> - <soap:operation - soapAction="http://www.bigbank.com/account/deposit" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - - <wsdl:operation name="purchaseStock"> - <soap:operation - soapAction="http://www.bigbank.com/account/purchaseStock" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - - <wsdl:operation name="sellStock"> - <soap:operation - soapAction="http://www.bigbank.com/account/sellStock" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - - <wsdl:operation name="createAccount"> - <soap:operation - soapAction="http://www.bigbank.com/account/createAccount" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - - <wsdl:operation name="getAccountLog"> - <soap:operation - soapAction="http://www.bigbank.com/account/getAccountLog" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - <wsdl:service name="AccountService"> - <wsdl:port binding="account:AccountServiceSOAP" - name="AccountServiceSOAP"> - <soap:address - location="http://localhost:8085/services/AccountService" /> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/branches/sca-java-0.91/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl b/branches/sca-java-0.91/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl deleted file mode 100644 index 3921dec72d..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl +++ /dev/null @@ -1,80 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> - <wsdlsoap:address location=""/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/branches/sca-java-0.91/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/branches/sca-java-0.91/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java deleted file mode 100644 index c11e814058..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java +++ /dev/null @@ -1,98 +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; - -import java.rmi.RemoteException; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -import bigbank.account.services.accountdata.AccountDataService; - -import com.bigbank.account.AccountFactory; -import com.bigbank.account.CustomerProfileData; - -/** - * Tests all the combinations of wiring services, components, and references - * which use either interface.java or interface.wsdl. - * - * The tests use a service (1) wired to a components (2) wired to another - * component (3) wired to a reference (4). Each of those uses either - * interface.java (a) or interface.wsdl (b). This results in 16 different - * combinations 1a2a3a4a thru 1b2b3b4b. - */ -public class SDOWSDLTestCase extends TestCase { - - private SCADomain domain; - - public void testClient1a2a3a4a() throws RemoteException { - - doit("Client1a2a3a4a"); - doit("Client1a2a3a4b"); - doit("Client1a2a3b4a"); - doit("Client1a2a3b4b"); - doit("Client1a2b3a4a"); - doit("Client1a2b3a4b"); - doit("Client1a2b3b4a"); - doit("Client1a2b3b4b"); - doit("Client1b2a3a4a"); - doit("Client1b2a3a4b"); - doit("Client1b2a3b4a"); - doit("Client1b2a3b4b"); - -// TODO: TUSCANY-1135, service using wsdl wired to component using wsdl fails -// doit("Client1b2b3a4a"); -// doit("Client1b2b3a4b"); -// doit("Client1b2b3b4a"); -// doit("Client1b2b3b4b"); - } - - private void doit(String compName) throws RemoteException { - AccountDataService client = domain.getService(AccountDataService.class, compName); - CustomerProfileData dataIn = AccountFactory.INSTANCE.createCustomerProfileData(); - dataIn.setAddress("home"); - dataIn.setEmail("petra@home"); - dataIn.setFirstName("petra"); - dataIn.setId(1); - dataIn.setLastName("A"); - dataIn.setLoginID("petra"); - dataIn.setPassword("ant"); - - CustomerProfileData dataOut = client.createAccount(dataIn , false, false); - - assertEquals(dataIn.getAddress(), dataOut.getAddress()); - assertEquals(dataIn.getEmail(), dataOut.getEmail()); - assertEquals(dataIn.getFirstName(), dataOut.getFirstName()); - assertEquals(dataIn.getId(), dataOut.getId()); - assertEquals(dataIn.getLastName(), dataOut.getLastName()); - assertEquals(dataIn.getLoginID(), dataOut.getLoginID()); - assertEquals(dataIn.getPassword(), dataOut.getPassword()); - } - - protected void setUp() throws Exception { - domain = SCADomain.newInstance("SDOWSDLTest.composite"); - } - - protected void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/branches/sca-java-0.91/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/branches/sca-java-0.91/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java deleted file mode 100644 index fd30d69c79..0000000000 --- a/branches/sca-java-0.91/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java +++ /dev/null @@ -1,146 +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; - -import static junit.framework.Assert.assertEquals; -import helloworld.HelloWorldService; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Tests all the combinations of wiring services, components, and references - * which use either interface.java or interface.wsdl. The tests use a service - * (1) wired to a components (2) wired to another component (3) wired to a - * reference (4). Each of those uses either interface.java (a) or interface.wsdl - * (b). This results in 16 different combinations 1a2a3a4a thru 1b2b3b4b. - */ -public class WSDLTestCase { - - private static SCADomain domain; - - @Test - public void testClient1a2a3a4a() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3a4a"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1a2a3a4b() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3a4b"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1a2a3b4a() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3b4a"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1a2a3b4b() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3b4b"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1a2b3a4a() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3a4a"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1a2b3a4b() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3a4b"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1a2b3b4a() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3b4a"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1a2b3b4b() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3b4b"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1b2a3a4a() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3a4a"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1b2a3a4b() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3a4b"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1b2a3b4a() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3b4a"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1b2a3b4b() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3b4b"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1b2b3a4a() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3a4a"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1b2b3a4b() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3a4b"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1b2b3b4a() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3b4a"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @Test - public void testClient1b2b3b4b() { - HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3b4b"); - assertEquals("Hi petra", client.getGreetings("petra")); - } - - @BeforeClass - public static void init() throws Throwable { - domain = SCADomain.newInstance("WSDLTest.composite"); - } - - @AfterClass - public static void destroy() throws Exception { - domain.close(); - } -} |