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

6 files changed, 0 insertions, 308 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/Bean.java b/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/Bean.java
deleted file mode 100644
index 20a4276b8b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/Bean.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.interfacedef.java.jaxrs;
-
-import javax.ws.rs.GET;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Bean {
-    
-    @GET
-    String[] get();
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/JAXRSInterfaceProcessorTestCase.java b/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/JAXRSInterfaceProcessorTestCase.java
deleted file mode 100644
index b680eaa491..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/JAXRSInterfaceProcessorTestCase.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.apache.tuscany.sca.interfacedef.java.jaxrs;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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 static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
-import javax.ws.rs.GET;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class JAXRSInterfaceProcessorTestCase {
-    private ExtensionPointRegistry registry;
-    
-    @Before
-    public void setUp() throws Exception {
-        registry = new DefaultExtensionPointRegistry();
-    }
-
-    @Test
-    public final void testProcessor() throws Exception {
-        DefaultJavaInterfaceFactory iFactory = new DefaultJavaInterfaceFactory(registry);
-        JavaInterface contract = iFactory.createJavaInterface(Bean.class);
-        
-        assertTrue(contract.isRemotable());
-        
-        Assert.assertEquals(1,contract.getOperations().size());
-        
-        List<Operation> getOperations = (List<Operation>) contract.getAttributes().get(GET.class);
-        Assert.assertEquals(1,getOperations.size());
-        
-        //list operation
-        System.out.println(">>> JAX-RS Operations");
-        for(Operation o : contract.getOperations()) {
-            System.out.println(">>>>>>" + o);
-        }
-        
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/MockedResource.java b/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/MockedResource.java
deleted file mode 100644
index 46d501d4be..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/MockedResource.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.interfacedef.java.jaxrs;
-
-public class MockedResource implements Resource {
-    private String value;
-
-    public MockedResource() {
-        super();
-    }
-
-    public String get() {
-        return value;
-    }
-
-    public void create(String value) {
-        this.value = value;
-    }
-
-    public void delete() {
-        value = null;
-    }
-
-    public void update(String value) {
-        this.value = value;
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/Resource.java b/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/Resource.java
deleted file mode 100644
index ac9fd514bd..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/Resource.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.interfacedef.java.jaxrs;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Resource {
-
-    @GET
-    String get();
-
-    @PUT
-    void update(String value);
-
-    @POST
-    void create(String value);
-
-    @DELETE
-    void delete();
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/ResourceWrapper.java b/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/ResourceWrapper.java
deleted file mode 100644
index 23b674778e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/ResourceWrapper.java
+++ /dev/null
@@ -1,54 +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.interfacedef.java.jaxrs;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-
-@Path("myURI")
-@Produces({"application/xml", "application/json"})
-@Consumes({"application/xml", "application/json"})
-public class ResourceWrapper implements Resource {
-    public static Resource delegate;
-
-    public ResourceWrapper() {
-        super();
-    }
-
-
-    public String get() {
-        return delegate.get();
-    }
-
-    public void create(String value) {
-        delegate.create(value);
-    }
-
-    public void delete() {
-        delegate.delete();
-    }
-
-    public void update(String value) {
-        delegate.update(value);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/RootResourceClassGeneratorTestCase.java b/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/RootResourceClassGeneratorTestCase.java
deleted file mode 100644
index aa6abcd5f6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/RootResourceClassGeneratorTestCase.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.interfacedef.java.jaxrs;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * 
- */
-public class RootResourceClassGeneratorTestCase {
-    @Test
-    public void testGenerator() throws Exception {
-        Class<?> cls = RootResourceClassGenerator.generateRootResourceClass(Resource.class, "myURI", "application/xml,application/json", "application/xml,application/json");
-        Assert.assertTrue(cls.isAnnotationPresent(Path.class));
-        Path path = cls.getAnnotation(Path.class);
-        Assert.assertEquals("myURI", path.value());
-        
-        Produces produces = cls.getAnnotation(Produces.class);
-        Assert.assertEquals("application/xml", produces.value()[0]);
-
-        Consumes consumes = cls.getAnnotation(Consumes.class);
-        Assert.assertEquals("application/json", consumes.value()[1]);
-        
-        Field field = cls.getField("delegate");
-        Assert.assertSame(Resource.class, field.getType());
-
-        Assert.assertTrue(Modifier.isPublic(field.getModifiers()));
-        Assert.assertTrue(Modifier.isStatic(field.getModifiers()));
-
-        Assert.assertTrue(Resource.class.isAssignableFrom(cls));
-
-        Resource resource = new MockedResource();
-        field.set(null, resource);
-
-        Resource resourceProxy = (Resource)cls.newInstance();
-        Assert.assertNull(resourceProxy.get());
-        resourceProxy.create("123");
-        Assert.assertEquals("123", resourceProxy.get());
-        resourceProxy.update("ABC");
-        Assert.assertEquals("ABC", resourceProxy.get());
-        resourceProxy.delete();
-        Assert.assertNull(resourceProxy.get());
-    }
-}