Delete and redo release branch

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

7 files changed, 0 insertions, 386 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/java/helloworld/BeanA.java b/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/java/helloworld/BeanA.java
deleted file mode 100644
index c8fd365da5..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/java/helloworld/BeanA.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 helloworld;

-

-public class BeanA {

-

-    protected Boolean b;

-    protected String s;

-    protected int x;

-    protected Integer y;

-    

-    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-Beta1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index f4a2023b17..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.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 helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClient implements HelloWorldService {
-
-    @Reference
-    public HelloWorldService  ref;
-    
-    public String sayHello(String name) {
-        return ref.sayHello(name);
-    }
-
-    public String sayHello2(String firstName, String lastName) {
-        return ref.sayHello2(firstName, lastName);
-    }
-
-    public BeanA sayHello3(BeanA bean) {
-        return ref.sayHello3(bean);
-    }
-    
-    public int sayHello4(boolean flag) {
-        return ref.sayHello4(flag);
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index f73b185ead..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.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 helloworld;
-
-
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-    public String sayHello2(String firstName, String lastName) {
-        return "Hello " + firstName + " " + lastName;
-    }
-    
-    public BeanA sayHello3(BeanA bean) {
-        bean.setS("XYZ");
-        return bean;
-    }
-
-    public int sayHello4(boolean flag) {
-        return 0;
-    }
-    
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 790fdd7467..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldService {
-
-    String sayHello(String name);
-
-    String sayHello2(String firstName, String lastName);
-    
-    BeanA sayHello3(BeanA bean);
-    
-    int sayHello4(boolean flag);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java b/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
deleted file mode 100644
index 0259fdf39d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
+++ /dev/null
@@ -1,115 +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 test;
-
-import helloworld.BeanA;
-import helloworld.HelloWorldService;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.http.jetty.JettyServer;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class BindingTestCase {
-
-    private static Node node;
-
-    @Test
-    public void testService() throws MalformedURLException, IOException {
-        URL url = new URL("http://localhost:8085/HelloWorldComponent/HelloWorldService/sayHello?name=petra&callback=foo");
-        BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
-        String response = br.readLine();
-        Assert.assertEquals("foo(\"Hello petra\");", response);
-
-    }
-
-    @Test
-    public void testTwoArgs() throws MalformedURLException, IOException {
-        URL url = new URL("http://localhost:8085/HelloWorldComponent/HelloWorldService/sayHello2?first=petra&last=arnold&callback=foo");
-        BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
-        String response = br.readLine();
-        Assert.assertEquals("foo(\"Hello petra arnold\");", response);
-
-    } 
-
-    @Test
-    public void testReference() throws MalformedURLException, IOException {
-        
-        HelloWorldService client = node.getService(HelloWorldService.class, "HelloWorldClient/HelloWorldService/sca");
-
-        Assert.assertEquals("Hello beate", client.sayHello("beate"));
-        Assert.assertEquals("Hello beate arnold", client.sayHello2("beate", "arnold"));
-        Assert.assertEquals(0, client.sayHello4(true));
-    }
-    
-    @Test
-    public void testComplexParams() throws MalformedURLException, IOException {
-        
-        HelloWorldService client = node.getService(HelloWorldService.class, "HelloWorldClient/HelloWorldService/sca");
-
-        BeanA bean = new BeanA();
-        bean.setB(true);
-        bean.setS("Fred");
-        bean.setX(2);
-        bean.setX(5);
-
-        Assert.assertEquals("XYZ", client.sayHello3(bean).getS());
-    }  
-    
-    /*
-     * Uncomment to keep the server running so you can ping it manually from a browser
-     * try:
-     *   http://localhost:8085/HelloWorldComponent/HelloWorldService/sayHello3?bean={%22b%22:%22true%22,%22s%22:%22a%20string%22,%22x%22:%2227%22,%22y%22:%2213%22}&callback=submitSucess
-     */
-    @Test
-    @Ignore
-    public void waitForInput(){
-        System.out.println("Press a key");
-        try {
-            System.in.read();
-        } catch (Exception ex){
-            // do nothing
-        }
-    }
-
-    @BeforeClass
-    public static void init() throws Exception {
-        JettyServer.portDefault = 8085;
-        node = NodeFactory.newInstance().createNode("jsonp/helloworld.composite").start();
-    }
-    
-    @AfterClass
-    public static void destroy() throws Exception {
-        if (node != null) {
-            node.stop();
-        }
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/resources/jquery.html b/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/resources/jquery.html
deleted file mode 100644
index a61cee3155..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/resources/jquery.html
+++ /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.    

- -->

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 

-                    "http://www.w3.org/TR/html4/loose.dtd">

-<html>

-    <title>Tuscany JQuery Client HelloWorld Sample</TITLE>

-    

-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>

-    <script language="JavaScript">

-

-       function getGreeting() {

-          var name = document.getElementById("name").value;

-          $.getJSON('http://localhost:8081/HelloWorldService/sayHello?name=' + name + '&callback=?', handleResponse);

-       }

-       function handleResponse(data) {

-          document.getElementById('greeting').innerHTML=data;

-       }

-  

-    </script>

-    

-  </head>

-

-  <body>

-    <h2>Tuscany JSONP HelloWorld Sample</h2>

-

-    This example uses the JQuery getJSON to make JSONP requests to the SCA service 'HelloWorldService'

-

-    <p>Enter Name: &nbsp;&nbsp;&nbsp;

-    <input type="text" id="name" size="30"/>               

-    <input type="button" value="Submit" onclick="getGreeting()" />

-

-    </p><div id='greeting'></div>

-

-  </body>

-</html>

diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/resources/jsonp/helloworld.composite b/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/resources/jsonp/helloworld.composite
deleted file mode 100644
index c1061147a8..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-jsonp-runtime/src/test/resources/jsonp/helloworld.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://docs.oasis-open.org/ns/opencsa/sca/200912"
-	       xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           targetNamespace="http://itest"
-           name="HelloWorldComposite">
-           
-    <component name="HelloWorldComponent">
-        <implementation.java class="helloworld.HelloWorldImpl"/>
-        <service name="HelloWorldService" >
-            <binding.sca name="sca"/>
-            <tuscany:binding.jsonp name="HelloWorldService"/>
-        </service>
-    </component>   
-  
-    <component name="HelloWorldClient">
-        <implementation.java class="helloworld.HelloWorldClient"/>
-        <reference name="ref" >
-            <binding.sca name="sca"/>
-            <tuscany:binding.jsonp name="HelloWorldService" uri="http://localhost:8085/HelloWorldComponent/HelloWorldService"/>
-        </reference>
-    </component>   
-
-</composite>