From 28f92c6fc62f3bc0637ac77681aabcc8c0b5e42c Mon Sep 17 00:00:00 2001 From: lresende Date: Thu, 11 Sep 2008 04:12:24 +0000 Subject: Renaming branch git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@694107 13f79535-47bb-0310-9956-ffa450edef68 --- branches/trunk-20080910/modules/policy-xml/LICENSE | 205 --------- branches/trunk-20080910/modules/policy-xml/NOTICE | 6 - branches/trunk-20080910/modules/policy-xml/pom.xml | 145 ------ .../sca/policy/xml/BindingTypeProcessor.java | 68 --- .../policy/xml/ImplementationTypeProcessor.java | 68 --- .../policy/xml/IntentAttachPointTypeProcessor.java | 248 ----------- .../tuscany/sca/policy/xml/PolicyConstants.java | 75 ---- .../sca/policy/xml/PolicyIntentProcessor.java | 417 ------------------ .../tuscany/sca/policy/xml/PolicySetProcessor.java | 487 --------------------- .../sca/policy/xml/ProfileIntentProcessor.java | 45 -- .../sca/policy/xml/QualifiedIntentProcessor.java | 45 -- .../sca/policy/xml/SimpleIntentProcessor.java | 45 -- ...ca.contribution.processor.StAXArtifactProcessor | 24 - .../policy-xml-validation-messages.properties | 44 -- .../sca/policy/xml/ReadDocumentTestCase.java | 269 ------------ .../sca/policy/xml/TestPolicyProcessor.java | 74 ---- .../tuscany/sca/policy/xml/test_definitions.xml | 255 ----------- 17 files changed, 2520 deletions(-) delete mode 100644 branches/trunk-20080910/modules/policy-xml/LICENSE delete mode 100644 branches/trunk-20080910/modules/policy-xml/NOTICE delete mode 100644 branches/trunk-20080910/modules/policy-xml/pom.xml delete mode 100644 branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java delete mode 100644 branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java delete mode 100644 branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java delete mode 100644 branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java delete mode 100644 branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java delete mode 100644 branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java delete mode 100644 branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java delete mode 100644 branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java delete mode 100644 branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java delete mode 100644 branches/trunk-20080910/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor delete mode 100644 branches/trunk-20080910/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties delete mode 100644 branches/trunk-20080910/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java delete mode 100644 branches/trunk-20080910/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java delete mode 100644 branches/trunk-20080910/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml (limited to 'branches/trunk-20080910/modules/policy-xml') diff --git a/branches/trunk-20080910/modules/policy-xml/LICENSE b/branches/trunk-20080910/modules/policy-xml/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. - - - diff --git a/branches/trunk-20080910/modules/policy-xml/NOTICE b/branches/trunk-20080910/modules/policy-xml/NOTICE deleted file mode 100644 index 1325efd8bf..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2008 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/trunk-20080910/modules/policy-xml/pom.xml b/branches/trunk-20080910/modules/policy-xml/pom.xml deleted file mode 100644 index b09443b018..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/pom.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 1.4-SNAPSHOT - ../pom.xml - - tuscany-policy-xml - Apache Tuscany SCA Policy XML Model - - - - org.apache.tuscany.sca - tuscany-policy - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-contribution - 1.4-SNAPSHOT - - - - - - org.codehaus.woodstox - wstx-asl - 3.2.1 - runtime - - - stax - stax-api - - - - - - - - - - - org.apache.felix - maven-bundle-plugin - - - - ${tuscany.version} - org.apache.tuscany.sca.policy.xml - ${pom.name} - org.apache.tuscany.sca.policy.xml* - - - - - - - diff --git a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java deleted file mode 100644 index d47cbd7dbe..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java +++ /dev/null @@ -1,68 +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.policy.xml; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.service.ContributionResolveException; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.policy.IntentAttachPointType; -import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory; -import org.apache.tuscany.sca.policy.PolicyFactory; -import org.apache.tuscany.sca.policy.impl.BindingTypeImpl; - - -/** - * Processor for handling XML models of BindingType meta data definitions - * - * @version $Rev$ $Date$ - */ -public class BindingTypeProcessor extends IntentAttachPointTypeProcessor { - - public BindingTypeProcessor(PolicyFactory policyFactory, IntentAttachPointTypeFactory intentAttachPointTypeFactory, - StAXArtifactProcessor extensionProcessor, Monitor monitor) { - super(policyFactory, intentAttachPointTypeFactory, extensionProcessor, monitor); - } - - public BindingTypeProcessor(ModelFactoryExtensionPoint modelFactories, - StAXArtifactProcessor extensionProcessor, - Monitor monitor) { - super(modelFactories.getFactory(PolicyFactory.class), - modelFactories.getFactory(IntentAttachPointTypeFactory.class), extensionProcessor, monitor); - } - - public QName getArtifactType() { - return BINDING_TYPE_QNAME; - } - - @Override - protected IntentAttachPointType resolveExtensionType(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException { - if ( extnType instanceof BindingTypeImpl ) { - BindingTypeImpl bindingType = (BindingTypeImpl)extnType; - return resolver.resolveModel(BindingTypeImpl.class, bindingType); - } else { - return extnType; - } - - } -} diff --git a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java deleted file mode 100644 index 119afa3473..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java +++ /dev/null @@ -1,68 +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.policy.xml; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.service.ContributionResolveException; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.policy.IntentAttachPointType; -import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory; -import org.apache.tuscany.sca.policy.PolicyFactory; -import org.apache.tuscany.sca.policy.impl.ImplementationTypeImpl; - - -/** - * Processor for handling XML models of ImplementationType meta data definitions - * - * @version $Rev$ $Date$ - */ -public class ImplementationTypeProcessor extends IntentAttachPointTypeProcessor { - - public ImplementationTypeProcessor(PolicyFactory policyFactory, IntentAttachPointTypeFactory intentAttachPointTypeFactory, - StAXArtifactProcessor extensionProcessor, Monitor monitor) { - super(policyFactory, intentAttachPointTypeFactory, extensionProcessor, monitor); - } - - public ImplementationTypeProcessor(ModelFactoryExtensionPoint modelFactories, - StAXArtifactProcessor extensionProcessor, - Monitor monitor) { - super(modelFactories.getFactory(PolicyFactory.class), - modelFactories.getFactory(IntentAttachPointTypeFactory.class), extensionProcessor, monitor); - } - - public QName getArtifactType() { - return IMPLEMENTATION_TYPE_QNAME; - } - - @Override - protected IntentAttachPointType resolveExtensionType(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException { - if ( extnType instanceof ImplementationTypeImpl ) { - ImplementationTypeImpl implType = (ImplementationTypeImpl)extnType; - return resolver.resolveModel(ImplementationTypeImpl.class, implType); - } else { - return extnType; - } - - } -} diff --git a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java b/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java deleted file mode 100644 index ec357aea93..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java +++ /dev/null @@ -1,248 +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.policy.xml; - -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; - -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.builder.impl.ProblemImpl; -import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.service.ContributionReadException; -import org.apache.tuscany.sca.contribution.service.ContributionResolveException; -import org.apache.tuscany.sca.contribution.service.ContributionWriteException; -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.Intent; -import org.apache.tuscany.sca.policy.IntentAttachPointType; -import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory; -import org.apache.tuscany.sca.policy.PolicyFactory; -import org.apache.tuscany.sca.policy.impl.BindingTypeImpl; -import org.apache.tuscany.sca.policy.impl.ImplementationTypeImpl; - - -/** - * Processor for handling XML models of ExtensionType meta data definitions - * - * @version $Rev$ $Date$ - */ -abstract class IntentAttachPointTypeProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor, PolicyConstants { - - private IntentAttachPointTypeFactory attachPointTypeFactory; - private PolicyFactory policyFactory; - private Monitor monitor; - - protected abstract IntentAttachPointType resolveExtensionType(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException; - - public IntentAttachPointTypeProcessor(PolicyFactory policyFactory, - IntentAttachPointTypeFactory attachPointTypeFactory, - StAXArtifactProcessor extensionProcessor, - Monitor monitor) { - this.policyFactory = policyFactory; - this.attachPointTypeFactory = attachPointTypeFactory; - this.monitor = monitor; - } - - /** - * Report a error. - * - * @param problems - * @param message - * @param model - */ - private void error(String message, Object model, Object... messageParameters) { - if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); - monitor.problem(problem); - } - } - - public IntentAttachPointType read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException { - QName type = getQName(reader, TYPE); - - if ( type != null ) { - if ( type.getLocalPart().startsWith(BINDING) ) { - IntentAttachPointType bindingType = attachPointTypeFactory.createBindingType(); - bindingType.setName(type); - bindingType.setUnresolved(true); - - readAlwaysProvidedIntents(bindingType, reader); - readMayProvideIntents(bindingType, reader); - return bindingType; - } else if ( type.getLocalPart().startsWith(IMPLEMENTATION) ) { - IntentAttachPointType implType = attachPointTypeFactory.createImplementationType(); - implType.setName(type); - implType.setUnresolved(true); - - readAlwaysProvidedIntents(implType, reader); - readMayProvideIntents(implType, reader); - return implType; - } else { - error("UnrecognizedIntentAttachPointType", reader, type); - //throw new ContributionReadException("Unrecognized IntentAttachPointType - " + type); - } - } else { - error("RequiredAttributeMissing", reader, TYPE); - //throw new ContributionReadException("Required attribute '" + TYPE + - //"' missing from BindingType Definition"); - } - return null; - } - - private void readAlwaysProvidedIntents(IntentAttachPointType extnType, XMLStreamReader reader) { - String value = reader.getAttributeValue(null, ALWAYS_PROVIDES); - if (value != null) { - List alwaysProvided = extnType.getAlwaysProvidedIntents(); - for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) { - QName qname = getQNameValue(reader, tokens.nextToken()); - Intent intent = policyFactory.createIntent(); - intent.setName(qname); - alwaysProvided.add(intent); - } - } - } - - private void readMayProvideIntents(IntentAttachPointType extnType, XMLStreamReader reader) { - String value = reader.getAttributeValue(null, MAY_PROVIDE); - if (value != null) { - List mayProvide = extnType.getMayProvideIntents(); - for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) { - QName qname = getQNameValue(reader, tokens.nextToken()); - Intent intent = policyFactory.createIntent(); - intent.setName(qname); - mayProvide.add(intent); - } - } - } - - public void write(IntentAttachPointType extnType, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException { - - // Write an - if ( extnType instanceof BindingTypeImpl ) { - writer.writeStartElement(SCA10_NS, BINDING_TYPE); - } else if ( extnType instanceof ImplementationTypeImpl ) { - writer.writeStartElement(SCA10_NS, IMPLEMENTATION_TYPE); - } - - writeAlwaysProvidesIntentsAttribute(extnType, writer); - writeMayProvideIntentsAttribute(extnType, writer); - - writer.writeEndElement(); - } - - private void writeMayProvideIntentsAttribute(IntentAttachPointType extnType, XMLStreamWriter writer) throws XMLStreamException { - StringBuffer sb = new StringBuffer(); - for ( Intent intent : extnType.getMayProvideIntents() ) { - writer.writeNamespace(intent.getName().getPrefix(), intent.getName().getNamespaceURI()); - sb.append(intent.getName().getPrefix() + COLON + intent.getName().getLocalPart()); - sb.append(WHITE_SPACE); - } - - if ( sb.length() > 0 ) { - writer.writeAttribute(MAY_PROVIDE, sb.toString()); - } - } - - private void writeAlwaysProvidesIntentsAttribute(IntentAttachPointType extnType, XMLStreamWriter writer) throws XMLStreamException { - StringBuffer sb = new StringBuffer(); - for ( Intent intent : extnType.getAlwaysProvidedIntents() ) { - writer.writeNamespace(intent.getName().getPrefix(), intent.getName().getNamespaceURI()); - sb.append(intent.getName().getPrefix() + COLON + intent.getName().getLocalPart()); - sb.append(WHITE_SPACE); - } - - if ( sb.length() > 0 ) { - writer.writeAttribute(ALWAYS_PROVIDES, sb.toString()); - - } - } - - public void resolve(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException { - - if (extnType != null && extnType.isUnresolved()) { - resolveAlwaysProvidedIntents(extnType, resolver); - resolveMayProvideIntents(extnType, resolver); - extnType.setUnresolved(false); - //resolveExtensionType(extnType, resolver); - } - } - - private void resolveAlwaysProvidedIntents(IntentAttachPointType extensionType, - ModelResolver resolver) throws ContributionResolveException { - if (extensionType != null) { - // resolve all provided intents - List alwaysProvided = new ArrayList(); - for (Intent providedIntent : extensionType.getAlwaysProvidedIntents()) { - if (providedIntent.isUnresolved()) { - providedIntent = resolver.resolveModel(Intent.class, providedIntent); - if (!providedIntent.isUnresolved()) { - alwaysProvided.add(providedIntent); - } else { - error("AlwaysProvidedIntentNotFound", resolver, providedIntent, extensionType); - //throw new ContributionResolveException("Always Provided Intent - " + providedIntent - //+ " not found for ExtensionType " - //+ extensionType); - } - } else { - alwaysProvided.add(providedIntent); - } - } - extensionType.getAlwaysProvidedIntents().clear(); - extensionType.getAlwaysProvidedIntents().addAll(alwaysProvided); - } - } - - private void resolveMayProvideIntents(IntentAttachPointType extensionType, - ModelResolver resolver) throws ContributionResolveException { - if (extensionType != null) { - // resolve all provided intents - List mayProvide = new ArrayList(); - for (Intent providedIntent : extensionType.getMayProvideIntents()) { - if (providedIntent.isUnresolved()) { - providedIntent = resolver.resolveModel(Intent.class, providedIntent); - if (!providedIntent.isUnresolved()) { - mayProvide.add(providedIntent); - } else { - error("MayProvideIntentNotFound", resolver, providedIntent, extensionType); - //throw new ContributionResolveException("May Provide Intent - " + providedIntent - //+ " not found for ExtensionType " - //+ extensionType); - } - } else { - mayProvide.add(providedIntent); - } - } - extensionType.getMayProvideIntents().clear(); - extensionType.getMayProvideIntents().addAll(mayProvide); - } - } - - public Class getModelType() { - return IntentAttachPointType.class; - } -} diff --git a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java deleted file mode 100644 index 3f1008e9a8..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java +++ /dev/null @@ -1,75 +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.policy.xml; - -import javax.xml.namespace.QName; - -/** - * constants related to policy framework - * - * @version $Rev$ $Date$ - */ -public interface PolicyConstants { - String WHITE_SPACE = " "; - String COLON = ":"; - String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0"; - String TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0"; - String INTENT = "intent"; - String POLICY_SET = "policySet"; - String POLICY_SET_REFERENCE = "policySetReference"; - String INTENT_MAP = "intentMap"; - String NAME = "name"; - String TARGET_NAMESPACE = "targetNamespace"; - String SCA_DEFINITIONS = "definitions"; - String CONSTRAINS = "constrains"; - String DESCRIPTION = "description"; - String PROVIDES = "provides"; - String APPLIES_TO = "appliesTo"; - String ALWAYS_APPLIES_TO = "alwaysAppliesTo"; - String QUALIFIER = "."; - String INTENT_MAP_QUALIFIER = "qualifier"; - String REQUIRES = "requires"; - String EXCLUDES = "excludes"; - String DEFAULT = "default"; - - String ALWAYS_PROVIDES = "alwaysProvides"; - String MAY_PROVIDE = "mayProvide"; - String TYPE = "type"; - String IMPLEMENTATION_TYPE = "implementationType"; - String BINDING_TYPE = "bindingType"; - QName IMPLEMENTATION_TYPE_QNAME = new QName(SCA10_NS, IMPLEMENTATION_TYPE); - QName BINDING_TYPE_QNAME = new QName(SCA10_NS, BINDING_TYPE); - String BINDING = "binding"; - String IMPLEMENTATION = "implementation"; - - QName POLICY_INTENT_QNAME = new QName(SCA10_NS, INTENT); - QName POLICY_SET_QNAME = new QName(SCA10_NS, POLICY_SET); - QName POLICY_INTENT_MAP_QNAME = new QName(SCA10_NS, INTENT_MAP); - QName SCA_DEFINITIONS_QNAME = new QName(SCA10_NS, SCA_DEFINITIONS); - QName DESCRIPTION_QNAME = new QName(SCA10_NS, DESCRIPTION); - QName POLICY_INTENT_MAP_QUALIFIER_QNAME = new QName(SCA10_NS, INTENT_MAP_QUALIFIER); - QName POLICY_SET_REFERENCE_QNAME = new QName(SCA10_NS, POLICY_SET_REFERENCE); - - String QUALIFIED_INTENT_CONSTRAINS_ERROR = " - Qualified Intents must not specify 'constrains' attribute"; - - - - - -} diff --git a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java deleted file mode 100644 index 76ef8df298..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java +++ /dev/null @@ -1,417 +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.policy.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 java.util.StringTokenizer; - -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.builder.impl.ProblemImpl; -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.service.ContributionReadException; -import org.apache.tuscany.sca.contribution.service.ContributionResolveException; -import org.apache.tuscany.sca.contribution.service.ContributionWriteException; -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.Intent; -import org.apache.tuscany.sca.policy.PolicyFactory; -import org.apache.tuscany.sca.policy.ProfileIntent; -import org.apache.tuscany.sca.policy.QualifiedIntent; - -/** - * Processor for handling XML models of PolicyIntent definitions - * - * @version $Rev$ $Date$ - */ -abstract class PolicyIntentProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor, PolicyConstants { - - private PolicyFactory policyFactory; - private Monitor monitor; - - public PolicyIntentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) { - this.policyFactory = modelFactories.getFactory(PolicyFactory.class); - this.monitor = monitor; - } - - public PolicyIntentProcessor(PolicyFactory policyFactory, Monitor monitor) { - this.policyFactory = policyFactory; - this.monitor = monitor; - } - - /** - * Report a error. - * - * @param problems - * @param message - * @param model - */ - private void error(String message, Object model, Object... messageParameters) { - if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); - monitor.problem(problem); - } - } - - public T read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException { - Intent policyIntent = null; - String policyIntentName = reader.getAttributeValue(null, NAME); - if (policyIntentName == null) { - error("IntentNameMissing", reader); - return (T)policyIntent; - } - - // Read an - if (reader.getAttributeValue(null, REQUIRES) != null) { - policyIntent = policyFactory.createProfileIntent(); - } else if ( policyIntentName != null && policyIntentName.indexOf(QUALIFIER) != -1) { - policyIntent = policyFactory.createQualifiedIntent(); - - int qualifierIndex = policyIntentName.lastIndexOf(QUALIFIER); - Intent qualifiableIntent = policyFactory.createIntent(); - qualifiableIntent.setUnresolved(true); - qualifiableIntent.setName(new QName(policyIntentName.substring(0, qualifierIndex))); - - ((QualifiedIntent)policyIntent).setQualifiableIntent(qualifiableIntent); - } else { - policyIntent = policyFactory.createIntent(); - } - policyIntent.setName(new QName(policyIntentName)); - - if ( policyIntent instanceof ProfileIntent ) { - readRequiredIntents((ProfileIntent)policyIntent, reader); - } - else { - readExcludedIntents(policyIntent, reader); - } - - readConstrainedArtifacts(policyIntent, reader); - - int event = reader.getEventType(); - QName name = null; - while (reader.hasNext()) { - event = reader.getEventType(); - switch (event) { - case START_ELEMENT : { - name = reader.getName(); - if (DESCRIPTION_QNAME.equals(name)) { - policyIntent.setDescription(reader.getElementText()); - } - break; - } - } - if (event == END_ELEMENT && POLICY_INTENT_QNAME.equals(reader.getName())) { - break; - } - - //Read the next element - if (reader.hasNext()) { - reader.next(); - } - } - return (T)policyIntent; - } - - public void write(T policyIntent, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException { - // Write an - writer.writeStartElement(PolicyConstants.SCA10_NS, INTENT); - writer.writeNamespace(policyIntent.getName().getPrefix(), policyIntent.getName().getNamespaceURI()); - writer.writeAttribute(PolicyConstants.NAME, - policyIntent.getName().getPrefix() + COLON + policyIntent.getName().getLocalPart()); - if (policyIntent instanceof ProfileIntent) { - ProfileIntent profileIntent = (ProfileIntent)policyIntent; - if (profileIntent.getRequiredIntents() != null && - profileIntent.getRequiredIntents().size() > 0) { - StringBuffer sb = new StringBuffer(); - for (Intent requiredIntents : profileIntent.getRequiredIntents()) { - sb.append(requiredIntents.getName()); - sb.append(" "); - } - writer.writeAttribute(PolicyConstants.REQUIRES, sb.toString()); - } - } - else { - if (policyIntent.getExcludedIntents() != null && - policyIntent.getExcludedIntents().size() > 0) { - StringBuffer sb = new StringBuffer(); - for (Intent excludedIntents : policyIntent.getExcludedIntents()) { - sb.append(excludedIntents.getName()); - sb.append(" "); - } - writer.writeAttribute(PolicyConstants.EXCLUDES, sb.toString()); - } - } - - if (!(policyIntent instanceof QualifiedIntent) ) { - if (policyIntent.getConstrains() != null && - policyIntent.getConstrains().size() > 0) { - StringBuffer sb = new StringBuffer(); - for (QName contrainedArtifact : policyIntent.getConstrains()) { - sb.append(contrainedArtifact.toString()); - sb.append(" "); - } - writer.writeAttribute(CONSTRAINS, sb.toString()); - } else { - error("ContrainsAttributeMissing", policyIntent, policyIntent.getName()); - //throw new ContributionWriteException("Contrains attribute missing from " + - //"Policy Intent Definition" + policyIntent.getName()); - } - } - - if ( policyIntent.getDescription() != null && policyIntent.getDescription().length() > 0) { - writer.writeStartElement(PolicyConstants.SCA10_NS, DESCRIPTION); - writer.writeCData(policyIntent.getDescription()); - writer.writeEndElement(); - } - - writer.writeEndElement(); - } - - //FIXME This method is never used -// private Intent resolveRequiredIntents(ProfileIntent policyIntent, ModelResolver resolver) throws ContributionResolveException { -// boolean isUnresolved = false; -// //FIXME: Need to check for cyclic references first i.e an A requiring B and then B requiring A... -// if (policyIntent != null && policyIntent.isUnresolved()) { -// -// //resolve all required intents -// List requiredIntents = new ArrayList(); -// for (Intent requiredIntent : policyIntent.getRequiredIntents()) { -// if ( requiredIntent.isUnresolved() ) { -// //policyIntent.getRequiredIntents().remove(requiredIntent); -// requiredIntent = resolver.resolveModel(Intent.class, requiredIntent); -// requiredIntents.add(requiredIntent); -// if (requiredIntent.isUnresolved()) { -// isUnresolved = true; -// } -// } -// } -// policyIntent.getRequiredIntents().clear(); -// policyIntent.getRequiredIntents().addAll(requiredIntents); -// } -// policyIntent.setUnresolved(isUnresolved); -// -// return policyIntent; -// } - - //FIXME This method is never used -// private Intent resolveQualifiableIntent(QualifiedIntent policyIntent, ModelResolver resolver) throws ContributionResolveException { -// boolean isUnresolved = false; -// -// if (policyIntent != null && policyIntent.isUnresolved()) { -// //resolve the qualifiable intent -// Intent qualifiableIntent = -// resolver.resolveModel(Intent.class, policyIntent.getQualifiableIntent()); -// policyIntent.setQualifiableIntent(qualifiableIntent); -// isUnresolved = qualifiableIntent.isUnresolved(); -// } -// policyIntent.setUnresolved(isUnresolved); -// -// return policyIntent; -// } - - private void resolveContrainedArtifacts(Intent policyIntent, ModelResolver resolver) { - //FIXME : need to figure out this resolution. - policyIntent.setUnresolved(false); - } - - private void resolveProfileIntent(ProfileIntent policyIntent, ModelResolver resolver) - throws ContributionResolveException { - // FIXME: Need to check for cyclic references first i.e an A requiring B - // and then B requiring A... - if (policyIntent != null) { - // resolve all required intents - List requiredIntents = new ArrayList(); - for (Intent requiredIntent : policyIntent.getRequiredIntents()) { - if (requiredIntent.isUnresolved()) { - Intent resolvedRequiredIntent = resolver.resolveModel(Intent.class, requiredIntent); - // At this point, when the required intent is not resolved, it does not mean - // its undeclared, chances are that their dependency are not resolved yet. - // Lets try to resolve them first. - if (resolvedRequiredIntent.isUnresolved()) { - if (resolvedRequiredIntent instanceof ProfileIntent) { - if ((((ProfileIntent)resolvedRequiredIntent).getRequiredIntents()).contains(policyIntent)) { - error("CyclicReferenceFound", resolver, requiredIntent, policyIntent); - return; - } - resolveDependent(resolvedRequiredIntent, resolver); - } - } - - if (!resolvedRequiredIntent.isUnresolved()) { - requiredIntents.add(resolvedRequiredIntent); - } else { - error("RequiredIntentNotFound", resolver, requiredIntent, policyIntent); - return; - //throw new ContributionResolveException("Required Intent - " + requiredIntent - //+ " not found for ProfileIntent " + policyIntent); - } - } else { - requiredIntents.add(requiredIntent); - } - } - policyIntent.getRequiredIntents().clear(); - policyIntent.getRequiredIntents().addAll(requiredIntents); - } - } - - private void resolveQualifiedIntent(QualifiedIntent policyIntent, ModelResolver resolver) - throws ContributionResolveException { - if (policyIntent != null) { - //resolve the qualifiable intent - Intent qualifiableIntent = policyIntent.getQualifiableIntent(); - if (qualifiableIntent.isUnresolved()) { - Intent resolvedQualifiableIntent = resolver.resolveModel(Intent.class, qualifiableIntent); - // At this point, when the qualifiable intent is not resolved, it does not mean - // its undeclared, chances are that their dependency are not resolved yet. - // Lets try to resolve them first. - if (resolvedQualifiableIntent.isUnresolved()) { - if (resolvedQualifiableIntent instanceof QualifiedIntent) { - resolveDependent(resolvedQualifiableIntent, resolver); - } - } - - if (!resolvedQualifiableIntent.isUnresolved()) { - policyIntent.setQualifiableIntent(resolvedQualifiableIntent); - } else { - error("QualifiableIntentNotFound", resolver, qualifiableIntent, policyIntent); - //throw new ContributionResolveException("Qualifiable Intent - " + qualifiableIntent - //+ " not found for QualifiedIntent " + policyIntent); - } - } - } - } - - public void resolveDependent(Intent policyIntent, ModelResolver resolver) throws ContributionResolveException { - if (policyIntent instanceof ProfileIntent) - resolveProfileIntent((ProfileIntent)policyIntent, resolver); - - if (policyIntent instanceof QualifiedIntent) - resolveQualifiedIntent((QualifiedIntent)policyIntent, resolver); - - resolveContrainedArtifacts(policyIntent, resolver); - } - - public void resolve(T policyIntent, ModelResolver resolver) throws ContributionResolveException { - if (policyIntent instanceof ProfileIntent) { - resolveProfileIntent((ProfileIntent)policyIntent, resolver); - } - else { - resolveExcludedIntents(policyIntent, resolver); - } - - if (policyIntent instanceof QualifiedIntent) { - resolveQualifiedIntent((QualifiedIntent)policyIntent, resolver); - } - - resolveContrainedArtifacts(policyIntent, resolver); - - /* This is too late in the processing - if ( !policyIntent.isUnresolved() ) { - resolver.addModel(policyIntent); - } - */ - } - - public QName getArtifactType() { - return POLICY_INTENT_QNAME; - } - - private void readConstrainedArtifacts(Intent policyIntent, XMLStreamReader reader) throws ContributionReadException { - String value = reader.getAttributeValue(null, CONSTRAINS); - if ( policyIntent instanceof QualifiedIntent && value != null) { - error("ErrorInPolicyIntentDefinition", policyIntent, policyIntent.getName(), QUALIFIED_INTENT_CONSTRAINS_ERROR); - //String errorMsg = "Error in PolicyIntent Definition - " + policyIntent.getName() + QUALIFIED_INTENT_CONSTRAINS_ERROR; - //throw new ContributionReadException(errorMsg); - } else { - if (value != null) { - List constrainedArtifacts = policyIntent.getConstrains(); - for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) { - QName qname = getQNameValue(reader, tokens.nextToken()); - constrainedArtifacts.add(qname); - } - } - } - } - - private void readRequiredIntents(ProfileIntent policyIntent, XMLStreamReader reader) { - String value = reader.getAttributeValue(null, REQUIRES); - if (value != null) { - List requiredIntents = policyIntent.getRequiredIntents(); - for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) { - QName qname = getQNameValue(reader, tokens.nextToken()); - Intent intent = policyFactory.createIntent(); - intent.setName(qname); - intent.setUnresolved(true); - requiredIntents.add(intent); - } - } - } - - private void readExcludedIntents(Intent policyIntent, XMLStreamReader reader) { - String value = reader.getAttributeValue(null, "excludes"); - if (value != null) { - List excludedIntents = policyIntent.getExcludedIntents(); - for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) { - QName qname = getQNameValue(reader, tokens.nextToken()); - Intent intent = policyFactory.createIntent(); - intent.setName(qname); - intent.setUnresolved(true); - excludedIntents.add(intent); - } - } - } - - private void resolveExcludedIntents(Intent policyIntent, ModelResolver resolver) - throws ContributionResolveException { - if (policyIntent != null) { - // resolve all excluded intents - List excludedIntents = new ArrayList(); - for (Intent excludedIntent : policyIntent.getExcludedIntents()) { - if (excludedIntent.isUnresolved()) { - Intent resolvedExcludedIntent = resolver.resolveModel(Intent.class, excludedIntent); - if (!resolvedExcludedIntent.isUnresolved()) { - excludedIntents.add(resolvedExcludedIntent); - } else { - error("ExcludedIntentNotFound", resolver, excludedIntent, policyIntent); - return; - //throw new ContributionResolveException("Excluded Intent " + excludedIntent - //+ " not found for intent " + policyIntent); - } - } else { - excludedIntents.add(excludedIntent); - } - } - policyIntent.getExcludedIntents().clear(); - policyIntent.getExcludedIntents().addAll(excludedIntents); - } - } - -} diff --git a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java deleted file mode 100644 index 81ca27a085..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java +++ /dev/null @@ -1,487 +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.policy.xml; - -import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; -import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; - -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; - -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.service.ContributionReadException; -import org.apache.tuscany.sca.contribution.service.ContributionResolveException; -import org.apache.tuscany.sca.contribution.service.ContributionWriteException; -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.Intent; -import org.apache.tuscany.sca.policy.PolicyFactory; -import org.apache.tuscany.sca.policy.PolicySet; - - -/** - * Processor for handling XML models of PolicySet definitions - * - * @version $Rev$ $Date$ - */ -public class PolicySetProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor, PolicyConstants { - - private PolicyFactory policyFactory; - private StAXArtifactProcessor extensionProcessor; - private XPathFactory xpathFactory = XPathFactory.newInstance(); - private Monitor monitor; - - public PolicySetProcessor(ModelFactoryExtensionPoint modelFactories, - StAXArtifactProcessor extensionProcessor, - Monitor monitor) { - this.policyFactory = modelFactories.getFactory(PolicyFactory.class); - this.extensionProcessor = extensionProcessor; - this.monitor = monitor; - } - - public PolicySetProcessor(PolicyFactory policyFactory, - StAXArtifactProcessor extensionProcessor, - Monitor monitor) { - this.policyFactory = policyFactory; - this.extensionProcessor = extensionProcessor; - 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 = new ProblemImpl(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, ex); - monitor.problem(problem); - } - } - - /** - * Report a error. - * - * @param problems - * @param message - * @param model - */ - private void error(String message, Object model, Object... messageParameters) { - if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); - monitor.problem(problem); - } - } - - public PolicySet read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException { - PolicySet policySet = null; - - String policySetName = reader.getAttributeValue(null, NAME); - String appliesTo = reader.getAttributeValue(null, APPLIES_TO); - if (policySetName == null || appliesTo == null) { - if (policySetName == null) - error("PolicySetNameMissing", reader); - if (appliesTo == null) - error("PolicySetAppliesToMissing", reader); - return policySet; - } - - policySet = policyFactory.createPolicySet(); - policySet.setName(new QName(policySetName)); - String alwaysAppliesTo = reader.getAttributeValue(TUSCANY_NS, ALWAYS_APPLIES_TO); - - //TODO: with 1.0 version of specs the applies to xpath is given related to the immediate - //parent whereas the runtime evaluates the xpath aginst the composite element. What the runtime - //is doing is what the future version of the specs could be tending towards. When that happens - //this 'if' must be deleted - if ( appliesTo != null && !appliesTo.startsWith("/") ) { - appliesTo = "//" + appliesTo; - } - - if ( alwaysAppliesTo != null && !alwaysAppliesTo.startsWith("/") ) { - alwaysAppliesTo = "//" + alwaysAppliesTo; - } - - policySet.setAppliesTo(appliesTo); - policySet.setAlwaysAppliesTo(alwaysAppliesTo); - - XPath path = xpathFactory.newXPath(); - path.setNamespaceContext(reader.getNamespaceContext()); - try { - if (appliesTo != null) { - policySet.setAppliesToXPathExpression(path.compile(appliesTo)); - } - if (alwaysAppliesTo != null) { - policySet.setAlwaysAppliesToXPathExpression(path.compile(alwaysAppliesTo)); - } - } catch (XPathExpressionException e) { - ContributionReadException ce = new ContributionReadException(e); - error("ContributionReadException", policySet, ce); - //throw ce; - } - - readProvidedIntents(policySet, reader); - - int event = reader.getEventType(); - QName name = null; - reader.next(); - while (reader.hasNext()) { - event = reader.getEventType(); - switch (event) { - case START_ELEMENT : { - name = reader.getName(); - if ( POLICY_INTENT_MAP_QNAME.equals(name) ) { - Intent mappedIntent = policyFactory.createIntent(); - String provides = reader.getAttributeValue(null, PROVIDES); - if (provides != null) { - mappedIntent.setName(getQName(reader, PROVIDES)); - if ( policySet.getProvidedIntents().contains(mappedIntent) ) { - readIntentMap(reader, policySet, mappedIntent); - } else { - error("IntentNotSpecified", policySet, policySetName); - //throw new ContributionReadException("Intent Map provides for Intent not specified as provided by parent PolicySet - " + policySetName); - } - } else { - error("IntentMapProvidesMissing", reader, policySetName); - } - } else if ( POLICY_SET_REFERENCE_QNAME.equals(name) ) { - PolicySet referredPolicySet = policyFactory.createPolicySet(); - String referencename = reader.getAttributeValue(null, NAME); - if (referencename != null) { - referredPolicySet.setName(getQName(reader, NAME)); - policySet.getReferencedPolicySets().add(referredPolicySet); - } else { - error("PolicySetReferenceNameMissing", reader, policySetName); - } - } /*else if ( WS_POLICY_QNAME.equals(name) ) { - OMElement policyElement = loadElement(reader); - org.apache.neethi.Policy wsPolicy = PolicyEngine.getPolicy(policyElement); - policySet.getPolicies().add(wsPolicy); - } */ else { - Object extension = extensionProcessor.read(reader); - if ( extension != null ) { - policySet.getPolicies().add(extension); - } - } - break; - } - } - if ( event == END_ELEMENT ) { - if ( POLICY_SET_QNAME.equals(reader.getName()) ) { - break; - } - } - - //Read the next element - if (reader.hasNext()) { - reader.next(); - } - } - return policySet; - } - - - public void readIntentMap(XMLStreamReader reader, PolicySet policySet, Intent mappedIntent) throws ContributionReadException { - QName name = reader.getName(); - Map> mappedPolicies = policySet.getMappedPolicies(); - if ( POLICY_INTENT_MAP_QNAME.equals(name) ) { - //Intent mappedIntent = policyFactory.createIntent(); - //mappedIntent.setName(getQName(reader, PROVIDES)); - String defaultQualifier = getString(reader, DEFAULT); - - String qualifierName = null; - String qualfiedIntentName = null; - Intent qualifiedIntent = null; - - int event = reader.getEventType(); - try { - reader.next(); - while (reader.hasNext()) { - event = reader.getEventType(); - switch (event) { - case START_ELEMENT : { - name = reader.getName(); - if ( POLICY_INTENT_MAP_QUALIFIER_QNAME.equals(name)) { - qualifierName = getString(reader, NAME); - if (qualifierName != null) { - qualfiedIntentName = mappedIntent.getName().getLocalPart() + - QUALIFIER + qualifierName; - qualifiedIntent = policyFactory.createIntent(); - qualifiedIntent.setName(new QName(mappedIntent.getName().getNamespaceURI(), - qualfiedIntentName)); - } else { - error("QualifierNameMissing", reader, policySet.getName()); - } - } else if ( POLICY_INTENT_MAP_QNAME.equals(name) ) { - QName providedIntent = getQName(reader, PROVIDES); - if ( qualifierName.equals(providedIntent.getLocalPart()) ) { - readIntentMap(reader, policySet, qualifiedIntent); - } else { - error("IntentMapDoesNotMatch", providedIntent, providedIntent, qualifierName, policySet); - //throw new ContributionReadException("Intent provided by IntentMap " + - //providedIntent + " does not match parent qualifier " + qualifierName + - //" in policyset - " + policySet); - } - }/* else if ( WS_POLICY_QNAME.equals(name) ) { - OMElement policyElement = loadElement(reader); - Policy wsPolicy = PolicyEngine.getPolicy(policyElement); - policySet.getPolicies().add(wsPolicy); - - List policyList = mappedPolicies.get(qualifiedIntent); - if ( policyList == null ) { - policyList = new ArrayList(); - mappedPolicies.put(qualifiedIntent, policyList); - - if (qualifierName.equals(defaultQualifier)) { - mappedPolicies.put(mappedIntent, policyList); - } - } - policyList.add((Policy)wsPolicy); - }*/ else { - Object extension = extensionProcessor.read(reader); - if ( extension != null && qualifiedIntent != null) { - List policyList = mappedPolicies.get(qualifiedIntent); - if ( policyList == null ) { - policyList = new ArrayList(); - mappedPolicies.put(qualifiedIntent, policyList); - - if (qualifierName.equals(defaultQualifier)) { - mappedPolicies.put(mappedIntent, policyList); - } - } - policyList.add(extension); - } - } - break; - } - case END_ELEMENT : { - if ( POLICY_INTENT_MAP_QNAME.equals(reader.getName()) ) { - if ( defaultQualifier != null ) { - String qualifiedIntentName = mappedIntent.getName().getLocalPart() + QUALIFIER + defaultQualifier; - Intent defaultQualifiedIntent = policyFactory.createIntent(); - defaultQualifiedIntent.setName(new QName(mappedIntent.getName().getNamespaceURI(), - qualifiedIntentName)); - List policyList = mappedPolicies.get(defaultQualifiedIntent); - if ( policyList != null ) { - mappedPolicies.put(mappedIntent, policyList); - } else { - error("UnableToMapPolicies", mappedPolicies, mappedIntent, policySet); - //throw new ContributionReadException("Unable to map policies for default qualifier in IntentMap for - " + - //mappedIntent + " in policy set - " + policySet); - } - defaultQualifier = null; - } - } - break; - } - } - if ( event == END_ELEMENT && POLICY_INTENT_MAP_QNAME.equals(reader.getName()) ) { - break; - } - //Read the next element - if (reader.hasNext()) { - reader.next(); - } - } - } catch (XMLStreamException e) { - ContributionReadException ce = new ContributionReadException(e); - error("ContributionReadException", reader, ce); - throw ce; - } - } - } - - public void write(PolicySet policySet, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException { - - // Write an - writer.writeStartElement(SCA10_NS, POLICY_SET); - writer.writeNamespace(policySet.getName().getPrefix(), policySet.getName().getNamespaceURI()); - writer.writeAttribute(NAME, - policySet.getName().getPrefix() + COLON + policySet.getName().getLocalPart()); - writer.writeAttribute(APPLIES_TO, policySet.getAppliesTo()); - writer.writeAttribute(TUSCANY_NS, ALWAYS_APPLIES_TO, policySet.getAlwaysAppliesTo()); - - writeProvidedIntents(policySet, writer); - - writer.writeEndElement(); - } - - private void readProvidedIntents(PolicySet policySet, XMLStreamReader reader) { - String value = reader.getAttributeValue(null, PROVIDES); - if (value != null) { - List providedIntents = policySet.getProvidedIntents(); - for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) { - QName qname = getQNameValue(reader, tokens.nextToken()); - Intent intent = policyFactory.createIntent(); - intent.setName(qname); - providedIntents.add(intent); - } - } - } - - private void writeProvidedIntents(PolicySet policySet, XMLStreamWriter writer) throws XMLStreamException { - if (policySet.getProvidedIntents() != null && - policySet.getProvidedIntents().size() > 0) { - StringBuffer sb = new StringBuffer(); - for (Intent providedIntents : policySet.getProvidedIntents()) { - sb.append(providedIntents.getName()); - sb.append(" "); - } - writer.writeAttribute(PolicyConstants.PROVIDES, sb.toString()); - } - } - - private void resolvePolicies(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException { - boolean unresolved = false; - if (policySet != null) { - for ( Object o : policySet.getPolicies() ) { - extensionProcessor.resolve(o, resolver); - /*if ( o instanceof Policy && ((Policy)o).isUnresolved() ) { - unresolved = true; - }*/ - } - policySet.setUnresolved(unresolved); - } - } - - - - public QName getArtifactType() { - return POLICY_SET_QNAME; - } - - public Class getModelType() { - return PolicySet.class; - } - - private void resolveProvidedIntents(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException { - if (policySet != null) { - //resolve all provided intents - List providedIntents = new ArrayList(); - for (Intent providedIntent : policySet.getProvidedIntents()) { - if (providedIntent.isUnresolved()) { - Intent resolvedProvidedIntent = resolver.resolveModel(Intent.class, providedIntent); - if (!resolvedProvidedIntent.isUnresolved()) { - providedIntents.add(resolvedProvidedIntent); - } else { - error("ProvidedIntentNotFound", policySet, providedIntent, policySet); - return; - //throw new ContributionResolveException("Provided Intent - " + providedIntent - //+ " not found for PolicySet " + policySet); - } - } else { - providedIntents.add(providedIntent); - } - } - policySet.getProvidedIntents().clear(); - policySet.getProvidedIntents().addAll(providedIntents); - } - } - - private void resolveIntentsInMappedPolicies(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException { - Map> mappedPolicies = new Hashtable>(); - for (Map.Entry> entry : policySet.getMappedPolicies().entrySet()) { - Intent mappedIntent = entry.getKey(); - if (mappedIntent.isUnresolved()) { - Intent resolvedMappedIntent = resolver.resolveModel(Intent.class, mappedIntent); - if (!resolvedMappedIntent.isUnresolved()) { - mappedPolicies.put(resolvedMappedIntent, entry.getValue()); - } else { - error("MappedIntentNotFound", policySet, mappedIntent, policySet); - return; - //throw new ContributionResolveException("Mapped Intent - " + mappedIntent - //+ " not found for PolicySet " + policySet); - } - } else { - mappedPolicies.put(mappedIntent, entry.getValue()); - } - } - - policySet.getMappedPolicies().clear(); - policySet.getMappedPolicies().putAll(mappedPolicies); - } - - private void resolveReferredPolicySets(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException { - - List referredPolicySets = new ArrayList(); - for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) { - if (referredPolicySet.isUnresolved()) { - PolicySet resolvedReferredPolicySet = resolver.resolveModel(PolicySet.class, referredPolicySet); - if (!resolvedReferredPolicySet.isUnresolved()) { - referredPolicySets.add(resolvedReferredPolicySet); - } else { - error("ReferredPolicySetNotFound", policySet, referredPolicySet, policySet); - return; - //throw new ContributionResolveException("Referred PolicySet - " + referredPolicySet - //+ "not found for PolicySet - " + policySet); - } - } else { - referredPolicySets.add(referredPolicySet); - } - } - policySet.getReferencedPolicySets().clear(); - policySet.getReferencedPolicySets().addAll(referredPolicySets); - } - - private void includeReferredPolicySets(PolicySet policySet, PolicySet referredPolicySet) { - for (PolicySet furtherReferredPolicySet : referredPolicySet.getReferencedPolicySets()) { - includeReferredPolicySets(referredPolicySet, furtherReferredPolicySet); - } - policySet.getPolicies().addAll(referredPolicySet.getPolicies()); - policySet.getMappedPolicies().putAll(referredPolicySet.getMappedPolicies()); - } - - public void resolve(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException { - resolveProvidedIntents(policySet, resolver); - resolveIntentsInMappedPolicies(policySet, resolver); - resolveReferredPolicySets(policySet, resolver); - - for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) { - includeReferredPolicySets(policySet, referredPolicySet); - } - - if ( policySet.isUnresolved() ) { - //resolve the policy attachments - resolvePolicies(policySet, resolver); - - /*if ( !policySet.isUnresolved() ) { - resolver.addModel(policySet); - }*/ - } - } - } diff --git a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java deleted file mode 100644 index 7c205292b0..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java +++ /dev/null @@ -1,45 +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.policy.xml; - -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.policy.PolicyFactory; -import org.apache.tuscany.sca.policy.ProfileIntent; - -/** - * Processor for handling XML models of PolicyIntent definitions that are ProfileIntents - * - * @version $Rev$ $Date$ - */ -public class ProfileIntentProcessor extends PolicyIntentProcessor { - - public ProfileIntentProcessor(PolicyFactory policyFactory, Monitor monitor) { - super(policyFactory, monitor); - } - - public ProfileIntentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) { - super(modelFactories, monitor); - } - - public Class getModelType() { - return ProfileIntent.class; - } -} diff --git a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java deleted file mode 100644 index abe80e2a54..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java +++ /dev/null @@ -1,45 +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.policy.xml; - -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.policy.PolicyFactory; -import org.apache.tuscany.sca.policy.QualifiedIntent; - -/** - * Processor for handling XML models of PolicyIntent definitions that are QualifiedIntents - * - * @version $Rev$ $Date$ - */ -public class QualifiedIntentProcessor extends PolicyIntentProcessor { - - public QualifiedIntentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) { - super(modelFactories, monitor); - } - - public QualifiedIntentProcessor(PolicyFactory policyFactory, Monitor monitor) { - super(policyFactory, monitor); - } - - public Class getModelType() { - return QualifiedIntent.class; - } -} diff --git a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java deleted file mode 100644 index 73795349c1..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java +++ /dev/null @@ -1,45 +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.policy.xml; - -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.policy.Intent; -import org.apache.tuscany.sca.policy.PolicyFactory; - -/** - * Processor for handling XML models of PolicyIntent definitions - * - * @version $Rev$ $Date$ - */ -public class SimpleIntentProcessor extends PolicyIntentProcessor { - - public SimpleIntentProcessor(PolicyFactory policyFactory, Monitor monitor) { - super(policyFactory, monitor); - } - - public SimpleIntentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) { - super(modelFactories, monitor); - } - - public Class getModelType() { - return Intent.class; - } -} diff --git a/branches/trunk-20080910/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/trunk-20080910/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor deleted file mode 100644 index c41a0cd01f..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ /dev/null @@ -1,24 +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. - -# Implementation class for the artifact processor extension -org.apache.tuscany.sca.policy.xml.BindingTypeProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#bindingType,model=org.apache.tuscany.sca.policy.IntentAttachPointType -org.apache.tuscany.sca.policy.xml.ImplementationTypeProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementationType,model=org.apache.tuscany.sca.policy.IntentAttachPointType -org.apache.tuscany.sca.policy.xml.SimpleIntentProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#intent,model=org.apache.tuscany.sca.policy.Intent -org.apache.tuscany.sca.policy.xml.PolicySetProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#policySet,model=org.apache.tuscany.sca.policy.PolicySet -org.apache.tuscany.sca.policy.xml.ProfileIntentProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#intent,model=org.apache.tuscany.sca.policy.ProfileIntent -org.apache.tuscany.sca.policy.xml.QualifiedIntentProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#intent,model=org.apache.tuscany.sca.policy.QualifiedIntent diff --git a/branches/trunk-20080910/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties b/branches/trunk-20080910/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties deleted file mode 100644 index 40107bb11e..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties +++ /dev/null @@ -1,44 +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. -# -# -ReferredPolicySetNotFound = Referred PolicySet - {0} not found for PolicySet - {1} -MappedIntentNotFound = Mapped Intent - {0} not found for PolicySet {1} -ProvidedIntentNotFound = Provided Intent - {0} not found for PolicySet {1} -UnableToMapPolicies = Unable to map policies for default qualifier in IntentMap for - {0} in policy set - {1} -IntentMapDoesNotMatch = Intent provided by IntentMap {0} does not match parent qualifier {1} in policyset - {2} -IntentNotSpecified = Intent Map provides for Intent not specified as provided by parent PolicySet - {0} -ContrainsAttributeMissing = Constrains attribute missing from Policy Intent Definition {0} -RequiredIntentNotFound = Required Intent - {0} not found for ProfileIntent {1} -QualifiableIntentNotFound = Qualifiable Intent - {0} not found for QualifiedIntent {1} -ErrorInPolicyIntentDefinition = Error in PolicyIntent Definition - {0} {1} -ExcludedIntentNotFound = Excluded Intent {0} not found for intent {1} -UnrecognizedIntentAttachPointType = Unrecognized IntentAttachPointType - {0} -RequiredAttributeMissing = Required attribute {0} missing from BindingType Definition -AlwaysProvidedIntentNotFound = Always Provided Intent - {0} not found for ExtensionType {1} -MayProvideIntentNotFound = May Provide Intent - {0} not found for ExtensionType {1} -ContributionReadException = ContributionReadException occurred due to: {0} -CyclicReferenceFound = Cyclic reference detected in required attributes of ProfileIntents {0} and {1} -IntentNameMissing = Required attribute "name" missing for Intent Definition -PolicySetReferenceNameMissing = Required attribute "name" missing for PolicySetReference in PolicySet : {0} -PolicySetNameMissing = Required attribute "name" missing for PolicySet Definition -PolicySetAppliesToMissing = Required attribute "appliesTo" missing for PolicySet Definition -IntentMapProvidesMissing = Required attribute "provides" missing for IntentMap in PolicySet : {0} -QualifierNameMissing = Required attribute "name" missing for qualifier definition in PolicySet : {0} - diff --git a/branches/trunk-20080910/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/branches/trunk-20080910/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java deleted file mode 100644 index 60de55a0d9..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java +++ /dev/null @@ -1,269 +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.policy.xml; - -import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; - -import java.io.InputStream; -import java.net.URL; -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamReader; - -import junit.framework.TestCase; - -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.contribution.resolver.DefaultModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.monitor.MonitorFactory; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl; -import org.apache.tuscany.sca.policy.Intent; -import org.apache.tuscany.sca.policy.IntentAttachPointType; -import org.apache.tuscany.sca.policy.PolicySet; -import org.apache.tuscany.sca.policy.ProfileIntent; -import org.apache.tuscany.sca.policy.QualifiedIntent; -import org.apache.tuscany.sca.policy.impl.BindingTypeImpl; -import org.apache.tuscany.sca.policy.impl.ImplementationTypeImpl; - -/** - * Test reading SCA XML assembly documents. - * - * @version $Rev: 551296 $ $Date: 2007-06-28 01:18:35 +0530 (Thu, 28 Jun 2007) $ - */ -public class ReadDocumentTestCase extends TestCase { - - private ModelResolver resolver; - private StAXArtifactProcessor staxProcessor; - private Monitor monitor; - - private Map intentTable = new Hashtable(); - private Map policySetTable = new Hashtable(); - private Map bindingTypesTable = new Hashtable(); - private Map implTypesTable = new Hashtable(); - private static final String scaNamespace = "http://www.osoa.org/xmlns/sca/1.0"; - private static final String namespace = "http://test"; - - private static final QName confidentiality = new QName(namespace, "confidentiality"); - private static final QName integrity = new QName(namespace, "integrity"); - private static final QName messageProtection = new QName(namespace, "messageProtection"); - private static final QName confidentiality_transport = new QName(namespace, "confidentiality.transport"); - private static final QName confidentiality_message = new QName(namespace, "confidentiality.message"); - private static final QName secureReliablePolicy = new QName(namespace, "SecureReliablePolicy"); - private static final QName secureMessagingPolicies = new QName(namespace, "SecureMessagingPolicies"); - private static final QName securityPolicy = new QName(namespace, "SecurityPolicy"); - private static final QName basicAuthMsgProtSecurity = new QName(namespace, "BasicAuthMsgProtSecurity"); - private static final QName wsBinding = new QName(scaNamespace, "binding.ws"); - private static final QName javaImpl = new QName(scaNamespace, "implementation.java"); - - - @Override - public void setUp() throws Exception { - DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); - resolver = new DefaultModelResolver(); - XMLInputFactory inputFactory = XMLInputFactory.newInstance(); - // Create a monitor - UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl(); - if (monitorFactory != null) { - monitor = monitorFactory.createMonitor(); - utilities.addUtility(monitorFactory); - } - StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); - staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, monitor); - staxProcessors.addArtifactProcessor(new TestPolicyProcessor()); - - URL url = getClass().getResource("test_definitions.xml"); - InputStream urlStream = url.openStream(); - XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream); - reader.next(); - while ( true ) { - int event = reader.getEventType(); - switch (event) { - case START_ELEMENT: { - Object artifact = staxProcessor.read(reader); - if ( artifact instanceof PolicySet ) { - PolicySet policySet = (PolicySet)artifact; - policySet.setName(new QName(namespace, policySet.getName().getLocalPart())); - policySetTable.put(policySet.getName(), policySet); - } else if ( artifact instanceof Intent ) { - Intent intent = (Intent)artifact; - intent.setName(new QName(namespace, intent.getName().getLocalPart())); - if ( intent instanceof QualifiedIntent ) { - ((QualifiedIntent)intent).getQualifiableIntent(). - setName(new QName(namespace, - ((QualifiedIntent)intent).getQualifiableIntent().getName().getLocalPart())); - } - intentTable.put(intent.getName(), intent); - } else if ( artifact instanceof BindingTypeImpl ) { - IntentAttachPointType bindingType = (IntentAttachPointType)artifact; - bindingTypesTable.put(bindingType.getName(), bindingType); - } else if ( artifact instanceof ImplementationTypeImpl ) { - IntentAttachPointType implType = (IntentAttachPointType)artifact; - implTypesTable.put(implType.getName(), implType); - } - - if ( artifact != null ) { - resolver.addModel(artifact); - } - - break; - } - } - if ( reader.hasNext() ) { - reader.next(); - } else { - break; - } - } - urlStream.close(); - } - - @Override - public void tearDown() throws Exception { - } - - public void testReadSCADefinitions() throws Exception { - assertNotNull(intentTable.get(confidentiality)); - assertNotNull(intentTable.get(messageProtection)); - assertNotNull(intentTable.get(confidentiality_transport)); - assertTrue(intentTable.get(confidentiality).getDescription().length() > 0 ); - - assertNotNull(policySetTable.get(secureReliablePolicy)); - assertTrue(policySetTable.get(secureReliablePolicy).getProvidedIntents().size() == 2); - assertTrue(policySetTable.get(secureReliablePolicy).getPolicies().size() == 2); - - assertNotNull(policySetTable.get(secureMessagingPolicies)); - assertEquals(policySetTable.get(secureMessagingPolicies).getMappedPolicies().size(), 3); - - assertEquals(bindingTypesTable.size(), 1); - assertNotNull(bindingTypesTable.get(wsBinding)); - assertEquals(implTypesTable.size(), 1); - assertNotNull(implTypesTable.get(javaImpl)); - } - - public void testResolution() throws Exception { - assertTrue(intentTable.get(messageProtection) instanceof ProfileIntent); - ProfileIntent profileIntent = (ProfileIntent)intentTable.get(new QName(namespace, "messageProtection")); - assertNull(profileIntent.getRequiredIntents().get(0).getDescription()); - - QName confidentiality_transport = new QName(namespace, "confidentiality.transport"); - assertTrue(intentTable.get(confidentiality_transport) instanceof QualifiedIntent); - QualifiedIntent qualifiedIntent = (QualifiedIntent)intentTable.get(new QName(namespace, "confidentiality.transport")); - assertNull(qualifiedIntent.getQualifiableIntent().getDescription()); - - PolicySet secureReliablePolicySet = policySetTable.get(secureReliablePolicy); - PolicySet secureMessagingPolicySet = policySetTable.get(secureMessagingPolicies); - PolicySet securityPolicySet = policySetTable.get(securityPolicy); - - assertEquals(secureReliablePolicySet.getProvidedIntents().get(1).getName(), integrity); - assertNull(secureReliablePolicySet.getProvidedIntents().get(1).getDescription()); - assertTrue(secureMessagingPolicySet.isUnresolved()); - assertEquals(securityPolicySet.getMappedPolicies().size(), 5); - - //testing to ensure that inclusion of referred policy sets has not happened - PolicySet basicAuthMsgProtSecurityPolicySet = policySetTable.get(basicAuthMsgProtSecurity); - assertTrue(basicAuthMsgProtSecurityPolicySet.getPolicies().isEmpty()); - assertTrue(basicAuthMsgProtSecurityPolicySet.getMappedPolicies().isEmpty()); - - IntentAttachPointType wsBindingType = bindingTypesTable.get(wsBinding); - assertNull(wsBindingType.getAlwaysProvidedIntents().get(0).getDescription()); - assertNull(wsBindingType.getMayProvideIntents().get(0).getDescription()); - - IntentAttachPointType javaImplType = implTypesTable.get(javaImpl); - assertNull(javaImplType.getAlwaysProvidedIntents().get(0).getDescription()); - assertNull(javaImplType.getMayProvideIntents().get(0).getDescription()); - - List simpleIntents = new ArrayList(); - List profileIntents = new ArrayList(); - List qualifiedIntents = new ArrayList(); - - for (Intent intent : intentTable.values()) { - if (intent instanceof ProfileIntent) - profileIntents.add((ProfileIntent)intent); - else if (intent instanceof QualifiedIntent) - qualifiedIntents.add((QualifiedIntent)intent); - else simpleIntents.add(intent); - } - - for (Intent intent : simpleIntents) - staxProcessor.resolve(intent, resolver); - - for (ProfileIntent intent : profileIntents) - staxProcessor.resolve(intent, resolver); - - for (QualifiedIntent intent : qualifiedIntents) - staxProcessor.resolve(intent, resolver); - - for ( PolicySet policySet : policySetTable.values() ) { - if (policySet.getReferencedPolicySets().isEmpty()) - staxProcessor.resolve(policySet, resolver); - } - - for ( PolicySet policySet : policySetTable.values() ) { - if (!policySet.getReferencedPolicySets().isEmpty()) - staxProcessor.resolve(policySet, resolver); - } - - for ( IntentAttachPointType bindingType : bindingTypesTable.values() ) { - staxProcessor.resolve(bindingType, resolver); - } - - for ( IntentAttachPointType implType : implTypesTable.values() ) { - staxProcessor.resolve(implType, resolver); - } - - //testing if policy intents have been linked have property been linked up - assertNotNull(profileIntent.getRequiredIntents().get(0).getDescription()); - assertNotNull(qualifiedIntent.getQualifiableIntent().getDescription()); - assertEquals(secureReliablePolicySet.getProvidedIntents().get(1).getName(), integrity); - assertNotNull(secureReliablePolicySet.getProvidedIntents().get(1).getDescription()); - - //testing if policysets have been properly linked up with intents - assertFalse(secureMessagingPolicySet.isUnresolved()); - assertNotNull(secureMessagingPolicySet.getMappedPolicies().get(intentTable.get(confidentiality))); - assertNotNull(secureMessagingPolicySet.getMappedPolicies().get(intentTable.get(confidentiality_transport))); - - //testing if intent maps have been properly mapped to policies - assertFalse(securityPolicySet.isUnresolved()); - assertNotNull(securityPolicySet.getMappedPolicies().get(intentTable.get(confidentiality))); - assertNotNull(securityPolicySet.getMappedPolicies().get(intentTable.get(confidentiality_message))); - - //testing for inclusion of referred policysets - assertFalse(basicAuthMsgProtSecurityPolicySet.getPolicies().isEmpty()); - assertFalse(basicAuthMsgProtSecurityPolicySet.getMappedPolicies().isEmpty()); - assertNotNull(basicAuthMsgProtSecurityPolicySet.getMappedPolicies().get(intentTable.get(confidentiality_transport))); - - assertNotNull(wsBindingType.getAlwaysProvidedIntents().get(0).getDescription()); - assertNotNull(wsBindingType.getMayProvideIntents().get(0).getDescription()); - - assertNotNull(javaImplType.getAlwaysProvidedIntents().get(0).getDescription()); - assertNotNull(javaImplType.getMayProvideIntents().get(0).getDescription()); - } -} diff --git a/branches/trunk-20080910/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/branches/trunk-20080910/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java deleted file mode 100644 index ce5b204787..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java +++ /dev/null @@ -1,74 +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.policy.xml; - -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.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.service.ContributionReadException; -import org.apache.tuscany.sca.contribution.service.ContributionResolveException; -import org.apache.tuscany.sca.contribution.service.ContributionWriteException; -import org.apache.tuscany.sca.policy.Policy; - -/** - * - * @version $Rev$ $Date$ - */ -public class TestPolicyProcessor implements StAXArtifactProcessor { - - public QName getArtifactType() { - return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment"); - } - - public Policy read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException { - return new MockPolicyImplOne(); - } - - public void write(Policy arg0, XMLStreamWriter arg1) throws ContributionWriteException, - XMLStreamException { - } - - public Class getModelType() { - // TODO Auto-generated method stub - return Policy.class; - } - - public void resolve(Policy arg0, ModelResolver arg1) throws ContributionResolveException { - - } - - - public class MockPolicyImplOne implements Policy { - public QName getSchemaName() { - return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment"); - } - - public boolean isUnresolved() { - return false; - } - - public void setUnresolved(boolean unresolved) { - } - - } -} diff --git a/branches/trunk-20080910/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/branches/trunk-20080910/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml deleted file mode 100644 index b51a6fba98..0000000000 --- a/branches/trunk-20080910/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - - - - - Test Intent - - - - - - Protect messages from unauthorized reading or modification - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ... - - - - ... - - - - - - - - - - - sp:X509v3 - - - - - - - - - - - - - - - - - - Protect messages from unauthorized reading or modification - - - - - - Protect messages from unauthorized reading or modification - - - - - - - Communitcation thro this binding must prevent - unauthorized users from reading the messages. - - - - - - Communitcation thro this binding must prevent - unauthorized modification of the messages. - - - - - - Communitcation thro this binding required - Authentication. - - - - - - All messages to and from this implementation must be logged - - - - - - Need to figure out some description for this - - - - \ No newline at end of file -- cgit v1.2.3