From 2e0a5f4c1368993c8cf71b9f4b59273a323b9aff Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 28 Jul 2011 11:07:25 +0000 Subject: Recreate 2.0-Beta3 branch from current trunk git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1151792 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/implementation/python/PythonEval.java | 32 ++++++ .../python/PythonImplementation.java | 104 ++++++++++++++++++++ .../python/PythonImplementationProcessor.java | 107 +++++++++++++++++++++ .../sca/implementation/python/PythonProperty.java | 32 ++++++ ...ca.contribution.processor.StAXArtifactProcessor | 20 ++++ ...any.sca.contribution.processor.ValidationSchema | 18 ++++ .../tuscany-sca-1.1-implementation-python.xsd | 38 ++++++++ .../implementation/python/ReadWriteTestCase.java | 91 ++++++++++++++++++ .../src/test/resources/domain-test.composite | 39 ++++++++ 9 files changed, 481 insertions(+) create mode 100644 sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonEval.java create mode 100644 sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonImplementation.java create mode 100644 sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonImplementationProcessor.java create mode 100644 sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonProperty.java create mode 100644 sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor create mode 100644 sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema create mode 100644 sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/resources/org/apache/tuscany/sca/implementation/python/tuscany-sca-1.1-implementation-python.xsd create mode 100644 sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/test/java/org/apache/tuscany/sca/implementation/python/ReadWriteTestCase.java create mode 100644 sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/test/resources/domain-test.composite (limited to 'sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src') diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonEval.java b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonEval.java new file mode 100644 index 0000000000..ae9caab7d0 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonEval.java @@ -0,0 +1,32 @@ +/* + * 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.implementation.python; + +import org.oasisopen.sca.annotation.Remotable; + +/** + * Python component generic evaluation interface. + * + * @version $Rev$ $Date$ + */ +@Remotable +public interface PythonEval { + + public String eval(String args) throws Exception; +} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonImplementation.java b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonImplementation.java new file mode 100644 index 0000000000..058c01a48e --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonImplementation.java @@ -0,0 +1,104 @@ +/* + * 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.implementation.python; + +import javax.xml.namespace.QName; + +import org.apache.tuscany.sca.assembly.Property; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.assembly.impl.ImplementationImpl; +import org.apache.tuscany.sca.assembly.impl.PropertyImpl; +import org.apache.tuscany.sca.assembly.impl.ReferenceImpl; +import org.apache.tuscany.sca.assembly.impl.ServiceImpl; +import org.apache.tuscany.sca.interfacedef.InterfaceContract; +import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl; +import org.apache.tuscany.sca.interfacedef.util.XMLType; + +/** + * The model representing a Python implementation in an SCA assembly. + * + * @version $Rev$ $Date$ + */ +public class PythonImplementation extends ImplementationImpl { + final String script; + final String location; + final InterfaceContract contract; + final Service service; + + PythonImplementation(final QName qn, final String scr, final String loc, final InterfaceContract c) { + super(qn); + script = scr; + location = loc; + contract = c; + + class DynService extends ServiceImpl { + public DynService() { + setName("default"); + setInterfaceContract(contract); + } + } + ; + service = new DynService(); + getServices().add(service); + } + + public String getScript() { + return script; + } + + public String getLocation() { + return location; + } + + public Service getService(final String n) { + return service; + } + + public Reference getReference(final String n) { + final Reference r = super.getReference(n); + if(r != null) + return r; + class DynReference extends ReferenceImpl { + public DynReference() { + setName(n); + setInterfaceContract(contract); + } + } + final Reference nr = new DynReference(); + getReferences().add(nr); + return nr; + } + + public Property getProperty(final String n) { + final Property p = super.getProperty(n); + if(p != null) + return p; + class DynProperty extends PropertyImpl { + public DynProperty() { + setName(n); + setDataType(new DataTypeImpl(null, String.class, String.class, XMLType.UNKNOWN)); + setXSDType(new QName("http://www.w3.org/2001/XMLSchema", "string")); + } + } + final Property np = new DynProperty(); + getProperties().add(np); + return np; + } +} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonImplementationProcessor.java b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonImplementationProcessor.java new file mode 100644 index 0000000000..424de86815 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonImplementationProcessor.java @@ -0,0 +1,107 @@ +/* + * 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.implementation.python; + +import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; +import static org.apache.tuscany.sca.assembly.Base.SCA11_TUSCANY_NS; + +import java.net.URI; + +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.contribution.processor.BaseStAXArtifactProcessor; +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.ProcessorContext; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.core.FactoryExtensionPoint; +import org.apache.tuscany.sca.interfacedef.InterfaceContract; +import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; +import org.apache.tuscany.sca.interfacedef.Operation; +import org.apache.tuscany.sca.interfacedef.java.JavaInterface; +import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; +import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceImpl; + +/** + * Implements a StAX artifact processor for Python implementations. + * + * @version $Rev$ $Date$ + */ +public class PythonImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor { + static QName QN = new QName(SCA11_TUSCANY_NS, "implementation.python"); + + final InterfaceContract contract; + + public PythonImplementationProcessor(final ExtensionPointRegistry ep) throws InvalidInterfaceException { + final FactoryExtensionPoint fep = ep.getExtensionPoint(FactoryExtensionPoint.class); + final JavaInterfaceFactory jf = fep.getFactory(JavaInterfaceFactory.class); + final JavaInterface eval = jf.createJavaInterface(PythonEval.class); + + class DynamicInterface extends JavaInterfaceImpl { + DynamicInterface() { + setJavaClass(eval.getJavaClass()); + setName(eval.getName()); + setRemotable(eval.isRemotable()); + Operation op = eval.getOperations().get(0); + op.setDynamic(true); + getOperations().add(op); + //resetDataBinding(JSONDataBinding.NAME); + resetDataBinding("JSON"); + setUnresolved(false); + } + + @Override + public boolean isDynamic() { + return true; + } + } + + contract = jf.createJavaInterfaceContract(); + contract.setInterface(new DynamicInterface()); + } + + public QName getArtifactType() { + return QN; + } + + public Class getModelType() { + return PythonImplementation.class; + } + + public PythonImplementation read(final XMLStreamReader r, final ProcessorContext ctx) throws ContributionReadException, XMLStreamException { + final String scr = r.getAttributeValue(null, "script"); + while(r.hasNext() && !(r.next() == END_ELEMENT && QN.equals(r.getName()))) + ; + return new PythonImplementation(QN, scr, URI.create(ctx.getContribution().getLocation()).getPath(), contract); + } + + public void resolve(final PythonImplementation impl, final ModelResolver res, final ProcessorContext ctx) throws ContributionResolveException { + } + + public void write(final PythonImplementation impl, final XMLStreamWriter w, final ProcessorContext ctx) throws ContributionWriteException, XMLStreamException { + writeStart(w, QN.getNamespaceURI(), QN.getLocalPart(), new XAttr("script", impl.getScript())); + writeEnd(w); + } +} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonProperty.java b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonProperty.java new file mode 100644 index 0000000000..6efee36ab3 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/java/org/apache/tuscany/sca/implementation/python/PythonProperty.java @@ -0,0 +1,32 @@ +/* + * 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.implementation.python; + +import org.oasisopen.sca.annotation.Remotable; + +/** + * Python component property evaluation interface. + * + * @version $Rev$ $Date$ + */ +@Remotable +public interface PythonProperty { + + public String eval(); +} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor new file mode 100644 index 0000000000..c6f60b9880 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor @@ -0,0 +1,20 @@ +# 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.implementation.python.PythonImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#implementation.python,model=org.apache.tuscany.sca.implementation.python.PythonImplementation + diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema new file mode 100644 index 0000000000..2543a67897 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema @@ -0,0 +1,18 @@ +# 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. +# +org/apache/tuscany/sca/implementation/python/tuscany-sca-1.1-implementation-python.xsd diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/resources/org/apache/tuscany/sca/implementation/python/tuscany-sca-1.1-implementation-python.xsd b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/resources/org/apache/tuscany/sca/implementation/python/tuscany-sca-1.1-implementation-python.xsd new file mode 100644 index 0000000000..75e69f1ccd --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/main/resources/org/apache/tuscany/sca/implementation/python/tuscany-sca-1.1-implementation-python.xsd @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/test/java/org/apache/tuscany/sca/implementation/python/ReadWriteTestCase.java b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/test/java/org/apache/tuscany/sca/implementation/python/ReadWriteTestCase.java new file mode 100644 index 0000000000..b3fd07b158 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/test/java/org/apache/tuscany/sca/implementation/python/ReadWriteTestCase.java @@ -0,0 +1,91 @@ +/* + * 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.implementation.python; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.ByteArrayOutputStream; +import java.io.InputStream; + +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamWriter; + +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.ContributionFactory; +import org.apache.tuscany.sca.contribution.DefaultContributionFactory; +import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.ProcessorContext; +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.monitor.DefaultMonitorFactory; +import org.apache.tuscany.sca.monitor.Monitor; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Test reading/writing Python implementations. + * + * @version $Rev$ $Date$ + */ +public class ReadWriteTestCase { + static XMLInputFactory xif; + static XMLOutputFactory xof; + static StAXArtifactProcessor xproc; + static ProcessorContext ctx; + + @BeforeClass + public static void setUp() throws Exception { + final DefaultExtensionPointRegistry ep = new DefaultExtensionPointRegistry(); + final ContributionFactory contribFactory = new DefaultContributionFactory(); + final Contribution contrib = contribFactory.createContribution(); + contrib.setLocation(ReadWriteTestCase.class.getProtectionDomain().getCodeSource().getLocation().toString()); + final Monitor mon = new DefaultMonitorFactory().createMonitor(); + ctx = new ProcessorContext(contrib, mon); + xif = XMLInputFactory.newInstance(); + xof = XMLOutputFactory.newInstance(); + final StAXArtifactProcessorExtensionPoint xpep = new DefaultStAXArtifactProcessorExtensionPoint(ep); + xproc = new ExtensibleStAXArtifactProcessor(xpep, xif, xof); + } + + @Test + public void testRead() throws Exception { + final InputStream is = getClass().getClassLoader().getResourceAsStream("domain-test.composite"); + final Composite c = (Composite)xproc.read(xif.createXMLStreamReader(is), ctx); + assertNotNull(c); + assertEquals("server_test.py", ((PythonImplementation)c.getComponents().get(0).getImplementation()).getScript()); + } + + @Test + public void testReadWrite() throws Exception { + final InputStream is = getClass().getClassLoader().getResourceAsStream("domain-test.composite"); + final Composite c = (Composite)xproc.read(xif.createXMLStreamReader(is), ctx); + final ByteArrayOutputStream bos = new ByteArrayOutputStream(); + XMLStreamWriter writer = xof.createXMLStreamWriter(bos); + xproc.write(c, writer, ctx); + writer.close(); + assertTrue(bos.toString().contains("script=\"server_test.py\"")); + } +} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/test/resources/domain-test.composite b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/test/resources/domain-test.composite new file mode 100644 index 0000000000..c1e40dc676 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-python/src/test/resources/domain-test.composite @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3