diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-16 06:48:13 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-16 06:48:13 +0000 |
| commit | 6f41ef61af2268d5576448974ca447b597387e88 (patch) | |
| tree | de4f94cc5b532a39f5968ff4fda6e714f52818a5 /branches/sca-java-2.0-M3/modules/xsd | |
| parent | 344bc76bba5f48b3476a8fc49d68bd3392703518 (diff) | |
Create 2.0 M3 release branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@785089 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-2.0-M3/modules/xsd')
20 files changed, 1637 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M3/modules/xsd/LICENSE b/branches/sca-java-2.0-M3/modules/xsd/LICENSE new file mode 100644 index 0000000000..8aa906c321 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/LICENSE @@ -0,0 +1,205 @@ + + 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-M3/modules/xsd/META-INF/MANIFEST.MF b/branches/sca-java-2.0-M3/modules/xsd/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..f88a2e4ad3 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/META-INF/MANIFEST.MF @@ -0,0 +1,46 @@ +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.w3c.dom,javax.xml.namespace",
+ org.apache.tuscany.sca.xsd.xml;version="2.0.0";
+ uses:="org.apache.ws.commons.schema,
+ org.apache.ws.commons.schema.resolver,
+ org.apache.tuscany.sca.contribution,
+ org.apache.tuscany.sca.core,
+ org.apache.tuscany.sca.monitor,
+ org.w3c.dom,
+ org.apache.tuscany.sca.contribution.namespace,
+ javax.xml.namespace,
+ org.xml.sax,
+ javax.xml.stream,
+ org.apache.tuscany.sca.contribution.resolver,
+ org.apache.tuscany.sca.contribution.processor"
+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.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-M3/modules/xsd/NOTICE b/branches/sca-java-2.0-M3/modules/xsd/NOTICE new file mode 100644 index 0000000000..25bb89c9b2 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/NOTICE @@ -0,0 +1,6 @@ +${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-M3/modules/xsd/pom.xml b/branches/sca-java-2.0-M3/modules/xsd/pom.xml new file mode 100644 index 0000000000..9379a95960 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/pom.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-modules</artifactId>
+ <version>2.0-M3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>tuscany-xsd</artifactId>
+ <name>Apache Tuscany SCA XSD Model</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly</artifactId>
+ <version>2.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution</artifactId>
+ <version>2.0-M3-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <!-- Apache repository for Web Services artifacts -->
+ <repository>
+ <id>apache.ws.zone</id>
+ <name>Apache WS Zone Repository</name>
+ <url>http://ws.zones.apache.org/repository2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+</project>
diff --git a/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java new file mode 100644 index 0000000000..92dce98fa1 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java @@ -0,0 +1,30 @@ +/* + * 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-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java new file mode 100644 index 0000000000..08a1c8dd63 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java @@ -0,0 +1,35 @@ +/* + * 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-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java new file mode 100644 index 0000000000..9a973cd095 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java @@ -0,0 +1,117 @@ +/* + * 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: 633545 $ $Date: 2008-03-04 16:52:24 +0000 (Tue, 04 Mar 2008) $ + */ +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<XSDefinition> getAggregatedDefinitions(); + + /** + * Set the aggregated definitions for a facade XSDefinition + * @param name The aggregated definitions + */ + void setAggregatedDefinitions(List<XSDefinition> definitions); +} diff --git a/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java new file mode 100644 index 0000000000..60ff6b6fd9 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java @@ -0,0 +1,35 @@ +/* + * 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-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java new file mode 100644 index 0000000000..34fb19f179 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java @@ -0,0 +1,232 @@ +/* + * 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: 582399 $ $Date: 2007-10-05 22:28:30 +0100 (Fri, 05 Oct 2007) $ + */ +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<XSDefinition> 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 extends XmlSchemaObject> T getXmlSchemaObject(XmlSchema schema, QName name, Class<T> 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<XSDefinition> getAggregatedDefinitions() { + return definitions; + } + + public void setAggregatedDefinitions(List<XSDefinition> definitions) { + this.definitions = definitions; + } + +} diff --git a/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java new file mode 100644 index 0000000000..a057bbe155 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java @@ -0,0 +1,184 @@ +/* + * 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.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.URL; +import java.net.URLConnection; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; + +import org.xml.sax.InputSource; + +/** + * @version $Rev$ $Date$ + */ +public class XMLDocumentHelper { + public static final QName WSDL11 = new QName("http://schemas.xmlsoap.org/wsdl/", "definitions"); + public static final QName XSD = new QName("http://www.w3.org/2001/XMLSchema", "schema"); + public static final QName WSDL20 = new QName("http://www.w3.org/ns/wsdl", "description"); + + protected static final int BUFFER_SIZE = 256; + + /** + * Detect the XML encoding of the document + * + * @param is The input stream + * @return The encoding + * @throws IOException + */ + public static String getEncoding(InputStream is) throws IOException { + if (!is.markSupported()) + is = new BufferedInputStream(is); + + byte[] buffer = readBuffer(is); + return getXMLEncoding(buffer); + } + + /** + * Searches the array of bytes to determine the XML encoding. + */ + protected static String getXMLEncoding(byte[] bytes) { + String javaEncoding = null; + + if (bytes.length >= 4) { + if (((bytes[0] == -2) && (bytes[1] == -1)) || ((bytes[0] == 0) && (bytes[1] == 60))) + javaEncoding = "UnicodeBig"; + else if (((bytes[0] == -1) && (bytes[1] == -2)) || ((bytes[0] == 60) && (bytes[1] == 0))) + javaEncoding = "UnicodeLittle"; + else if ((bytes[0] == -17) && (bytes[1] == -69) && (bytes[2] == -65)) + javaEncoding = "UTF8"; + } + + String header = null; + + try { + if (javaEncoding != null) + header = new String(bytes, 0, bytes.length, javaEncoding); + else + header = new String(bytes, 0, bytes.length); + } catch (UnsupportedEncodingException e) { + return null; + } + + if (!header.startsWith("<?xml")) + return "UTF-8"; + + int endOfXMLPI = header.indexOf("?>"); + int encodingIndex = header.indexOf("encoding", 6); + + if ((encodingIndex == -1) || (encodingIndex > endOfXMLPI)) + return "UTF-8"; + + int firstQuoteIndex = header.indexOf("\"", encodingIndex); + int lastQuoteIndex; + + if ((firstQuoteIndex == -1) || (firstQuoteIndex > endOfXMLPI)) { + firstQuoteIndex = header.indexOf("'", encodingIndex); + lastQuoteIndex = header.indexOf("'", firstQuoteIndex + 1); + } else + lastQuoteIndex = header.indexOf("\"", firstQuoteIndex + 1); + + return header.substring(firstQuoteIndex + 1, lastQuoteIndex); + } + + protected static byte[] readBuffer(InputStream is) throws IOException { + if (is.available() == 0) { + return new byte[0]; + } + + byte[] buffer = new byte[BUFFER_SIZE]; + is.mark(BUFFER_SIZE); + int bytesRead = is.read(buffer, 0, BUFFER_SIZE); + int totalBytesRead = bytesRead; + + while (bytesRead != -1 && (totalBytesRead < BUFFER_SIZE)) { + bytesRead = is.read(buffer, totalBytesRead, BUFFER_SIZE - totalBytesRead); + + if (bytesRead != -1) + totalBytesRead += bytesRead; + } + + if (totalBytesRead < BUFFER_SIZE) { + byte[] smallerBuffer = new byte[totalBytesRead]; + System.arraycopy(buffer, 0, smallerBuffer, 0, totalBytesRead); + smallerBuffer = buffer; + } + + is.reset(); + return buffer; + } + + public static InputSource getInputSource(URL url) throws IOException { + URLConnection connection = url.openConnection(); + connection.setUseCaches(false); + InputStream is = connection.getInputStream(); + return getInputSource(url, is); + } + + public static InputSource getInputSource(URL url, InputStream is) throws IOException { + is = new BufferedInputStream(is); + String encoding = getEncoding(is); + InputSource inputSource = new InputSource(is); + inputSource.setEncoding(encoding); + // [rfeng] Make sure we set the system id as it will be used as the base URI for nested import/include + inputSource.setSystemId(url.toString()); + return inputSource; + } + + public static String readTargetNamespace(URL doc, QName element, boolean rootOnly, String attribute, XMLInputFactory inputFactory) + throws IOException, XMLStreamException { + if (attribute == null) { + attribute = "targetNamespace"; + } + URLConnection connection = doc.openConnection(); + connection.setUseCaches(false); + InputStream is = connection.getInputStream(); + try { + XMLStreamReader reader = inputFactory.createXMLStreamReader(is); + int eventType = reader.getEventType(); + while (true) { + if (eventType == XMLStreamConstants.START_ELEMENT) { + if (element.equals(reader.getName())) { + return reader.getAttributeValue(null, attribute); + } else if (rootOnly) { + return null; + } + } + if (reader.hasNext()) { + eventType = reader.next(); + } else { + break; + } + } + return null; + } finally { + is.close(); + } + } + +} diff --git a/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java new file mode 100644 index 0000000000..1d84b6c0a0 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java @@ -0,0 +1,101 @@ +/* + * 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.contribution.processor.ContributionReadException; +import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; +import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.core.FactoryExtensionPoint; +import org.apache.tuscany.sca.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<XSDefinition> { + + private XSDFactory factory; + private XMLInputFactory inputFactory; + private Monitor monitor; + + public XSDDocumentProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) { + this.factory = modelFactories.getFactory(XSDFactory.class); + this.inputFactory = modelFactories.getFactory(XMLInputFactory.class); + this.monitor = monitor; + } + + /** + * Report a exception. + * + * @param problems + * @param message + * @param model + */ + private void error(String message, Object model, Exception ex) { + if (monitor != null) { + Problem problem = monitor.createProblem(this.getClass().getName(), "xsd-xml-validation-messages", Severity.ERROR, model, message, ex); + monitor.problem(problem); + } + } + + public XSDefinition read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException { + try { + return indexRead(artifactURL); + } catch (Exception e) { + ContributionReadException ce = new ContributionReadException(e); + error("ContributionReadException", artifactURL, ce); + throw ce; + } + } + + public void resolve(XSDefinition model, ModelResolver resolver) throws ContributionResolveException { + } + + public String getArtifactType() { + return ".xsd"; + } + + public Class<XSDefinition> 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(XMLDocumentHelper.readTargetNamespace(doc, XSD, true, "targetNamespace", inputFactory)); + xsd.setLocation(doc.toURI()); + xsd.setUnresolved(false); + return xsd; + } +} diff --git a/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java new file mode 100644 index 0000000000..2f303a295c --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java @@ -0,0 +1,301 @@ +/* + * 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.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Collections; + +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.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.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<String, List<XSDefinition>> map = new HashMap<String, List<XSDefinition>>(); + private XmlSchemaCollection schemaCollection; + + public XSDModelResolver(Contribution contribution, FactoryExtensionPoint modelFactories) { + this.contribution = contribution; + this.schemaCollection = new XmlSchemaCollection(); + schemaCollection.setSchemaResolver(new URIResolverImpl(contribution)); + this.factory = new DefaultXSDFactory(); + } + + public void addModel(Object resolved) { + XSDefinition definition = (XSDefinition)resolved; + List<XSDefinition> list = map.get(definition.getNamespace()); + if (list == null) { + list = new ArrayList<XSDefinition>(); + map.put(definition.getNamespace(), list); + } + list.add(definition); + } + + public Object removeModel(Object resolved) { + XSDefinition definition = (XSDefinition)resolved; + List<XSDefinition> list = map.get(definition.getNamespace()); + if (list == null) { + return null; + } else { + return list.remove(definition); + } + } + + public <T> T resolveModel(Class<T> modelClass, T unresolved) { + + XSDefinition definition = (XSDefinition)unresolved; + String namespace = definition.getNamespace(); + XSDefinition resolved = null; + + // Lookup a definition for the given namespace, from imports + List<String> locations = new ArrayList<String>(); + // Collection of namespace imports with location + Map<String, NamespaceImport> locationMap = new HashMap<String, NamespaceImport>(); + for (Import import_ : this.contribution.getImports()) { + if (import_ instanceof NamespaceImport) { + NamespaceImport namespaceImport = (NamespaceImport)import_; + if (namespaceImport.getNamespace().equals(namespace)) { + if (namespaceImport.getLocation() == null) { + // Delegate the resolution to the namespace import resolver + resolved = + namespaceImport.getModelResolver().resolveModel(XSDefinition.class, (XSDefinition)unresolved); + if (!resolved.isUnresolved()) { + return modelClass.cast(resolved); + } + } else { + // We might have multiple imports for the same namespace, + // need to search them in lexical order. + locations.add(namespaceImport.getLocation()); + } + } + } else if (import_ instanceof DefaultImport) { + + // Delegate the resolution to the default import resolver + resolved = + import_.getModelResolver().resolveModel(XSDefinition.class, (XSDefinition)unresolved); + if (!resolved.isUnresolved()) { + return modelClass.cast(resolved); + } + } + } + // 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); + if (!resolved.isUnresolved()) { + return modelClass.cast(resolved); + } + } + + // Not found, lookup a definition for the given namespace, within the contribution + List<XSDefinition> 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<XSDefinition>(); + 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 + InputSource xsd = XMLDocumentHelper.getInputSource(definition.getLocation().toURL()); + for (XmlSchema d : schemaCollection.getXmlSchemas()) { + if (d.getTargetNamespace().equals(definition.getNamespace())) { + if (d.getSourceURI().equals(definition.getLocation().toString())) + return; + } + } + XmlSchema 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<XSDefinition> 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; + + public URIResolverImpl(Contribution contribution) { + this.contribution = contribution; + } + + 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; + 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) { + return null; + } + } + } + +} diff --git a/branches/sca-java-2.0-M3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/branches/sca-java-2.0-M3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor new file mode 100644 index 0000000000..1ec3d27200 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor @@ -0,0 +1,19 @@ +# 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-M3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/branches/sca-java-2.0-M3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver new file mode 100644 index 0000000000..a67ecf063a --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver @@ -0,0 +1,18 @@ +# 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-M3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory b/branches/sca-java-2.0-M3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory new file mode 100644 index 0000000000..ca06127c06 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory @@ -0,0 +1,18 @@ +# 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
\ No newline at end of file diff --git a/branches/sca-java-2.0-M3/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties b/branches/sca-java-2.0-M3/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties new file mode 100644 index 0000000000..ab50456510 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties @@ -0,0 +1,23 @@ +# +# +# 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-M3/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java b/branches/sca-java-2.0-M3/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java new file mode 100644 index 0000000000..56831e23d3 --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java @@ -0,0 +1,50 @@ +/* + * 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.URL; + +import javax.xml.stream.XMLInputFactory; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +/** + * @version $Rev$ $Date$ + */ +public class XMLDocumentHelperTestCase { + private URL xsd; + + /** + * @throws java.lang.Exception + */ + @Before + public void setUp() throws Exception { + xsd = getClass().getResource("/xsd/greeting.xsd"); + } + + @Test + public void testReadTNS() throws Exception { + String tns = XMLDocumentHelper.readTargetNamespace(xsd, XMLDocumentHelper.XSD, true, null, XMLInputFactory.newInstance()); + Assert.assertEquals("http://greeting", tns); + } + +} diff --git a/branches/sca-java-2.0-M3/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java b/branches/sca-java-2.0-M3/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java new file mode 100644 index 0000000000..3862973eca --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java @@ -0,0 +1,94 @@ +/* + * 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.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<Object> 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, null); + 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 { + URL url = getClass().getResource("/xsd/greeting.xsd"); + XSDefinition definition = (XSDefinition)documentProcessor.read(null, URI.create("xsd/greeting.xsd"), url); + 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); + Assert.assertNull(definition1.getSchema()); + Assert.assertEquals("http://greeting", definition1.getNamespace()); + resolver.addModel(definition); + XSDefinition resolved = resolver.resolveModel(XSDefinition.class, definition); + 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); + resolved = resolver.resolveModel(XSDefinition.class, definition); + 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-M3/modules/xsd/src/test/resources/xsd/greeting.xsd b/branches/sca-java-2.0-M3/modules/xsd/src/test/resources/xsd/greeting.xsd new file mode 100644 index 0000000000..635ca25bfc --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/test/resources/xsd/greeting.xsd @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<schema targetNamespace="http://greeting" xmlns="http://www.w3.org/2001/XMLSchema"> + <include schemaLocation="name.xsd" /> + <complexType name="Greeting"> + <sequence> + <element name="message" type="string" /> + <element name="name" type="Name" /> + </sequence> + </complexType> + +</schema>
\ No newline at end of file diff --git a/branches/sca-java-2.0-M3/modules/xsd/src/test/resources/xsd/name.xsd b/branches/sca-java-2.0-M3/modules/xsd/src/test/resources/xsd/name.xsd new file mode 100644 index 0000000000..300de931ec --- /dev/null +++ b/branches/sca-java-2.0-M3/modules/xsd/src/test/resources/xsd/name.xsd @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<schema targetNamespace="http://greeting" xmlns="http://www.w3.org/2001/XMLSchema"> + + <complexType name="Name"> + <sequence> + <element name="firstName" type="string" /> + <element name="lastName" type="string" /> + </sequence> + </complexType> + +</schema>
\ No newline at end of file |