From 94fe4f9f4c1c02bd655e0be72c5ee9c9cb22941c Mon Sep 17 00:00:00 2001 From: rfeng Date: Thu, 26 Jul 2012 18:20:29 +0000 Subject: Add the remoteEndpoints configuration for node.xml to define statically-configured remote endpoints git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1366125 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/assembly/xml/BaseAssemblyProcessor.java | 2 +- .../trunk/modules/node-impl/META-INF/MANIFEST.MF | 2 + .../xml/NodeConfigurationProcessor.java | 31 ++--- .../node/configuration/xml/RemoteEndpoints.java | 29 +++++ .../xml/RemoteEndpointsProcessor.java | 134 +++++++++++++++++++++ ...ca.contribution.processor.StAXArtifactProcessor | 2 + .../tuscany/sca/node/configuration/node1.xml | 22 +++- 7 files changed, 206 insertions(+), 16 deletions(-) create mode 100644 sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/RemoteEndpoints.java create mode 100644 sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/RemoteEndpointsProcessor.java (limited to 'sca-java-2.x/trunk/modules') diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java index a1e24f1494..2906e41d0c 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java @@ -94,7 +94,7 @@ import org.w3c.dom.Node; * * @version $Rev$ $Date$ */ -abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor { +public abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor { protected AssemblyFactory assemblyFactory; protected PolicyFactory policyFactory; diff --git a/sca-java-2.x/trunk/modules/node-impl/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/node-impl/META-INF/MANIFEST.MF index 0f8eebd936..23d0c125ab 100644 --- a/sca-java-2.x/trunk/modules/node-impl/META-INF/MANIFEST.MF +++ b/sca-java-2.x/trunk/modules/node-impl/META-INF/MANIFEST.MF @@ -12,6 +12,7 @@ Import-Package: javax.management;resolution:=optional, javax.xml.stream, 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", org.apache.tuscany.sca.common.java.io;version="2.0.0", org.apache.tuscany.sca.common.xml.stax;version="2.0.0", org.apache.tuscany.sca.context;version="2.0.0", @@ -34,6 +35,7 @@ Import-Package: javax.management;resolution:=optional, org.apache.tuscany.sca.node.configuration;version="2.0.0", org.apache.tuscany.sca.node.extensibility, org.apache.tuscany.sca.node.impl;version="2.0.0", + org.apache.tuscany.sca.policy;version="2.0.0", org.apache.tuscany.sca.runtime;version="2.0.0", org.apache.tuscany.sca.work;version="2.0.0", org.oasisopen.sca;version="2.0.0", diff --git a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java index 48d76225fb..a476df3043 100644 --- a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java +++ b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java @@ -69,8 +69,7 @@ public class NodeConfigurationProcessor extends BaseStAXArtifactProcessor implem private NodeConfigurationFactory nodeConfigurationFactory; private StAXHelper helper; - public NodeConfigurationProcessor(ExtensionPointRegistry registry, - StAXArtifactProcessor processor) { + public NodeConfigurationProcessor(ExtensionPointRegistry registry, StAXArtifactProcessor processor) { FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class); this.nodeConfigurationFactory = modelFactories.getFactory(NodeConfigurationFactory.class); this.processor = processor; @@ -87,7 +86,8 @@ public class NodeConfigurationProcessor extends BaseStAXArtifactProcessor implem return NodeConfiguration.class; } - public NodeConfiguration read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException { + public NodeConfiguration read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, + XMLStreamException { NodeConfiguration node = null; ContributionConfiguration contribution = null; @@ -136,7 +136,7 @@ public class NodeConfigurationProcessor extends BaseStAXArtifactProcessor implem if (contribution != null) { contribution.getDeploymentComposites().add(composite); } - } else if(BASE_URI.equals(name)) { + } else if (BASE_URI.equals(name)) { // We also support element String baseURI = reader.getElementText(); if (baseURI != null && binding != null) { @@ -159,7 +159,9 @@ public class NodeConfigurationProcessor extends BaseStAXArtifactProcessor implem composite.setContent(sw.toString()); } else { Object ext = processor.read(reader, context); - if (ext instanceof Endpoint) { + if (ext instanceof RemoteEndpoints) { + node.getEndpointDescriptions().addAll((RemoteEndpoints)ext); + } else if (ext instanceof Endpoint) { node.getEndpointDescriptions().add((Endpoint)ext); } else { node.getExtensions().add(ext); @@ -189,11 +191,12 @@ public class NodeConfigurationProcessor extends BaseStAXArtifactProcessor implem return node; } - public void resolve(NodeConfiguration node, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException { + public void resolve(NodeConfiguration node, ModelResolver resolver, ProcessorContext context) + throws ContributionResolveException { } - public void write(NodeConfiguration node, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, - XMLStreamException { + public void write(NodeConfiguration node, XMLStreamWriter writer, ProcessorContext context) + throws ContributionWriteException, XMLStreamException { writeStart(writer, NODE.getNamespaceURI(), @@ -243,13 +246,13 @@ public class NodeConfigurationProcessor extends BaseStAXArtifactProcessor implem new XAttr("baseURIs", baseURIs)); writeEnd(writer); } - + // FIXME: The composite processor assumes that composite is root element -// for (Endpoint o : node.getEndpointDescriptions()) { -// processor.write(o, writer, context); -// } - - for(Object o: node.getExtensions()) { + // for (Endpoint o : node.getEndpointDescriptions()) { + // processor.write(o, writer, context); + // } + + for (Object o : node.getExtensions()) { processor.write(o, writer, context); } diff --git a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/RemoteEndpoints.java b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/RemoteEndpoints.java new file mode 100644 index 0000000000..b4e631c08e --- /dev/null +++ b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/RemoteEndpoints.java @@ -0,0 +1,29 @@ +/* + * 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.node.configuration.xml; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.tuscany.sca.assembly.Endpoint; + +public class RemoteEndpoints extends ArrayList { + private static final long serialVersionUID = -9045949145596529956L; +} diff --git a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/RemoteEndpointsProcessor.java b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/RemoteEndpointsProcessor.java new file mode 100644 index 0000000000..dc4b79e099 --- /dev/null +++ b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/RemoteEndpointsProcessor.java @@ -0,0 +1,134 @@ +/* + * 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.node.configuration.xml; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; + +import org.apache.tuscany.sca.assembly.Binding; +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.ComponentService; +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.assembly.Endpoint; +import org.apache.tuscany.sca.assembly.xml.BaseAssemblyProcessor; +import org.apache.tuscany.sca.assembly.xml.Constants; +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.processor.StAXAttributeProcessor; +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.policy.PolicySet; + +/** + * A StaX processor for remote endpoints + */ +public class RemoteEndpointsProcessor extends BaseAssemblyProcessor implements StAXArtifactProcessor { + private final static String ENDPOINT = "remoteEndpoints"; + private final static QName ENDPOINT_QNAME = new QName(Constants.SCA11_TUSCANY_NS, ENDPOINT); + + private ExtensionPointRegistry registry; + + public RemoteEndpointsProcessor(ExtensionPointRegistry registry, + StAXArtifactProcessor extensionProcessor, + StAXAttributeProcessor extensionAttributeProcessor) { + + super(modelFactories(registry), extensionProcessor); + this.registry = registry; + } + + /** + * Returns the model factory extension point to use. + * + * @param extensionPoints + * @return + */ + private static FactoryExtensionPoint modelFactories(ExtensionPointRegistry extensionPoints) { + return extensionPoints.getExtensionPoint(FactoryExtensionPoint.class); + } + + public QName getArtifactType() { + return ENDPOINT_QNAME; + } + + public RemoteEndpoints read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, + XMLStreamException { + RemoteEndpoints endpoints = new RemoteEndpoints(); + if (reader.getEventType() == XMLStreamConstants.START_DOCUMENT) { + reader.nextTag(); + } + if (reader.getEventType() == XMLStreamConstants.START_ELEMENT && ENDPOINT_QNAME.equals(reader.getName())) { + // Skip the "endpoint" element wrapper + reader.nextTag(); + } + Object model = extensionProcessor.read(reader, context); + if (model instanceof Composite) { + Composite composite = (Composite)model; + for (Component component : composite.getComponents()) { + if (component.getURI() == null) { + // Default to the component name as the uri + component.setURI(component.getName()); + } + for (ComponentService service : component.getServices()) { + for (Binding binding : service.getBindings()) { + Endpoint endpoint = assemblyFactory.createEndpoint(); + endpoint.setComponent(component); + endpoint.setService(service); + endpoint.setBinding(binding); + + // retrieve the stash of intents and policy sets from the component + endpoint.getRequiredIntents().addAll(component.getRequiredIntents()); + endpoint.getPolicySets().addAll(component.getPolicySets()); + + endpoints.add(endpoint); + } + } + } + } + return endpoints; + } + + public void write(RemoteEndpoints model, XMLStreamWriter writer, ProcessorContext context) + throws ContributionWriteException, XMLStreamException { + + } + + public Class getModelType() { + return RemoteEndpoints.class; + } + + public void resolve(RemoteEndpoints model, ModelResolver resolver, ProcessorContext context) + throws ContributionResolveException { + // the only thing we'll resolve here is the policy model as the endpoint + // matching algorithm needs to look inside the policy model + + for (Endpoint endpoint : model) { + for (PolicySet policySet : endpoint.getPolicySets()) { + extensionProcessor.resolve(policySet, resolver, context); + } + } + } +} diff --git a/sca-java-2.x/trunk/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor index a9d0f5ef52..3d377c39a4 100644 --- a/sca-java-2.x/trunk/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ b/sca-java-2.x/trunk/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor @@ -15,4 +15,6 @@ # specific language governing permissions and limitations # under the License. org.apache.tuscany.sca.node.configuration.xml.NodeConfigurationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#node,model=org.apache.tuscany.sca.node.configuration.NodeConfiguration +org.apache.tuscany.sca.node.configuration.xml.RemoteEndpointsProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#remoteEndpoints,model=org.apache.tuscany.sca.node.configuration.xml.RemoteEndpoints + diff --git a/sca-java-2.x/trunk/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml b/sca-java-2.x/trunk/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml index 0e574e61fe..914458faca 100644 --- a/sca-java-2.x/trunk/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml +++ b/sca-java-2.x/trunk/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml @@ -59,9 +59,29 @@ - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3