Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk

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

5 files changed, 0 insertions, 417 deletions

diff --git a/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java b/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
deleted file mode 100644
index a7c7c15eaa..0000000000
--- a/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
+++ /dev/null
@@ -1,108 +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.apace.tuscany.sca.binding.sca.xml;
-
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-
-/**
- * Test reading WSDL interfaces.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadTestCase extends TestCase {
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private CompositeBuilder compositeBuilder;
-
-    @Override
-    public void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-
-        inputFactory = XMLInputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); 
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper, null);
-        
-    }
-
-    public void testReadComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("/CalculatorServiceImpl.componentType");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        ComponentType componentType = (ComponentType)staxProcessor.read(reader);
-        assertNotNull(componentType);
-        
-        SCABinding referenceSCABinding = (SCABinding) componentType.getReferences().get(0).getBindings().get(0);
-        assertNotNull(referenceSCABinding);
-        
-        SCABinding serviceSCABinding   = (SCABinding) componentType.getServices().get(0).getBindings().get(0);
-        assertNotNull(serviceSCABinding);     
-
-        //new PrintUtil(System.out).print(componentType);
-    }
-
-    public void testReadComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("/Calculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-
-        compositeBuilder.build(composite);
-        
-        SCABinding referenceSCABinding = (SCABinding) composite.getComponents().get(0).getReferences().get(0).getBindings().get(0);
-        SCABinding serviceSCABinding   = (SCABinding) composite.getComponents().get(1).getServices().get(0).getBindings().get(0);
-        
-        Assert.assertNotNull(referenceSCABinding);
-        Assert.assertNotNull(serviceSCABinding);        
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadWriteAnyAttributeTestCase.java b/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadWriteAnyAttributeTestCase.java
deleted file mode 100644
index b5f9fa4673..0000000000
--- a/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadWriteAnyAttributeTestCase.java
+++ /dev/null
@@ -1,140 +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.apace.tuscany.sca.binding.sca.xml;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.ByteArrayOutputStream;
-import java.io.StringReader;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.binding.sca.xml.SCABindingProcessor;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXAttributeProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXAttributeProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.xml.AnyAttributeProcessor;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test reading SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadWriteAnyAttributeTestCase {
-
-    private static final QName EXTENDED_ATTRIBUTE = new QName("http://test", "customAttribute");
-    
-    private static final String XML = 
-        "<?xml version='1.0' encoding='UTF-8'?>" +
-        "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" " +
-                    "xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\" " +
-                    "targetNamespace=\"http://temp\" " +
-                    "name=\"myComposite\">" +
-          "<service name=\"service\">" +
-            "<binding.sca xmlns:myPrefix=\"http://myPrefix\" myPrefix:myWSAnyAttribute=\"EJB Value\" />" +  
-            "<interface.java interface=\"com.ibm.MyInterface\" xmlns:myPrefix=\"http://myPrefix\" myPrefix:myJavaInterfaceAnyAttribute=\"Java Interface Value\" />" +
-          "</service>" +
-          "<component name=\"component\">" +
-            "<implementation.java class=\"com.ibm.test.MyClass\" xmlns:myPrefix=\"http://myPrefix\" myPrefix:myJavaImplAnyAttribute=\"Java Impl Value\" />" +
-          "</component>" +
-          "<component name=\"component1\">" +
-             "<implementation.composite xmlns:ns2=\"http://temp\" name=\"ns2:myComposite\" xmlns:myPrefix=\"http://myPrefix\" myPrefix:myCompositeImplAnyAttribute=\"Composite Impl Value\" />" +
-          "</component>" +
-          "<reference name=\"reference\">" +
-             "<interface.wsdl interface=\"http://www.example.org/SpaceWarGame/#wsdl.interface(SpaceWarGame)\" xmlns:myPrefix=\"http://myPrefix\" myPrefix:myWSDLInterfaceAnyAttribute=\"WSDL Interface Value\" />" +
-          "</reference>" +
-          "</composite>";
-    
-    private XMLInputFactory inputFactory;
-    private ExtensibleStAXArtifactProcessor staxProcessor;
-
-
-    /**
-     * Initialize the test environment
-     * This takes care to register attribute processors when provided
-     *
-     * @param attributeProcessor
-     * @throws Exception
-     */
-    @Before
-    public void setUp() throws Exception {
-    	ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-    	ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-    	
-    	inputFactory = XMLInputFactory.newInstance();
-    	
-    	StAXAttributeProcessor attributeProcessor = new AnyAttributeProcessor(modelFactories,null);
-    	
-    	StAXAttributeProcessorExtensionPoint staxAttributeProcessorsExtensionPoint = new DefaultStAXAttributeProcessorExtensionPoint(extensionPoints);
-    	staxAttributeProcessorsExtensionPoint.addArtifactProcessor(attributeProcessor);
-        extensionPoints.addExtensionPoint(staxAttributeProcessorsExtensionPoint);
-
-        
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        XMLOutputFactory outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        StAXAttributeProcessor<Object> staxAttributeProcessor = new ExtensibleStAXAttributeProcessor(staxAttributeProcessorsExtensionPoint ,inputFactory, outputFactory, null);
-        
-        SCABindingProcessor wsbp = new SCABindingProcessor(modelFactories, null, staxAttributeProcessor, null);
-        
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessors.addArtifactProcessor(wsbp);
-            	
-    	staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance(), null);
-    }
-    
-    @After
-    public void tearDown() throws Exception {
-        
-    }
-
-
-    @Test
-    //@Ignore()
-    public void testReadWriteCompositeWithBindings() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(XML));
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-        reader.close();
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, bos);
-
-        // used for debug comparison
-        // System.out.println(XML);
-        // System.out.println(bos.toString());
-
-        assertEquals(XML, bos.toString());
-        bos.close();
-    }    
-}
diff --git a/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
deleted file mode 100644
index db611fa413..0000000000
--- a/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.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 org.apace.tuscany.sca.binding.sca.xml;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-
-/**
- * Test reading/write WSDL interfaces.
- * 
- * @version $Rev$ $Date$
- */
-public class WriteTestCase extends TestCase {
-
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private XMLInputFactory inputFactory;
-    private XMLOutputFactory outputFactory;
-
-    @Override
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        inputFactory = XMLInputFactory.newInstance();
-        outputFactory = XMLOutputFactory.newInstance();
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, null);
-    }
-
-    public void testReadWriteComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("/CalculatorServiceImpl.componentType");
-        ComponentType componentType = (ComponentType)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(componentType);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(componentType, outputFactory.createXMLStreamWriter(bos));
-        assertEquals("<?xml version='1.0' encoding='UTF-8'?><componentType xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\"><service name=\"CalculatorService\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><reference name=\"addService\"><binding.sca /><interface.java interface=\"calculator.AddService\" /></reference></componentType>",
-        		     bos.toString());
-        }
-
-    public void testReadWriteComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("/Calculator.composite");
-        Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(composite);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
-        assertEquals("<?xml version='1.0' encoding='UTF-8'?><composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://calc\" name=\"Calculator\"><service name=\"CalculatorService\" promote=\"CalculatorServiceComponent\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><component name=\"CalculatorServiceComponent\"><implementation.java class=\"calculator.CalculatorServiceImpl\" /><reference name=\"addService\" target=\"AddServiceComponent\"><binding.sca /></reference><reference name=\"subtractService\" target=\"SubtractServiceComponent\" /><reference name=\"multiplyService\" target=\"MultiplyServiceComponent\" /><reference name=\"divideService\" target=\"DivideServiceComponent\" /></component><component name=\"AddServiceComponent\"><implementation.java class=\"calculator.AddServiceImpl\" /><service name=\"AddService\"><binding.sca /><interface.java interface=\"calculator.AddService\" /></service></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>",
-                     bos.toString());
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-sca-xml/src/test/resources/Calculator.composite b/branches/sca-java-1.5/modules/binding-sca-xml/src/test/resources/Calculator.composite
deleted file mode 100644
index 0be16ec536..0000000000
--- a/branches/sca-java-1.5/modules/binding-sca-xml/src/test/resources/Calculator.composite
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        xmlns:calc="http://calc"
-        targetNamespace="http://calc"
-        name="Calculator">
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.CalculatorService"/>
-        <binding.sca/>
-   </service>
-
-   <component name="CalculatorServiceComponent">
-        <implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent">
-            <binding.sca/>
-        </reference>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-    <implementation.java class="calculator.AddServiceImpl"/>
-    <service name="AddService">
-        <interface.java interface="calculator.AddService"/>
-            <binding.sca/>
-    </service>        
-    </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-1.5/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType b/branches/sca-java-1.5/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
deleted file mode 100644
index 55e8926504..0000000000
--- a/branches/sca-java-1.5/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
+++ /dev/null
@@ -1,33 +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="CalculatorService">
-        <interface.java interface="calculator.CalculatorService" />
-        <binding.sca/>
-  </service>
-
-  <reference name="addService">
-        <interface.java interface="calculator.AddService" />
-        <binding.sca/>
-  </reference>  
-
-</componentType>              
-       
\ No newline at end of file