From a7c1a39d8c3c4ef4d5878dbff726085082a17e8a Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:09:31 +0000 Subject: Moving 2.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835136 13f79535-47bb-0310-9956-ffa450edef68 --- .../xml/DefaultDefinitionsExtensionPoint.java | 121 ----------- .../xml/DefinitionsDocumentProcessor.java | 210 ------------------- .../definitions/xml/DefinitionsExtensionPoint.java | 64 ------ .../sca/definitions/xml/DefinitionsProcessor.java | 226 --------------------- 4 files changed, 621 deletions(-) delete mode 100644 branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java delete mode 100644 branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java delete mode 100644 branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsExtensionPoint.java delete mode 100644 branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java (limited to 'branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca') diff --git a/branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java b/branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java deleted file mode 100644 index aa244ba274..0000000000 --- a/branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java +++ /dev/null @@ -1,121 +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.apache.tuscany.sca.definitions.xml; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.URI; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.definitions.Definitions; -import org.apache.tuscany.sca.extensibility.ServiceDeclaration; -import org.apache.tuscany.sca.extensibility.ServiceDiscovery; - -/** - * Default implementation of an extension point for XML definitionss. - * - * @version $Rev: 758911 $ $Date: 2009-03-26 15:52:27 -0700 (Thu, 26 Mar 2009) $ - */ -public class DefaultDefinitionsExtensionPoint implements DefinitionsExtensionPoint { - private static final Logger logger = Logger.getLogger(DefaultDefinitionsExtensionPoint.class.getName()); - private static final URI DEFINITIONS_URI = URI.create("META-INF/definitions.xml"); - private ExtensionPointRegistry registry; - private List documents = new ArrayList(); - private List definitions = new ArrayList(); - private boolean documentsLoaded; - private boolean loaded; - - public DefaultDefinitionsExtensionPoint(ExtensionPointRegistry registry) { - this.registry = registry; - } - - public void addDefinitionsDocument(URL url) { - documents.add(url); - } - - public void removeDefinitionsDocument(URL url) { - documents.remove(url); - } - - /** - * Load definitions declarations from META-INF/services/ - * org.apache.tuscany.sca.contribution.processor.Definitions files - */ - private synchronized void loadDefinitionsDocuments() { - if (documentsLoaded) - return; - - // Get the definitions declarations - Collection definitionsDeclarations; - try { - definitionsDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(DEFINITIONS_FILE); - } catch (IOException e) { - throw new IllegalStateException(e); - } - - // Find each definitions - for (ServiceDeclaration definitionsDeclaration : definitionsDeclarations) { - URL url = definitionsDeclaration.getResource(definitionsDeclaration.getClassName()); - if (url == null) { - throw new IllegalArgumentException(new FileNotFoundException(definitionsDeclaration.getClassName())); - } - documents.add(url); - } - - documentsLoaded = true; - } - - public synchronized List getDefinitions() { - if (!loaded) { - loadDefinitionsDocuments(); - URLArtifactProcessorExtensionPoint processors = - registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - URLArtifactProcessor processor = processors.getProcessor(Definitions.class); - for (URL url : documents) { - Definitions def; - try { - def = processor.read(null, DEFINITIONS_URI, url); - definitions.add(def); - } catch (ContributionReadException e) { - logger.log(Level.SEVERE, e.getMessage(), e); - } - } - loaded = true; - } - return definitions; - } - - public void addDefinitions(Definitions def) { - this.definitions.add(def); - } - - public void removeDefinitions(Definitions def) { - this.definitions.remove(def); - } -} diff --git a/branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java b/branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java deleted file mode 100644 index 7d87a8a659..0000000000 --- a/branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java +++ /dev/null @@ -1,210 +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.apache.tuscany.sca.definitions.xml; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.net.URL; -import java.net.URLConnection; -import java.security.AccessController; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; -import java.util.HashSet; -import java.util.Set; - -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; - -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.definitions.Definitions; -import org.apache.tuscany.sca.definitions.DefinitionsFactory; -import org.apache.tuscany.sca.definitions.util.DefinitionsUtil; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.Problem.Severity; -import org.apache.tuscany.sca.policy.BindingType; -import org.apache.tuscany.sca.policy.ImplementationType; -import org.apache.tuscany.sca.policy.Intent; -import org.apache.tuscany.sca.policy.PolicySet; - -/** - * A SCA Definitions Document processor. - * - * @version $Rev$ $Date$ - */ -public class DefinitionsDocumentProcessor implements URLArtifactProcessor { - private StAXArtifactProcessor extensionProcessor; - private XMLInputFactory inputFactory; - private DefinitionsFactory definitionsFactory; - private Monitor monitor; - - /** - * Construct a new SCADefinitions processor - * @param assemblyFactory - * @param policyFactory - * @param staxProcessor - */ - public DefinitionsDocumentProcessor(StAXArtifactProcessor staxProcessor, - XMLInputFactory inputFactory, - DefinitionsFactory definitionsFactory, - Monitor monitor) { - this.extensionProcessor = (StAXArtifactProcessor)staxProcessor; - this.inputFactory = inputFactory; - this.definitionsFactory = definitionsFactory; - this.monitor = monitor; - } - - /** - * Constructs a new SCADefinitions processor. - * - * @param modelFactories - * @param staxProcessor - */ - public DefinitionsDocumentProcessor(FactoryExtensionPoint modelFactories, - StAXArtifactProcessor staxProcessor, - Monitor monitor) { - this.extensionProcessor = (StAXArtifactProcessor)staxProcessor; - this.inputFactory = modelFactories.getFactory(XMLInputFactory.class); - this.definitionsFactory = modelFactories.getFactory(DefinitionsFactory.class); - this.monitor = monitor; - } - - /** - * Report a exception. - * - * @param problems - * @param message - * @param model - */ - private void error(String message, Object model, Exception ex) { - if (monitor != null) { - Problem problem = - monitor.createProblem(this.getClass().getName(), - "definitions-xml-validation-messages", - Severity.ERROR, - model, - message, - ex); - monitor.problem(problem); - } - } - - public Definitions read(URL contributionURL, final URI uri, final URL url) throws ContributionReadException { - InputStream urlStream = null; - try { - // Allow privileged access to open URL stream. Add FilePermission to added to security - // policy file. - try { - urlStream = AccessController.doPrivileged(new PrivilegedExceptionAction() { - public InputStream run() throws IOException { - URLConnection connection = url.openConnection(); - connection.setUseCaches(false); - return connection.getInputStream(); - } - }); - } catch (PrivilegedActionException e) { - error("PrivilegedActionException", url, (IOException)e.getException()); - throw (IOException)e.getException(); - } - - //urlStream = createInputStream(url); - XMLStreamReader reader = inputFactory.createXMLStreamReader(url.toString(), urlStream); - - Definitions definitions = definitionsFactory.createDefinitions(); - int event = reader.getEventType(); - while (reader.hasNext()) { - event = reader.next(); - - // We only deal with the root element - if (event == XMLStreamConstants.START_ELEMENT) { - // QName name = reader.getName(); - Object model = extensionProcessor.read(reader); - if (model instanceof Definitions) { - DefinitionsUtil.aggregate((Definitions)model, definitions); - return definitions; - } else { - error("ContributionReadException", model, null); - } - } - } - - return definitions; - } catch (XMLStreamException e) { - ContributionReadException ce = new ContributionReadException(e); - error("ContributionReadException", inputFactory, ce); - throw ce; - } catch (IOException e) { - ContributionReadException ce = new ContributionReadException(e); - error("ContributionReadException", inputFactory, ce); - throw ce; - } finally { - - try { - if (urlStream != null) { - urlStream.close(); - urlStream = null; - } - } catch (IOException ioe) { - //ignore - } - } - } - - // FIXME: [rfeng] We need to validate the definitions against the Conformance Items - // defined by the SCA Policy Framework Spec V1.1 - private static void stripDuplicates(Definitions definitions) { - Set intents = new HashSet(definitions.getIntents()); - Set policySets = new HashSet(definitions.getPolicySets()); - - Set bindingTypes = new HashSet(definitions.getBindingTypes()); - Set implementationTypes = new HashSet(definitions.getImplementationTypes()); - - definitions.getIntents().clear(); - definitions.getIntents().addAll(intents); - definitions.getPolicySets().clear(); - definitions.getPolicySets().addAll(policySets); - definitions.getBindingTypes().clear(); - definitions.getBindingTypes().addAll(bindingTypes); - definitions.getImplementationTypes().clear(); - definitions.getImplementationTypes().addAll(implementationTypes); - } - - public void resolve(Definitions scaDefinitions, ModelResolver resolver) throws ContributionResolveException { - stripDuplicates(scaDefinitions); - extensionProcessor.resolve(scaDefinitions, resolver); - } - - public String getArtifactType() { - return "/META-INF/definitions.xml"; - } - - public Class getModelType() { - return Definitions.class; - } - -} diff --git a/branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsExtensionPoint.java b/branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsExtensionPoint.java deleted file mode 100644 index 61b815577f..0000000000 --- a/branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsExtensionPoint.java +++ /dev/null @@ -1,64 +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.apache.tuscany.sca.definitions.xml; - -import java.net.URL; -import java.util.List; - -import org.apache.tuscany.sca.definitions.Definitions; - -/** - * An extension point for built-in SCA intent/policySet definition files - * - * @version $Rev: 758911 $ $Date: 2009-03-26 15:52:27 -0700 (Thu, 26 Mar 2009) $ - */ -public interface DefinitionsExtensionPoint { - String DEFINITIONS_FILE = "org.apache.tuscany.sca.definitions.xml.Definitions"; - - /** - * Add a definitions document - * - * @param url the URL of the definitions - */ - void addDefinitionsDocument(URL url); - - /** - * Remove a definitions document - * - * @param url the URL of the definitions - */ - void removeDefinitionsDocument(URL url); - - /** - * @param definitions - */ - void addDefinitions(Definitions definitions); - /** - * @param definitions - */ - void removeDefinitions(Definitions definitions); - - /** - * Get the list of definitions - * @return A list of definitions - */ - List getDefinitions(); - -} diff --git a/branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java b/branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java deleted file mode 100644 index 7b80a750d2..0000000000 --- a/branches/sca-java-2.0-M3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java +++ /dev/null @@ -1,226 +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.apache.tuscany.sca.definitions.xml; - -import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; -import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; - -import java.util.ArrayList; -import java.util.List; - -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.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.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.definitions.Definitions; -import org.apache.tuscany.sca.definitions.DefinitionsFactory; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.policy.BindingType; -import org.apache.tuscany.sca.policy.ImplementationType; -import org.apache.tuscany.sca.policy.Intent; -import org.apache.tuscany.sca.policy.PolicySet; - -/** - * Processor for SCA Definitions - * - * @version $Rev$ $Date$ - */ -public class DefinitionsProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor { - - private StAXArtifactProcessor extensionProcessor; - private DefinitionsFactory definitionsFactory; - private Monitor monitor; - - public static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903"; - public static final String BINDING = "binding"; - public static final String IMPLEMENTATION = "implementation"; - public static final String DEFINITIONS = "definitions"; - public static final QName DEFINITIONS_QNAME = new QName(SCA11_NS, DEFINITIONS); - public static final String TARGET_NAMESPACE = "targetNamespace"; - public static final String NAME = "name"; - - public DefinitionsProcessor(FactoryExtensionPoint factoryExtensionPoint, - StAXArtifactProcessor extensionProcessor, - Monitor monitor) { - this.extensionProcessor = extensionProcessor; - this.monitor = monitor; - this.definitionsFactory = factoryExtensionPoint.getFactory(DefinitionsFactory.class); - } - - public Definitions read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException { - QName name = null; - Definitions definitions = null; - String targetNamespace = null; - - while (reader.hasNext()) { - int event = reader.getEventType(); - switch (event) { - case START_ELEMENT: { - name = reader.getName(); - if (DEFINITIONS_QNAME.equals(name)) { - definitions = definitionsFactory.createDefinitions(); - targetNamespace = reader.getAttributeValue(null, TARGET_NAMESPACE); - definitions.setTargetNamespace(targetNamespace); - } else { - Object extension = extensionProcessor.read(reader); - if (extension != null) { - if (extension instanceof Intent) { - Intent intent = (Intent)extension; - intent.setName(new QName(targetNamespace, intent.getName().getLocalPart())); - definitions.getIntents().add(intent); - for (Intent i : intent.getQualifiedIntents()) { - i.setName(new QName(targetNamespace, i.getName().getLocalPart())); - } - } else if (extension instanceof PolicySet) { - PolicySet policySet = (PolicySet)extension; - policySet.setName(new QName(targetNamespace, policySet.getName().getLocalPart())); - definitions.getPolicySets().add(policySet); - } else if (extension instanceof Binding) { - Binding binding = (Binding)extension; - definitions.getBindings().add(binding); - } else if (extension instanceof BindingType) { - definitions.getBindingTypes().add((BindingType)extension); - } else if (extension instanceof ImplementationType) { - definitions.getImplementationTypes().add((ImplementationType)extension); - } - } - break; - } - } - - case XMLStreamConstants.CHARACTERS: - break; - - case END_ELEMENT: - name = reader.getName(); - if (DEFINITIONS_QNAME.equals(name)) { - return definitions; - } - break; - } - - //Read the next element - if (reader.hasNext()) { - reader.next(); - } - } - return definitions; - } - - public void write(Definitions definitions, XMLStreamWriter writer) throws ContributionWriteException, - XMLStreamException { - - writeStartDocument(writer, SCA11_NS, DEFINITIONS, new XAttr(TARGET_NAMESPACE, definitions.getTargetNamespace())); - - for (Intent policyIntent : definitions.getIntents()) { - extensionProcessor.write(policyIntent, writer); - } - - for (PolicySet policySet : definitions.getPolicySets()) { - extensionProcessor.write(policySet, writer); - } - - for (BindingType bindingType : definitions.getBindingTypes()) { - extensionProcessor.write(bindingType, writer); - } - - for (ImplementationType implType : definitions.getImplementationTypes()) { - extensionProcessor.write(implType, writer); - } - - writeEndDocument(writer); - } - - public void resolve(Definitions scaDefns, ModelResolver resolver) throws ContributionResolveException { - // start by adding all of the top level artifacts into the resolver as there - // are many cross artifact references in a definitions file and we don't want - // to be dependent on the order things appear - - List intents = new ArrayList(); - List policySets = new ArrayList(); - List referredPolicySets = new ArrayList(); - - for (Intent intent : scaDefns.getIntents()) { - intents.add(intent); - resolver.addModel(intent); - for (Intent i : intent.getQualifiedIntents()) { - intents.add(i); - resolver.addModel(i); - } - } - - for (PolicySet policySet : scaDefns.getPolicySets()) { - if (policySet.getReferencedPolicySets().isEmpty()) { - policySets.add(policySet); - } else { - referredPolicySets.add(policySet); - } - - resolver.addModel(policySet); - } - - for (BindingType bindingType : scaDefns.getBindingTypes()) { - resolver.addModel(bindingType); - } - - for (ImplementationType implType : scaDefns.getImplementationTypes()) { - resolver.addModel(implType); - } - - // now resolve everything to ensure that any references between - // artifacts are satisfied - - for (Intent policyIntent : intents) - extensionProcessor.resolve(policyIntent, resolver); - - for (PolicySet policySet : policySets) - extensionProcessor.resolve(policySet, resolver); - - for (PolicySet policySet : referredPolicySets) - extensionProcessor.resolve(policySet, resolver); - - for (BindingType bindingType : scaDefns.getBindingTypes()) { - extensionProcessor.resolve(bindingType, resolver); - } - - for (ImplementationType implementationType : scaDefns.getImplementationTypes()) { - extensionProcessor.resolve(implementationType, resolver); - } - } - - public QName getArtifactType() { - return DEFINITIONS_QNAME; - } - - public Class getModelType() { - return Definitions.class; - } - -} -- cgit v1.2.3