You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/09/05 19:07:14 UTC
[GitHub] matthiasblaesing closed pull request #834: [NETBEANS-857] Import
WSDL XSD from Apache CXF sources
matthiasblaesing closed pull request #834: [NETBEANS-857] Import WSDL XSD from Apache CXF sources
URL: https://github.com/apache/incubator-netbeans/pull/834
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ide/xml.wsdl.model/build.xml b/ide/xml.wsdl.model/build.xml
index d23b01ae5b..479145d141 100644
--- a/ide/xml.wsdl.model/build.xml
+++ b/ide/xml.wsdl.model/build.xml
@@ -21,4 +21,33 @@
-->
<project name="ide/xml.wsdl.model" default="build" basedir=".">
<import file="../../nbbuild/templates/projectized.xml"/>
+
+ <!-- Hook into harness "-process.release.files" task -->
+ <target name="-process.release.files" depends="prepare-wsdl"/>
+
+ <!-- Check if taglib doc was already generated -->
+ <target name="-check-prepared-wsdl">
+ <condition property="xml.wsdl.model.wsdlgenerated" value="present">
+ <and>
+ <available file="external/generated-wsdl-xsd-2004.08.24-license.jar" />
+ </and>
+ </condition>
+ </target>
+
+ <target name="prepare-wsdl" depends="-check-prepared-wsdl,-define-FileCRC32Calculator" unless="xml.wsdl.model.wsdlgenerated">
+ <!--
+
+ This task prepares the XSD for WSDLs by repackaging the XSD contained
+ in the CXF artifacts. Its unclear why the netbeans project may not
+ hold the XSDs, while the CXF project may, but the IPMC member made
+ it clear, that he'd veto a release if removal was not planned.
+
+ -->
+
+ <jar destfile="external/generated-wsdl-xsd-2004.08.24.jar">
+ <zipfileset src="external/cxf-core-3.2.6-sources.jar"
+ includes="schemas/wsdl/wsdl.xsd"
+ fullpath="org/netbeans/modules/xml/wsdl/validator/resources/external/wsdl-2004-08-24.xsd" />
+ </jar>
+ </target>
</project>
diff --git a/ide/xml.wsdl.model/external/binaries-list b/ide/xml.wsdl.model/external/binaries-list
new file mode 100644
index 0000000000..8f05a5a5c6
--- /dev/null
+++ b/ide/xml.wsdl.model/external/binaries-list
@@ -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.
+92D8617FE2F22AAD7DD34B6CC563D12CABAE38EF org.apache.cxf:cxf-core:3.2.6:sources
+
diff --git a/ide/xml.wsdl.model/external/cxf-core-3.2.6-sources-license.txt b/ide/xml.wsdl.model/external/cxf-core-3.2.6-sources-license.txt
new file mode 100644
index 0000000000..c07547c4de
--- /dev/null
+++ b/ide/xml.wsdl.model/external/cxf-core-3.2.6-sources-license.txt
@@ -0,0 +1,209 @@
+Name: Apache CXF
+Description: Apache CXF is an open-source services framework that aids in the development of services using front-end programming APIs, like JAX-WS and JAX-RS.
+Origin: Apache Software Foundation
+Version: 3.2.6
+License: Apache-2.0
+URL: http://cxf.apache.org/
+Comment: Only used to extract the WSDL xsd
+
+ 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/ide/xml.wsdl.model/external/cxf-core-3.2.6-sources-notice.txt b/ide/xml.wsdl.model/external/cxf-core-3.2.6-sources-notice.txt
new file mode 100644
index 0000000000..a64ddd7a77
--- /dev/null
+++ b/ide/xml.wsdl.model/external/cxf-core-3.2.6-sources-notice.txt
@@ -0,0 +1,5 @@
+Apache CXF
+Copyright 2006-2018 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/ide/xml.wsdl.model/external/generated-wsdl-xsd-2004.08.24-license.txt b/ide/xml.wsdl.model/external/generated-wsdl-xsd-2004.08.24-license.txt
new file mode 100644
index 0000000000..dc09b66734
--- /dev/null
+++ b/ide/xml.wsdl.model/external/generated-wsdl-xsd-2004.08.24-license.txt
@@ -0,0 +1,32 @@
+Name: WSDL Schema
+Description: WSDL Schema described as an XML Schema
+Origin: Apache CXF
+Version: 2004.08.24
+License: WSDL-2004
+Type: generated
+
+Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
+All Rights Reserved
+
+License for WSDL Schema Files
+
+The Authors grant permission to copy and distribute the WSDL Schema
+Files in any medium without fee or royalty as long as this notice and
+license are distributed with them. The originals of these files can
+be located at:
+
+http://schemas.xmlsoap.org/wsdl/2004-08-24.xsd
+
+THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS
+OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR
+RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner,
+including advertising or publicity pertaining to these files or any program
+or service that uses these files, written prior permission. Title to copyright
+in these files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
diff --git a/ide/xml.wsdl.model/licenseinfo.xml b/ide/xml.wsdl.model/licenseinfo.xml
deleted file mode 100644
index 19ef7df870..0000000000
--- a/ide/xml.wsdl.model/licenseinfo.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.
-
--->
-<licenseinfo>
- <fileset>
- <file>src/org/netbeans/modules/xml/wsdl/validator/resources/wsdl-2004-08-24.xsd</file>
- <license ref="WSDL-2004" />
- <comment type="CATEGORY_B">
- Used at runtime for the XML validation.
- </comment>
- </fileset>
-</licenseinfo>
diff --git a/ide/xml.wsdl.model/nbproject/project.properties b/ide/xml.wsdl.model/nbproject/project.properties
index e24a53a9de..dafbcb1822 100644
--- a/ide/xml.wsdl.model/nbproject/project.properties
+++ b/ide/xml.wsdl.model/nbproject/project.properties
@@ -21,6 +21,7 @@ is.autoload=true
javac.source=1.6
javadoc.arch=${basedir}/arch.xml
spec.version.base=1.36.0
+release.external/generated-wsdl-xsd-2004.08.24.jar=modules/ext/generated-wsdl-xsd-2004.08.24.jar
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/ide/xml.wsdl.model/nbproject/project.xml b/ide/xml.wsdl.model/nbproject/project.xml
index 34c6f4283d..171155dacc 100644
--- a/ide/xml.wsdl.model/nbproject/project.xml
+++ b/ide/xml.wsdl.model/nbproject/project.xml
@@ -126,6 +126,10 @@
<package>org.netbeans.modules.xml.wsdl.model.visitor</package>
<package>org.netbeans.modules.xml.wsdl.validator.spi</package>
</public-packages>
+ <class-path-extension>
+ <runtime-relative-path>ext/generated-wsdl-xsd-2004.08.24.jar</runtime-relative-path>
+ <binary-origin>external/generated-wsdl-xsd-2004.08.24.jar</binary-origin>
+ </class-path-extension>
</data>
</configuration>
</project>
diff --git a/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/WSDLSchemaValidator.java b/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/WSDLSchemaValidator.java
index 4a329f98a8..9e003583d2 100644
--- a/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/WSDLSchemaValidator.java
+++ b/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/WSDLSchemaValidator.java
@@ -18,7 +18,6 @@
*/
package org.netbeans.modules.xml.wsdl.validator;
-import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -47,7 +46,7 @@
* Uses the WSDL Basic Profile 1.1 schema from
* http://www.ws-i.org/Profiles/BasicProfile-1.1.html#WSDLDOCSTRUCT
*/
- static final String wsdlXSDUrl = "/org/netbeans/modules/xml/wsdl/validator/resources/wsdl-2004-08-24.xsd";
+ static final String wsdlXSDUrl = "/org/netbeans/modules/xml/wsdl/validator/resources/external/wsdl-2004-08-24.xsd";
public String getName() {
return "WSDLSchemaValidator"; //NO I18N
diff --git a/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/resources/wsdl-2004-08-24.xsd b/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/resources/wsdl-2004-08-24.xsd
deleted file mode 100644
index 70c31ff345..0000000000
--- a/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/resources/wsdl-2004-08-24.xsd
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
-All Rights Reserved
-
-License for WSDL Schema Files
-
-The Authors grant permission to copy and distribute the WSDL Schema
-Files in any medium without fee or royalty as long as this notice and
-license are distributed with them. The originals of these files can
-be located at:
-
-http://schemas.xmlsoap.org/wsdl/2004-08-24.xsd
-
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS
-OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT,
-INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR
-RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner,
-including advertising or publicity pertaining to these files or any program
-or service that uses these files, written prior permission. Title to copyright
-in these files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- targetNamespace="http://schemas.xmlsoap.org/wsdl/" elementFormDefault="qualified">
- <xs:complexType mixed="true" name="tDocumentation">
- <xs:sequence>
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="tDocumented">
- <xs:annotation>
- <xs:documentation>
- This type is extended by component types to allow them to be documented
- </xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="documentation" type="wsdl:tDocumentation" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <!-- implemented resolution of swa124 -->
- <xs:complexType name="tExtensibleAttributesDocumented" abstract="true">
- <xs:complexContent>
- <xs:extension base="wsdl:tDocumented">
- <xs:annotation>
- <xs:documentation>
- This type is extended by component types to allow attributes from other namespaces to be added.
- </xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:any namespace="##other" minOccurs="0"
- maxOccurs="unbounded" processContents="lax"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <!-- implemented resolution of swa124 -->
- <xs:complexType name="tExtensibleDocumented" abstract="true">
- <xs:complexContent>
- <xs:extension base="wsdl:tDocumented">
- <xs:annotation>
- <xs:documentation>
- This type is extended by component types to allow elements from other namespaces to be added.
- </xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:any namespace="##other" minOccurs="0"
- maxOccurs="unbounded" processContents="lax"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:element name="definitions" type="wsdl:tDefinitions">
- <xs:key name="message">
- <xs:selector xpath="wsdl:message"/>
- <xs:field xpath="@name"/>
- </xs:key>
- <xs:key name="portType">
- <xs:selector xpath="wsdl:portType"/>
- <xs:field xpath="@name"/>
- </xs:key>
- <xs:key name="binding">
- <xs:selector xpath="wsdl:binding"/>
- <xs:field xpath="@name"/>
- </xs:key>
- <xs:key name="service">
- <xs:selector xpath="wsdl:service"/>
- <xs:field xpath="@name"/>
- </xs:key>
- <xs:key name="import">
- <xs:selector xpath="wsdl:import"/>
- <xs:field xpath="@namespace"/>
- </xs:key>
- </xs:element>
- <xs:group name="anyTopLevelOptionalElement">
- <xs:annotation>
- <xs:documentation>
- Any top level optional element allowed to appear more then once - any child of definitions element except wsdl:types. Any extensibility element is allowed in any place.
- </xs:documentation>
- </xs:annotation>
- <xs:choice>
- <xs:element name="import" type="wsdl:tImport"/>
- <xs:element name="types" type="wsdl:tTypes"/>
- <xs:element name="message" type="wsdl:tMessage">
- <xs:unique name="part">
- <xs:selector xpath="wsdl:part"/>
- <xs:field xpath="@name"/>
- </xs:unique>
- </xs:element>
- <xs:element name="portType" type="wsdl:tPortType"/>
- <xs:element name="binding" type="wsdl:tBinding"/>
- <xs:element name="service" type="wsdl:tService">
- <xs:unique name="port">
- <xs:selector xpath="wsdl:port"/>
- <xs:field xpath="@name"/>
- </xs:unique>
- </xs:element>
- </xs:choice>
- </xs:group>
- <!-- implemented resolution of er015 and UPA fix. ASK -->
- <xs:complexType name="tDefinitions">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleDocumented">
- <xs:sequence minOccurs="0">
- <xs:group ref="wsdl:anyTopLevelOptionalElement"/>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:group ref="wsdl:anyTopLevelOptionalElement"/>
- <xs:any namespace="##other" processContents="lax"/>
- </xs:choice>
- </xs:sequence>
- <xs:attribute name="targetNamespace" type="xs:anyURI" use="optional"/>
- <xs:attribute name="name" type="xs:NCName" use="optional"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="tImport">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleAttributesDocumented">
- <xs:attribute name="namespace" type="xs:anyURI" use="required"/>
- <xs:attribute name="location" type="xs:anyURI" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="tTypes">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleDocumented"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="tMessage">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleDocumented">
- <xs:sequence>
- <xs:element name="part" type="wsdl:tPart"
- minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:NCName" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="tPart">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleAttributesDocumented">
- <xs:attribute name="name" type="xs:NCName" use="required"/>
- <xs:attribute name="element" type="xs:QName" use="optional"/>
- <xs:attribute name="type" type="xs:QName" use="optional"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="tPortType">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleAttributesDocumented">
- <xs:sequence>
- <xs:element name="operation" type="wsdl:tOperation"
- minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:NCName" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="tOperation">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleDocumented">
- <xs:sequence>
- <xs:choice>
- <xs:group ref="wsdl:request-response-or-one-way-operation"/>
- <xs:group ref="wsdl:solicit-response-or-notification-operation"/>
- </xs:choice>
- </xs:sequence>
- <xs:attribute name="name" type="xs:NCName" use="required"/>
- <xs:attribute name="parameterOrder" type="xs:NMTOKENS" use="optional"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:group name="request-response-or-one-way-operation">
- <xs:sequence>
- <xs:element name="input" type="wsdl:tParam"/>
- <xs:sequence minOccurs="0">
- <xs:element name="output" type="wsdl:tParam"/>
- <xs:element name="fault" type="wsdl:tFault"
- minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:sequence>
- </xs:group>
- <xs:group name="solicit-response-or-notification-operation">
- <xs:sequence>
- <xs:element name="output" type="wsdl:tParam"/>
- <xs:sequence minOccurs="0">
- <xs:element name="input" type="wsdl:tParam"/>
- <xs:element name="fault" type="wsdl:tFault"
- minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:sequence>
- </xs:group>
- <xs:complexType name="tParam">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleAttributesDocumented">
- <xs:attribute name="name" type="xs:NCName" use="optional"/>
- <xs:attribute name="message" type="xs:QName" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="tFault">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleAttributesDocumented">
- <xs:attribute name="name" type="xs:NCName" use="required"/>
- <xs:attribute name="message" type="xs:QName" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="tBinding">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleDocumented">
- <xs:sequence>
- <xs:element name="operation"
- type="wsdl:tBindingOperation" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:NCName" use="required"/>
- <xs:attribute name="type" type="xs:QName" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="tBindingOperationMessage">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleDocumented">
- <xs:attribute name="name" type="xs:NCName" use="optional"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="tBindingOperationFault">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleDocumented">
- <xs:attribute name="name" type="xs:NCName" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="tBindingOperation">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleDocumented">
- <xs:sequence>
- <xs:element name="input"
- type="wsdl:tBindingOperationMessage" minOccurs="0"/>
- <xs:element name="output"
- type="wsdl:tBindingOperationMessage" minOccurs="0"/>
- <xs:element name="fault"
- type="wsdl:tBindingOperationFault" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:NCName" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="tService">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleDocumented">
- <xs:sequence>
- <xs:element name="port" type="wsdl:tPort"
- minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:NCName" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="tPort">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibleDocumented">
- <xs:attribute name="name" type="xs:NCName" use="required"/>
- <xs:attribute name="binding" type="xs:QName" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:attribute name="arrayType" type="xs:string"/>
- <xs:attribute name="required" type="xs:boolean"/>
- <xs:complexType name="tExtensibilityElement" abstract="true">
- <xs:attribute ref="wsdl:required" use="optional"/>
- </xs:complexType>
-</xs:schema>
diff --git a/nbbuild/licenses/WSDL-2004 b/nbbuild/licenses/WSDL-2004
index b96497a7da..b6a47b2eda 100644
--- a/nbbuild/licenses/WSDL-2004
+++ b/nbbuild/licenses/WSDL-2004
@@ -3,23 +3,23 @@ All Rights Reserved
License for WSDL Schema Files
-The Authors grant permission to copy and distribute the WSDL Schema
-Files in any medium without fee or royalty as long as this notice and
-license are distributed with them. The originals of these files can
+The Authors grant permission to copy and distribute the WSDL Schema
+Files in any medium without fee or royalty as long as this notice and
+license are distributed with them. The originals of these files can
be located at:
http://schemas.xmlsoap.org/wsdl/2004-08-24.xsd
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS
-OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT,
-INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR
+THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS
+OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR
RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-The name and trademarks of the Authors may NOT be used in any manner,
-including advertising or publicity pertaining to these files or any program
-or service that uses these files, written prior permission. Title to copyright
+The name and trademarks of the Authors may NOT be used in any manner,
+including advertising or publicity pertaining to these files or any program
+or service that uses these files, written prior permission. Title to copyright
in these files will at all times remain with the Authors.
No other rights are granted by implication, estoppel or otherwise.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists