Start merging binding-sca into assembly and creating a binding-sca-runtime module

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

5 files changed, 0 insertions, 381 deletions

diff --git a/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
deleted file mode 100644
index 8a3b664fac..0000000000
--- a/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
+++ /dev/null
@@ -1,107 +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;
-
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-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.CompositeBuilderExtensionPoint;
-import org.apache.tuscany.sca.assembly.xml.CompositeModelResolver;
-import org.apache.tuscany.sca.binding.sca.impl.SCABindingFactoryImpl;
-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.FactoryExtensionPoint;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * SCABindingTestCase
- *
- * @version $Rev$ $Date$
- */
-public class SCABindingTestCase {
-	
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor; 
-    private CompositeModelResolver resolver; 
-    private CompositeBuilder compositeBuilder;
-
-    @Before
-    public void init() throws Exception { 
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-        
-        resolver = new CompositeModelResolver(null, null);
-        
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        PolicyFactory attachPointTypeFactory = modelFactories.getFactory(PolicyFactory.class);
-
-        compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
-        
-    }
-    
-    @Test
-    public void testSCABindingFactory() {
-        SCABindingFactory factory = new SCABindingFactoryImpl();
-        Assert.assertNotNull(factory.createSCABinding());
-    }
-    
-    @Test 
-    public void testBuildModel() {
-    	try{
-	        InputStream is = getClass().getResourceAsStream("/Calculator.composite");      
-	        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-	        Composite composite = (Composite)staxProcessor.read(reader);
-	        
-	        is.close();
-	        Assert.assertNotNull(composite);
-	        
-	        resolver.addModel(composite);
-	       
-	        staxProcessor.resolve(composite, resolver);
-	        
-	        compositeBuilder.build(composite, null, null);
-	        
-	        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);
-    	} catch (Exception ex) {
-    		Assert.fail(ex.getMessage());
-    	}
-    	
-    }
-}
diff --git a/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java b/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
deleted file mode 100644
index db3a38f912..0000000000
--- a/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.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.apace.tuscany.sca.binding.sca.xml;

-

-import static org.junit.Assert.assertNotNull;

-

-import java.io.InputStream;

-

-import javax.xml.stream.XMLInputFactory;

-import javax.xml.stream.XMLStreamReader;

-

-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.builder.CompositeBuilder;

-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;

-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.junit.Assert;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-/**

- * Test reading WSDL interfaces.

- * 

- * @version $Rev: 722930 $ $Date: 2008-12-03 15:27:31 +0000 (Wed, 03 Dec 2008) $

- */

-public class ReadTestCase {

-

-    private static XMLInputFactory inputFactory;

-    private static StAXArtifactProcessor<Object> staxProcessor;

-    private static CompositeBuilder compositeBuilder;

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

-

-        inputFactory = XMLInputFactory.newInstance();

-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);

-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);

-

-        compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");

-    }

-

-    @Test

-    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);

-    }

-

-    @Test

-    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, null, null);

-        

-        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/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
deleted file mode 100644
index 0f7083f370..0000000000
--- a/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
+++ /dev/null
@@ -1,85 +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.InputStream;

-

-import javax.xml.stream.XMLInputFactory;

-import javax.xml.stream.XMLOutputFactory;

-

-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;

-import org.junit.BeforeClass;

-import org.junit.Ignore;

-import org.junit.Test;

-

-/**

- * Test reading/write WSDL interfaces.

- * 

- * @version $Rev: 750765 $ $Date: 2009-03-06 04:36:04 +0000 (Fri, 06 Mar 2009) $

- */

-public class WriteTestCase {

-

-    private static StAXArtifactProcessor<Object> staxProcessor;

-    private static XMLInputFactory inputFactory;

-    private static XMLOutputFactory outputFactory;

-

-    @BeforeClass

-    public static 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);

-    }

-

-    @Test

-    @Ignore // broken in 2.0 bring up

-    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://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\"><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());

-        }

-

-    @Test

-    @Ignore // broken in 2.0 bring up

-    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://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" 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/java/sca/modules/binding-sca/src/test/resources/Calculator.composite b/java/sca/modules/binding-sca/src/test/resources/Calculator.composite
deleted file mode 100644
index b504e0a677..0000000000
--- a/java/sca/modules/binding-sca/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://docs.oasis-open.org/ns/opencsa/sca/200903"

-        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/java/sca/modules/binding-sca/src/test/resources/CalculatorServiceImpl.componentType b/java/sca/modules/binding-sca/src/test/resources/CalculatorServiceImpl.componentType
deleted file mode 100644
index 88611d47f2..0000000000
--- a/java/sca/modules/binding-sca/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://docs.oasis-open.org/ns/opencsa/sca/200903">

-

-  <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