From f9be2165328dc76f562938566057e89c0723fe08 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:09:40 +0000 Subject: Moving 2.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835137 13f79535-47bb-0310-9956-ffa450edef68 --- branches/sca-java-2.0-M4/modules/xsd/LICENSE | 205 ------------- .../modules/xsd/META-INF/MANIFEST.MF | 47 --- branches/sca-java-2.0-M4/modules/xsd/NOTICE | 6 - branches/sca-java-2.0-M4/modules/xsd/pom.xml | 65 ---- .../apache/tuscany/sca/xsd/DefaultXSDFactory.java | 30 -- .../org/apache/tuscany/sca/xsd/XSDFactory.java | 35 --- .../org/apache/tuscany/sca/xsd/XSDefinition.java | 117 -------- .../tuscany/sca/xsd/impl/XSDFactoryImpl.java | 35 --- .../tuscany/sca/xsd/impl/XSDefinitionImpl.java | 232 --------------- .../tuscany/sca/xsd/xml/XSDDocumentProcessor.java | 106 ------- .../tuscany/sca/xsd/xml/XSDModelResolver.java | 328 --------------------- ...sca.contribution.processor.URLArtifactProcessor | 20 -- ...tuscany.sca.contribution.resolver.ModelResolver | 19 -- .../services/org.apache.tuscany.sca.xsd.XSDFactory | 18 -- .../xsd-xml-validation-messages.properties | 23 -- .../sca/xsd/xml/XSDDocumentProcessorTestCase.java | 96 ------ .../xsd/src/test/resources/xsd/greeting.xsd | 29 -- .../modules/xsd/src/test/resources/xsd/name.xsd | 29 -- 18 files changed, 1440 deletions(-) delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/LICENSE delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/META-INF/MANIFEST.MF delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/NOTICE delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/pom.xml delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/src/test/resources/xsd/greeting.xsd delete mode 100644 branches/sca-java-2.0-M4/modules/xsd/src/test/resources/xsd/name.xsd (limited to 'branches/sca-java-2.0-M4/modules/xsd') diff --git a/branches/sca-java-2.0-M4/modules/xsd/LICENSE b/branches/sca-java-2.0-M4/modules/xsd/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/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/sca-java-2.0-M4/modules/xsd/META-INF/MANIFEST.MF b/branches/sca-java-2.0-M4/modules/xsd/META-INF/MANIFEST.MF deleted file mode 100644 index b8bb9642f1..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/META-INF/MANIFEST.MF +++ /dev/null @@ -1,47 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: org.apache.tuscany.sca.xsd;version="2.0.0"; - uses:="org.apache.ws.commons.schema, - org.apache.tuscany.sca.assembly, - org.apache.tuscany.sca.xsd.impl, - org.w3c.dom, - javax.xml.namespace", - org.apache.tuscany.sca.xsd.xml;version="2.0.0"; - uses:="org.apache.ws.commons.schema.resolver, - org.apache.tuscany.sca.contribution.resolver, - org.apache.tuscany.sca.contribution.processor, - org.apache.tuscany.sca.contribution, - org.apache.tuscany.sca.xsd, - org.apache.tuscany.sca.core, - org.apache.tuscany.sca.monitor, - org.xml.sax, - javax.xml.namespace" -Private-Package: org.apache.tuscany.sca.xsd.impl;version="2.0.0" -Tool: Bnd-0.0.255 -Bundle-Name: Apache Tuscany SCA XSD Model -Created-By: 1.6.0_07 (Sun Microsystems Inc.) -Bundle-Vendor: The Apache Software Foundation -Bundle-Version: 2.0.0 -Bnd-LastModified: 1225397174343 -Bundle-ManifestVersion: 2 -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Description: Apache Tuscany SCA XSD Model -Import-Package: javax.xml.namespace, - javax.xml.stream, - org.apache.tuscany.sca.assembly;version="2.0.0", - org.apache.tuscany.sca.common.xml;version="2.0.0", - org.apache.tuscany.sca.common.xml.stax;version="2.0.0", - org.apache.tuscany.sca.contribution;version="2.0.0", - org.apache.tuscany.sca.contribution.namespace;version="2.0.0", - org.apache.tuscany.sca.contribution.processor;version="2.0.0", - org.apache.tuscany.sca.contribution.resolver;version="2.0.0", - org.apache.tuscany.sca.core;version="2.0.0", - org.apache.tuscany.sca.monitor;version="2.0.0", - org.apache.tuscany.sca.xsd;version="2.0.0", - org.apache.tuscany.sca.xsd.xml;version="2.0.0", - org.apache.ws.commons.schema, - org.apache.ws.commons.schema.resolver, - org.w3c.dom, - org.xml.sax -Bundle-SymbolicName: org.apache.tuscany.sca.xsd -Bundle-DocURL: http://www.apache.org/ -Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 diff --git a/branches/sca-java-2.0-M4/modules/xsd/NOTICE b/branches/sca-java-2.0-M4/modules/xsd/NOTICE deleted file mode 100644 index 25bb89c9b2..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2009 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-2.0-M4/modules/xsd/pom.xml b/branches/sca-java-2.0-M4/modules/xsd/pom.xml deleted file mode 100644 index e50da3c675..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 2.0-M4-SNAPSHOT - ../pom.xml - - tuscany-xsd - Apache Tuscany SCA XSD Model - - - - org.apache.tuscany.sca - tuscany-assembly - 2.0-M4-SNAPSHOT - - - - org.apache.ws.commons.schema - XmlSchema - 1.4.2 - - - org.apache.tuscany.sca - tuscany-contribution - 2.0-M4-SNAPSHOT - - - - - - - apache.ws.zone - Apache WS Zone Repository - http://ws.zones.apache.org/repository2 - - true - - - false - - - - - diff --git a/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java b/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java deleted file mode 100644 index 92dce98fa1..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java +++ /dev/null @@ -1,30 +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.xsd; - -import org.apache.tuscany.sca.xsd.impl.XSDFactoryImpl; - -/** - * A factory for XSD definitions - * - * @version $Rev$ $Date$ - */ -public class DefaultXSDFactory extends XSDFactoryImpl implements XSDFactory { - -} diff --git a/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java b/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java deleted file mode 100644 index 08a1c8dd63..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java +++ /dev/null @@ -1,35 +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.xsd; - -/** - * Factory for XSD definitions - * - * @version $Rev$ $Date$ - */ -public interface XSDFactory { - - /** - * Creates a new XML Schema definition. - * - * @return a new XML Schema definition - */ - XSDefinition createXSDefinition(); - -} diff --git a/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java b/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java deleted file mode 100644 index f9bf627655..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java +++ /dev/null @@ -1,117 +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.xsd; - -import java.net.URI; -import java.util.List; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.Base; -import org.apache.ws.commons.schema.XmlSchema; -import org.apache.ws.commons.schema.XmlSchemaCollection; -import org.apache.ws.commons.schema.XmlSchemaElement; -import org.apache.ws.commons.schema.XmlSchemaType; -import org.w3c.dom.Document; - -/** - * Represents an XML Schema definition. - * - * @version $Rev$ $Date$ - */ -public interface XSDefinition extends Base { - XmlSchemaCollection getSchemaCollection(); - - void setSchemaCollection(XmlSchemaCollection schemaCollection); - - /** - * Returns the XmlSchema definition model - * @return the XmlSchema definition model - */ - XmlSchema getSchema(); - - /** - * Sets the XmlSchema definition model - * @param definition the XmlSchema definition model - */ - void setSchema(XmlSchema definition); - - /** - * Returns the namespace of this XmlSchema definition. - * @return the namespace of this XmlSchema definition - */ - String getNamespace(); - - /** - * Sets the namespace of this XmlSchema definition. - * @param namespace the namespace of this XmlSchema definition - */ - void setNamespace(String namespace); - - /** - * Get the location of the XSD - * @return - */ - URI getLocation(); - - /** - * Set the location of the XSD - * @param uri - */ - void setLocation(URI uri); - - /** - * Get the DOM representation of the XSD - * @return - */ - Document getDocument(); - - /** - * Set the DOM representation of the XSD - * @param document - */ - void setDocument(Document document); - - /** - * Get an XSD element by QName - * @param name The element name - * @return The XSD element - */ - XmlSchemaElement getXmlSchemaElement(QName name); - - /** - * Get an XSD type by QName - * @param name The type name - * @return The XSD type - */ - XmlSchemaType getXmlSchemaType(QName name); - - /** - * Get the aggregated definitions for a facade XSDefinition - * @return The aggregated definitions, or null if not a facade - */ - List getAggregatedDefinitions(); - - /** - * Set the aggregated definitions for a facade XSDefinition - * @param name The aggregated definitions - */ - void setAggregatedDefinitions(List definitions); -} diff --git a/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java b/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java deleted file mode 100644 index 60ff6b6fd9..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java +++ /dev/null @@ -1,35 +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.xsd.impl; - -import org.apache.tuscany.sca.xsd.XSDefinition; -import org.apache.tuscany.sca.xsd.XSDFactory; - -/** - * A factory for XSD definitions - * - * @version $Rev$ $Date$ - */ -public abstract class XSDFactoryImpl implements XSDFactory { - - public XSDefinition createXSDefinition() { - return new XSDefinitionImpl(); - } - -} diff --git a/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java b/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java deleted file mode 100644 index af8cbf12ab..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java +++ /dev/null @@ -1,232 +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.xsd.impl; - -import java.net.URI; -import java.util.Iterator; -import java.util.List; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.xsd.XSDefinition; -import org.apache.ws.commons.schema.XmlSchema; -import org.apache.ws.commons.schema.XmlSchemaCollection; -import org.apache.ws.commons.schema.XmlSchemaElement; -import org.apache.ws.commons.schema.XmlSchemaImport; -import org.apache.ws.commons.schema.XmlSchemaInclude; -import org.apache.ws.commons.schema.XmlSchemaObject; -import org.apache.ws.commons.schema.XmlSchemaType; -import org.w3c.dom.Document; - -/** - * Represents a XML schema definition. - * - * @version $Rev$ $Date$ - */ -public class XSDefinitionImpl implements XSDefinition { - private XmlSchemaCollection schemaCollection = new XmlSchemaCollection(); - private XmlSchema schema; - private String namespace; - private URI location; - private Document document; - private boolean unresolved; - private List definitions; - - public XSDefinitionImpl() { - } - - public XmlSchema getSchema() { - return schema; - } - - public void setSchema(XmlSchema definition) { - this.schema = definition; - } - - public boolean isUnresolved() { - return unresolved; - } - - public void setUnresolved(boolean undefined) { - this.unresolved = undefined; - } - - public String getNamespace() { - if (isUnresolved()) { - return namespace; - } else if (schema != null) { - return schema.getTargetNamespace(); - } else { - return namespace; - } - } - - public void setNamespace(String namespace) { - if (!isUnresolved()) { - throw new IllegalStateException(); - } else { - this.namespace = namespace; - } - } - - /** - * @return the location - */ - public URI getLocation() { - return location; - } - - /** - * @param location the location to set - */ - public void setLocation(URI location) { - this.location = location; - } - - /** - * @return the document - */ - public Document getDocument() { - return document; - } - - /** - * @param document the document to set - */ - public void setDocument(Document document) { - this.document = document; - } - - /** - * @return the schemaCollection - */ - public XmlSchemaCollection getSchemaCollection() { - return schemaCollection; - } - - /** - * @param schemaCollection the schemaCollection to set - */ - public void setSchemaCollection(XmlSchemaCollection schemaCollection) { - this.schemaCollection = schemaCollection; - } - - /** - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((location == null) ? 0 : location.hashCode()); - result = prime * result + ((namespace == null) ? 0 : namespace.hashCode()); - return result; - } - - /** - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof XSDefinitionImpl)) - return false; - final XSDefinitionImpl other = (XSDefinitionImpl)obj; - if (location == null) { - if (other.location != null) - return false; - } else if (!location.equals(other.location)) - return false; - if (namespace == null) { - if (other.namespace != null) - return false; - } else if (!namespace.equals(other.namespace)) - return false; - return true; - } - - private static T getXmlSchemaObject(XmlSchema schema, QName name, Class type) { - if (schema != null) { - XmlSchemaObject object = null; - if (type == XmlSchemaElement.class) { - object = schema.getElementByName(name); - } else if (type == XmlSchemaType.class) { - object = schema.getTypeByName(name); - } - if (object != null) { - return type.cast(object); - } - for (Iterator i = schema.getIncludes().getIterator(); i.hasNext();) { - XmlSchemaObject obj = (XmlSchemaObject)i.next(); - XmlSchema ext = null; - if (obj instanceof XmlSchemaInclude) { - ext = ((XmlSchemaInclude)obj).getSchema(); - } - if (obj instanceof XmlSchemaImport) { - ext = ((XmlSchemaImport)obj).getSchema(); - } - object = getXmlSchemaObject(ext, name, type); - if (object != null) { - return type.cast(object); - } - } - } - return null; - } - - public XmlSchemaElement getXmlSchemaElement(QName name) { - if (schema != null) { - XmlSchemaElement element = getXmlSchemaObject(schema, name, XmlSchemaElement.class); - if (element != null) { - return element; - } - } - - if (schemaCollection != null) { - return schemaCollection.getElementByQName(name); - } - return null; - } - - public XmlSchemaType getXmlSchemaType(QName name) { - if (schema != null) { - XmlSchemaType type = getXmlSchemaObject(schema, name, XmlSchemaType.class); - if (type != null) { - return type; - } - } - if (schemaCollection != null) { - return schemaCollection.getTypeByQName(name); - } - return null; - } - - public List getAggregatedDefinitions() { - return definitions; - } - - public void setAggregatedDefinitions(List definitions) { - this.definitions = definitions; - } - -} diff --git a/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java b/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java deleted file mode 100644 index 1166567bcc..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java +++ /dev/null @@ -1,106 +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.xsd.xml; - -import java.net.URI; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLInputFactory; - -import org.apache.tuscany.sca.common.xml.stax.StAXHelper; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -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.xsd.XSDFactory; -import org.apache.tuscany.sca.xsd.XSDefinition; - -/** - * An ArtifactProcessor for XSD documents. - * - * @version $Rev$ $Date$ - */ -public class XSDDocumentProcessor implements URLArtifactProcessor { - private StAXHelper helper; - private XSDFactory factory; - private XMLInputFactory inputFactory; - - - public XSDDocumentProcessor(ExtensionPointRegistry registry, StAXArtifactProcessor processor) { - FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class); - this.factory = modelFactories.getFactory(XSDFactory.class); - this.inputFactory = modelFactories.getFactory(XMLInputFactory.class); - this.helper = StAXHelper.getInstance(registry); - } - - /** - * Report a exception. - * - * @param problems - * @param message - * @param model - */ - private void error(Monitor monitor, String message, Object model, Exception ex) { - if (monitor != null) { - Problem problem = monitor.createProblem(this.getClass().getName(), "xsd-xml-validation-messages", Severity.ERROR, model, message, ex); - monitor.problem(problem); - } - } - - public XSDefinition read(URL contributionURL, URI artifactURI, URL artifactURL, ProcessorContext context) throws ContributionReadException { - try { - return indexRead(artifactURL); - } catch (Exception e) { - ContributionReadException ce = new ContributionReadException(e); - error(context.getMonitor(), "ContributionReadException", artifactURL, ce); - throw ce; - } - } - - public void resolve(XSDefinition model, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException { - } - - public String getArtifactType() { - return ".xsd"; - } - - public Class getModelType() { - return XSDefinition.class; - } - - public static final QName XSD = new QName("http://www.w3.org/2001/XMLSchema", "schema"); - - protected XSDefinition indexRead(URL doc) throws Exception { - XSDefinition xsd = factory.createXSDefinition(); - xsd.setUnresolved(true); - xsd.setNamespace(helper.readAttribute(doc, XSD, "targetNamespace")); - xsd.setLocation(doc.toURI()); - xsd.setUnresolved(false); - return xsd; - } -} diff --git a/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java deleted file mode 100644 index 63ecf5d56f..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java +++ /dev/null @@ -1,328 +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.xsd.xml; - -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.tuscany.sca.common.xml.XMLDocumentHelper; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.DefaultImport; -import org.apache.tuscany.sca.contribution.Import; -import org.apache.tuscany.sca.contribution.namespace.NamespaceImport; -import org.apache.tuscany.sca.contribution.processor.ContributionRuntimeException; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.xsd.DefaultXSDFactory; -import org.apache.tuscany.sca.xsd.XSDFactory; -import org.apache.tuscany.sca.xsd.XSDefinition; -import org.apache.tuscany.sca.xsd.impl.XSDefinitionImpl; -import org.apache.ws.commons.schema.XmlSchema; -import org.apache.ws.commons.schema.XmlSchemaCollection; -import org.apache.ws.commons.schema.XmlSchemaInclude; -import org.apache.ws.commons.schema.resolver.URIResolver; -import org.xml.sax.InputSource; - -/** - * A Model Resolver for XSD models. - * - * @version $Rev$ $Date$ - */ -public class XSDModelResolver implements ModelResolver { - private static final String AGGREGATED_XSD = "http://tuscany.apache.org/aggregated.xsd"; - private XSDFactory factory; - private Contribution contribution; - private Map> map = new HashMap>(); - private XmlSchemaCollection schemaCollection; - - public XSDModelResolver(Contribution contribution, FactoryExtensionPoint modelFactories) { - this.contribution = contribution; - this.schemaCollection = new XmlSchemaCollection(); - this.factory = new DefaultXSDFactory(); - } - - public void addModel(Object resolved, ProcessorContext context) { - XSDefinition definition = (XSDefinition)resolved; - List list = map.get(definition.getNamespace()); - if (list == null) { - list = new ArrayList(); - map.put(definition.getNamespace(), list); - } - list.add(definition); - } - - public Object removeModel(Object resolved, ProcessorContext context) { - XSDefinition definition = (XSDefinition)resolved; - List list = map.get(definition.getNamespace()); - if (list == null) { - return null; - } else { - return list.remove(definition); - } - } - - public T resolveModel(Class modelClass, T unresolved, ProcessorContext context) { - schemaCollection.setSchemaResolver(new URIResolverImpl(contribution, context)); - XSDefinition definition = (XSDefinition)unresolved; - String namespace = definition.getNamespace(); - XSDefinition resolved = null; - - // Lookup a definition for the given namespace, within the contribution - List list = map.get(namespace); - XSDefinition modelXSD = null; - if (list != null && definition.getDocument() != null) { - // Set the document for the inline schema - int index = list.indexOf(definition); - if (index != -1) { // a matching (not identical) document was found - modelXSD = list.get(index); - modelXSD.setDocument(definition.getDocument()); - } - } - if (list == null && definition.getDocument() != null) { - // Hit for the 1st time - list = new ArrayList(); - list.add(definition); - map.put(namespace, list); - } - try { - resolved = aggregate(list); - } catch (IOException e) { - throw new ContributionRuntimeException(e); - } - if (resolved != null && !resolved.isUnresolved()) { - if (definition.isUnresolved() && definition.getSchema() == null && modelXSD != null) { - // Update the unresolved model with schema information and mark it - // resolved. This information in the unresolved model is needed when - // this method is called by WSDLModelResolver.readInlineSchemas(). - definition.setSchema(modelXSD.getSchema()); - definition.setSchemaCollection(modelXSD.getSchemaCollection()); - definition.setUnresolved(false); - } - return modelClass.cast(resolved); - } - - return modelClass.cast(unresolved); - } - - private void loadOnDemand(XSDefinition definition) throws IOException { - if (definition.getSchema() != null) { - return; - } - if (definition.getDocument() != null) { - String uri = null; - if (definition.getLocation() != null) { - uri = definition.getLocation().toString(); - } - XmlSchema schema = schemaCollection.read(definition.getDocument(), uri, null); - definition.setSchemaCollection(schemaCollection); - definition.setSchema(schema); - definition.setUnresolved(false); - } else if (definition.getLocation() != null) { - if (definition.getLocation().getFragment() != null) { - // It's an inline schema - return; - } - // Read an XSD document - XmlSchema schema = null; - for (XmlSchema d : schemaCollection.getXmlSchemas()) { - if (d.getTargetNamespace().equals(definition.getNamespace())) { - if (d.getSourceURI().equals(definition.getLocation().toString())) { - schema = d; - break; - } - } - } - if (schema == null) { - InputSource xsd = XMLDocumentHelper.getInputSource(definition.getLocation().toURL()); - schema = schemaCollection.read(xsd, null); - } - definition.setSchemaCollection(schemaCollection); - definition.setSchema(schema); - } - } - - /** - * Create a facade XmlSchema which includes all the definitions - * - * @param definitions A list of the XmlSchema under the same target - * namespace - * @return The aggregated XmlSchema - */ - private XSDefinition aggregate(List definitions) throws IOException { - if (definitions == null || definitions.size() == 0) { - return null; - } - if (definitions.size() == 1) { - XSDefinition d = definitions.get(0); - loadOnDemand(d); - return d; - } - XSDefinition aggregated = factory.createXSDefinition(); - for (XSDefinition d : definitions) { - loadOnDemand(d); - } - String ns = definitions.get(0).getNamespace(); - - XmlSchema facade = null; - // Check if the facade XSD is already in the collection - for (XmlSchema s : schemaCollection.getXmlSchema(AGGREGATED_XSD)) { - if (ns.equals(s.getTargetNamespace())) { - facade = s; - break; - } - } - if (facade == null) { - // This will add the facade into the collection - facade = new XmlSchema(ns, AGGREGATED_XSD, schemaCollection); - } - - for (XmlSchema d : schemaCollection.getXmlSchemas()) { - if (ns.equals(d.getTargetNamespace())) { - if (d == facade) { - continue; - } - XmlSchemaInclude include = new XmlSchemaInclude(); - include.setSchema(d); - include.setSourceURI(d.getSourceURI()); - include.setSchemaLocation(d.getSourceURI()); - facade.getIncludes().add(include); - facade.getItems().add(include); - } - } - aggregated.setUnresolved(true); - aggregated.setSchema(facade); - aggregated.setNamespace(ns); - aggregated.setAggregatedDefinitions(definitions); - aggregated.setUnresolved(false); - - // FIXME: [rfeng] This is hacky - //definitions.clear(); - //definitions.add(aggregated); - return aggregated; - } - - /** - * URI resolver implementation for XML schema - */ - public static class URIResolverImpl implements URIResolver { - private Contribution contribution; - private ProcessorContext context; - - public URIResolverImpl(Contribution contribution, ProcessorContext context) { - this.contribution = contribution; - this.context = context; - } - - public org.xml.sax.InputSource resolveEntity(java.lang.String targetNamespace, - java.lang.String schemaLocation, - java.lang.String baseUri) { - try - { - if (schemaLocation == null) { - return null; - } - URL url = null; - - // Delegate the resolution to namespace imports - XSDefinition resolved = null; - XSDefinition unresolved = new XSDefinitionImpl(); - unresolved.setUnresolved(true); - unresolved.setLocation(new URI(schemaLocation)); - unresolved.setNamespace(targetNamespace); - - // Collection of namespace imports with location - List locations = new ArrayList(); - Map locationMap = new HashMap(); - for (Import import_ : this.contribution.getImports()) { - if (import_ instanceof NamespaceImport) { - NamespaceImport namespaceImport = (NamespaceImport)import_; - if (namespaceImport.getNamespace().equals(targetNamespace)) { - if (namespaceImport.getLocation() == null) { - // Delegate the resolution to the namespace import resolver - resolved = - namespaceImport.getModelResolver().resolveModel(XSDefinition.class, (XSDefinition)unresolved, context); - if (!resolved.isUnresolved()) { - return XMLDocumentHelper.getInputSource(resolved.getLocation().toURL()); - } - } else { - // We might have multiple imports for the same namespace, - // need to search them in lexical order. - locations.add(namespaceImport.getLocation()); - locationMap.put(namespaceImport.getLocation(), namespaceImport); - } - } - } else if (import_ instanceof DefaultImport) { - // Delegate the resolution to the default import resolver - resolved = - import_.getModelResolver().resolveModel(XSDefinition.class, (XSDefinition)unresolved, context); - if (!resolved.isUnresolved()) { - return XMLDocumentHelper.getInputSource(resolved.getLocation().toURL()); - } - } - } - // Search namespace imports with location in lexical order - Collections.sort(locations); - for (String location : locations) { - NamespaceImport namespaceImport = (NamespaceImport)locationMap.get(location); - // Delegate the resolution to the namespace import resolver - resolved = - namespaceImport.getModelResolver().resolveModel(XSDefinition.class, (XSDefinition)unresolved, context); - if (!resolved.isUnresolved()) { - return XMLDocumentHelper.getInputSource(resolved.getLocation().toURL()); - } - } - - // Not found, lookup a definition for the given namespace - // within the current contribution. - if (schemaLocation.startsWith("/")) { - // The URI is relative to the contribution - String uri = schemaLocation.substring(1); - for (Artifact a : contribution.getArtifacts()) { - if (a.getURI().equals(uri)) { - url = new URL(a.getLocation()); - break; - } - } - } else { - url = new URL(new URL(baseUri), schemaLocation); - } - return XMLDocumentHelper.getInputSource(url); - } catch (IOException e) { - // Invalid URI; return a default InputSource so that the - // XmlSchema code will produce a useful diagnostic - return new InputSource(schemaLocation); - } catch (URISyntaxException e) { - // Invalid URI; return a default InputSource so that the - // XmlSchema code will produce a useful diagnostic - return new InputSource(schemaLocation); - } - } - } - -} diff --git a/branches/sca-java-2.0-M4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/branches/sca-java-2.0-M4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor deleted file mode 100644 index 8431cdcb75..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor +++ /dev/null @@ -1,20 +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.xsd.xml.XSDDocumentProcessor;type=.xsd,model=org.apache.tuscany.sca.xsd.XSDefinition - diff --git a/branches/sca-java-2.0-M4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/branches/sca-java-2.0-M4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver deleted file mode 100644 index acae484065..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver +++ /dev/null @@ -1,19 +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. - -org.apache.tuscany.sca.xsd.xml.XSDModelResolver;model=org.apache.tuscany.sca.xsd.XSDefinition - diff --git a/branches/sca-java-2.0-M4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory b/branches/sca-java-2.0-M4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory deleted file mode 100644 index d51b2445a4..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory +++ /dev/null @@ -1,18 +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. - -org.apache.tuscany.sca.xsd.DefaultXSDFactory diff --git a/branches/sca-java-2.0-M4/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties b/branches/sca-java-2.0-M4/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties deleted file mode 100644 index ab50456510..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties +++ /dev/null @@ -1,23 +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. -# -# -ContributionReadException = ContributionReadException occured due to : {0} - - diff --git a/branches/sca-java-2.0-M4/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java b/branches/sca-java-2.0-M4/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java deleted file mode 100644 index e139625986..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java +++ /dev/null @@ -1,96 +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.xsd.xml; - -import java.net.URI; -import java.net.URL; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.ContributionFactory; -import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.xsd.XSDefinition; -import org.apache.ws.commons.schema.XmlSchemaInclude; -import org.apache.ws.commons.schema.XmlSchemaObjectCollection; -import org.apache.ws.commons.schema.XmlSchemaType; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - */ -public class XSDDocumentProcessorTestCase { - private URLArtifactProcessor documentProcessor; - private ContributionFactory contributionFactory; - private ModelResolver resolver; - - /** - * @throws java.lang.Exception - */ - @Before - public void setUp() throws Exception { - ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); - URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors); - FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class); - contributionFactory = modelFactories.getFactory(ContributionFactory.class); - Contribution contribution = contributionFactory.createContribution(); - resolver = new XSDModelResolver(contribution, modelFactories); - } - - @Test - public void testXSD() throws Exception { - ProcessorContext context = new ProcessorContext(); - URL url = getClass().getResource("/xsd/greeting.xsd"); - XSDefinition definition = (XSDefinition)documentProcessor.read(null, URI.create("xsd/greeting.xsd"), url, context); - Assert.assertNull(definition.getSchema()); - Assert.assertEquals("http://greeting", definition.getNamespace()); - URL url1 = getClass().getResource("/xsd/name.xsd"); - XSDefinition definition1 = (XSDefinition)documentProcessor.read(null, URI.create("xsd/name.xsd"), url1, context); - Assert.assertNull(definition1.getSchema()); - Assert.assertEquals("http://greeting", definition1.getNamespace()); - resolver.addModel(definition, context); - XSDefinition resolved = resolver.resolveModel(XSDefinition.class, definition, context); - XmlSchemaObjectCollection collection = resolved.getSchema().getIncludes(); - Assert.assertTrue(collection.getCount() == 1); - XmlSchemaType type = - ((XmlSchemaInclude)collection.getItem(0)).getSchema().getTypeByName(new QName("http://greeting", "Name")); - Assert.assertNotNull(type); - resolver.addModel(definition1, context); - resolved = resolver.resolveModel(XSDefinition.class, definition, context); - collection = resolved.getSchema().getIncludes(); - Assert.assertTrue(collection.getCount() == 2); - XmlSchemaType type1 = - ((XmlSchemaInclude)collection.getItem(0)).getSchema().getTypeByName(new QName("http://greeting", "Name")); - XmlSchemaType type2 = - ((XmlSchemaInclude)collection.getItem(1)).getSchema().getTypeByName(new QName("http://greeting", "Name")); - Assert.assertTrue(type1 != null || type2 != null); - } - -} diff --git a/branches/sca-java-2.0-M4/modules/xsd/src/test/resources/xsd/greeting.xsd b/branches/sca-java-2.0-M4/modules/xsd/src/test/resources/xsd/greeting.xsd deleted file mode 100644 index 635ca25bfc..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/src/test/resources/xsd/greeting.xsd +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-2.0-M4/modules/xsd/src/test/resources/xsd/name.xsd b/branches/sca-java-2.0-M4/modules/xsd/src/test/resources/xsd/name.xsd deleted file mode 100644 index 300de931ec..0000000000 --- a/branches/sca-java-2.0-M4/modules/xsd/src/test/resources/xsd/name.xsd +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3