From 132aa8a77685ec92bc90c03f987650d275a7b639 Mon Sep 17 00:00:00 2001 From: lresende Date: Mon, 30 Sep 2013 06:59:11 +0000 Subject: 2.0.1 RC1 release tag git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1527464 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/implementation/web/WebImplementation.java | 47 +++++++ .../web/WebImplementationFactory.java | 34 +++++ .../web/impl/WebImplementationBuilder.java | 43 ++++++ .../web/impl/WebImplementationFactoryImpl.java | 37 +++++ .../web/impl/WebImplementationImpl.java | 156 +++++++++++++++++++++ .../web/xml/WebImplementationProcessor.java | 126 +++++++++++++++++ 6 files changed, 443 insertions(+) create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationBuilder.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java (limited to 'sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web') diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java new file mode 100644 index 0000000000..c7613a9045 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java @@ -0,0 +1,47 @@ +/* + * 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.web; + +import javax.xml.namespace.QName; + +import org.apache.tuscany.sca.assembly.Implementation; + + + +/** + * The model representing an Web implementation in an SCA assembly model. + */ +public interface WebImplementation extends Implementation { + QName TYPE = new QName(SCA11_NS, "implementation.web"); + + /** + * Returns the webapp URI. + * @return the webapp URI + */ + String getWebURI(); + + /** + * Sets the Webapp URI. + * @param uri the webapp URI + */ + void setWebURI(String webappURI); + + boolean getJSClient(); + void setJSClient(boolean jsCLient); +} diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java new file mode 100644 index 0000000000..df2e6c5520 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java @@ -0,0 +1,34 @@ +/* + * 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.web; + + +/** + * Factory for the Web implementation model. + */ +public interface WebImplementationFactory { + + /** + * Creates a new Web implementation. + * @return a new Web implementation + */ + WebImplementation createWebImplementation(); + +} diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationBuilder.java b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationBuilder.java new file mode 100644 index 0000000000..41adb73f61 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationBuilder.java @@ -0,0 +1,43 @@ +/* + * 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.web.impl; + +import javax.xml.namespace.QName; + +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.builder.BuilderContext; +import org.apache.tuscany.sca.assembly.builder.ImplementationBuilder; +import org.apache.tuscany.sca.implementation.web.WebImplementation; + +/** + * + */ +public class WebImplementationBuilder implements ImplementationBuilder { + + public void build(Component component, WebImplementation implmentation, BuilderContext context) { + ((WebImplementationImpl)implmentation).build(component); + + } + + public QName getImplementationType() { + return WebImplementation.TYPE; + } + +} diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java new file mode 100644 index 0000000000..daff2d23a1 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java @@ -0,0 +1,37 @@ +/* + * 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.web.impl; + +import org.apache.tuscany.sca.implementation.web.WebImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementationFactory; + +/** + * Factory for the Web implementation model. + */ +public class WebImplementationFactoryImpl implements WebImplementationFactory { + + public WebImplementationFactoryImpl() { + } + + public WebImplementation createWebImplementation() { + return new WebImplementationImpl(); + } + +} diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java new file mode 100644 index 0000000000..bdf9c81909 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java @@ -0,0 +1,156 @@ +/* + * 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.web.impl; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.apache.tuscany.sca.assembly.Component; +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.implementation.web.WebImplementation; +import org.apache.tuscany.sca.runtime.RuntimeComponent; + + +/** + * The model representing an Web implementation in an SCA assembly model. + */ +class WebImplementationImpl extends ImplementationImpl implements WebImplementation { + + private List properties = new ArrayList(); + private List references = new ArrayList(); + + private String webURI; + private boolean jsClient = true; + + /** + * Constructs a new Web implementation. + */ + WebImplementationImpl() { + super(TYPE); + } + + public List getProperties() { + return properties; + } + + public List getServices() { + // The Web implementation does not offer services + return Collections.emptyList(); + } + + public List getReferences() { + return references; + } + + public String getWebURI() { + return webURI; + } + + public void setWebURI(String webURI) { + this.webURI = webURI; + } + + /** + * Use preProcess to add any references and properties dynamically + * TODO: also support introspection and handle WEB-INF/web.componentType (spec line 503) + */ + public void build(Component component) { + if (!(component instanceof RuntimeComponent)) { + return; + } + RuntimeComponent rtc = (RuntimeComponent) component; + + for (Reference reference : rtc.getReferences()) { + if (getReference(reference.getName()) == null) { + getReferences().add(createReference(reference)); + } + } + + for (Property property : rtc.getProperties()) { + if (getProperty(property.getName()) == null) { + getProperties().add(createProperty(property)); + } + } + } + + + protected Reference createReference(Reference reference) { + Reference newReference; + try { + newReference = (Reference)reference.clone(); + } catch (CloneNotSupportedException e) { + throw new AssertionError(e); // should not ever happen + } + return newReference; + } + + + protected Property createProperty(Property property) { + Property newProperty; + try { + newProperty = (Property)property.clone(); + } catch (CloneNotSupportedException e) { + throw new AssertionError(e); // should not ever happen + } + return newProperty; + } + + public boolean getJSClient() { + return jsClient; + } + + public void setJSClient(boolean jsClient) { + this.jsClient = jsClient; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + ((webURI == null) ? 0 : webURI.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!super.equals(obj)) { + return false; + } + if (!(obj instanceof WebImplementationImpl)) { + return false; + } + WebImplementationImpl other = (WebImplementationImpl)obj; + if (webURI == null) { + if (other.webURI != null) { + return false; + } + } else if (!webURI.equals(other.webURI)) { + return false; + } + return true; + } + +} diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java new file mode 100644 index 0000000000..afcc85b58f --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java @@ -0,0 +1,126 @@ +/* + * 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.web.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.AssemblyFactory; +import org.apache.tuscany.sca.assembly.ComponentType; +import org.apache.tuscany.sca.assembly.xml.Constants; +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.implementation.web.WebImplementation; +import org.apache.tuscany.sca.implementation.web.WebImplementationFactory; +import org.apache.tuscany.sca.implementation.web.impl.WebImplementationFactoryImpl; + +/** + * Implements a StAX artifact processor for Web implementations. + */ +public class WebImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor { + private static final QName IMPLEMENTATION_WEB = new QName(Constants.SCA11_NS, "implementation.web"); + + private AssemblyFactory assemblyFactory; + private WebImplementationFactory implementationFactory; + + public WebImplementationProcessor(ExtensionPointRegistry extensionPoints) { + FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class); + this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); + this.implementationFactory = new WebImplementationFactoryImpl(); + } + + public QName getArtifactType() { + // Returns the QName of the XML element processed by this processor + return IMPLEMENTATION_WEB; + } + + public Class getModelType() { + // Returns the type of model processed by this processor + return WebImplementation.class; + } + + public WebImplementation read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException { + + // Read an element + WebImplementation implementation = implementationFactory.createWebImplementation(); + implementation.setUnresolved(true); + + // Read the webapp uri attribute + String webURI = getString(reader, "web-uri"); + if (webURI != null) { + implementation.setWebURI(webURI); + + // Set the URI of the component type + implementation.setURI(webURI); + } + + String jsClient = reader.getAttributeValue(Constants.SCA11_TUSCANY_NS, "jsClient"); + if (jsClient != null) { + implementation.setJSClient(Boolean.parseBoolean(jsClient)); + } + + // Skip to end element + while (reader.hasNext()) { + if (reader.next() == END_ELEMENT && IMPLEMENTATION_WEB.equals(reader.getName())) { + break; + } + } + + return implementation; + } + + public void resolve(WebImplementation implementation, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException { + + // Resolve the component type + String uri = implementation.getURI(); + if (uri != null) { + ComponentType componentType = assemblyFactory.createComponentType(); + componentType.setURI("web.componentType"); + componentType = resolver.resolveModel(ComponentType.class, componentType, context); + if (!componentType.isUnresolved()) { + + // Initialize the implementation's services, references and properties + implementation.getServices().addAll(componentType.getServices()); + implementation.getReferences().addAll(componentType.getReferences()); + implementation.getProperties().addAll(componentType.getProperties()); + } + } + implementation.setUnresolved(false); + } + + public void write(WebImplementation implementation, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException { + + // Write + writeStart(writer, IMPLEMENTATION_WEB.getNamespaceURI(), IMPLEMENTATION_WEB.getLocalPart(), + new XAttr("web-uri", implementation.getWebURI())); + + writeEnd(writer); + } +} -- cgit v1.2.3