Merge binding sca xml module into model module

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

7 files changed, 390 insertions, 16 deletions

diff --git a/java/sca/modules/binding-sca/META-INF/MANIFEST.MF b/java/sca/modules/binding-sca/META-INF/MANIFEST.MF
index 84fb5fa857..234035b9ac 100644
--- a/java/sca/modules/binding-sca/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-sca/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Bnd-LastModified: 1225397165593
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Default Binding Model

-Import-Package: javax.xml.stream;resolution:=optional,

+Import-Package: javax.xml.namespace, 

+ javax.xml.stream;resolution:=optional,

  org.apache.tuscany.sca.assembly;version="2.0.0",

  org.apache.tuscany.sca.assembly.builder;version="2.0.0",

  org.apache.tuscany.sca.assembly.xml;version="2.0.0";resolution:=optional,

diff --git a/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java b/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
new file mode 100644
index 0000000000..74dac90fce
--- /dev/null
+++ b/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
@@ -0,0 +1,132 @@
+/*

+ * 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.sca.xml;

+

+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;

+

+import javax.xml.namespace.QName;

+import javax.xml.stream.XMLStreamException;

+import javax.xml.stream.XMLStreamReader;

+import javax.xml.stream.XMLStreamWriter;

+

+import org.apache.tuscany.sca.assembly.SCABinding;

+import org.apache.tuscany.sca.assembly.SCABindingFactory;

+import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor;

+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;

+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;

+import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;

+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

+import org.apache.tuscany.sca.core.FactoryExtensionPoint;

+import org.apache.tuscany.sca.policy.ExtensionType;

+import org.apache.tuscany.sca.policy.PolicyFactory;

+import org.apache.tuscany.sca.policy.PolicySubject;

+

+/**

+ * A processor to read the XML that describes the SCA binding.

+ *

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

+ */

+

+public class SCABindingProcessor implements StAXArtifactProcessor<SCABinding> {

+	private static final String NAME = "name";

+	private static final String URI = "uri";

+	

+	private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";

+    private static final String BINDING_SCA = "binding.sca";

+    private static final QName BINDING_SCA_QNAME = new QName(SCA11_NS, BINDING_SCA);

+    

+    private PolicyFactory policyFactory;       

+    private SCABindingFactory scaBindingFactory;

+    private PolicySubjectProcessor policyProcessor;

+    private PolicyFactory  intentAttachPointTypeFactory;

+

+

+    public SCABindingProcessor(FactoryExtensionPoint modelFactories) {

+        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);

+        this.scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);

+        policyProcessor = new PolicySubjectProcessor(policyFactory);

+        this.intentAttachPointTypeFactory = modelFactories.getFactory(PolicyFactory.class);

+    }

+

+    public QName getArtifactType() {

+        return BINDING_SCA_QNAME;

+    }

+

+    public Class<SCABinding> getModelType() {

+        return SCABinding.class;

+    }

+

+    public SCABinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {

+        SCABinding scaBinding = scaBindingFactory.createSCABinding();

+        ExtensionType bindingType = intentAttachPointTypeFactory.createBindingType();

+        bindingType.setType(getArtifactType());

+        bindingType.setUnresolved(true);

+        ((PolicySubject)scaBinding).setType(bindingType);

+        

+        // Read policies

+        policyProcessor.readPolicies(scaBinding, reader);

+        

+        // Read binding name

+        String name = reader.getAttributeValue(null, NAME);

+        if (name != null) {

+            scaBinding.setName(name);

+        }

+

+        // Read binding URI

+        String uri = reader.getAttributeValue(null, URI);

+        if (uri != null) {

+            scaBinding.setURI(uri);

+        }

+

+        // Skip to end element

+        while (reader.hasNext()) {

+            if (reader.next() == END_ELEMENT && BINDING_SCA_QNAME.equals(reader.getName())) {

+                break;

+            }

+        }

+        return scaBinding;

+    }

+    

+    public void resolve(SCABinding model, ModelResolver resolver) throws ContributionResolveException {

+        policyProcessor.resolvePolicies(model, resolver);

+    }    

+

+    public void write(SCABinding scaBinding, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {

+

+        // Write <binding.sca>

+        policyProcessor.writePolicyPrefixes(scaBinding, writer);

+        writer.writeStartElement(SCA11_NS, BINDING_SCA);

+        policyProcessor.writePolicyAttributes(scaBinding, writer);

+

+        // Write binding name

+        if (scaBinding.getName() != null) {

+            writer.writeAttribute(NAME, scaBinding.getName());

+        }

+        

+        // Write binding URI

+        if (scaBinding.getURI() != null) {

+            writer.writeAttribute(URI, scaBinding.getURI());

+        }

+        

+        writer.writeEndElement();

+    }

+    

+}

diff --git a/java/sca/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
new file mode 100644
index 0000000000..9d522c352c
--- /dev/null
+++ b/java/sca/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -0,0 +1,19 @@
+# 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. 
+
+# Implementation class for the artifact processor extension
+org.apache.tuscany.sca.binding.sca.xml.SCABindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#binding.sca,model=org.apache.tuscany.sca.assembly.SCABinding
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
new file mode 100644
index 0000000000..db3a38f912
--- /dev/null
+++ b/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
@@ -0,0 +1,97 @@
+/*

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

+ * 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
index 509a320943..b504e0a677 100644
--- a/java/sca/modules/binding-sca/src/test/resources/Calculator.composite
+++ b/java/sca/modules/binding-sca/src/test/resources/Calculator.composite
@@ -18,35 +18,42 @@
  * under the License.    

 -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-    xmlns:calc="http://calc"

-    targetNamespace="http://calc"

-    name="Calculator">

-    

-    <component name="CalculatorServiceComponent">

+        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"/>

+        <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"/>

-        </service>        

+    <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>
\ No newline at end of file
+</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
new file mode 100644
index 0000000000..88611d47f2
--- /dev/null
+++ b/java/sca/modules/binding-sca/src/test/resources/CalculatorServiceImpl.componentType
@@ -0,0 +1,33 @@
+<?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