delete the beta2 branch as i'd not seen raymonds mail when i made it and we might as well wait till he's got his changes in before creating the beta2 branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1040700 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 0 insertions, 331 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java
deleted file mode 100644
index e712ec8b53..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.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.binding.ws.jaxws;
-
-import java.io.Serializable;
-
-public class Bar implements Serializable {
-    private static final long serialVersionUID = 1249963611910502668L;
-    
-    private String s;
-    private int x;
-    private Integer y;
-    
-    private Boolean b;
-    
-    public Boolean getB() {
-        return b;
-    }
-    public void setB(Boolean b) {
-        this.b = b;
-    }
-    public String getS() {
-        return s;
-    }
-    public void setS(String s) {
-        this.s = s;
-    }
-    public int getX() {
-        return x;
-    }
-    public void setX(int x) {
-        this.x = x;
-    }
-    public Integer getY() {
-        return y;
-    }
-    public void setY(Integer y) {
-        this.y = y;
-    }
-    
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java
deleted file mode 100644
index d09b2af230..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.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.binding.ws.jaxws;
-
-import java.io.Serializable;
-
-public class Foo implements Serializable {
-    private static final long serialVersionUID = 4879476066850018458L;
-    
-    private Bar[] bars;
-
-    public Bar[] getBars() {
-        return bars;
-    }
-
-    public void setBars(Bar[] bars) {
-        this.bars = bars;
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java
deleted file mode 100644
index 652f7b53c4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.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.binding.ws.jaxws;
-
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorld {
-    
-    String getGreetings(String s);
-    String getGreetingsException(String s) throws ServiceRuntimeException;
-    Foo getGreetingsComplex(Foo foo);
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java
deleted file mode 100644
index 85e55888c6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java
+++ /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 org.apache.tuscany.sca.binding.ws.jaxws;
-
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.jaxws.HelloWorldService;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-
-@WebService
-public class HelloWorldImpl implements HelloWorld {
-
-    @Reference
-    public HelloWorldService helloWorldExternal;
-    
-    public String getGreetings(String s) {
-        System.out.println("Entering SCA HelloWorld.getGreetings: " + s);
-        String response = helloWorldExternal.getGreetings(s);
-        System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
-        return response;
-    }
-    
-    public String getGreetingsException(String s) throws ServiceRuntimeException {
-        System.out.println("Entering SCA HelloWorld.getGreetingsException: " + s);
-        String response = helloWorldExternal.getGreetings(s);
-        System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
-        throw new ServiceRuntimeException(response);
-    }    
-
-    public Foo getGreetingsComplex(Foo foo){
-        Foo response = null;//helloWorldExternal.getGreetingsComplex(foo);
-        System.out.println("At client: " + response.getBars()[0].getS());
-        return response;
-    } 
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
deleted file mode 100644
index 51f6dd4d51..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<xs:schema version="1.0" targetNamespace="http://helloworld/external" xmlns:tns="http://helloworld/external" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-  <xs:element name="getGreetings" type="tns:getGreetings"/>
-
-  <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
-  <xs:complexType name="getGreetings">
-    <xs:sequence>
-      <xs:element name="name" type="xs:string" form="qualified" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="getGreetingsResponse">
-    <xs:sequence>
-      <xs:element name="getGreetingsReturn" type="xs:string" form="qualified" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>
-
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 7e71dd465f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.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.    
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-              xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2">
-   <deployable composite="itest:HelloWorld"/>
-</contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
deleted file mode 100644
index 67236a5f98..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.7-b01-. -->
-<definitions targetNamespace="http://helloworld/external" name="HelloWorldServiceService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://helloworld/external" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <types>
-    <xsd:schema>
-      <xsd:import namespace="http://helloworld/external" schemaLocation="HelloWorldServiceService_schema1.xsd"/>
-    </xsd:schema>
-  </types>
-  <message name="getGreetings">
-    <part name="parameters" element="tns:getGreetings"/>
-  </message>
-  <message name="getGreetingsResponse">
-    <part name="parameters" element="tns:getGreetingsResponse"/>
-  </message>
-  <portType name="HelloWorldService">
-    <operation name="getGreetings">
-      <input message="tns:getGreetings"/>
-      <output message="tns:getGreetingsResponse"/>
-    </operation>
-  </portType>
-  <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="getGreetings">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-    </operation>
-  </binding>
-  <service name="HelloWorldServiceService">
-    <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding">
-      <soap:address location="http://localhost:8086/External/HelloWorld"/>
-    </port>
-  </service>
-</definitions>
-
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite b/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite
deleted file mode 100644
index 0188dc0d41..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.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://docs.oasis-open.org/ns/opencsa/sca/200912"
-		   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-		   targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"
-           name="HelloWorld">
-               
-    <component name="HelloWorldService">
-		<implementation.java class="org.apache.tuscany.sca.binding.ws.jaxws.HelloWorldImpl"/>
-	    <service name="HelloWorld">
-            <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld"/>
-	    </service>
-        <reference name="helloWorldExternal">
-            <binding.ws uri="http://localhost:8086/External/HelloWorld"/>
-        </reference>	
-    </component>
-    
-</composite>