You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/10/11 17:45:47 UTC
[01/24] incubator-netbeans git commit: [NETBEANS-54] Module review
xml.multiview
Repository: incubator-netbeans
Updated Branches:
refs/heads/master 7fe8ddf7c -> b136e1207
[NETBEANS-54] Module review xml.multiview
- no external library
- checked Rat report; added license header to testfiles, manually
updated unconverted license headers
- skimmed through the module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/c7cc9953
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/c7cc9953
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/c7cc9953
Branch: refs/heads/master
Commit: c7cc9953d6f042dbce1cb8670194547dd3f3226d
Parents: c70e37a
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Tue Oct 3 19:17:53 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:15 2017 +0200
----------------------------------------------------------------------
.../modules/xml/multiview/Bundle.properties | 53 +++++--------------
.../modules/xml/multiview/ui/Bundle.properties | 55 +++++---------------
.../ChangedChapterLength.pass | 20 +++++++
.../ChangedChapterTitle.pass | 20 +++++++
xml.multiview/test/unit/data/sample.book | 20 +++++++
5 files changed, 88 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c7cc9953/xml.multiview/src/org/netbeans/modules/xml/multiview/Bundle.properties
----------------------------------------------------------------------
diff --git a/xml.multiview/src/org/netbeans/modules/xml/multiview/Bundle.properties b/xml.multiview/src/org/netbeans/modules/xml/multiview/Bundle.properties
index 25df397..d6b2c87 100644
--- a/xml.multiview/src/org/netbeans/modules/xml/multiview/Bundle.properties
+++ b/xml.multiview/src/org/netbeans/modules/xml/multiview/Bundle.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is Forte for Java, Community Edition. The Initial
-# Developer of the Original Software is Sun Microsystems, Inc. Portions
-# Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
+# 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.
# Module manifest localization
OpenIDE-Module-Name=XML Multiview Editor
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c7cc9953/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/Bundle.properties
----------------------------------------------------------------------
diff --git a/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/Bundle.properties b/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/Bundle.properties
index 86b76a7..e37b3de 100644
--- a/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/Bundle.properties
+++ b/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/Bundle.properties
@@ -1,46 +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
#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is Forte for Java, Community Edition. The Initial
-# Developer of the Original Software is Sun Microsystems, Inc. Portions
-# Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
+# 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.
LBL_Add=&Add...
HINT_Add=Add
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c7cc9953/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterLength.pass
----------------------------------------------------------------------
diff --git a/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterLength.pass b/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterLength.pass
index 0450fe1..e3c7d27 100644
--- a/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterLength.pass
+++ b/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterLength.pass
@@ -1,4 +1,24 @@
<?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.
+
+-->
<!DOCTYPE book PUBLIC "-//BookCompany//Entity ID//EN" "file://book.dtd">
<book instock="yes">
<title lang="en">A bean on the beach</title>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c7cc9953/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterTitle.pass
----------------------------------------------------------------------
diff --git a/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterTitle.pass b/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterTitle.pass
index 480a290..6b62586 100644
--- a/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterTitle.pass
+++ b/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterTitle.pass
@@ -1,4 +1,24 @@
<?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.
+
+-->
<!DOCTYPE book PUBLIC "-//BookCompany//Entity ID//EN" "file://book.dtd">
<book instock="yes">
<title lang="en">A bean on the beach</title>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c7cc9953/xml.multiview/test/unit/data/sample.book
----------------------------------------------------------------------
diff --git a/xml.multiview/test/unit/data/sample.book b/xml.multiview/test/unit/data/sample.book
index 798e811..fe9ea96 100644
--- a/xml.multiview/test/unit/data/sample.book
+++ b/xml.multiview/test/unit/data/sample.book
@@ -1,4 +1,24 @@
<?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.
+
+-->
<!DOCTYPE book PUBLIC "-//BookCompany//Entity ID//EN" "file://sample.dtd">
<book instock="yes">
<title lang="en">A bean on the beach</title>
[10/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.xdm
Posted by ma...@apache.org.
[NETBEANS-54] Modules review xml.xdm
- no external library
- checked Rat report: excluded test-data from rat (no IP value)
- disable tests that fail because referenced files were not donated
- skimmed through module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/9ee72106
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/9ee72106
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/9ee72106
Branch: refs/heads/master
Commit: 9ee72106afac864a1e518d45b77fe1be277f19f4
Parents: a948b44
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Fri Oct 6 21:26:57 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:53 2017 +0200
----------------------------------------------------------------------
nbbuild/build.xml | 4 ++++
.../unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java | 3 ++-
.../org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java | 5 +++--
.../org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java | 9 ++++++---
.../netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java | 3 ++-
.../netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java | 7 ++++---
.../modules/xml/xdm/visitor/FindNamespaceVisitorTest.java | 5 +++--
.../netbeans/modules/xml/xdm/visitor/XPathFinderTest.java | 5 +++--
8 files changed, 27 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index ca3ab8f..8f85aca 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1978,6 +1978,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="spi.navigator/test/unit/src/org/netbeans/modules/navigator/resources/lastsel/file.lastsel_mime1" /> <!--empty file-->
<exclude name="xml.axi/test/unit/src/org/netbeans/modules/xml/axi/resources/**" /> <!-- test data -->
<exclude name="xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/resources/**" /> <!-- test data -->
+ <exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.wsdl" /> <!-- test data -->
+ <exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.xml" /> <!-- test data -->
+ <exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.xsd" /> <!-- test data -->
+ <exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.bpel" /> <!-- test data -->
<exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/DTDExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
<exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/XMLExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
<exclude name="xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/**/data/**" /> <!-- test data -->
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java
----------------------------------------------------------------------
diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java
index 491e019..a2c846f 100644
--- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java
+++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java
@@ -61,7 +61,8 @@ public class XDMModelTest extends TestCase {
suite.addTest(new XDMModelTest("testModifyNegative"));
suite.addTest(new XDMModelTest("testSyncAndNamespace"));
suite.addTest(new XDMModelTest("testSyncToEmptyRoot"));
- suite.addTest(new XDMModelTest("testXDMModelSize"));
+// Disabled as referenced files were partly not donated by oracle to apache
+// suite.addTest(new XDMModelTest("testXDMModelSize"));
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java
----------------------------------------------------------------------
diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java
index 6d9a5e8..70025ce 100644
--- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java
+++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java
@@ -52,8 +52,9 @@ public class DiffFinderTest extends TestCase {
suite.addTest(new DiffFinderTest("testFindDiff1"));
suite.addTest(new DiffFinderTest("testFindDiff2"));
suite.addTest(new DiffFinderTest("testFindDiff3"));
- suite.addTest(new DiffFinderTest("testFindDiffPerf"));
- suite.addTest(new DiffFinderTest("testFindDiffPerf2"));
+// Disabled as referenced files were partly not donated by oracle to apache
+// suite.addTest(new DiffFinderTest("testFindDiffPerf"));
+// suite.addTest(new DiffFinderTest("testFindDiffPerf2"));
suite.addTest(new DiffFinderTest("testElementAddedBeforeChildAttributeChange"));
suite.addTest(new DiffFinderTest("testElementAddedBeforeChildAttributeChange2"));
return suite;
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java
----------------------------------------------------------------------
diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java
index 4b119d9..5f773b0 100644
--- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java
+++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java
@@ -77,12 +77,14 @@ public class MergeDiffTest extends TestCase {
TestSuite suite = new TestSuite();
suite.addTest(new MergeDiffTest("testMerge1"));
suite.addTest(new MergeDiffTest("testMerge2"));
- suite.addTest(new MergeDiffTest("testMerge3"));
+// Disabled as referenced files were partly not donated by oracle to apache
+// suite.addTest(new MergeDiffTest("testMerge3"));
suite.addTest(new MergeDiffTest("testMerge4"));
suite.addTest(new MergeDiffTest("testMerge5"));
suite.addTest(new MergeDiffTest("testMerge6"));
suite.addTest(new MergeDiffTest("testMerge7"));
- suite.addTest(new MergeDiffTest("testMerge8"));
+// Disabled as referenced files were partly not donated by oracle to apache
+// suite.addTest(new MergeDiffTest("testMerge8"));
suite.addTest(new MergeDiffTest("testMerge9"));
suite.addTest(new MergeDiffTest("testMerge10"));
suite.addTest(new MergeDiffTest("testPrettyPrint"));
@@ -94,7 +96,8 @@ public class MergeDiffTest extends TestCase {
suite.addTest(new MergeDiffTest("testPosChange3"));
suite.addTest(new MergeDiffTest("testPosChange3_2"));
suite.addTest(new MergeDiffTest("testPosChange3_3"));
- suite.addTest(new MergeDiffTest("testMergeVenetianBlindPO"));
+// Disabled as referenced files were partly not donated by oracle to apache
+// suite.addTest(new MergeDiffTest("testMergeVenetianBlindPO"));
suite.addTest(new MergeDiffTest("testForwardReorderNodeWithChangesOnChildren"));
suite.addTest(new MergeDiffTest("testMergeReformatDiff"));
return suite;
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java
----------------------------------------------------------------------
diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java
index 73dcd38..c3cdbb6 100644
--- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java
+++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java
@@ -62,7 +62,8 @@ public class XMLSyntaxParserTest extends TestCase {
suite.addTest(new XMLSyntaxParserTest("testParseTestXML"));
suite.addTest(new XMLSyntaxParserTest("testMultiRootXML"));
suite.addTest(new XMLSyntaxParserTest("testParseWSDL"));
- suite.addTest(new XMLSyntaxParserTest("testParsePerformace"));
+// Disabled as referenced files were partly not donated by oracle to apache
+// suite.addTest(new XMLSyntaxParserTest("testParsePerformace"));
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java
----------------------------------------------------------------------
diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java
index 5e3ce6d..f84d315 100644
--- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java
+++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java
@@ -87,9 +87,10 @@ public class XDMPerfNumberTest extends TestCase {
public static Test suite() {
TestSuite suite = new TestSuite();
- suite.addTest(new XDMPerfNumberTest("testReadUsingDOM"));
- suite.addTest(new XDMPerfNumberTest("testReadUsingSyntaxParser"));
- suite.addTest(new XDMPerfNumberTest("testReadUsingXDM"));
+// Disabled as referenced files were partly not donated by oracle to apache
+// suite.addTest(new XDMPerfNumberTest("testReadUsingDOM"));
+// suite.addTest(new XDMPerfNumberTest("testReadUsingSyntaxParser"));
+// suite.addTest(new XDMPerfNumberTest("testReadUsingXDM"));
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/FindNamespaceVisitorTest.java
----------------------------------------------------------------------
diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/FindNamespaceVisitorTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/FindNamespaceVisitorTest.java
index b1aaf7d..cfb21cd 100644
--- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/FindNamespaceVisitorTest.java
+++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/FindNamespaceVisitorTest.java
@@ -52,8 +52,9 @@ public class FindNamespaceVisitorTest extends TestCase {
}
public static Test suite() {
- TestSuite suite = new TestSuite(FindNamespaceVisitorTest.class);
-
+ TestSuite suite = new TestSuite();
+// Disabled as referenced files were partly not donated by oracle to apache
+// suite.addTestSuite(FindNamespaceVisitorTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/XPathFinderTest.java
----------------------------------------------------------------------
diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/XPathFinderTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/XPathFinderTest.java
index 83c9282..5473081 100644
--- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/XPathFinderTest.java
+++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/XPathFinderTest.java
@@ -46,8 +46,9 @@ public class XPathFinderTest extends TestCase {
}
public static Test suite() {
- TestSuite suite = new TestSuite(XPathFinderTest.class);
-
+ TestSuite suite = new TestSuite();
+// Disabled as referenced files were partly not donated by oracle to apache
+// suite.addTestSuite(XPathFinderTest.class);
return suite;
}
[05/24] incubator-netbeans git commit: [NETBEANS-54] Module review
xml.text.obsolete90
Posted by ma...@apache.org.
[NETBEANS-54] Module review xml.text.obsolete90
- no external library
- checked Rat report; added license header to testfiles and ensured
tests still run cleanly, removed unused file, that only differs from
neighbouring file by license
- skimmed through the module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/dae04c89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/dae04c89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/dae04c89
Branch: refs/heads/master
Commit: dae04c89d95b2231df68064af032fa8a9504f98b
Parents: 7fe8ddf
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Tue Oct 3 18:18:44 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:15 2017 +0200
----------------------------------------------------------------------
.../XMLFormatterTest/testReformatSample1.pass | 19 +
.../XMLFormatterTest/testReformatSample2-.pass | 1716 ------------------
.../input/XMLFormatterTest/testReformat/web.xml | 19 +
.../modules/xml/text/syntax/invalid.xml | 20 +
.../netbeans/modules/xml/text/syntax/test.xml | 20 +
5 files changed, 78 insertions(+), 1716 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/dae04c89/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass
----------------------------------------------------------------------
diff --git a/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass b/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass
index 11e1b78..46cdf92 100644
--- a/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass
+++ b/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass
@@ -1,5 +1,24 @@
<?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.
+
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/dae04c89/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2-.pass
----------------------------------------------------------------------
diff --git a/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2-.pass b/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2-.pass
deleted file mode 100644
index 700be9a..0000000
--- a/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2-.pass
+++ /dev/null
@@ -1,1716 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- sgml-indent-step: 2 -*- -->
-<!--
-The contents of this file are subject to the terms of the Common Development
-and Distribution License (the License). You may not use this file except in
-compliance with the License.
-
-You can obtain a copy of the License at http://www.netbeans.org/cddl.html
-or http://www.netbeans.org/cddl.txt.
-
-When distributing Covered Code, include this CDDL Header Notice in each file
-and include the License file at http://www.netbeans.org/cddl.txt.
-If applicable, add the following below the CDDL Header, with the fields
-enclosed by brackets [] replaced by your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
--->
-<project name="nbbuild" default="all" basedir=".">
-
- <import file="default.xml"/>
-
- <!-- To make people happy who want to do `ant clean all': -->
- <target name="all" depends="build,commit-validation" description="Build the IDE and run basic validation tests."/>
-
- <target name="all-nozip" depends="build-nozip,commit-validation" description="Build the IDE (no ZIP file, unpacked) and run basic validation tests."/>
-
- <target name="assure-ant">
- <condition property="ant.version.is.good">
- <!-- this is in 1.6.3 only -->
- <!-- actually needed for 'executable' attr on <javadoc>, at least -->
- <available classname="org.apache.tools.ant.types.mappers.FilterMapper"/>
- </condition>
- <fail unless="ant.version.is.good">
- You need to have ant 1.6.3 at least to build NetBeans.
- </fail>
- </target>
-
- <target name="bootstrap"
- description="Bootstrap NetBeans-specific Ant extensions."
- depends="-jdk-init,-assure-jdk-1.4,assure-ant">
- <echo message="Bootstrapping NetBeans-specific Ant extensions..."
- />
- <property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
- <path id="bootstrap-cp">
- <pathelement location="${ant.jar}"/>
- <fileset dir="..">
- <!-- For JavaHelp indexing: -->
- <include name="nbbuild/external/jhall*.jar"/>
- </fileset>
- </path>
- <!-- Sanity check: -->
- <pathconvert pathsep=":" property="class.files.in.antsrc">
- <path>
- <fileset dir="antsrc">
- <include name="**/*.class"/>
- </fileset>
- </path>
- </pathconvert>
- <fail>
- <condition>
- <not>
- <equals arg1="${class.files.in.antsrc}" arg2=""/>
- </not>
- </condition>
- You have stray *.class files in ${basedir}/antsrc which you must remove.
- Probably you failed to clean your sources before updating them from CVS.
- </fail>
- <!-- OK, continue: -->
- <mkdir dir="build/antclasses"/>
- <javac srcdir="antsrc" destdir="build/antclasses" deprecation="true" debug="${build.compiler.debug}" source="1.4">
- <classpath refid="bootstrap-cp"/>
- </javac>
- <jar jarfile="nbantext.jar">
- <fileset dir="build/antclasses"/>
- <fileset dir="antsrc">
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- <exclude name="package-list"/>
- </fileset>
- </jar>
- </target>
-
- <target name="init-module-list" depends="bootstrap">
- <!-- Define modules. -->
- <resolve name="modules" value="config.modules.${moduleconfig}"/>
- <resolve name="fixedmodules" value="config.fixedmodules.${moduleconfig}"/>
- <property name="allmodules" value="${fixedmodules},${modules}"/>
- </target>
-
- <target name="set-buildnumber" unless="buildnumber">
- <tstamp>
- <format property="buildnumber" pattern="yyMMdd"/>
- </tstamp>
- <tstamp>
- <format property="buildday" pattern="d MMM yyyy" locale="en" />
- </tstamp>
- </target>
-
- <target name="init" depends="init-module-list,set-buildnumber,init-tasks">
- <taskdef name="cleanall" classname="org.netbeans.nbbuild.CleanAll" classpath="nbantext.jar"/>
- <taskdef name="nbmerge" classname="org.netbeans.nbbuild.NbMerge" classpath="nbantext.jar"/>
- <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="nbantext.jar"/>
- <taskdef name="getdependsclusters" classname="org.netbeans.nbbuild.GetDependsClusters" classpath="nbantext.jar"/>
- <taskdef name="repeat" classname="org.netbeans.nbbuild.Repeat" classpath="nbantext.jar"/>
-
- <!-- We need absolute path to ${netbeans.dest} -->
- <property name="netbeans.dest.abs" location="${netbeans.dest}"/>
- <!-- Overridable. Note: need not necessarily be a number at all): -->
- <property name="buildnum" value="dev-${buildnumber}"/>
- <property name="sanitystart.args" value="-J-Dnetbeans.close=true ${sanitystart.args.additional}"/>
-
- <!-- Set up automatic all-* targets: -->
- <taskdef name="insert-module-all-targets" classname="org.netbeans.nbbuild.InsertModuleAllTargets" classpath="nbantext.jar"/>
- <insert-module-all-targets/>
- </target>
-
- <target name="all-java/storagebuilder" depends="init">
- <antcall target="build-one-cluster-dependencies" inheritall="false">
- <param name="one.cluster.dependencies" value="nb.cluster.platform,nb.cluster.ide"/>
- <param name="one.cluster.name" value="this-cluster"/>
- </antcall>
- <echo message="Building java/storagebuilder library..."/>
- <ant dir="../java/storagebuilder" target="jar"/>
- </target>
-
- <target name="all-ide/branding" depends="init">
- <echo message="Building module ide/branding..."/>
- <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
- <antcall target="build-one-cluster-dependencies" inheritAll="false">
- <param name="one.cluster.dependencies" value="${dependsClusters}"/>
- <param name="one.cluster.name" value="this-cluster"/>
- </antcall>
- <ant dir="../ide/branding" target="netbeans"/>
- </target>
-
- <target name="all-installer" description="Dummy target for build system compatibility"/>
-
- <target name="all-tomcatint/tomcat5/bundled" depends="init">
- <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
- <antcall target="build-one-cluster-dependencies" inheritAll="false">
- <param name="one.cluster.dependencies" value="${dependsClusters}"/>
- <param name="one.cluster.name" value="this-cluster"/>
- </antcall>
- <!-- XXX this and xtest are clumsy: <antcall target="all-monitor"/> will not work since the subproject used by antcall does *not* have the synthetic targets! -->
- <ant dir="../monitor"/>
- <echo message="Building module tomcatint/tomcat5/bundled..."/>
- <ant dir="../tomcatint/tomcat5/bundled" target="netbeans"/>
- </target>
-
- <target name="all-translatedfiles" depends="init">
- <echo message="Building module translatedfiles..."/>
- <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
- <antcall target="build-one-cluster-dependencies" inheritAll="false">
- <param
- name="one.cluster.dependencies"
- value="${dependsClusters}"/>
- <param name="one.cluster.name" value="this-cluster"/>
- </antcall>
- <ant dir="../translatedfiles" target="netbeans"/>
- </target>
-
- <target name="all-xtest" depends="init">
- <getdependsclusters name="dependsClusters" list="${clusters.list}"/>
- <antcall target="build-one-cluster-dependencies" inheritAll="false">
- <param name="one.cluster.dependencies" value="${dependsClusters}"/>
- <param name="one.cluster.name" value="this-cluster"/>
- </antcall>
- <ant dir="../xtest/nbjunit"/>
- <echo message="Building module xtest..."/>
- <ant dir="../xtest" antfile="build.xml" target="netbeans"/>
- </target>
-
- <!-- this is project is not a netbeans module project, so we do a no-op
- here. The code in appsrvbridge gets built by XXX -->
- <target name="all-serverplugins/sun/appsrvbridge" depends="init">
- <echo message="Building module serverplugins/sun/appsrvbridge... NO-OP"/>
- </target>
-
- <!-- build NBMs for selected modules -->
- <target name="build-nbms" depends="init">
- <!-- It's good idea to call merge target before this one.
- NbMerge.java can set property "modules" to the list of realy
- built modules (excluding fixedmodules which must build everytime). -->
- <mkdir dir="nbms" />
- <property name="nbm.target.dir" location="nbms" />
- <for-each startdir=".." target="nbm" locations="${allmodules}"/>
- </target>
- <target name="nbm"/><!-- dummy target -->
-
- <property name="jnlp.signjar.keystore" location="build/default.keystore" />
- <available property="jnlp.signjar.keystore.exists" file="${jnlp.signjar.keystore}" />
- <target name="jnlp-generate-keystore" depends="init" unless="jnlp.signjar.keystore.exists" >
- <property name="jnlp.signjar.alias" value="jnlp" />
- <property name="jnlp.signjar.password" value="netbeans" />
- <property name="jnlp.signjar.vendor" value="CN=NetBeans, OU=NetBeans, O=netbeans.org, C=US" />
-
- <mkdir dir="${jnlp.signjar.keystore}/../" />
- <echo message="Going to create default keystore in ${jnlp.signjar.keystore}" />
- <genkey
- alias="${jnlp.signjar.alias}"
- keystore="${jnlp.signjar.keystore}"
- storepass="${jnlp.signjar.password}"
- dname="${jnlp.signjar.vendor}"
- />
- </target>
-
- <target name="build-jnlp" depends="init,jnlp-generate-keystore">
- <fail message="Property jnlp.codebase must be set to final location of your JNLP files!" unless="jnlp.codebase" />
- <property name="jnlp.dest.dir" location="build/jnlp" />
- <mkdir dir="${jnlp.dest.dir}" />
- <for-each startdir=".." target="jnlp" locations="${config.modules.jnlp}"/>
- </target>
-
- <target name="set-config-to-javadoc" >
- <property name="moduleconfig" value="javadoc" />
- </target>
-
- <!-- build javadoc for selected modules -->
- <target name="build-javadoc" depends="set-config-to-javadoc,init" description="Builds Javadoc documentation for modules; on branches pass e.g. -Djavadoc.web.root=http://www.netbeans.org/download/release35/javadoc">
- <ant dir="." target="merge">
- <property name="modules" value="${modules}"/>
- <property name="fixedmodules" value="${fixedmodules}"/>
- <property name="merge.dependent.modules" value="true"/>
- <property name="stop.when.broken.module" value="false"/>
- </ant>
-
- <mkdir dir="build/ModulesExportedInterfaces" />
- <property name="export.interfaces" location="build/ModulesExportedInterfaces" />
-
- <mkdir dir="build/APIChanges" />
- <property name="export.apichanges" location="build/APIChanges" />
-
- <!-- build javadoc for supported APIs -->
- <for-each startdir=".." target="javadoc" locations="${fixedmodules}"/>
- <!-- build javadoc for unsupported APIs -->
- <for-each startdir=".." target="javadoc" locations="${modules}"/>
-
- <antcall inheritall="true" inheritrefs="true" target="javadoc-generate-xml" />
- <antcall inheritall="true" inheritrefs="true" target="javadoc-generate-html" />
- <antcall inheritall="true" inheritrefs="true" target="javadoc-check-broken-links" />
- </target>
-
- <target name="javadoc-generate-xml" depends="set-config-to-javadoc,init" >
- <echo file="build/APIChanges/header.gen" ><?xml version="1.0" encoding="UTF-8"?>
- <changes>
- </echo>
-
- <echo file="build/APIChanges/footer.gen" >
- </changes>
- </echo>
-
- <concat destfile="${netbeans.javadoc.dir}/apichanges.xml" >
- <fileset dir="build/APIChanges" includes="header.gen" />
- <fileset dir="build/APIChanges" includes="*" excludes="*.gen" />
- <fileset dir="build/APIChanges" includes="footer.gen" />
- </concat>
-
-
- <echo file="build/ModulesExportedInterfaces/header.gen" ><?xml version="1.0" encoding="UTF-8"?>
- <apis>
- </echo>
-
- <echo file="build/ModulesExportedInterfaces/footer.gen" >
- </apis>
- </echo>
-
- <concat destfile="${netbeans.javadoc.dir}/modules.xml" >
- <fileset dir="build/ModulesExportedInterfaces" includes="header.gen" />
- <fileset dir="build/ModulesExportedInterfaces" includes="*" excludes="*.gen" />
- <fileset dir="build/ModulesExportedInterfaces" includes="footer.gen" />
- </concat>
-
- <taskdef
- name="javadoc-index"
- classpath="nbantext.jar"
- classname="org.netbeans.nbbuild.JavadocIndex"
- />
-
-
- <javadoc-index target="${netbeans.javadoc.dir}/allclasses.xml" >
- <packageslist dir="${netbeans.javadoc.dir}" >
- <include name="**/allclasses-noframe.html" />
- </packageslist>
- </javadoc-index>
- </target>
-
-
- <target name="javadoc-generate-html" depends="set-config-to-javadoc,init" >
- <tstamp>
- <format property="modules-javadoc-date" pattern="d MMM yyyy" locale="en" />
- </tstamp>
-
- <style
- in="${netbeans.javadoc.dir}/modules.xml"
- out="${netbeans.javadoc.dir}/usecases.html"
- style="javadoctools/export2usecases.xsl"
- >
- <param name="date" expression="${modules-javadoc-date}"/>
- </style>
-
- <style
- in="${netbeans.javadoc.dir}/apichanges.xml"
- out="${netbeans.javadoc.dir}/apichanges.html"
- style="javadoctools/export2apichanges.xsl"
- >
- <param name="date" expression="${modules-javadoc-date}"/>
- <param name="changes-since-year" expression="${previous.release.year}"/>
- <param name="changes-since-day" expression="${previous.release.day}"/>
- <param name="changes-since-month" expression="${previous.release.month}"/>
- <param name="include-introduction" expression="true" />
- </style>
-
- <copy file="javadoctools/netbeans.css" tofile="${netbeans.javadoc.dir}/netbeans.css" />
- <condition property="javadoc.style.sheet.exists" >
- <available file="${netbeans.javadoc.dir}/org-openide-util/javadoc.css" />
- </condition>
-
- <fail unless="javadoc.style.sheet.exists" >
- The org-openide-util/javadoc.css has to exist as we are refering to
- it from to master module javadoc pages. If it does not anymore, update
- the javadoctools/export*.xsl templates.
- </fail>
-
- <style
- in="${netbeans.javadoc.dir}/allclasses.xml"
- out="${netbeans.javadoc.dir}/allclasses-frame.html"
- style="javadoctools/export2allclasses.xsl"
- >
- </style>
-
- <style
- in="${netbeans.javadoc.dir}/modules.xml"
- out="${netbeans.javadoc.dir}/overview-frame.html"
- style="javadoctools/export2allmodules.xsl"
- >
- <param name="date" expression="${modules-javadoc-date}"/>
- </style>
-
- <style
- in="${netbeans.javadoc.dir}/modules.xml"
- out="${netbeans.javadoc.dir}/layers.html"
- style="javadoctools/export2layer.xsl"
- >
- <param name="date" expression="${modules-javadoc-date}"/>
- </style>
-
- <style
- in="${netbeans.javadoc.dir}/modules.xml"
- out="${netbeans.javadoc.dir}/overview-summary.html"
- style="javadoctools/export2html.xsl"
- >
- <param name="date" expression="${modules-javadoc-date}"/>
- </style>
-
-
- <!-- at the end geneate the index.html so people know where to start -->
- <echo file="${netbeans.javadoc.dir}/index.html" ><![CDATA[
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<HTML><HEAD><TITLE>NetBeans API Index</TITLE>
-</HEAD>
-<FRAMESET cols="20%,80%" title="" onLoad="top.loadFrames()">
-<FRAMESET rows="30%,70%" title="" onLoad="top.loadFrames()">
-<FRAME src="overview-frame.html" name="packageListFrame" title="All Modules">
-<FRAME src="allclasses-frame.html" name="packageFrame" title="All classes">
-</FRAMESET>
-<FRAME src="overview-summary.html" name="classFrame" title="Module, package, class and interface descriptions" scrolling="yes">
-<NOFRAMES>
-<H2>Frame Alert</H2>
-<P>
-This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-Link to<A HREF="overview-summary.html">Non-frame version.</A>
-</NOFRAMES>
-</FRAMESET>
-</HTML>
- ]]></echo>
-
- <replace dir="${netbeans.javadoc.dir}">
- <include name="*.html"/>
- <replacefilter token="@JDK@" value="http://java.sun.com/j2se/1.4.2/docs/api"/>
- <replacefilter token="http://root/" value="." />
- <replacefilter token="$${javadoc.web.root}" value="." />
- </replace>
-
- <echo message="Javadoc index has been generated to ${netbeans.javadoc.dir}/index.html" />
- </target>
-
-
- <target name="javadoc-check-broken-links" depends="init" unless="javadoc.skip.brokenlinks.check" >
- <taskdef name="checklinks" classname="org.netbeans.nbbuild.CheckLinks">
- <classpath>
- <pathelement location="nbantext.jar"/>
- </classpath>
- </taskdef>
- <checklinks basedir="${netbeans.javadoc.dir}" checkexternal="${javadoc.check.external.links}" checkspaces="false" failonerror="true" >
- <include name="*/overview-summary.html"/>
- <include name="*/apichanges.html"/>
- <include name="*/architecture-summary.html"/>
- <include name="*/**/package-summary.html"/>
- <include name="*/**/doc-files/**/*.html"/>
- <include name="*.html" />
- </checklinks>
- </target>
-
- <target name="build-messaging" depends="init">
- <echo message="Starting a build for NetBeans (build ${buildnum}, config '${moduleconfig}') ..."/>
- <echo message="Selected modules: ${modules}"/>
- <echo message="OS: ${os.name} ${os.version} Locale: ${user.language}_${user.region}"/>
- <echo message="Java: ${nbjdk.home}"/>
- </target>
-
- <!-- Use of nbmerge target has the effect of automatically depending on all-X for every module. -->
- <!-- It also runs deltree(dir=wherever) and copydir(src=../X/netbeans,dest=wherever) to create the IDE install. -->
-
- <target name="build-nozip" depends="clean-cluster-flags,build-clusters" description="Build the IDE but do not create a final ZIP file.">
- <loadproperties srcFile="${clusters.list.file}" />
-
- <loadproperties srcfile="${netbeans.dest.dir}/moduleCluster.properties" />
-
- <mkdir dir="${netbeans.dest.dir}/bin" />
- <copy file="../ide/launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" />
- <chmod file="${netbeans.dest.dir}/bin/netbeans" perm="ugo+rx"/>
- <copy file="../ide/launcher/windows/netbeans.exe" todir="${netbeans.dest.dir}/bin" />
- <copy file="../ide/launcher/windows/nb.exe" todir="${netbeans.dest.dir}/bin" />
- <copy file="../ide/launcher/os2/netbeans.cmd" todir="${netbeans.dest.dir}/bin" />
- <!-- if anybody knows better place for icons, let me know: jtulach@netbeans.org -->
- <copy file="../ide/launcher/os2/nbos2icons.zip" todir="${netbeans.dest.dir}/${nb.cluster.nb.dir}/" />
-
- <mkdir dir="${netbeans.dest.dir}/etc" />
- <copy file="../ide/launcher/netbeans.conf" todir="${netbeans.dest.dir}/etc" />
-
- <echo message="${netbeans.dest.dir}/${nb.cluster.platform.dir}/lib/nbexec" />
- <fixcrlf eol="lf" srcdir="${netbeans.dest.dir}" >
- <include name="etc/netbeans.conf" />
- <include name="bin/netbeans" />
- <include name="${nb.cluster.platform.dir}/lib/nbexec" />
- </fixcrlf>
- <fixcrlf eol="crlf" srcdir="${netbeans.dest.dir}" >
- <include name="bin/netbeans.cmd" />
- <include name="${nb.cluster.platform.dir}/lib/nbexec.cmd" />
- </fixcrlf>
-
- <echo file="${netbeans.dest.dir}/build_info">NetBeans dev build
- ------------------
- Number: ${buildnumber}
- Date: ${buildday}
- Branding:
- Branch: trunk
- Tag:
- </echo>
- </target>
-
- <target name="build" depends="build-nozip"
- description="Create a complete build including a ZIP distribution (but do not try it).">
- <delete file="NetBeans-${buildnum}.zip"/>
- <delete file="NetBeans-${buildnum}-build-extra-data.zip"/>
-
- <property name="nb-extra-files" value="*.built,test/**,extra/**"/>
-
- <!-- package the zip file -->
- <zip destfile="NetBeans-${buildnum}.zip" update="true" duplicate="preserve">
- <zipfileset file="${netbeans.dest.dir}/bin/netbeans" filemode="755" prefix="${netbeans.dest}/bin"/>
- <zipfileset file="${netbeans.dest.dir}/${nb.cluster.platform.dir}/lib/nbexec" filemode="755" prefix="${netbeans.dest}/${nb.cluster.platform.dir}/lib"/>
- <zipfileset dir="${netbeans.dest.dir}/${nb.cluster.ide.dir}/ant/bin" filemode="755" prefix="${netbeans.dest}/${nb.cluster.ide.dir}/ant/bin">
- <exclude name="*.bat"/>
- <exclude name="*.cmd"/>
- </zipfileset>
- <zipfileset dir="${netbeans.dest.dir}" filemode="755" prefix="${netbeans.dest}">
- <include name="**/*.sh"/>
- </zipfileset>
- <zipfileset dir="${netbeans.dest.dir}" prefix="${netbeans.dest}" excludes="${nb-extra-files}">
- <!-- XXX exclude the temporary cluster for parts of openide -->
- <exclude name="tmp" />
- <exclude name="tmp/**/*" />
- </zipfileset>
- </zip>
-
- <!-- package the zip file with extra files not to be included in regular product package-->
- <!--
- <zip destfile="NetBeans-${buildnum}-build-extra-data.zip" update="true" duplicate="preserve">
- <zipfileset dir="${netbeans.dest.dir}" prefix="${netbeans.dest}" includes="${nb-extra-files}"/>
- </zip>
- -->
-
- <echo>Build created; see NetBeans-${buildnum}.zip (in nbbuild/).
- If you like, you may run the IDE straight from
- the ${netbeans.dest}/bin/ directory.
- (For example, type: ant tryme)
- </echo>
- </target>
-
- <target name="delete-and-merge" depends="merge-delete,merge" />
-
- <target name="merge-delete" depends="init">
- <delete dir="${netbeans.dest}" />
- </target>
-
- <target name="merge" depends="build-messaging">
- <mkdir dir="${netbeans.dest.dir}"/>
- <nbmerge failonerror="${stop.when.broken.modules}"
- dest="${netbeans.dest}"
- topdir=".."
- fixedmodules="${fixedmodules}"
- modules="${modules}"
- builtmodulesproperty="${built.modules.property}"
- targetprefix="all-"
- mergedependentmodules="${merge.dependent.modules}" >
- </nbmerge>
- <chmod perm="ugo+x">
- <fileset dir="${netbeans.dest.dir}">
- <include name="bin/netbeans"/>
- <include name="bin/**/*.pl"/>
- <include name="jakarta-tomcat-*/bin/*.sh"/>
- </fileset>
- </chmod>
- </target>
-
- <target name="build-platform" depends="init">
- <run-depend-build clusters-to-build="nb.cluster.platform,nb.cluster.harness"/>
- </target>
-
- <target name="build-cluster" depends="init">
- <run-depend-build clusters-to-build="${cluster-name}"/>
- </target>
-
- <macrodef name="resolve">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="run-depend-build">
- <attribute name="clusters-to-build"/>
- <sequential>
- <echo>Repeat @{clusters-to-build}</echo>
- <repeat target="build-one-cluster" name="one.cluster.name" values="@{clusters-to-build}" />
- </sequential>
- </macrodef>
-
- <target name="build-clusters" depends="init">
- <run-depend-build clusters-to-build="${nb.clusters.list}"/>
- </target>
-
- <target name="build-one-cluster-dependencies-check">
- <condition property="${one.cluster.name}-hasNoDependencies">
- <equals arg1="${one.cluster.dependencies}" arg2="" trim="true"/>
- </condition>
- <echo>Dependency prop :${one.cluster.name}-hasNoDependencies:</echo>
- <echo>Cluster dep :${one.cluster.dependencies}:</echo>
- <resolve name="test.prop" value="${one.cluster.name}-hasNoDependencies"/>
- <echo>Cluster dep prp:${test.prop}:</echo>
- </target>
-
- <target name="build-one-cluster-dependencies"
- depends="build-one-cluster-dependencies-check"
- unless="${one.cluster.name}-hasNoDependencies">
- <run-depend-build clusters-to-build="${one.cluster.dependencies}"/>
- </target>
-
- <target name="build-one-cluster-check">
- <condition property="${one.cluster.name}-is-built">
- <available file="${netbeans.dest.dir}/${one.cluster.name}.built"/>
- </condition>
- <resolve name="test1.prop" value="${one.cluster.name}-is-built"/>
- <echo>Cluster ${one.cluster.name} is :${test1.prop}:</echo>
- </target>
-
- <target name="build-one-cluster" unless="${one.cluster.name}-is-built" depends="build-one-cluster-check">
- <echo message="Building ${one.cluster.name} modules"/>
- <resolve name="one-cluster-modules" value="${one.cluster.name}"/>
- <resolve name="one-cluster-dependencies" value="${one.cluster.name}.depends"/>
- <echo>${one-cluster-modules}</echo>
- <echo>Dependencies: ${one-cluster-dependencies}</echo>
- <insert-module-all-targets/> <!-- we are in a subproject, so need to reinsert the targets... XXX <antcall> and thus <repeat> apparently reparses the Ant script from disk! -->
- <antcall target="build-one-cluster-dependencies" inheritAll="false">
- <param name="one.cluster.dependencies" value="${one-cluster-dependencies}"/>
- <param name="one.cluster.name" value="${one.cluster.name}"/>
- </antcall>
- <mkdir dir="${netbeans.dest.dir}"/>
- <nbmerge failonerror="${stop.when.broken.modules}"
- dest="${netbeans.dest.dir}"
- topdir="${nb_all}"
- fixedmodules="${one-cluster-modules}"
- builtmodulesproperty="${built.modules.property}"
- targetprefix="all-"
- mergedependentmodules="false">
- </nbmerge>
- <touch file="${netbeans.dest.dir}/${one.cluster.name}.built"/>
- </target>
-
- <target name="zipclusters" depends="init">
- <mkdir dir="${netbeans.build.dir}/zips"/>
- <repeat target="zip-one-cluster" name="one.cluster.name" values="${clusters.list}" />
-
- <!-- package the misc files -->
- <zip destfile="${netbeans.build.dir}/zips/${clusters.prefix}-misc-${buildnum}.zip" update="true" duplicate="preserve">
- <zipfileset dir="${netbeans.dest.dir}" filemode="755">
- <include name="bin/netbeans"/>
- </zipfileset>
- <zipfileset dir="${netbeans.dest.dir}">
- <include name="bin/**"/>
- <include name="etc/**/"/>
- </zipfileset>
- </zip>
- </target>
-
- <target name="zip-one-cluster">
- <taskdef name="setclusterpatternset" classname="org.netbeans.nbbuild.SetClusterPatternSet" classpath="nbantext.jar"/>
- <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/>
- <loadproperties srcFile="${clusters.list.file}" />
- <loadproperties srcFile="cluster-description.properties" />
- <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
-
- <setclusterpatternset cluster="${one.cluster.name}" name="${one.cluster.name}.files" trackingpath="${netbeans.dest.dir}" clusterdir="${one.cluster.dir}"/>
-
- <resolve name="zipcluster.file" value="${one.cluster.name}.pkg.filename"/>
- <zip destfile="${netbeans.build.dir}/zips/${clusters.prefix}-${zipcluster.file}-${buildnum}.zip" update="true" duplicate="preserve">
- <zipfileset dir="${netbeans.dest.dir}" filemode="755">
- <include name="${one.cluster.dir}/lib/nbexec"/>
- </zipfileset>
- <zipfileset dir="${netbeans.dest.dir}" filemode="755">
- <include name="${one.cluster.dir}/ant/bin/*"/>
- <exclude name="${one.cluster.dir}/ant/bin/*.bat"/>
- <exclude name="${one.cluster.dir}/ant/bin/*.cmd"/>
- </zipfileset>
- <zipfileset dir="${netbeans.dest.dir}">
- <patternset refID="${one.cluster.name}.files"/>
- </zipfileset>
- </zip>
- </target>
-
- <target name="create-rpms-proto">
- <mkdir dir="${netbeans.build.dir}/rpms"/>
- <repeat target="create-one-rpm-proto" name="one.cluster.name" values="${clusters.list}" />
- </target>
-
- <target name="create-one-rpm-proto">
- <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/>
- <loadproperties srcFile="cluster.properties" />
- <loadproperties srcFile="cluster-description.properties" />
- <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
- <mkdir dir="${netbeans.build.dir}/rpms"/>
-
- <resolve name="pkg.name" value="${one.cluster.name}.pkg.name"/>
- <resolve name="pkg.version" value="${one.cluster.name}.pkg.version"/>
- <resolve name="pkg.desc" value="${one.cluster.name}.pkg.desc"/>
- <resolve name="pkg.vendor" value="${one.cluster.name}.pkg.vendor"/>
- <resolve name="pkg.email" value="${one.cluster.name}.pkg.email"/>
- <resolve name="pkg.rpm.name" value="${one.cluster.name}.pkg.rpm.name"/>
- <resolve name="pkg.rpm.requires" value="${one.cluster.name}.pkg.rpm.requires"/>
- <resolve name="pkg.rpm.group" value="${one.cluster.name}.pkg.rpm.group"/>
- <resolve name="pkg.rpm.url" value="${one.cluster.name}.pkg.rpm.url"/>
- <resolve name="pkg.rpm.copyright" value="${one.cluster.name}.pkg.rpm.copyright"/>
- <resolve name="pkg.rpm.map" value="${one.cluster.name}.pkg.rpm.map"/>
- <resolve name="pkg.rpm.prefix" value="${one.cluster.name}.pkg.rpm.prefix"/>
-
- <echo file="${netbeans.build.dir}/rpms/${pkg.rpm.name}.spec">
- %define global_product_version ${pkg.version}
- %define global_product_release 00
- %define _prefix ${pkg.rpm.prefix}
- Version: %{global_product_version}
- Release: %{global_product_release}
- Group: ${pkg.rpm.group}
- Copyright: ${pkg.rpm.copyright}
- Vendor: ${pkg.vendor}
- URL: ${pkg.rpm.url}
- Prefix: %_prefix
- AutoReqProv: no
- Name: ${pkg.rpm.name}
- Summary: ${pkg.name}
- %description
- ${pkg.desc}
-
- %files
-
- %erpm_map ${pkg.rpm.map} nb_destdir
-
- %dir ${pkg.rpm.map}
-
- ${pkg.rpm.map}/${one.cluster.dir}</echo>
- </target>
-
- <target name="create-svr4s-proto">
- <mkdir dir="${netbeans.build.dir}/rpms"/>
- <repeat target="create-one-svr4-proto" name="one.cluster.name" values="${clusters.list}" />
- </target>
-
- <target name="create-one-svr4-proto">
- <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/>
- <loadproperties srcFile="cluster.properties" />
- <loadproperties srcFile="cluster-description.properties" />
- <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
- <mkdir dir="${netbeans.build.dir}/svr4s"/>
-
- <resolve name="pkg.name" value="${one.cluster.name}.pkg.name"/>
- <resolve name="pkg.version" value="${one.cluster.name}.pkg.version"/>
- <resolve name="pkg.desc" value="${one.cluster.name}.pkg.desc"/>
- <resolve name="pkg.vendor" value="${one.cluster.name}.pkg.vendor"/>
- <resolve name="pkg.email" value="${one.cluster.name}.pkg.email"/>
- <resolve name="pkg.svr4.pkg" value="${one.cluster.name}.pkg.svr4.pkg"/>
- <resolve name="pkg.svr4.maxinst" value="${one.cluster.name}.pkg.svr4.maxinst"/>
- <resolve name="pkg.svr4.sunw_pkgvers" value="${one.cluster.name}.pkg.svr4.sunw_pkgvers"/>
- <resolve name="pkg.svr4.hotline" value="${one.cluster.name}.pkg.svr4.hotline"/>
- <resolve name="pkg.svr4.classes" value="${one.cluster.name}.pkg.svr4.classes"/>
- <resolve name="pkg.svr4.basedir" value="${one.cluster.name}.pkg.svr4.basedir"/>
- <resolve name="pkg.svr4.pkginst" value="${one.cluster.name}.pkg.svr4.pkginst"/>
- <resolve name="pkg.svr4.category" value="${one.cluster.name}.pkg.svr4.category"/>
- <echo file="${netbeans.build.dir}/svr4s/${pkg.svr4.pkg}.spec">
- PKG=${pkg.svr4.pkg}
- NAME=${pkg.name}
- ARCH=sparc
- VERSION=${pkg.version}
- MAXINST=${pkg.svr4.maxinst}
- CATEGORY=${pkg.svr4.category}
- SUNW_PKGVERS=${pkg.svr4.sunw_pkgvers}
- DESC=${pkg.desc}
- VENDOR=${pkg.vendor}
- HOTLINE=${pkg.svr4.hotline}
- EMAIL=${pkg.email}
- CLASSES=${pkg.svr4.classes}
- BASEDIR=${pkg.svr4.basedir}
- PKGINST=${pkg.svr4.pkginst}</echo>
- </target>
-
- <target name="sanity-check" depends="testuserdir-delete,sanity-start" description="Test whether the build can start up without problems."/>
- <target name="-testuserdir-delete-init" depends="init">
- <property name="test.user.dir.lock" location="${test.user.dir}/lock"/>
- <available property="app.running" file="${test.user.dir.lock}"/>
- </target>
- <target name="-testuserdir-delete-ok" depends="-testuserdir-delete-init" unless="app.running">
- <delete dir="${test.user.dir}"/>
- </target>
- <target name="-testuserdir-delete-fail" depends="-testuserdir-delete-init" if="app.running">
- <!-- #66799: best to warn about this condition... -->
- <fail>Will not delete ${test.user.dir} because ${test.user.dir.lock} still exists; kill any running process and delete lock file if necessary</fail>
- </target>
- <target name="testuserdir-delete" depends="-testuserdir-delete-ok,-testuserdir-delete-fail"/>
- <target name="sanity-start" depends="init,maybe-build-nozip,-jdk-init">
- <mkdir dir="${test.user.dir}"/>
- <echo>Starting the IDE as a sanity check...</echo>
- <echo>WARNING - the sanity-start target is deprecated. Use commit-validation instead.</echo>
- <!-- XXX better would be to scan start log for stacktraces and just show those; -->
- <!-- possibly after filtering for duplicates or something like this. -->
- <!-- Timeout is ten minutes; should be enough for valid start, while preventing -->
- <!-- a deadlock from hanging an automated build: -->
- <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000">
- <arg value="--jdkhome"/>
- <arg file="${nbjdk.home}"/>
- <arg value="--userdir"/>
- <arg file="${test.user.dir}"/>
- <arg line="${sanitystart.args}"/>
- </exec>
- <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes" timeout="600000">
- <arg value="${netbeans.dest.abs}/bin/netbeans"/>
- <arg value="--jdkhome"/>
- <arg file="${nbjdk.home}"/>
- <arg value="--userdir"/>
- <arg file="${test.user.dir}"/>
- <arg line="${sanitystart.args}"/>
- </exec>
- <echo>Finished starting the IDE, pay attention to any reported errors.</echo>
- </target>
-
- <target name="check-for-build" >
- <available property="have-build" file="${netbeans.dest.dir}/bin/netbeans"/>
- </target>
- <target name="maybe-build-nozip" depends="check-for-build" unless="have-build">
- <ant dir="${basedir}" target="build-nozip"/>
- </target>
-
- <target name="nozip-check"
- depends="build-nozip,sanity-check">
- <echo>WARNING - the nozip-check target is deprecated. Use all-nozip instead.</echo>
- </target>
-
- <target name="tryme-setup-debug-args" if="debug.port" >
- <property name="debug.pause" value="n" />
- <property name="debug.server" value="y" />
-
- <property name="tryme.debug.args" value="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=${debug.server},address=${debug.port}" />
- </target>
-
- <target name="tryme-debug" depends="-jdk-presetdef-nbjpdastart" description="Start IDE in debugger. May only be called from within IDE.">
- <nbjpdastart name="NetBeans" addressproperty="debug.port" transport="dt_socket">
- <classpath>
- <fileset dir="${netbeans.dest.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
- </nbjpdastart>
- <property name="debug.server" value="n"/>
- <antcall target="tryme"/>
- </target>
-
- <target name="tryme-profile" depends="-jdk-presetdef-nbprofiledirect" description="Start IDE in debugger. May only be called from within IDE.">
- <property name="profiler.roots.path" value="profiler.roots.all" />
- <fileset id="profiler.roots.all" dir="${netbeans.dest.dir}">
- <include name="**/*.jar"/>
- </fileset>
- <nbprofiledirect
- jvmargsprefix="-J"
- jvmargsproperty="profiler.jvmargs"
- mainclass="org.netbeans.Main"
- >
- <classpath>
- <fileset dir="${netbeans.dest.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
- <rootspath>
- <fileset refid="${profiler.roots.path}" />
- </rootspath>
- </nbprofiledirect>
-
- <antcall target="tryme">
- <param name="tryme.args" value="${profiler.jvmargs}"/>
- </antcall>
- </target>
-
- <target name="tryme" depends="init,maybe-build-nozip,tryme-setup-debug-args,-jdk-init"
- description="Try running the IDE interactively (build it first if needed).
- It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in debug mode"
- >
- <property name="tryme.debug.args" value="" />
-
- <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes">
- <arg value="--jdkhome"/>
- <arg file="${nbjdk.home}"/>
- <arg value="--userdir"/>
- <arg file="${test.user.dir}"/>
- <arg line="${tryme.args}"/>
- <arg line="${tryme.debug.args}" />
- </exec>
- <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
- <arg value="${netbeans.dest}/bin/netbeans"/>
- <arg value="--jdkhome"/>
- <arg file="${nbjdk.home}"/>
- <arg value="--userdir"/>
- <arg file="${test.user.dir}"/>
- <arg line="${tryme.args}"/>
- <arg line="${tryme.debug.args}" />
- </exec>
- </target>
-
- <target name="l10n-kit" depends="init">
- <taskdef name="l10n" classname="org.netbeans.nbbuild.L10nTask"
- classpath="nbantext.jar"/>
- <delete dir="${l10n.dist.dir}"/>
- <mkdir dir="${l10n.dist.dir}"/>
- <delete dir="tmp"/>
- <mkdir dir="tmp"/>
- <property name="nbroot" location=".."/>
- <l10n topdirs="${nbroot}" modules="${fixedmodules},${modules}"
- localizablefile="l10n.list" generatedfile="l10n.list.translated"
- distdir="${l10n.dist.dir}" changedfile="l10n.list.changed"
- builddir="tmp" buildnumber="${buildnumber}"
- excludepattern="**/ja/,**/*_ja.*"/>
- <delete dir="tmp"/>
- </target>
-
- <target name="bootstrap-javadoc"
- depends="bootstrap"
- description="Generate Javadoc for Ant extensions.">
- <!-- XXX this ought to be deleted at some point. -->
- <!-- Can be done anyway by apisupport/ant, and published as regular module Javadoc -->
- <!-- by the regular daily Javadoc build process. -->
- <!-- Then all of this stuff can be deleted from the www part of CVS. -->
- <mkdir dir="www/nbantext-javadoc"/>
- <delete>
- <fileset dir="www/nbantext-javadoc">
- <include name="**/*.html"/>
- </fileset>
- </delete>
- <tstamp/>
- <javadoc sourcepath="antsrc"
- destdir="www/nbantext-javadoc"
- packagenames="org.netbeans.nbbuild.*"
- windowtitle="NetBeans Ant Extensions"
- doctitle="Extended Ant Tasks for Building NetBeans"
- nodeprecatedlist="true"
- notree="true"
- noindex="true"
- nohelp="true"
- nonavbar="true"
- author="false"
- version="false"
- bottom="Built on ${buildday}"
- >
- <classpath refid="bootstrap-cp"/>
- <link href="http://nagoya.apache.org/gump/javadoc/ant/build/javadocs" offline="true" packagelistloc="antsrc"/>
- </javadoc>
- </target>
-
- <target name="clean-external">
- <subant target="clean">
- <fileset dir="..">
- <include name="*/external/build.xml"/>
- <include name="contrib/*/external/build.xml"/>
- </fileset>
- </subant>
- </target>
-
- <target name="real-clean" depends="clean,clean-external"
- description="Clean everything possible.">
- <echo message="Cleaning old builds..."/>
- <delete>
- <fileset dir=".">
- <include name="NetBeans-*.log"/>
- <include name="NetBeans-*.zip"/>
- </fileset>
- </delete>
- <!-- This step must be last: -->
- <echo message="Cleaning NetBeans-specific Ant extensions..."/>
- <delete file="nbantext.jar" quiet="true"/>
- <delete dir="build/antclasses"/>
- </target>
-
- <target name="ant-clean">
- <delete file="nbantext.jar"/>
- </target>
-
- <target name="clean-cluster-flags" unless="do-not-rebuild-clusters">
- <mkdir dir="${netbeans.dest.dir}"/>
- <delete includeEmptyDirs="true">
- <fileset dir="${netbeans.dest.dir}">
- <include name="*.built"/>
- </fileset>
- </delete>
- </target>
-
- <target name="localclean" depends="clean-cluster-flags,init">
- <delete dir="${test.user.dir}"/>
- <delete dir="build"/>
- <delete file="moduledefs-tmp.properties"/>
- <delete dir="nbms" />
- <delete dir="${netbeans.dest.dir}"/>
- </target>
-
- <!-- more correct but takes too long: <target name="localtest" depends="bootstrap,all-xtest/nbjunit" > -->
- <target name="localtest" depends="bootstrap">
- <ant dir="test" target="cleanresults"/>
- <ant dir="test" target="runtests"/>
- </target>
- <target name="localtest-nb" depends="localtest">
- <nbbrowse file="test/results/index.html"/>
- </target>
- <target name="localtest-single-nb" depends="bootstrap">
- <property name="unit.test.base" location="test/unit/src"/>
- <pathconvert property="xtest.includes" pathsep=",">
- <path path="${includes}"/>
- <mapper type="glob" from="${unit.test.base}${file.separator}*.java" to="*.class"/>
- </pathconvert>
- <property name="xtest.attribs" value="empty"/>
- <ant dir="test" target="cleanresults"/>
- <ant dir="test" target="runtests"/>
- <nbbrowse file="test/results/index.html"/>
- </target>
- <target name="localtest-single-nb-debug" depends="bootstrap,-jdk-presetdef-nbjpdastart">
- <property name="unit.test.base" location="test/unit/src"/>
- <pathconvert property="xtest.includes" pathsep=",">
- <path path="${includes}"/>
- <mapper type="glob" from="${unit.test.base}${file.separator}*.java" to="*.class"/>
- </pathconvert>
- <property name="xtest.attribs" value="empty"/>
- <ant dir="test" target="cleanresults"/>
- <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="${test.class}">
- <classpath>
- <!--
- <path location="test/work/sys/tests/unit/classes"/>
- <path location="test/work/sys/tests/"/>
- <path location="test/unit/src/"/>
- -->
- <path location="nbantext.jar"/>
- </classpath>
- </nbjpdastart>
- <ant dir="test" target="runtests">
- <property name="xtest.debug.address" value="${jpda.address}" />
- <property name="xtest.debug.pause" value="false" />
- </ant>
- <nbbrowse file="test/results/index.html"/>
- </target>
-
- <target name="cleanall" depends="init">
- <cleanall topdir=".."
- modules="${allmodules}"
- targetname="clean"
- resolvedependencies="${resolve.clean.dependencies}"
- deptargetprefix="all-"
- failonerror="${stop.when.clean.error}" />
- </target>
-
- <target name="clean" depends="init,cleanall,localclean"
- description="Clean out (almost) all build products.">
- <echo message="Run `ant real-clean' if desired."/>
- </target>
-
- <!-- This section contains properties and targets used to build -->
- <!-- Solaris packages. -->
-
- <property name="solpkg-pkgproto" value="pkgproto"/>
- <property name="solpkg-pkgmk" value="pkgmk"/>
- <property name="solpkg-proto-file" value="prototype"/>
- <property name="solpkg-actual-dir" value="to-be-specified"/>
- <property name="solpkg-pkg-dir" value="to-be-specified"/>
- <property name="solpkg-pkg-dest-dir" value="to-be-specified"/>
-
- <!-- You can run this target to create the prototype file and create -->
- <!-- the package, or if you need to modify the prototype file before -->
- <!-- building the package, you can run the two subtargets -->
- <!-- separately. -->
- <target name="solpkg-build" depends="solpkg-pkgproto,solpkg-pkgmk"
- description="Generate a prototype file and create a Solaris package."/>
-
- <!-- This creates the pkg prototype file for a given directory and -->
- <!-- its files. -->
- <target name="solpkg-pkgproto"
- description="Generate a prototype file.">
- <exec executable="rm" failonerror="yes">
- <arg value="-rf"/>
- <arg value="${solpkg-proto-file}"/>
- </exec>
- <exec executable="${solpkg-pkgproto}" output="${solpkg-proto-file}"
- failonerror="yes">
- <arg value="${solpkg-actual-dir}=${solpkg-pkg-dir}"/>
- </exec>
- </target>
-
- <!-- This creates the Solaris pkg for a given prototype file, pkginfo -->
- <!-- file, and directory. -->
- <target name="solpkg-pkgmk"
- description="Create a Solaris package.">
- <exec executable="${solpkg-pkgmk}" failonerror="yes">
- <arg value="-o"/>
- <arg value="-f"/>
- <arg value="${solpkg-proto-file}"/>
- <arg value="-r"/>
- <arg value="${solpkg-actual-dir}"/>
- <arg value="-d"/>
- <arg value="${solpkg-pkg-dest-dir}"/>
- </exec>
- </target>
-
- <!-- End of Solaris package section. -->
-
-
- <!-- Localized builds -->
- <target name="all-dutch" depends="set-dutch-locale,all"/>
- <target name="all-russian" depends="set-russian-locale,all"/>
- <target name="all-french" depends="set-french-locale,all"/>
- <target name="all-ja-zh" depends="set-ja-zh_CN-locales,all"/>
-
- <target name="set-ja-zh_CN-locales">
- <property name="locales" value="ja,zh_CN"/>
- <property name="locjar.locales" value="${locales}"/>
- <property name="locmakenbm.locales" value="${locales}"/>
- <property name="locjhindexer.locales" value="${locales}"/>
- <property name="localized.build.locales" value="${locales}"/>
- </target>
-
- <target name="set-dutch-locale">
- <property name="locales" value="nl"/>
- <property name="locjar.locales" value="${locales}"/>
- <property name="locmakenbm.locales" value="${locales}"/>
- <property name="locjhindexer.locales" value="${locales}"/>
- <property name="localized.build.locales" value="${locales}"/>
- </target>
-
- <target name="set-russian-locale">
- <property name="locales" value="ru"/>
- <property name="locjar.locales" value="${locales}"/>
- <property name="locmakenbm.locales" value="${locales}"/>
- <property name="locjhindexer.locales" value="${locales}"/>
- <property name="localized.build.locales" value="${locales}"/>
- </target>
-
- <target name="set-french-locale">
- <property name="locales" value="fr"/>
- <property name="locjar.locales" value="${locales}"/>
- <property name="locmakenbm.locales" value="${locales}"/>
- <property name="locjhindexer.locales" value="${locales}"/>
- <property name="localized.build.locales" value="${locales}"/>
- </target>
-
- <!-- end of localized builds -->
-
-
- <target name="print-selected-modules" depends="init" description="Prints list of modules to build in selected moduleconfig.">
- <echo message="modules=${allmodules}"/>
- </target>
-
- <target name="print-cvs-modules" depends="init" description="Prints list of cvs modules required to build in selected moduleconfig.">
- <taskdef name="printcvsmodules" classname="org.netbeans.nbbuild.PrintCvsModules" classpath="nbantext.jar"/>
- <printcvsmodules modules="${fixedmodules},${modules}" targetprefix="all-" />
- </target>
-
- <target name="check-commit-validation">
- <condition property="run.validation" >
- <and>
- <available file="../ide/test/build.xml" />
- <available file="../jemmy/build.xml" />
- <available file="../jellytools/build.xml" />
- <available file="../xtest/build.xml" />
- <or>
- <not>
- <isset property="nb.run.validation"/>
- </not>
- <istrue value="${nb.run.validation}"/>
- </or>
- </and>
- </condition>
- </target>
-
- <target
- name="unit-validation"
- description="Invokes all existing unit tests in all IDE modules.
- Useful when one wants to deeply verify that his changes
- work"
- >
- <ant dir="../xtest/instance" target="runtests" >
- <property name="xtest.config" value="unit-nb" />
- </ant>
- </target>
-
- <target
- name="commit-validation"
- depends="commit-verification,commitValidation,no-commit-validation"
- description="Runs tests to validate IDE before commit."
- />
-
- <target name="all-commitValidation" description="dummy target for build error recognition facility"/>
-
- <target
- name="commit-verification"
- description="Compares result of a build with golden files verifying various aspects of the exported interfaces"
- depends="
- all-verification,
- check-files-layout,
- check-public-packages,
- check-friend-packages,
- check-shared-packages,
- check-modules,
- check-dependencies,
- check-implementation-dependencies,
- check-cluster-dependencies,
- check-cluster-implementation-dependencies,
- check-clusters-content"
- />
-
- <!-- JST: One day also add
- check-external-libraries
- -->
-
- <target name="all-verification" >
- <echo message="Runs verification tests to check the IDE before commit" />
- </target>
-
- <!-- keep this target name at least for a while for backward compat -jglick -->
- <target name="commitValidation" depends="all-commitValidation,check-commit-validation" if="run.validation">
- <property name="xtest.home" location="../xtest"/>
- <ant dir="${xtest.home}/instance" target="cleanresults">
- <property name="xtest.config" value="commit-validation-nb"/>
- </ant>
- <ant dir="${xtest.home}/instance" target="cleantests">
- <property name="xtest.config" value="commit-validation-nb"/>
- </ant>
- <ant dir="${xtest.home}/instance" target="runtests">
- <property name="xtest.config" value="commit-validation-nb"/>
- <property name="xtest.fail.on.failure" value="true"/>
- </ant>
- </target>
-
- <target name="no-commit-validation" depends="check-commit-validation" unless="run.validation">
- <echo>
- *** WARNING ***
- You do not seem to have the modules needed to run the commit validation test suite.
- You may not commit any changes into the CVS repository without running these tests.
- For more information: http://www.netbeans.org/community/guidelines/commit.html
- </echo>
- </target>
-
- <target name="sanity-build-from-source-pkg" depends="build-source">
- <available file="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip"
- property="pkg.available"/>
- <fail message="Source package ${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip not available" unless="pkg.available"/>
- <delete dir="testbuild"/>
- <mkdir dir="testbuild"/>
- <unzip dest="testbuild" src="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip"/>
- <property name="one.cluster.name" value="${cluster.name}"/>
- <propertyset id="sanity-build">
- <propertyref name="one.cluster.name"/>
- </propertyset>
- <echoproperties destfile="testbuild/nbbuild/user.properties">
- <propertyset refid="sanity-build"/>
- </echoproperties>
-
- <!-- it should call build of the refered cluster and not just hardcoded platform -->
- <ant antfile="testbuild/nbbuild/build.xml" inheritall="false" target="build-one-cluster">
- <property file="testbuild/nbbuild/user.properties"/>
- </ant>
- <delete dir="testbuild"/>
- </target>
-
- <target name="build-source"
- depends="init,set-buildnumber"
- description="Packages sources needed to compile given by cluster.name (can be specified by -Dcluster.name=nb.cluster.platform"
- if="cluster.name"
- >
- <property name="buildnum" value="dev-${buildnumber}"/>
- <echo message="Packaging sources of ${cluster.name} modules"/>
- <resolve name="cluster-modules" value="${cluster.name}"/>
- <resolve name="harness-modules" value="nb.cluster.harness"/>
- <mkdir dir="${netbeans.build.dir}"/>
- <taskdef name="definefileset" classname="org.netbeans.nbbuild.PrintCvsModules" classpath="nbantext.jar"/>
- <definefileset modules="${cluster-modules}" targetprefix="all-" id="source-modules" dir=".." />
- <definefileset modules="${cluster-modules}" targetprefix="all-" id="external-modules" dir=".." mode="binaries" />
- <definefileset modules="${harness-modules}" targetprefix="all-" id="harness-source-modules" dir=".." />
- <definefileset modules="${harness-modules}" targetprefix="all-" id="harness-external-modules" dir=".." mode="binaries" />
- <zip zipfile="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip" duplicate="preserve">
- <fileset refid="source-modules" />
- <fileset refid="external-modules" />
- <fileset refid="harness-source-modules" />
- <fileset refid="harness-external-modules" />
- </zip>
- </target>
-
- <target name="generate-golden-files-init" depends="init,bootstrap" >
- <property name="template.files.dir" location="build/golden" />
- <property name="golden.files.dir" location="../ide/golden" />
- <condition property="golden.files.eol" value="unix" >
- <or>
- <os family="unix" />
- <os family="mac" />
- </or>
- </condition>
- <property name="golden.files.eol" value="dos" />
-
- <mkdir dir="${template.files.dir}" />
-
- <!-- convert the golden files into platform default encoding -->
- <fixcrlf srcdir="${golden.files.dir}" destdir="${template.files.dir}" eol="${golden.files.eol}" >
- <include name="*txt" />
- </fixcrlf>
-
- </target>
-
-
- <target name="generate-golden-files" depends="generate-golden-files-init" >
- <property name="generated.files.dir" location="build/generated" />
- <mkdir dir="${generated.files.dir}" />
-
- <taskdef name="deps" classname="org.netbeans.nbbuild.ModuleDependencies" classpath="nbantext.jar"/>
-
- <deps>
- <input name="platform" >
- <jars dir="${netbeans.dest.dir}" >
- <include name="${nb.cluster.platform.dir}/**/*.jar" />
- </jars>
- </input>
- <input name="ide" >
- <jars dir="${netbeans.dest.dir}" >
- <include name="${nb.cluster.ide.dir}/**/*.jar" />
- </jars>
- </input>
- <input name="j2ee" >
- <jars dir="${netbeans.dest.dir}" >
- <include name="${nb.cluster.j2ee.dir}/**/*.jar" />
- </jars>
- </input>
- <input name="nb" >
- <jars dir="${netbeans.dest.dir}" >
- <include name="${nb.cluster.nb.dir}/**/*.jar" />
- </jars>
- </input>
- <input name="harness" >
- <jars dir="${netbeans.dest.dir}" >
- <include name="${nb.cluster.harness.dir}/**/*.jar" />
- </jars>
- </input>
-
- <output type="group-dependencies" file="${generated.files.dir}/cluster-deps.txt" />
- <output type="group-implementation-dependencies" file="${generated.files.dir}/cluster-impl-deps.txt" />
- <output type="modules" file="${generated.files.dir}/modules.txt" />
- <output type="dependencies" file="${generated.files.dir}/deps.txt" />
- <output type="implementation-dependencies" file="${generated.files.dir}/impl-deps.txt" />
- <output type="public-packages" file="${generated.files.dir}/public-packages.txt" />
- <output type="shared-packages" file="${generated.files.dir}/shared-packages.txt" />
- <output type="friend-packages" file="${generated.files.dir}/friend-packages.txt" />
- <output type="external-libraries" file="${generated.files.dir}/external-libraries.txt" />
- </deps>
- </target>
-
- <target name="check-public-packages" depends="generate-golden-files" >
- <property name="check.public.packages.golden" location="${golden.files.dir}/public-packages.txt" />
- <property name="check.public.packages.template" location="${template.files.dir}/public-packages.txt" />
- <property name="check.public.packages.generated" location="${generated.files.dir}/public-packages.txt" />
-
- <condition property="check-public-packages-are-they-the-same" >
- <filesmatch file1="${check.public.packages.template}" file2="${check.public.packages.generated}" />
- </condition>
-
-
- <exec os="Linux SunOS Solaris " dir="." executable="diff" failonerror="no" timeout="60000" >
- <arg value="-U"/>
- <arg value="15"/>
- <arg value="${check.public.packages.template}" />
- <arg value="${check.public.packages.generated}" />
- </exec>
-
- <fail unless="check-public-packages-are-they-the-same" >!
- *** Public packages has changed! ***
-
- Differences were found while comparing file
- ${check.public.packages.template}
- with
- ${check.public.packages.generated}
-
- This means that the set of public packages changed since the previously known one.
- Some packages may have been added, some of them may have been removed
- Either by changing manifest of a module or by adding or removing a class file
- from a module package.
-
-
- Changing the packages may or may not be ok. It means that an api of
- whole product changes and as such it is subject to review. If you passed
- your review and want to change the list of public packages, then please
- update the golden file at
- ${check.public.packages.golden}
- and run the test once again.
-
- Read more about the Verification Framework:
- http://openide.netbeans.org/proposals/arch/clusters.html#verify
-
- Look at for information about reviews:
- http://openide.netbeans.org/tutorial/review-steps.html
-
- Check the page about APIs:
- http://openide.netbeans.org/tutorial/api-design.html#api
- </fail>
- </target>
-
- <target name="check-friend-packages" depends="generate-golden-files" >
- <property name="check.friend.packages.golden" location="${golden.files.dir}/friend-packages.txt" />
- <property name="check.friend.packages.template" location="${template.files.dir}/friend-packages.txt" />
- <property name="check.friend.packages.generated" location="${generated.files.dir}/friend-packages.txt" />
-
- <condition property="check-friend-packages-are-they-the-same" >
- <filesmatch file1="${check.friend.packages.template}" file2="${check.friend.packages.generated}" />
- </condition>
-
-
- <exec os="Linux SunOS Solaris " dir="." executable="diff" failonerror="no" timeout="60000" >
- <arg value="-U"/>
- <arg value="15"/>
- <arg value="${check.friend.packages.template}" />
- <arg value="${check.friend.packages.generated}" />
- </exec>
-
- <fail unless="check-friend-packages-are-they-the-same" >!
- *** Friend packages has changed! ***
-
- Differences were found while comparing file
- ${check.friend.packages.template}
- with
- ${check.friend.packages.generated}
-
- This means that the set of friend packages changed since the previously known one.
- Some packages may have been added, some of them may have been removed
- Either by changing manifest of a module or by adding or removing a class file
- from a module package.
-
-
- Changing the packages may or may not be ok. It means that an api of
- whole product changes and as such it is subject to review. If you passed
- your review and want to change the list of friend packages, then please
- update the golden file at
- ${check.friend.packages.golden}
- and run the test once again.
-
- Read more about the Verification Framework:
- http://openide.netbeans.org/proposals/arch/clusters.html#verify
-
- Look at for information about reviews:
- http://openide.netbeans.org/tutorial/review-steps.html
-
- Check the page about APIs:
- http://openide.netbeans.org/tutorial/api-design.html#api
- </fail>
- </target>
-
- <target name="check-shared-packages" depends="generate-golden-files,-jdk-init" unless="have-jdk-1.5" >
- <property name="check.shared.packages.golden" location="${golden.files.dir}/shared-packages.txt" />
- <property name="check.shared.packages.template" location="${template.files.dir}/shared-packages.txt" />
- <property name="check.shared.packages.generated" location="${generated.files.dir}/shared-packages.txt" />
-
- <condition property="check-shared-packages-are-they-the-same" >
- <filesmatch file1="${check.shared.packages.template}" file2="${check.shared.packages.generated}" />
- </condition>
-
-
- <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
- <arg value="-U"/>
- <arg value="15"/>
- <arg value="${check.shared.packages.template}" />
- <arg value="${check.shared.packages.generated}" />
- </exec>
-
- <fail unless="check-shared-packages-are-they-the-same" >!
- *** Shared packages has changed! ***
-
- Differences were found while comparing file
- ${check.shared.packages.template}
- with
- ${check.shared.packages.generated}
-
- This means that the set of shared packages changed since the previously known one.
- Some packages may have been added, some of them may have been removed
- Either by changing manifest of a module or by adding or removing a class file
- from a module package.
-
-
- Removing shared packages is ok. Adding shared packages is silly, complicates
- and slows down module system and startup of the application. Do not do that!
- If you are removing a shared package please update
- ${check.shared.packages.golden}
- and run the test once again.
-
- Read more about the Verification Framework:
- http://openide.netbeans.org/proposals/arch/clusters.html#verify
-
- Look at for information about reviews:
- http://openide.netbeans.org/tutorial/review-steps.html
-
- Check the page about APIs:
- http://openide.netbeans.org/tutorial/api-design.html#api
- </fail>
- </target>
-
- <target name="check-external-libraries" depends="generate-golden-files" >
- <property name="check.external.libraries.golden" location="${golden.files.dir}/external-libraries.txt" />
- <property name="check.external.libraries.template" location="${template.files.dir}/external-libraries.txt" />
- <property name="check.external.libraries.generated" location="${generated.files.dir}/external-libraries.txt" />
-
- <condition property="check-external-libraries-are-they-the-same" >
- <filesmatch file1="${check.external.libraries.template}" file2="${check.external.libraries.generated}" />
- </condition>
-
-
- <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
- <arg value="-U"/>
- <arg value="15"/>
- <arg value="${check.external.libraries.template}" />
- <arg value="${check.external.libraries.generated}" />
- </exec>
-
- <fail unless="check-external-libraries-are-they-the-same" >!
- *** List of external libraries has changed! ***
-
- Differences were found while comparing file
- ${check.external.libraries.template}
- with
- ${check.external.libraries.generated}
-
- This means that the set of external libraries (JARs that are not NetBeans
- modules or does not have NetBeans-Own-Library: true in manifest) has
- changed since the previously known one. Some libraries may have been added,
- some of them may have been removed, they MD5 checksum or size has been changed.
-
- Changing the external libraries is ok, but requires legal approval everytime
- new version of a library is put into the product. If you have the approval
- want to change the list of external libraries, then please
- update the golden file at
- ${check.external.libraries.golden}
- and run the test once again.
-
- Read more about the Verification Framework:
- http://openide.netbeans.org/proposals/arch/clusters.html#verify
-
- Look at for information about reviews:
- http://openide.netbeans.org/tutorial/review-steps.html
-
- Check the page about APIs:
- http://openide.netbeans.org/tutorial/api-design.html#api
- </fail>
- </target>
-
- <target name="check-modules" depends="generate-golden-files" >
- <property name="check.modules.golden" location="${golden.files.dir}/modules.txt" />
- <property name="check.modules.template" location="${template.files.dir}/modules.txt" />
- <property name="check.modules.generated" location="${generated.files.dir}/modules.txt" />
-
- <condition property="check-modules-are-they-the-same" >
- <filesmatch file1="${check.modules.template}" file2="${check.modules.generated}" />
- </condition>
-
-
- <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
- <arg value="-U"/>
- <arg value="15"/>
- <arg value="${check.modules.template}" />
- <arg value="${check.modules.generated}" />
- </exec>
-
- <fail unless="check-modules-are-they-the-same" >!
- *** List of modules has changed! ***
-
- Differences were found while comparing file
- ${check.modules.template}
- with
- ${check.modules.generated}
-
- This means that the set of modules changed since the previously known one.
- Adding or removing a module significatly affects the set of APIs the
- product offers and as such is subject to review. If you passed
- your review and want to change the list of modules, then please
- update the golden file at
- ${check.modules.golden}
- and run the test once again.
-
- Read more about the Verification Framework:
- http://openide.netbeans.org/proposals/arch/clusters.html#verify
-
- Look at for information about reviews:
- http://openide.netbeans.org/tutorial/review-steps.html
-
- Check the page about APIs:
- http://openide.netbeans.org/tutorial/api-design.html#api
- </fail>
- </target>
-
- <target name="check-dependencies" depends="generate-golden-files" >
- <antcall target="check-dependencies-subroutine" >
- <param name="check.dependencies.golden" location="${golden.files.dir}/deps.txt" />
- <param name="check.dependencies.template" location="${template.files.dir}/deps.txt" />
- <param name="check.dependencies.generated" location="${generated.files.dir}/deps.txt" />
- </antcall>
- </target>
-
- <target name="check-implementation-dependencies" depends="generate-golden-files" >
- <antcall target="check-dependencies-subroutine" >
- <param name="check.dependencies.golden" location="${golden.files.dir}/impl-deps.txt" />
- <param name="check.dependencies.template" location="${template.files.dir}/impl-deps.txt" />
- <param name="check.dependencies.generated" location="${generated.files.dir}/impl-deps.txt" />
- </antcall>
- </target>
-
- <target name="check-cluster-dependencies" depends="generate-golden-files" >
- <antcall target="check-dependencies-subroutine" >
- <param name="check.dependencies.golden" location="${golden.files.dir}/cluster-deps.txt" />
- <param name="check.dependencies.template" location="${template.files.dir}/cluster-deps.txt" />
- <param name="check.dependencies.generated" location="${generated.files.dir}/cluster-deps.txt" />
- </antcall>
- </target>
-
- <target name="check-cluster-implementation-dependencies" depends="generate-golden-files" >
- <antcall target="check-dependencies-subroutine" >
- <param name="check.dependencies.golden" location="${golden.files.dir}/cluster-impl-deps.txt" />
- <param name="check.dependencies.template" location="${template.files.dir}/cluster-impl-deps.txt" />
- <param name="check.dependencies.generated" location="${generated.files.dir}/cluster-impl-deps.txt" />
- </antcall>
- </target>
-
- <target name="check-dependencies-subroutine" >
- <condition property="check-dependencies-are-they-the-same" >
- <filesmatch file1="${check.dependencies.template}" file2="${check.dependencies.generated}" />
- </condition>
-
-
- <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
- <arg value="-U"/>
- <arg value="15"/>
- <arg value="${check.dependencies.template}" />
- <arg value="${check.dependencies.generated}" />
- </exec>
-
- <fail unless="check-dependencies-are-they-the-same" >!
- *** List of dependencies has changed! ***
-
- Differences were found while comparing file
- ${check.dependencies.template}
- with
- ${check.dependencies.generated}
-
- This means that the set of dependencies changed since the previously known one.
- Adding a dependency can restrict the ways how a final product can be assembled
- and as such it forms an important aspect of API and is subject to review.
- If you passed your review or you are sure you want to change the
- list of dependencies, then please update the golden file at
- ${check.dependencies.golden}
- and run the test once again.
-
- Read more about the Verification Framework:
- http://openide.netbeans.org/proposals/arch/clusters.html#verify
-
- Look at for information about reviews:
- http://openide.netbeans.org/tutorial/review-steps.html
-
- Check the page about APIs and dependencies being important:
- http://openide.netbeans.org/tutorial/api-design.html#api
- </fail>
- </target>
-
-
- <target name="generate-files-layout" depends="generate-golden-files-init" >
- <property name="generated.files.dir" location="build/generated" />
- <mkdir dir="${generated.files.dir}" />
-
- <property name="check.files.layout.golden" location="${golden.files.dir}/files-layout.txt" />
- <property name="check.files.layout.template" location="${template.files.dir}/files-layout.txt" />
- <property name="check.files.layout.generated" location="${generated.files.dir}/files-layout.txt" />
-
- <property name="check-file-layout-root" location="${netbeans.dest.dir}" />
- <fileset id="check-file-layout" dir="${check-file-layout-root}" casesensitive="yes" >
- <include name="platform*/**" />
- <include name="ide*/**" />
- <include name="enterprise*/**" />
- <include name="nb*/**" />
- <include name="harness*/**" />
- </fileset>
-
- <pathconvert property="check-file-layout" refid="check-file-layout" dirsep="/" pathsep="," >
- <map from="${check-file-layout-root}${file.separator}" to="" />
- </pathconvert>
- <mkdir dir="build/generated" />
- <echo message="${check-file-layout}${line.separator}" file="${check.files.layout.generated}" />
- <replace file="${check.files.layout.generated}" token="," value="${line.separator}" />
- <replace file="${check.files.layout.generated}" token="\" value="/" />
- <condition property="check-files-are-they-the-same" >
- <filesmatch file1="${check.files.layout.template}" file2="${check.files.layout.generated}" />
- </condition>
-
-
- </target>
-
-
- <target name="check-files-layout" depends="generate-files-layout" >
- <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" >
- <arg value="-U"/>
- <arg value="15"/>
- <arg value="${check.files.layout.template}" />
- <arg value="${check.files.layout.generated}" />
- </exec>
-
- <fail unless="check-files-are-they-the-same" >!
- *** Layout of files has changed! ***
-
- Differences were found while comparing file ${check.files.layout.generated} with
- ${check.files.layout.template}
- This means that the layout of files changed since the previously known one.
- Some files may have been added, some of them may have been removed or renamed.
-
- Changing the layout may or may not be ok. If you are sure that you want to
- change the layout of files, then update the golden file at
- ${check.files.layout.golden}
- and run the test once again. If you got this warning without intending
- to change the layout of files, think twice whether your commit is really
- correct and consider asking for a review first.
-
- Read more about the Verification Framework:
- http://openide.netbeans.org/proposals/arch/clusters.html#verify
-
- Look at for information about reviews:
- http://openide.netbeans.org/tutorial/review-steps.html
-
- Check the page about APIs and files layout being an API:
- http://openide.netbeans.org/tutorial/api-design.html#api
- </fail>
- </target>
-
- <target name="check-clusters-content" depends="bootstrap,init-tasks">
- <taskdef name="checkcontent" classname="org.netbeans.nbbuild.CheckClustersContent" classpath="nbantext.jar"/>
- <checkcontent clusters="${nb.clusters.list}" trackingPath="${netbeans.dest.dir}" kitDestDir="${netbeans.dest.dir}">
- <exclude name="extra/**"/>
- <exclude name="testtools/**"/>
- <exclude name="bin/**"/>
- <exclude name="README.html"/>
- <exclude name="CREDITS.html"/>
- <exclude name="LICENSE.txt"/>
- <exclude name="DISTRIBUTION.txt"/>
- <exclude name="THIRDPARTYLICENSE.txt"/>
- <exclude name="nb.cluster.*"/>
- <exclude name="etc/netbeans.conf"/>
- <exclude name="build_info"/>
- <exclude name="module_tracking.xml"/>
- <exclude name="moduleCluster.properties"/>
- <exclude name="netbeans.css"/>
- </checkcontent>
- </target>
-
- <target name="check-module-configs" depends="bootstrap" description="Sanity-check build.properties and cluster.properties.">
- <taskdef name="checkmoduleconfigs" classname="org.netbeans.nbbuild.CheckModuleConfigs" classpath="nbantext.jar"/>
- <checkmoduleconfigs nbroot=".."/>
- </target>
-
- <target name="display-l10n-list-matches" description="Show which files are actually matched by an l10n.list in some module.">
- <property name="nbroot" location=".."/>
- <input addproperty="module">Select a top-level module (e.g. "java") to display results for:</input>
- <property name="listfile" location="${nbroot}/${module}/l10n.list"/>
- <echo>${listfile}:1: Matches follow... (click on hyperlinks from IDE!)</echo>
- <echo>(warning: 'exclude' directives not honored here yet)</echo><!-- XXX use filtersets or something to fix -->
- <apply parallel="false" executable="sh">
- <arg value="-c"/>
- <arg value="echo $0:1"/>
- <fileset dir="${nbroot}" includesfile="${listfile}"/>
- </apply>
- </target>
-
- <target name="increment-spec-versions" depends="bootstrap,init-module-list" description="Increment all standard module specification versions. Pass -Dbranch=true if not on the trunk.">
- <property name="branch" value="false"/>
- <taskdef name="incrspecvers" classname="org.netbeans.nbbuild.IncrementSpecificationVersions" classpath="nbantext.jar"/>
- <incrspecvers nbroot=".." modules="${allmodules}" branch="${branch}"/>
- </target>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/dae04c89/xml.text.obsolete90/test/unit/data/input/XMLFormatterTest/testReformat/web.xml
----------------------------------------------------------------------
diff --git a/xml.text.obsolete90/test/unit/data/input/XMLFormatterTest/testReformat/web.xml b/xml.text.obsolete90/test/unit/data/input/XMLFormatterTest/testReformat/web.xml
index 65c9467..cacd1df 100644
--- a/xml.text.obsolete90/test/unit/data/input/XMLFormatterTest/testReformat/web.xml
+++ b/xml.text.obsolete90/test/unit/data/input/XMLFormatterTest/testReformat/web.xml
@@ -1,5 +1,24 @@
<?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.
+
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
[03/24] incubator-netbeans git commit: [NETBEANS-54] Module review
xml.core
Posted by ma...@apache.org.
[NETBEANS-54] Module review xml.core
- no external library
- checked Rat report; added license header to testfiles
- skimmed through the module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/0ff34983
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/0ff34983
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/0ff34983
Branch: refs/heads/master
Commit: 0ff34983c525f19b5fee5da24780d190a00f78cf
Parents: dae04c8
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Tue Oct 3 18:41:58 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:15 2017 +0200
----------------------------------------------------------------------
.../modules/xml/api/data/data.properties | 16 ++++++++++++++++
.../modules/xml/api/data/illegal_encoding.xml | 20 ++++++++++++++++++++
.../modules/xml/api/data/long_encoding.xml | 19 +++++++++++++++++++
.../modules/xml/api/data/long_no_encoding.xml | 20 ++++++++++++++++++++
.../modules/xml/api/data/short_encoding.xml | 20 ++++++++++++++++++++
.../modules/xml/api/data/short_no_encoding.xml | 20 ++++++++++++++++++++
.../xml/api/data/unsupported_encoding.xml | 20 ++++++++++++++++++++
.../netbeans/modules/xml/dtd/grammar/email.xml | 19 +++++++++++++++++++
8 files changed, 154 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0ff34983/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/data.properties
----------------------------------------------------------------------
diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/data.properties b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/data.properties
index ec60222..dd5c496 100644
--- a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/data.properties
+++ b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/data.properties
@@ -1,3 +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.
short_encoding.xml=ISO-8859-1
long_encoding.xml=ISO-8859-2
short_no_encoding.xml=<null>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0ff34983/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/illegal_encoding.xml
----------------------------------------------------------------------
diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/illegal_encoding.xml b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/illegal_encoding.xml
index f78722e..3efeac6 100644
--- a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/illegal_encoding.xml
+++ b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/illegal_encoding.xml
@@ -1,4 +1,24 @@
<?xml version='1.0' encoding='$$$' ?>
+<!--
+
+ 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.
+
+-->
<root>
Short XML file test.
</root>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0ff34983/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_encoding.xml
----------------------------------------------------------------------
diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_encoding.xml b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_encoding.xml
index 7747d85..8ed6e2b 100644
--- a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_encoding.xml
+++ b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_encoding.xml
@@ -1,5 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-2"?>
+<!--
+
+ 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.
+
+-->
<!--
Document : long_encoding.xml.xml
Created on : October 8, 2007, 6:03 PM
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0ff34983/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_no_encoding.xml
----------------------------------------------------------------------
diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_no_encoding.xml b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_no_encoding.xml
index a1003f7..9219170 100644
--- a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_no_encoding.xml
+++ b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_no_encoding.xml
@@ -1,3 +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.
+
+-->
<!--
Document : long_encoding.xml.xml
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0ff34983/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_encoding.xml
----------------------------------------------------------------------
diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_encoding.xml b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_encoding.xml
index aba0581..51fcbf7 100644
--- a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_encoding.xml
+++ b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_encoding.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ 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.
+
+-->
<root>
Short XML file test.
</root>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0ff34983/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_no_encoding.xml
----------------------------------------------------------------------
diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_no_encoding.xml b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_no_encoding.xml
index 1a36aad..7274fa0 100644
--- a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_no_encoding.xml
+++ b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_no_encoding.xml
@@ -1,3 +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.
+
+-->
<root>
Short XML file test.
</root>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0ff34983/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/unsupported_encoding.xml
----------------------------------------------------------------------
diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/unsupported_encoding.xml b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/unsupported_encoding.xml
index d409ed4..b3af875 100644
--- a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/unsupported_encoding.xml
+++ b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/unsupported_encoding.xml
@@ -1,4 +1,24 @@
<?xml version='1.0' encoding='unknown' ?>
+<!--
+
+ 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.
+
+-->
<root>
Short XML file test.
</root>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0ff34983/xml.core/test/unit/src/org/netbeans/modules/xml/dtd/grammar/email.xml
----------------------------------------------------------------------
diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/dtd/grammar/email.xml b/xml.core/test/unit/src/org/netbeans/modules/xml/dtd/grammar/email.xml
index dcce616..b6ccee8 100644
--- a/xml.core/test/unit/src/org/netbeans/modules/xml/dtd/grammar/email.xml
+++ b/xml.core/test/unit/src/org/netbeans/modules/xml/dtd/grammar/email.xml
@@ -1,5 +1,24 @@
<?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.
+
+-->
<!DOCTYPE email SYSTEM "email.dtd" [
<!ELEMENT testANYElement ANY>
<!NOTATION testNotation PUBLIC "not-pub" "not-sys">
[19/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.tax
Posted by ma...@apache.org.
[NETBEANS-54] Modules review xml.tax
- no external library
- checked Rat report: added missing headers, ignored i10n.list
- skimmed through module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/c5009b81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/c5009b81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/c5009b81
Branch: refs/heads/master
Commit: c5009b81db104a3896aae3d38f26973ae9edeac3
Parents: f29b958
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Fri Oct 6 20:33:22 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:53 2017 +0200
----------------------------------------------------------------------
.../src/org/netbeans/tax/data/xstates.dtd | 20 ++++++++++++++++++++
.../netbeans/tax/io/data/dir/dir-b/level2.dtd | 20 ++++++++++++++++++++
.../netbeans/tax/io/data/dir/dir-b/level3.dtd | 20 ++++++++++++++++++++
.../src/org/netbeans/tax/io/data/dir/level1.dtd | 20 ++++++++++++++++++++
.../src/org/netbeans/tax/dom/data/Prototype.xml | 20 ++++++++++++++++++++
5 files changed, 100 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c5009b81/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/data/xstates.dtd
----------------------------------------------------------------------
diff --git a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/data/xstates.dtd b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/data/xstates.dtd
index 3543367..a75ddc9 100644
--- a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/data/xstates.dtd
+++ b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/data/xstates.dtd
@@ -1,4 +1,24 @@
<?xml 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.
+
+-->
<!-- Created by mschovanek on October 23, 2000, 6:44 PM -->
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c5009b81/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level2.dtd
----------------------------------------------------------------------
diff --git a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level2.dtd b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level2.dtd
index 90990b3..5728c6d 100644
--- a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level2.dtd
+++ b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level2.dtd
@@ -1,3 +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.
+
+-->
<!ELEMENT element-b (#PCDATA)>
<!ENTITY % c SYSTEM "level3.dtd">
%c;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c5009b81/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level3.dtd
----------------------------------------------------------------------
diff --git a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level3.dtd b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level3.dtd
index 5e286fe..8ed4764 100644
--- a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level3.dtd
+++ b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level3.dtd
@@ -1 +1,21 @@
+<!--
+
+ 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.
+
+-->
<!ELEMENT element-c (#PCDATA)>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c5009b81/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/level1.dtd
----------------------------------------------------------------------
diff --git a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/level1.dtd b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/level1.dtd
index ad464d2..5463d86 100644
--- a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/level1.dtd
+++ b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/level1.dtd
@@ -1,3 +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.
+
+-->
<!ELEMENT element (#PCDATA)>
<!ENTITY % b SYSTEM "dir-b/level2.dtd">
%b;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c5009b81/xml.tax/lib/test/unit/src/org/netbeans/tax/dom/data/Prototype.xml
----------------------------------------------------------------------
diff --git a/xml.tax/lib/test/unit/src/org/netbeans/tax/dom/data/Prototype.xml b/xml.tax/lib/test/unit/src/org/netbeans/tax/dom/data/Prototype.xml
index 43c5e68..cb70e84 100644
--- a/xml.tax/lib/test/unit/src/org/netbeans/tax/dom/data/Prototype.xml
+++ b/xml.tax/lib/test/unit/src/org/netbeans/tax/dom/data/Prototype.xml
@@ -1,3 +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.
+
+-->
<root>
<child attribute="value1"/>
<text>data</text>
[14/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.schema.completion
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/f29b9587/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/BasicCompletionTest.java
----------------------------------------------------------------------
diff --git a/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/BasicCompletionTest.java b/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/BasicCompletionTest.java
index 2fd5557..1082d1a 100644
--- a/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/BasicCompletionTest.java
+++ b/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/BasicCompletionTest.java
@@ -41,19 +41,21 @@ public class BasicCompletionTest extends AbstractTestCase {
suite.addTest(new BasicCompletionTest("testNoNamespaceCompletion"));
suite.addTest(new BasicCompletionTest("testNoNamespaceCompletion1"));
suite.addTest(new BasicCompletionTest("testNoNamespaceCompletion2"));
- suite.addTest(new BasicCompletionTest("testPurchaseOrder"));
- suite.addTest(new BasicCompletionTest("testPurchaseOrder1"));
- suite.addTest(new BasicCompletionTest("testPurchaseOrder2"));
- suite.addTest(new BasicCompletionTest("testCompletionFilter1"));
- suite.addTest(new BasicCompletionTest("testCompletionFilter2"));
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTest(new BasicCompletionTest("testPurchaseOrder"));
+// suite.addTest(new BasicCompletionTest("testPurchaseOrder1"));
+// suite.addTest(new BasicCompletionTest("testPurchaseOrder2"));
+// suite.addTest(new BasicCompletionTest("testCompletionFilter1"));
+// suite.addTest(new BasicCompletionTest("testCompletionFilter2"));
suite.addTest(new BasicCompletionTest("testEmptyTag1"));
suite.addTest(new BasicCompletionTest("testEmptyTag2"));
suite.addTest(new BasicCompletionTest("testEmptyTag3"));
suite.addTest(new BasicCompletionTest("testEmptyTag4"));
- suite.addTest(new BasicCompletionTest("testEndtagCompletion1"));
- suite.addTest(new BasicCompletionTest("testEndtagCompletion2"));
- suite.addTest(new BasicCompletionTest("testEndtagCompletion3"));
- suite.addTest(new BasicCompletionTest("testCompletionWithAmpersand"));
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTest(new BasicCompletionTest("testEndtagCompletion1"));
+// suite.addTest(new BasicCompletionTest("testEndtagCompletion2"));
+// suite.addTest(new BasicCompletionTest("testEndtagCompletion3"));
+// suite.addTest(new BasicCompletionTest("testCompletionWithAmpersand"));
// disabled since it accesses Net:
// suite.addTest(new BasicCompletionTest("testSchemaFromRuntimeCatalog"));
//suite.addTest(new BasicCompletionTest("testCompletionUsingSchemaFromCatalog"));
@@ -66,10 +68,11 @@ public class BasicCompletionTest extends AbstractTestCase {
suite.addTest(new BasicCompletionTest("testChildren2"));
suite.addTest(new BasicCompletionTest("testImport1"));
suite.addTest(new BasicCompletionTest("testInclude1"));
- suite.addTest(new BasicCompletionTest("testElementValueCompletion1"));
- suite.addTest(new BasicCompletionTest("testElementValueCompletion2"));
- suite.addTest(new BasicCompletionTest("testAttributeValueCompletion1"));
- suite.addTest(new BasicCompletionTest("testAttributeValueCompletion2"));
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTest(new BasicCompletionTest("testElementValueCompletion1"));
+// suite.addTest(new BasicCompletionTest("testElementValueCompletion2"));
+// suite.addTest(new BasicCompletionTest("testAttributeValueCompletion1"));
+// suite.addTest(new BasicCompletionTest("testAttributeValueCompletion2"));
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/f29b9587/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/CompletionPerfTest.java
----------------------------------------------------------------------
diff --git a/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/CompletionPerfTest.java b/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/CompletionPerfTest.java
index 2bd56e5..e986a60 100644
--- a/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/CompletionPerfTest.java
+++ b/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/CompletionPerfTest.java
@@ -34,7 +34,9 @@ public class CompletionPerfTest extends AbstractTestCase {
}
public static Test suite() {
- TestSuite suite = new TestSuite(CompletionPerfTest.class);
+ TestSuite suite = new TestSuite();
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTestSuite(CompletionPerfTest.class);
return suite;
}
[23/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.lexer
Posted by ma...@apache.org.
[NETBEANS-54] Modules review xml.lexer
- no external library
- checked Rat report: excluded test-data from rat (no IP value)
- disable tests that fail because referenced files were not donated
- skimmed through module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/ed10c5af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/ed10c5af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/ed10c5af
Branch: refs/heads/master
Commit: ed10c5af2e8c40f9e6f1bcabd9330ace533a4593
Parents: bce3d24
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Fri Oct 6 23:37:07 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:54 2017 +0200
----------------------------------------------------------------------
nbbuild/build.xml | 2 ++
.../unit/src/org/netbeans/api/xml/lexer/XMLTokenIdTest.java | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ed10c5af/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 729b68c..b98d30f 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1986,6 +1986,8 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.xml" /> <!-- test data -->
<exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.xsd" /> <!-- test data -->
<exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.bpel" /> <!-- test data -->
+ <exclude name="xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/resources/*.dtd" /> <!-- test data -->
+ <exclude name="xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/resources/*.xml" /> <!-- test data -->
<exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/DTDExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
<exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/XMLExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
<exclude name="xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/**/data/**" /> <!-- test data -->
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ed10c5af/xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/XMLTokenIdTest.java
----------------------------------------------------------------------
diff --git a/xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/XMLTokenIdTest.java b/xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/XMLTokenIdTest.java
index 6d1f427..829a7ce 100644
--- a/xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/XMLTokenIdTest.java
+++ b/xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/XMLTokenIdTest.java
@@ -35,11 +35,13 @@ public class XMLTokenIdTest extends AbstractTestCase {
TestSuite suite = new TestSuite();
suite.addTest(new XMLTokenIdTest("testTokens"));
//regression tests on XMLLexer
- suite.addTest(new XMLTokenIdTest("testParse1"));
+// Disabled as referenced files were partly not donated by oracle to apache
+// suite.addTest(new XMLTokenIdTest("testParse1"));
suite.addTest(new XMLTokenIdTest("testParse2"));
suite.addTest(new XMLTokenIdTest("testParse3"));
//measure performace
- suite.addTest(new XMLTokenIdTest("testParsePerformance"));
+// Disabled as referenced files were partly not donated by oracle to apache
+// suite.addTest(new XMLTokenIdTest("testParsePerformance"));
return suite;
}
[04/24] incubator-netbeans git commit: [NETBEANS-54] Module review
xml.text.obsolete90
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/dae04c89/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml
----------------------------------------------------------------------
diff --git a/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml b/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml
index ae45b83..5093417 100644
--- a/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml
+++ b/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml
@@ -1,4 +1,24 @@
<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<root>
<
<A>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/dae04c89/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml
----------------------------------------------------------------------
diff --git a/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml b/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml
index 50740e4..3d30c04 100644
--- a/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml
+++ b/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml
@@ -1,4 +1,24 @@
<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<company name="Sun Microsystems Inc.">
<employee ssn="xxx-xx-xxxx" id="123"
address="16 Network Circle"
[13/24] incubator-netbeans git commit: [NETBEANS-54] Module review
xml.text
Posted by ma...@apache.org.
[NETBEANS-54] Module review xml.text
- no external library
- checked Rat report; added license to many test files and adjusted
tests to match these; exclude GUI visible sample data and special
test data
- skimmed through the module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/00155f15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/00155f15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/00155f15
Branch: refs/heads/master
Commit: 00155f15e55969a636a395fd7f912708c1928bd6
Parents: 498cc4f
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Tue Oct 3 21:17:52 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:53 2017 +0200
----------------------------------------------------------------------
nbbuild/build.xml | 3 +
.../XMLFormatterTest/testReformatSample1.pass | 19 +++++++
.../XMLFormatterTest/testReformatSample2.pass | 28 ++++-----
.../input/XMLFormatterTest/testReformat/web.xml | 19 +++++++
.../modules/xml/text/AbstractTestCase.java | 22 +++----
.../text/bracematch/XMLBraceMatcherTest.java | 60 ++++++++++----------
.../modules/xml/text/bracematch/test.xml | 20 +++++++
.../ElementResultItemDocumentationTest.java | 4 +-
.../modules/xml/text/completion/parentDoc.html | 20 +++++++
.../xml/text/completion/res/docResource.html | 20 +++++++
.../xml/text/completion/res/relativeLink1.html | 20 +++++++
.../xml/text/dom/XMLSyntaxSupportTest.java | 18 +++---
.../netbeans/modules/xml/text/dom/result1.txt | 52 +++++++++++------
.../netbeans/modules/xml/text/dom/result2.txt | 48 ++++++++++------
.../modules/xml/text/indent/1998stats.xml | 19 +++++++
.../xml/text/indent/XMLLexerFormatterTest.java | 10 ++--
.../netbeans/modules/xml/text/indent/input.xml | 21 ++++++-
.../netbeans/modules/xml/text/indent/input2.xsd | 19 +++++++
.../xml/text/indent/input_attrsIndent.xml | 20 +++++++
.../text/indent/input_breaksMixedContent.xml | 19 +++++++
.../xml/text/indent/input_cdataContent.xml | 20 +++++++
.../xml/text/indent/input_contentIndent.xml | 20 +++++++
.../xml/text/indent/input_emptyComment.xml | 20 +++++++
.../xml/text/indent/input_nestedSame.xml | 20 +++++++
.../xml/text/indent/input_newlineInTags.xml | 20 +++++++
.../modules/xml/text/indent/input_preserve.xml | 20 +++++++
.../xml/text/indent/input_processingXml.xml | 20 +++++++
.../modules/xml/text/indent/input_sub.xml | 21 ++++++-
.../modules/xml/text/indent/input_sub1.xml | 20 +++++++
.../modules/xml/text/indent/input_sub2.xml | 20 +++++++
.../xml/text/indent/input_tagAtStatOfLine.xml | 20 +++++++
.../xml/text/indent/input_withpreserve.xml | 20 +++++++
.../netbeans/modules/xml/text/indent/output.xml | 21 ++++++-
.../modules/xml/text/indent/output2.xsd | 19 +++++++
.../xml/text/indent/output_attrsIndent.xml | 20 +++++++
.../text/indent/output_breaksMixedContent.xml | 19 +++++++
.../xml/text/indent/output_cdataContent.xml | 20 +++++++
.../xml/text/indent/output_contentIndent.xml | 20 +++++++
.../xml/text/indent/output_emptyComment.xml | 20 +++++++
.../xml/text/indent/output_nestedSame.xml | 20 +++++++
.../xml/text/indent/output_newlineInTags.xml | 20 +++++++
.../modules/xml/text/indent/output_preserve.xml | 22 ++++++-
.../xml/text/indent/output_processingXml.xml | 20 +++++++
.../modules/xml/text/indent/output_sub.xml | 21 ++++++-
.../modules/xml/text/indent/output_sub1.xml | 20 +++++++
.../modules/xml/text/indent/output_sub2.xml | 20 +++++++
.../xml/text/indent/output_tagAtStatOfLine.xml | 20 +++++++
.../xml/text/indent/output_withpreserve.xml | 20 +++++++
.../modules/xml/text/syntax/invalid.xml | 20 +++++++
.../netbeans/modules/xml/text/syntax/test.xml | 20 +++++++
50 files changed, 953 insertions(+), 111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 61679db..7a59cc1 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1972,6 +1972,9 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="utilities/test/unit/src/org/netbeans/modules/openfile/resources/recent_files/*" /> <!--test data-->
<exclude name="**/*.url" /> <!--no degree of creativity-->
<exclude name="spi.navigator/test/unit/src/org/netbeans/modules/navigator/resources/lastsel/file.lastsel_mime1" /> <!--empty file-->
+ <exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/DTDExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
+ <exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/XMLExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
+ <exclude name="xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/**/data/**" /> <!-- test data -->
<exclude name="xsl/src/org/netbeans/modules/xsl/resources/templates/stylesheet.xsl" /> <!-- Template for user - very limited degree of creativity -->
<exclude name="xsl/test/unit/src/org/netbeans/modules/xsl/utils/data/*" /> <!--test data-->
<exclude name="spi.navigator/test/unit/src/org/netbeans/modules/navigator/resources/lastsel/file.lastsel_mime1" /> <!--empty file-->
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass b/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass
index 11e1b78..46cdf92 100644
--- a/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass
+++ b/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass
@@ -1,5 +1,24 @@
<?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.
+
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass b/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass
index a52e983..e4d15eb 100644
--- a/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass
+++ b/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass
@@ -1,21 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?> <!-- -*- sgml-indent-step: 2 -*- -->
<!--
-The contents of this file are subject to the terms of the Common Development
-and Distribution License (the License). You may not use this file except in
-compliance with the License.
-You can obtain a copy of the License at http://www.netbeans.org/cddl.html
-or http://www.netbeans.org/cddl.txt.
+ 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
-When distributing Covered Code, include this CDDL Header Notice in each file
-and include the License file at http://www.netbeans.org/cddl.txt.
-If applicable, add the following below the CDDL Header, with the fields
-enclosed by brackets [] replaced by your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
+ 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.
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
-->
<project name="nbbuild" default="all" basedir=".">
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/data/input/XMLFormatterTest/testReformat/web.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/data/input/XMLFormatterTest/testReformat/web.xml b/xml.text/test/unit/data/input/XMLFormatterTest/testReformat/web.xml
index 65c9467..cacd1df 100644
--- a/xml.text/test/unit/data/input/XMLFormatterTest/testReformat/web.xml
+++ b/xml.text/test/unit/data/input/XMLFormatterTest/testReformat/web.xml
@@ -1,5 +1,24 @@
<?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.
+
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/AbstractTestCase.java
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/AbstractTestCase.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/AbstractTestCase.java
index 98ba328..037582e 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/AbstractTestCase.java
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/AbstractTestCase.java
@@ -114,20 +114,16 @@ public class AbstractTestCase extends NbTestCase {
/**
* Converts expected result data into a string. See result*.txt files.
*/
- protected String getExpectedResultAsString(String resultFile) {
+ protected String getExpectedResultAsString(String resultFile) throws IOException {
StringBuilder expectedResult = new StringBuilder();
- InputStream in = AbstractTestCase.class.getResourceAsStream(resultFile);
- Scanner scanner = new Scanner(in);
- try {
- while(scanner.hasNextLine()) {
- expectedResult.append(scanner.nextLine());
- }
- } finally {
- scanner.close();
- try {
- in.close();
- } catch (IOException ex) {
- //stupid catch
+ try (InputStream in = AbstractTestCase.class.getResourceAsStream(resultFile);
+ Scanner scanner = new Scanner(in)) {
+ while (scanner.hasNextLine()) {
+ String line = scanner.nextLine();
+ if (!line.trim().startsWith("#")) {
+ expectedResult.append(line);
+ expectedResult.append("\n");
+ }
}
}
return expectedResult.toString();
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/XMLBraceMatcherTest.java
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/XMLBraceMatcherTest.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/XMLBraceMatcherTest.java
index b8f03c9..d98821a 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/XMLBraceMatcherTest.java
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/XMLBraceMatcherTest.java
@@ -72,88 +72,88 @@ public class XMLBraceMatcherTest extends AbstractTestCase {
public void testDeclaration() throws Exception {
BaseDocument doc = getDocument("bracematch/test.xml");
//inside "<!DOCTYPE"
- XMLBraceMatcher instance = new XMLBraceMatcher(doc, 44);
+ XMLBraceMatcher instance = new XMLBraceMatcher(doc, 866);
int[] origin = instance.doFindOrigin();
- assert(origin[0] == 39 && origin[1] == 48);
+ assert(origin[0] == 861 && origin[1] == 870);
int[] match = instance.doFindMatches();
- assert(match[0] == 78 && match[1] == 79);
+ assert(match[0] == 900 && match[1] == 901);
//between "<!DOCTYPE" and ">"
- instance = new XMLBraceMatcher(doc, 65);
+ instance = new XMLBraceMatcher(doc, 887);
origin = instance.doFindOrigin();
assert(origin == null);
match = instance.doFindMatches();
//in declaration end i.e. ">"
- instance = new XMLBraceMatcher(doc, 79);
+ instance = new XMLBraceMatcher(doc, 901);
origin = instance.doFindOrigin();
- assert(origin[0] == 78 && origin[1] == 79);
+ assert(origin[0] == 900 && origin[1] == 901);
match = instance.doFindMatches();
- assert(match[0] == 39 && match[1] == 48);
+ assert(match[0] == 861 && match[1] == 870);
}
public void testComment() throws Exception {
BaseDocument doc = getDocument("bracematch/test.xml");
//inside start of comment i.e "<!--"
- XMLBraceMatcher instance = new XMLBraceMatcher(doc, 81);
+ XMLBraceMatcher instance = new XMLBraceMatcher(doc, 903);
int[] origin = instance.doFindOrigin();
- assert(origin[0] == 80 && origin[1] == 84);
+ assert(origin[0] == 902 && origin[1] == 906);
int[] match = instance.doFindMatches();
- assert(match[0] == 103 && match[1] == 106);
+ assert(match[0] == 925 && match[1] == 928);
//somewhere between "<!--" and "-->"
- instance = new XMLBraceMatcher(doc, 95);
+ instance = new XMLBraceMatcher(doc, 917);
origin = instance.doFindOrigin();
assert(origin == null);
match = instance.doFindMatches();
//inside "-->"
- instance = new XMLBraceMatcher(doc, 105);
+ instance = new XMLBraceMatcher(doc, 927);
origin = instance.doFindOrigin();
- assert(origin[0] == 103 && origin[1] == 106);
+ assert(origin[0] == 925 && origin[1] == 928);
match = instance.doFindMatches();
- assert(match[0] == 80 && match[1] == 84);
+ assert(match[0] == 902 && match[1] == 906);
}
public void testTag1() throws Exception {
BaseDocument doc = getDocument("bracematch/test.xml");
//inside start of root tag "<root"
- XMLBraceMatcher instance = new XMLBraceMatcher(doc, 110);
+ XMLBraceMatcher instance = new XMLBraceMatcher(doc, 932);
int[] origin = instance.doFindOrigin();
- assert(origin[0] == 107 && origin[1] == 126);
+ assert(origin[0] == 929 && origin[1] == 948);
int[] match = instance.doFindMatches();
- assert(match[0] == 204 && match[1] == 211);
+ assert(match[0] == 1026 && match[1] == 1033);
//somewhere between "<root" and ">"
- instance = new XMLBraceMatcher(doc, 120);
+ instance = new XMLBraceMatcher(doc, 942);
origin = instance.doFindOrigin();
- assert(origin[0] == 107 && origin[1] == 126);
+ assert(origin[0] == 929 && origin[1] == 948);
match = instance.doFindMatches();
//inside "</root>"
- instance = new XMLBraceMatcher(doc, 207);
+ instance = new XMLBraceMatcher(doc, 1029);
origin = instance.doFindOrigin();
- assert(origin[0] == 204 && origin[1] == 211);
+ assert(origin[0] == 1026 && origin[1] == 1033);
match = instance.doFindMatches();
- assert(match[0] == 107 && match[1] == 112);
- assert(match[2] == 125 && match[3] == 126);
+ assert(match[0] == 929 && match[1] == 934);
+ assert(match[2] == 947 && match[3] == 948);
}
public void testTag2() throws Exception {
BaseDocument doc = getDocument("bracematch/test.xml");
//just before > in "<root...>"
- XMLBraceMatcher instance = new XMLBraceMatcher(doc, 125);
+ XMLBraceMatcher instance = new XMLBraceMatcher(doc, 947);
int[] origin = instance.doFindOrigin();
- assert(origin[0] == 107 && origin[1] == 126);
+ assert(origin[0] == 929 && origin[1] == 948);
int[] match = instance.doFindMatches();
- assert(match[0] == 204 && match[1] == 211);
+ assert(match[0] == 1026 && match[1] == 1033);
//just before > in "</root...>"
- instance = new XMLBraceMatcher(doc, 210);
+ instance = new XMLBraceMatcher(doc, 1032);
origin = instance.doFindOrigin();
- assert(origin[0] == 204 && origin[1] == 211);
+ assert(origin[0] == 1026 && origin[1] == 1033);
match = instance.doFindMatches();
- assert(match[0] == 107 && match[1] == 112);
- assert(match[2] == 125 && match[3] == 126);
+ assert(match[0] == 929 && match[1] == 934);
+ assert(match[2] == 947 && match[3] == 948);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/test.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/test.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/test.xml
index 09ef08d..478877d 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/test.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/test.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<!DOCTYPE taglib PUBLIC "hello" "hello">
<!--
Hello World.
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/ElementResultItemDocumentationTest.java
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/ElementResultItemDocumentationTest.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/ElementResultItemDocumentationTest.java
index b3dffb6..05e770f 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/ElementResultItemDocumentationTest.java
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/ElementResultItemDocumentationTest.java
@@ -199,7 +199,7 @@ public class ElementResultItemDocumentationTest extends NbTestCase {
CompletionDocumentation file = doc.resolveLink(url.toString());
assertNotNull(file);
assertEquals("URL must be openable in browser", url, file.getURL());
- assertTrue("Invalid content of the linked doc", file.getText().startsWith("This is an URL resource with <a href="));
+ assertTrue("Invalid content of the linked doc", file.getText().contains("This is an URL resource with <a href="));
}
/**
@@ -283,7 +283,7 @@ public class ElementResultItemDocumentationTest extends NbTestCase {
assertNull("Must not be openable in browser", resolved.getURL());
// fwk is able to fetch contents
assertTrue("Framework must fetch contents of linked URL",
- resolved.getText().startsWith("Resource referenced by relative link"));
+ resolved.getText().contains("Resource referenced by relative link"));
CompletionDocumentation parent = doc.resolveLink("customContent");
assertEquals(PLAIN_DESCRIPTION_TEXT, parent.getText());
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/parentDoc.html
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/parentDoc.html b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/parentDoc.html
index e34fbd2..90a539a 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/parentDoc.html
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/parentDoc.html
@@ -1 +1,21 @@
+<!--
+
+ 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.
+
+-->
Document in parent directory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/docResource.html
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/docResource.html b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/docResource.html
index 6170619..94d1b84 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/docResource.html
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/docResource.html
@@ -1,2 +1,22 @@
+<!--
+
+ 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.
+
+-->
This is an URL resource with <a href="relativeLink1.html">relative link</a> and
<a href="http://www.seznam.cz">absolute link</a>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/relativeLink1.html
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/relativeLink1.html b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/relativeLink1.html
index c9215a0..52648c7 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/relativeLink1.html
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/relativeLink1.html
@@ -1 +1,21 @@
+<!--
+
+ 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.
+
+-->
Resource referenced by relative link
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/XMLSyntaxSupportTest.java
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/XMLSyntaxSupportTest.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/XMLSyntaxSupportTest.java
index d1c3f14..bbfe81c 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/XMLSyntaxSupportTest.java
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/XMLSyntaxSupportTest.java
@@ -39,8 +39,8 @@ public class XMLSyntaxSupportTest extends AbstractTestCase {
public static Test suite() {
TestSuite suite = new TestSuite();
-// suite.addTest(new XMLSyntaxSupportTest("testParseForeward"));
-// suite.addTest(new XMLSyntaxSupportTest("testParseBackward"));
+ suite.addTest(new XMLSyntaxSupportTest("testParseForeward"));
+ suite.addTest(new XMLSyntaxSupportTest("testParseBackward"));
suite.addTest(new XMLSyntaxSupportTest("testTokens"));
return suite;
}
@@ -53,10 +53,10 @@ public class XMLSyntaxSupportTest extends AbstractTestCase {
SyntaxElement se = support.getElementChain(1);
StringBuilder actualResult = new StringBuilder();
while( se != null) {
- actualResult.append("Class: " + se.getClass().getSimpleName() + " Offset: " + se.getElementOffset() + " Length: "+ se.getElementLength());
+ actualResult.append("Class: " + se.getClass().getSimpleName() + " Offset: " + se.getElementOffset() + " Length: "+ se.getElementLength() + "\n");
se = se.getNext();
}
- assert(getExpectedResultAsString("dom/result1.txt").equals(actualResult.toString()));
+ assertEquals(getExpectedResultAsString("dom/result1.txt"), actualResult.toString());
}
public void testParseBackward() throws Exception {
@@ -65,20 +65,20 @@ public class XMLSyntaxSupportTest extends AbstractTestCase {
SyntaxElement se = support.getElementChain(doc.getLength()-1);
StringBuilder actualResult = new StringBuilder();
while( se != null) {
- actualResult.append("Class: " + se.getClass().getSimpleName() + " Offset: " + se.getElementOffset() + " Length: "+ se.getElementLength());
+ actualResult.append("Class: " + se.getClass().getSimpleName() + " Offset: " + se.getElementOffset() + " Length: "+ se.getElementLength() + "\n");
se = se.getPrevious();
}
- assert(getExpectedResultAsString("dom/result2.txt").equals(actualResult.toString()));
+ assertEquals(getExpectedResultAsString("dom/result2.txt"), actualResult.toString());
}
public void testTokens() throws Exception {
BaseDocument doc = getDocument("syntax/test.xml");
XMLSyntaxSupport support = XMLSyntaxSupport.getSyntaxSupport(doc);
- Token token = support.getPreviousToken(30);
+ Token token = support.getPreviousToken(852);
System.out.println("Token: " + token.id() + " Text: " + token.text());
- token = support.getPreviousToken(31);
+ token = support.getPreviousToken(852 + 1);
System.out.println("Token: " + token.id() + " Text: " + token.text());
- token = support.getPreviousToken(32);
+ token = support.getPreviousToken(852 + 2);
System.out.println("Token: " + token.id() + " Text: " + token.text());
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result1.txt
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result1.txt b/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result1.txt
index 7e03686..795d404 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result1.txt
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result1.txt
@@ -1,18 +1,36 @@
+# 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.
Class: ProcessingInstruction Offset: 0 Length: 21
-Class: Text Offset: 21 Length: 1
-Class: StartTag Offset: 22 Length: 38
-Class: Text Offset: 60 Length: 5
-Class: StartTag Offset: 65 Length: 103
-Class: Text Offset: 168 Length: 13
-Class: EndTag Offset: 181 Length: 11
-Class: Text Offset: 192 Length: 5
-Class: StartTag Offset: 197 Length: 10
-Class: CDATASection Offset: 207 Length: 37
-Class: EndTag Offset: 244 Length: 11
-Class: Text Offset: 255 Length: 5
-Class: Comment Offset: 260 Length: 40
-Class: Text Offset: 300 Length: 5
-Class: EmptyTag Offset: 305 Length: 11
-Class: Text Offset: 316 Length: 1
-Class: EndTag Offset: 317 Length: 10
-Class: Text Offset: 327 Length: 1
+Class: TextImpl Offset: 21 Length: 1
+Class: Comment Offset: 22 Length: 821
+Class: TextImpl Offset: 843 Length: 1
+Class: StartTag Offset: 844 Length: 38
+Class: TextImpl Offset: 882 Length: 5
+Class: StartTag Offset: 887 Length: 103
+Class: TextImpl Offset: 990 Length: 13
+Class: EndTag Offset: 1003 Length: 11
+Class: TextImpl Offset: 1014 Length: 5
+Class: StartTag Offset: 1019 Length: 10
+Class: CDATASection Offset: 1029 Length: 37
+Class: EndTag Offset: 1066 Length: 11
+Class: TextImpl Offset: 1077 Length: 5
+Class: Comment Offset: 1082 Length: 40
+Class: TextImpl Offset: 1122 Length: 5
+Class: EmptyTag Offset: 1127 Length: 11
+Class: TextImpl Offset: 1138 Length: 1
+Class: EndTag Offset: 1139 Length: 10
+Class: TextImpl Offset: 1149 Length: 2
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result2.txt
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result2.txt b/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result2.txt
index 46ee555..a1467ac 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result2.txt
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result2.txt
@@ -1,18 +1,32 @@
-Class: Text Offset: 327 Length: 1
-Class: EndTag Offset: 317 Length: 10
-Class: Text Offset: 316 Length: 1
-Class: EmptyTag Offset: 305 Length: 11
-Class: Text Offset: 300 Length: 5
-Class: Comment Offset: 260 Length: 40
-Class: Text Offset: 255 Length: 5
-Class: EndTag Offset: 244 Length: 11
-Class: CDATASection Offset: 207 Length: 37
-Class: StartTag Offset: 197 Length: 10
-Class: Text Offset: 192 Length: 5
-Class: EndTag Offset: 181 Length: 11
-Class: Text Offset: 168 Length: 13
-Class: StartTag Offset: 65 Length: 103
-Class: Text Offset: 60 Length: 5
-Class: StartTag Offset: 22 Length: 38
-Class: Text Offset: 21 Length: 1
+# 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.
+Class: EndTag Offset: 1139 Length: 10
+Class: EmptyTag Offset: 1127 Length: 11
+Class: TextImpl Offset: 1122 Length: 5
+Class: Comment Offset: 1082 Length: 40
+Class: TextImpl Offset: 1077 Length: 5
+Class: EndTag Offset: 1066 Length: 11
+Class: CDATASection Offset: 1029 Length: 37
+Class: StartTag Offset: 1019 Length: 10
+Class: TextImpl Offset: 1014 Length: 5
+Class: EndTag Offset: 1003 Length: 11
+Class: TextImpl Offset: 990 Length: 13
+Class: StartTag Offset: 887 Length: 103
+Class: TextImpl Offset: 882 Length: 5
+Class: StartTag Offset: 844 Length: 38
+Class: Comment Offset: 22 Length: 821
Class: ProcessingInstruction Offset: 0 Length: 21
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/1998stats.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/1998stats.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/1998stats.xml
index ffc426c..a93b56d 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/1998stats.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/1998stats.xml
@@ -1,5 +1,24 @@
<?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.
+
+-->
<SEASON>
<YEAR>1998</YEAR>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatterTest.java
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatterTest.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatterTest.java
index bbd7e0c..43017ee 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatterTest.java
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatterTest.java
@@ -86,7 +86,7 @@ public class XMLLexerFormatterTest extends AbstractTestCase {
BaseDocument inputDoc = getDocument("indent/input_sub.xml");
//format a subsection of the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- LineDocument formattedDoc = formatter.doReformat(inputDoc, 72, 97);
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 893, 918);
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
LineDocument outputDoc = getDocument("indent/output_sub.xml");
assertTrue (compare(formattedDoc, outputDoc));
@@ -126,7 +126,7 @@ public class XMLLexerFormatterTest extends AbstractTestCase {
BaseDocument inputDoc = getDocument("indent/input_sub1.xml");
//format a subsection of the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- LineDocument formattedDoc = formatter.doReformat(inputDoc, 46, 74);
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 868, 896);
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
LineDocument outputDoc = getDocument("indent/output_sub1.xml");
assertTrue (compare(formattedDoc, outputDoc));
@@ -136,7 +136,7 @@ public class XMLLexerFormatterTest extends AbstractTestCase {
BaseDocument inputDoc = getDocument("indent/input_sub2.xml");
//format a subsection of the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- LineDocument formattedDoc = formatter.doReformat(inputDoc, 63, 80);
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 885, 899);
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
LineDocument outputDoc = getDocument("indent/output_sub2.xml");
assertTrue (compare(formattedDoc, outputDoc));
@@ -169,8 +169,8 @@ public class XMLLexerFormatterTest extends AbstractTestCase {
BaseDocument inputDoc = getDocument("indent/input_preserve.xml");
//format the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- System.out.println("SECTION:" + inputDoc.getText(91, 87));
- LineDocument formattedDoc = formatter.doReformat(inputDoc, 91, 91 + 87);
+ System.out.println("SECTION:" + inputDoc.getText(913, 87));
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 913, 913 + 87);
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
LineDocument outputDoc = getDocument("indent/output_preserve.xml");
assertTrue(compare(formattedDoc, outputDoc));
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input.xml
index 09514e2..5c94a6a 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input.xml
@@ -1,5 +1,24 @@
<?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.
+
+-->
<!-- hello world -->
<wrap>
<root>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input2.xsd
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input2.xsd b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input2.xsd
index 74ccbbc..1254fd5 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input2.xsd
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input2.xsd
@@ -1,5 +1,24 @@
<?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.
+
+-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://xml.netbeans.org/schema/Namespace2"
xmlns:tns="http://xml.netbeans.org/schema/Namespace2"
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_attrsIndent.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_attrsIndent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_attrsIndent.xml
index 5452540..6a4399d 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_attrsIndent.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_attrsIndent.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root var1="not indented"
var2="aligned with var1">
<child
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_breaksMixedContent.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_breaksMixedContent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_breaksMixedContent.xml
index 31f3a28..0cc53b7 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_breaksMixedContent.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_breaksMixedContent.xml
@@ -1,5 +1,24 @@
<?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.
+
+-->
<root>
<para>
This is one sentence.
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_cdataContent.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_cdataContent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_cdataContent.xml
index 2bd299e..f02a0a5 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_cdataContent.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_cdataContent.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root>
<a>
<b><![CDATA[some content
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_contentIndent.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_contentIndent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_contentIndent.xml
index f11c9eb..393e7a1 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_contentIndent.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_contentIndent.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<!-- hello world -->
<wrap>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_emptyComment.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_emptyComment.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_emptyComment.xml
index 32aabea..a0ded82 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_emptyComment.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_emptyComment.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root>
<!--
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_nestedSame.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_nestedSame.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_nestedSame.xml
index 0e9440b..10379c3 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_nestedSame.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_nestedSame.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root>
<elem1>
<elem1></elem1>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_newlineInTags.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_newlineInTags.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_newlineInTags.xml
index fa928e1..23daf69 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_newlineInTags.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_newlineInTags.xml
@@ -1,6 +1,26 @@
<?xml
encoding="UTF8"
?>
+<!--
+
+ 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.
+
+-->
<root
attribute1="val"
>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_preserve.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_preserve.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_preserve.xml
index 258c41e..c021658 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_preserve.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_preserve.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root name="a" xml:space="preserve">
Keep
this
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_processingXml.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_processingXml.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_processingXml.xml
index 29ed523..e05d02c 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_processingXml.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_processingXml.xml
@@ -1,6 +1,26 @@
<?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.
+
+-->
<root>
</root>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub.xml
index b90b24d..37e9277 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub.xml
@@ -1,7 +1,26 @@
<?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.
+
+-->
<!-- bug#131223 -->
<root>
<a><b>hello world</b></a>
-</root>
+</root>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub1.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub1.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub1.xml
index 98a437a..9ad2b09 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub1.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub1.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root>
<test attr="replace"></test>
<a/>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub2.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub2.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub2.xml
index 5c4ddeb..abd0e4d 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub2.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub2.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root>
<a/>
<test attr="replace"></test>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_tagAtStatOfLine.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_tagAtStatOfLine.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_tagAtStatOfLine.xml
index 9060b2a..ab1148c 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_tagAtStatOfLine.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_tagAtStatOfLine.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_withpreserve.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_withpreserve.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_withpreserve.xml
index 5818ecd..7c01739 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_withpreserve.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_withpreserve.xml
@@ -1,2 +1,22 @@
<?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.
+
+-->
<root><node><nest xml:space="preserve"><child>Do not format</child><child>And do not format this</child></nest><nest><child>Do format</child><child>And format this</child></nest></node></root>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output.xml
index 463a0e6..1459ac2 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output.xml
@@ -1,5 +1,24 @@
<?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.
+
+-->
<!-- hello world -->
<wrap>
<root>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output2.xsd
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output2.xsd b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output2.xsd
index 3682acc..a0d6044 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output2.xsd
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output2.xsd
@@ -1,5 +1,24 @@
<?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.
+
+-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://xml.netbeans.org/schema/Namespace2"
xmlns:tns="http://xml.netbeans.org/schema/Namespace2"
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_attrsIndent.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_attrsIndent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_attrsIndent.xml
index 71eea0d..60b2670 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_attrsIndent.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_attrsIndent.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root var1="not indented"
var2="aligned with var1">
<child
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_breaksMixedContent.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_breaksMixedContent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_breaksMixedContent.xml
index 9e5252a..72ee208 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_breaksMixedContent.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_breaksMixedContent.xml
@@ -1,5 +1,24 @@
<?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.
+
+-->
<root>
<para>
This is one sentence.
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_cdataContent.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_cdataContent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_cdataContent.xml
index 053d317..df2c10f 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_cdataContent.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_cdataContent.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root>
<a>
<b><![CDATA[some content
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_contentIndent.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_contentIndent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_contentIndent.xml
index 0c22dce..17daaf4 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_contentIndent.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_contentIndent.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<!-- hello world -->
<wrap>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_emptyComment.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_emptyComment.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_emptyComment.xml
index fc871c4..0a9ce9c 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_emptyComment.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_emptyComment.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root>
<!--
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_nestedSame.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_nestedSame.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_nestedSame.xml
index 69e73dc..3fbe75a 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_nestedSame.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_nestedSame.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root>
<elem1>
<elem1></elem1>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_newlineInTags.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_newlineInTags.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_newlineInTags.xml
index 6be3aa1..8a6c2fc 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_newlineInTags.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_newlineInTags.xml
@@ -1,6 +1,26 @@
<?xml
encoding="UTF8"
?>
+<!--
+
+ 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.
+
+-->
<root
attribute1="val"
>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_preserve.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_preserve.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_preserve.xml
index 387ca40..d1afa84 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_preserve.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_preserve.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root name="a" xml:space="preserve">
Keep
this
@@ -9,4 +29,4 @@ is<nest xml:space="default">
</nest>,
and this
too
-</root>
+</root>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_processingXml.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_processingXml.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_processingXml.xml
index 5307ff4..122543b 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_processingXml.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_processingXml.xml
@@ -1,6 +1,26 @@
<?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.
+
+-->
<root>
</root>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub.xml
index d021f2e..1df55ad 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub.xml
@@ -1,9 +1,28 @@
<?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.
+
+-->
<!-- bug#131223 -->
<root>
<a>
<b>hello world</b>
</a>
-</root>
+</root>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub1.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub1.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub1.xml
index 720dad1..8fccd71 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub1.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub1.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root>
<test attr="replace"></test>
<a/>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub2.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub2.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub2.xml
index 5b0f528..07260ee 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub2.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub2.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root>
<a/>
<test attr="replace"></test>
[15/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.schema.completion
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/f29b9587/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/util/XMLSchema.xsd
----------------------------------------------------------------------
diff --git a/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/util/XMLSchema.xsd b/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/util/XMLSchema.xsd
index 608a24d..7430b63 100644
--- a/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/util/XMLSchema.xsd
+++ b/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/util/XMLSchema.xsd
@@ -1,2163 +1,1605 @@
<?xml version='1.0' encoding='UTF-8'?>
-
-<xs:schema targetNamespace="http://www.w3.org/2001/XMLSchema"
-blockDefault="#all"
-elementFormDefault="qualified" version="1.0"
-xmlns:xs="http://www.w3.org/2001/XMLSchema"
-xml:lang="EN" xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty">
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File fetched from https://www.w3.org/2009/XMLSchema/XMLSchema.xsd
+- Added license header
+
+-->
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XSD 1.1//EN" "XMLSchema.dtd" [
+
+<!-- provide ID type information even for parsers which only read the
+ internal subset -->
+<!ATTLIST xs:schema id ID #IMPLIED>
+<!ATTLIST xs:complexType id ID #IMPLIED>
+<!ATTLIST xs:complexContent id ID #IMPLIED>
+<!ATTLIST xs:simpleContent id ID #IMPLIED>
+<!ATTLIST xs:extension id ID #IMPLIED>
+<!ATTLIST xs:element id ID #IMPLIED>
+<!ATTLIST xs:group id ID #IMPLIED>
+<!ATTLIST xs:all id ID #IMPLIED>
+<!ATTLIST xs:choice id ID #IMPLIED>
+<!ATTLIST xs:sequence id ID #IMPLIED>
+<!ATTLIST xs:any id ID #IMPLIED>
+<!ATTLIST xs:anyAttribute id ID #IMPLIED>
+<!ATTLIST xs:attribute id ID #IMPLIED>
+<!ATTLIST xs:attributeGroup id ID #IMPLIED>
+<!ATTLIST xs:unique id ID #IMPLIED>
+<!ATTLIST xs:key id ID #IMPLIED>
+<!ATTLIST xs:keyref id ID #IMPLIED>
+<!ATTLIST xs:selector id ID #IMPLIED>
+<!ATTLIST xs:field id ID #IMPLIED>
+<!ATTLIST xs:assert id ID #IMPLIED>
+<!ATTLIST xs:include id ID #IMPLIED>
+<!ATTLIST xs:import id ID #IMPLIED>
+<!ATTLIST xs:redefine id ID #IMPLIED>
+<!ATTLIST xs:override id ID #IMPLIED>
+<!ATTLIST xs:notation id ID #IMPLIED>
+<!--
+ Make sure that processors that do not read the external
+ subset will know about the various IDs we declare
+ -->
+ <!ATTLIST xs:simpleType id ID #IMPLIED>
+ <!ATTLIST xs:maxExclusive id ID #IMPLIED>
+ <!ATTLIST xs:minExclusive id ID #IMPLIED>
+ <!ATTLIST xs:maxInclusive id ID #IMPLIED>
+ <!ATTLIST xs:minInclusive id ID #IMPLIED>
+ <!ATTLIST xs:totalDigits id ID #IMPLIED>
+ <!ATTLIST xs:fractionDigits id ID #IMPLIED>
+ <!ATTLIST xs:length id ID #IMPLIED>
+ <!ATTLIST xs:minLength id ID #IMPLIED>
+ <!ATTLIST xs:maxLength id ID #IMPLIED>
+ <!ATTLIST xs:enumeration id ID #IMPLIED>
+ <!ATTLIST xs:pattern id ID #IMPLIED>
+ <!ATTLIST xs:assertion id ID #IMPLIED>
+ <!ATTLIST xs:explicitTimezone id ID #IMPLIED>
+ <!ATTLIST xs:appinfo id ID #IMPLIED>
+ <!ATTLIST xs:documentation id ID #IMPLIED>
+ <!ATTLIST xs:list id ID #IMPLIED>
+ <!ATTLIST xs:union id ID #IMPLIED>
+ ]>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified" xml:lang="EN"
+ targetNamespace="http://www.w3.org/2001/XMLSchema"
+ version="1.0">
<xs:annotation>
<xs:documentation>
- Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp
- Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp
+ Part 1 version: structures.xsd (rec-20120405)
+ Part 2 version: datatypes.xsd (rec-20120405)
</xs:documentation>
</xs:annotation>
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/2004/PER-xmlschema-1-20040318/structures.html">
+ <xs:annotation>
+ <xs:documentation source="../structures/structures.html">
The schema corresponding to this document is normative,
with respect to the syntactic constraints it expresses in the
- XML Schema language. The documentation (within <documentation> elements)
+ XML Schema Definition Language. The documentation (within 'documentation' elements)
below, is not normative, but rather highlights important aspects of
- the W3C Recommendation of which this is a part</xs:documentation>
- </xs:annotation>
+ the W3C Recommendation of which this is a part.
- <xs:annotation>
- <xs:documentation>
+ See below (at the bottom of this document) for information about
+ the revision and namespace-versioning policy governing this
+ schema document.
+
+ </xs:documentation>
+ </xs:annotation>
+ <xs:annotation>
+ <xs:documentation>
The simpleType element and all of its members are defined
- towards the end of this schema document</xs:documentation>
+ towards the end of this schema document.</xs:documentation>
</xs:annotation>
-
- <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd">
- <xs:annotation>
- <xs:documentation>
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace"
+ schemaLocation="http://www.w3.org/2001/xml.xsd">
+ <xs:annotation>
+ <xs:documentation>
Get access to the xml: attribute groups for xml:lang
as declared on 'schema' and 'documentation' below
</xs:documentation>
- </xs:annotation>
- </xs:import>
-
- <xs:complexType name="openAttrs">
- <xs:annotation>
- <xs:documentation>
+ </xs:annotation>
+ </xs:import>
+ <xs:complexType name="openAttrs">
+ <xs:annotation>
+ <xs:documentation>
This type is extended by almost all schema types
to allow attributes from other namespaces to be
added to user schemas.
</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="annotated">
- <xs:annotation>
- <xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:restriction base="xs:anyType">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="annotated">
+ <xs:annotation>
+ <xs:documentation>
This type is extended by all types which allow annotation
- other than <schema> itself
+ other than <schema> itself
</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xs:openAttrs">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="id" type="xs:ID"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:group name="schemaTop">
- <xs:annotation>
- <xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="xs:openAttrs">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:ID"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:group name="composition">
+ <xs:choice>
+ <xs:element ref="xs:include"/>
+ <xs:element ref="xs:import"/>
+ <xs:element ref="xs:redefine"/>
+ <xs:element ref="xs:override"/>
+ <xs:element ref="xs:annotation"/>
+ </xs:choice>
+ </xs:group>
+ <xs:group name="schemaTop">
+ <xs:annotation>
+ <xs:documentation>
This group is for the
elements which occur freely at the top level of schemas.
All of their types are based on the "annotated" type by extension.</xs:documentation>
- </xs:annotation>
- <xs:choice>
- <xs:group ref="xs:redefinable"/>
- <xs:element ref="xs:element"/>
- <xs:element ref="xs:attribute"/>
- <xs:element ref="xs:notation"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="redefinable">
- <xs:annotation>
- <xs:documentation>
+ </xs:annotation>
+ <xs:choice>
+ <xs:group ref="xs:redefinable"/>
+ <xs:element ref="xs:element"/>
+ <xs:element ref="xs:attribute"/>
+ <xs:element ref="xs:notation"/>
+ </xs:choice>
+ </xs:group>
+ <xs:group name="redefinable">
+ <xs:annotation>
+ <xs:documentation>
This group is for the
elements which can self-redefine (see <redefine> below).</xs:documentation>
- </xs:annotation>
- <xs:choice>
- <xs:element ref="xs:simpleType"/>
- <xs:element ref="xs:complexType"/>
- <xs:element ref="xs:group"/>
- <xs:element ref="xs:attributeGroup"/>
- </xs:choice>
- </xs:group>
-
- <xs:simpleType name="formChoice">
- <xs:annotation>
- <xs:documentation>
+ </xs:annotation>
+ <xs:choice>
+ <xs:element ref="xs:simpleType"/>
+ <xs:element ref="xs:complexType"/>
+ <xs:element ref="xs:group"/>
+ <xs:element ref="xs:attributeGroup"/>
+ </xs:choice>
+ </xs:group>
+ <xs:simpleType name="formChoice">
+ <xs:annotation>
+ <xs:documentation>
A utility type, not for public use</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:NMTOKEN">
- <xs:enumeration value="qualified"/>
- <xs:enumeration value="unqualified"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="reducedDerivationControl">
- <xs:annotation>
- <xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="qualified"/>
+ <xs:enumeration value="unqualified"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="reducedDerivationControl">
+ <xs:annotation>
+ <xs:documentation>
A utility type, not for public use</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:derivationControl">
- <xs:enumeration value="extension"/>
- <xs:enumeration value="restriction"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="derivationSet">
- <xs:annotation>
- <xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:derivationControl">
+ <xs:enumeration value="extension"/>
+ <xs:enumeration value="restriction"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="derivationSet">
+ <xs:annotation>
+ <xs:documentation>
A utility type, not for public use</xs:documentation>
- <xs:documentation>
+ <xs:documentation>
#all or (possibly empty) subset of {extension, restriction}</xs:documentation>
- </xs:annotation>
- <xs:union>
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="#all"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType>
- <xs:list itemType="xs:reducedDerivationControl"/>
- </xs:simpleType>
- </xs:union>
- </xs:simpleType>
-
- <xs:simpleType name="typeDerivationControl">
- <xs:annotation>
- <xs:documentation>
+ </xs:annotation>
+ <xs:union>
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="#all"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType>
+ <xs:list itemType="xs:reducedDerivationControl"/>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+ <xs:simpleType name="typeDerivationControl">
+ <xs:annotation>
+ <xs:documentation>
A utility type, not for public use</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:derivationControl">
- <xs:enumeration value="extension"/>
- <xs:enumeration value="restriction"/>
- <xs:enumeration value="list"/>
- <xs:enumeration value="union"/>
- </xs:restriction>
- </xs:simpleType>
-
+ </xs:annotation>
+ <xs:restriction base="xs:derivationControl">
+ <xs:enumeration value="extension"/>
+ <xs:enumeration value="restriction"/>
+ <xs:enumeration value="list"/>
+ <xs:enumeration value="union"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="fullDerivationSet">
- <xs:annotation>
- <xs:documentation>
+ <xs:annotation>
+ <xs:documentation>
A utility type, not for public use</xs:documentation>
- <xs:documentation>
+ <xs:documentation>
#all or (possibly empty) subset of {extension, restriction, list, union}</xs:documentation>
- </xs:annotation>
- <xs:union>
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="#all"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType>
- <xs:list itemType="xs:typeDerivationControl"/>
- </xs:simpleType>
- </xs:union>
- </xs:simpleType>
-
- <xs:element name="schema" id="schema">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-schema"/>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="xs:openAttrs">
- <xs:sequence>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="xs:include"/>
- <xs:element ref="xs:import"/>
- <xs:element ref="xs:redefine"/>
- <xs:element ref="xs:annotation"/>
- </xs:choice>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:group ref="xs:schemaTop"/>
- <xs:element ref="xs:annotation" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:sequence>
- <xs:attribute name="targetNamespace" type="xs:anyURI"/>
- <xs:attribute name="version" type="xs:token"/>
- <xs:attribute name="finalDefault" type="xs:fullDerivationSet" use="optional" default=""/>
- <xs:attribute name="blockDefault" type="xs:blockSet" use="optional" default=""/>
- <xs:attribute name="attributeFormDefault" type="xs:formChoice" use="optional" default="unqualified"/>
- <xs:attribute name="elementFormDefault" type="xs:formChoice" use="optional" default="unqualified"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:attribute ref="xml:lang"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:key name="element">
- <xs:selector xpath="xs:element"/>
- <xs:field xpath="@name"/>
- </xs:key>
-
- <xs:key name="attribute">
- <xs:selector xpath="xs:attribute"/>
- <xs:field xpath="@name"/>
- </xs:key>
-
- <xs:key name="type">
- <xs:selector xpath="xs:complexType|xs:simpleType"/>
- <xs:field xpath="@name"/>
- </xs:key>
-
- <xs:key name="group">
- <xs:selector xpath="xs:group"/>
- <xs:field xpath="@name"/>
- </xs:key>
-
- <xs:key name="attributeGroup">
- <xs:selector xpath="xs:attributeGroup"/>
- <xs:field xpath="@name"/>
- </xs:key>
-
- <xs:key name="notation">
- <xs:selector xpath="xs:notation"/>
- <xs:field xpath="@name"/>
- </xs:key>
-
- <xs:key name="identityConstraint">
- <xs:selector xpath=".//xs:key|.//xs:unique|.//xs:keyref"/>
- <xs:field xpath="@name"/>
- </xs:key>
-
- </xs:element>
-
- <xs:simpleType name="allNNI">
- <xs:annotation><xs:documentation>
- for maxOccurs</xs:documentation></xs:annotation>
- <xs:union memberTypes="xs:nonNegativeInteger">
- <xs:simpleType>
- <xs:restriction base="xs:NMTOKEN">
- <xs:enumeration value="unbounded"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:union>
- </xs:simpleType>
-
- <xs:attributeGroup name="occurs">
- <xs:annotation><xs:documentation>
- for all particles</xs:documentation></xs:annotation>
- <xs:attribute name="minOccurs" type="xs:nonNegativeInteger" use="optional" default="1"/>
- <xs:attribute name="maxOccurs" type="xs:allNNI" use="optional" default="1"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="defRef">
- <xs:annotation><xs:documentation>
+ </xs:annotation>
+ <xs:union>
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="#all"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType>
+ <xs:list itemType="xs:typeDerivationControl"/>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+ <xs:element name="schema" id="schema">
+ <xs:annotation>
+ <xs:documentation
+ source="../structures/structures.html#element-schema"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:openAttrs">
+ <xs:sequence>
+ <xs:group ref="xs:composition" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:sequence minOccurs="0">
+ <xs:element ref="xs:defaultOpenContent"/>
+ <xs:element ref="xs:annotation" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:group ref="xs:schemaTop"/>
+ <xs:element ref="xs:annotation" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:sequence>
+ <xs:attribute name="targetNamespace" type="xs:anyURI"/>
+ <xs:attribute name="version" type="xs:token"/>
+ <xs:attribute name="finalDefault" type="xs:fullDerivationSet"
+ default="" use="optional"/>
+ <xs:attribute name="blockDefault" type="xs:blockSet" default=""
+ use="optional"/>
+ <xs:attribute name="attributeFormDefault" type="xs:formChoice"
+ default="unqualified" use="optional"/>
+ <xs:attribute name="elementFormDefault" type="xs:formChoice"
+ default="unqualified" use="optional"/>
+ <xs:attribute name="defaultAttributes" type="xs:QName"/>
+ <xs:attribute name="xpathDefaultNamespace" type="xs:xpathDefaultNamespace"
+ default="##local" use="optional"/>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute ref="xml:lang"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:key name="element">
+ <xs:selector xpath="xs:element"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+ <xs:key name="attribute">
+ <xs:selector xpath="xs:attribute"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+ <xs:key name="type">
+ <xs:selector xpath="xs:complexType|xs:simpleType"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+ <xs:key name="group">
+ <xs:selector xpath="xs:group"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+ <xs:key name="attributeGroup">
+ <xs:selector xpath="xs:attributeGroup"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+ <xs:key name="notation">
+ <xs:selector xpath="xs:notation"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+ <xs:key name="identityConstraint">
+ <xs:selector xpath=".//xs:key|.//xs:unique|.//xs:keyref"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+ </xs:element>
+ <xs:simpleType name="allNNI">
+ <xs:annotation>
+ <xs:documentation>
+ for maxOccurs</xs:documentation>
+ </xs:annotation>
+ <xs:union memberTypes="xs:nonNegativeInteger">
+ <xs:simpleType>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="unbounded"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+ <xs:attributeGroup name="occurs">
+ <xs:annotation>
+ <xs:documentation>
+ for all particles</xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="minOccurs" type="xs:nonNegativeInteger" default="1"
+ use="optional"/>
+ <xs:attribute name="maxOccurs" type="xs:allNNI" default="1" use="optional"/>
+ </xs:attributeGroup>
+ <xs:attributeGroup name="defRef">
+ <xs:annotation>
+ <xs:documentation>
for element, group and attributeGroup,
- which both define and reference</xs:documentation></xs:annotation>
- <xs:attribute name="name" type="xs:NCName"/>
- <xs:attribute name="ref" type="xs:QName"/>
- </xs:attributeGroup>
-
- <xs:group name="typeDefParticle">
- <xs:annotation>
- <xs:documentation>
- 'complexType' uses this</xs:documentation></xs:annotation>
- <xs:choice>
- <xs:element name="group" type="xs:groupRef"/>
- <xs:element ref="xs:all"/>
- <xs:element ref="xs:choice"/>
- <xs:element ref="xs:sequence"/>
- </xs:choice>
- </xs:group>
-
-
-
- <xs:group name="nestedParticle">
- <xs:choice>
- <xs:element name="element" type="xs:localElement"/>
- <xs:element name="group" type="xs:groupRef"/>
- <xs:element ref="xs:choice"/>
- <xs:element ref="xs:sequence"/>
- <xs:element ref="xs:any"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="particle">
- <xs:choice>
- <xs:element name="element" type="xs:localElement"/>
- <xs:element name="group" type="xs:groupRef"/>
- <xs:element ref="xs:all"/>
- <xs:element ref="xs:choice"/>
- <xs:element ref="xs:sequence"/>
- <xs:element ref="xs:any"/>
- </xs:choice>
- </xs:group>
-
- <xs:complexType name="attribute">
- <xs:complexContent>
- <xs:extension base="xs:annotated">
+ which both define and reference</xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="name" type="xs:NCName"/>
+ <xs:attribute name="ref" type="xs:QName"/>
+ </xs:attributeGroup>
+ <xs:group name="typeDefParticle">
+ <xs:annotation>
+ <xs:documentation>
+ 'complexType' uses this</xs:documentation>
+ </xs:annotation>
+ <xs:choice>
+ <xs:element name="group" type="xs:groupRef"/>
+ <xs:element ref="xs:all"/>
+ <xs:element ref="xs:choice"/>
+ <xs:element ref="xs:sequence"/>
+ </xs:choice>
+ </xs:group>
+ <xs:group name="nestedParticle">
+ <xs:choice>
+ <xs:element name="element" type="xs:localElement"/>
+ <xs:element name="group" type="xs:groupRef"/>
+
+ <xs:element ref="xs:choice"/>
+ <xs:element ref="xs:sequence"/>
+ <xs:element ref="xs:any"/>
+ </xs:choice>
+ </xs:group>
+ <xs:group name="particle">
+ <xs:choice>
+ <xs:element name="element" type="xs:localElement"/>
+ <xs:element name="group" type="xs:groupRef"/>
+ <xs:element ref="xs:all"/>
+ <xs:element ref="xs:choice"/>
+ <xs:element ref="xs:sequence"/>
+ <xs:element ref="xs:any"/>
+ </xs:choice>
+ </xs:group>
+ <xs:complexType name="attribute">
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:sequence>
+ <xs:element name="simpleType" type="xs:localSimpleType" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="xs:defRef"/>
+ <xs:attribute name="type" type="xs:QName"/>
+ <xs:attribute name="use" default="optional" use="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="prohibited"/>
+ <xs:enumeration value="optional"/>
+ <xs:enumeration value="required"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="default" type="xs:string"/>
+ <xs:attribute name="fixed" type="xs:string"/>
+ <xs:attribute name="form" type="xs:formChoice"/>
+ <xs:attribute name="targetNamespace" type="xs:anyURI"/>
+
+ <xs:attribute name="inheritable" type="xs:boolean"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="topLevelAttribute">
+ <xs:complexContent>
+ <xs:restriction base="xs:attribute">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:element name="simpleType" type="xs:localSimpleType" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="ref" use="prohibited"/>
+ <xs:attribute name="form" use="prohibited"/>
+ <xs:attribute name="use" use="prohibited"/>
+ <xs:attribute name="targetNamespace" use="prohibited"/>
+ <xs:attribute name="name" type="xs:NCName" use="required"/>
+ <xs:attribute name="inheritable" type="xs:boolean"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:group name="attrDecls">
<xs:sequence>
- <xs:element name="simpleType" minOccurs="0" type="xs:localSimpleType"/>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="attribute" type="xs:attribute"/>
+ <xs:element name="attributeGroup" type="xs:attributeGroupRef"/>
+ </xs:choice>
+ <xs:element ref="xs:anyAttribute" minOccurs="0"/>
</xs:sequence>
- <xs:attributeGroup ref="xs:defRef"/>
- <xs:attribute name="type" type="xs:QName"/>
- <xs:attribute name="use" use="optional" default="optional">
- <xs:simpleType>
- <xs:restriction base="xs:NMTOKEN">
- <xs:enumeration value="prohibited"/>
- <xs:enumeration value="optional"/>
- <xs:enumeration value="required"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="default" type="xs:string"/>
- <xs:attribute name="fixed" type="xs:string"/>
- <xs:attribute name="form" type="xs:formChoice"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="topLevelAttribute">
- <xs:complexContent>
- <xs:restriction base="xs:attribute">
+ </xs:group>
+ <xs:element name="anyAttribute" id="anyAttribute">
+ <xs:annotation>
+ <xs:documentation
+ source="../structures/structures.html#element-anyAttribute"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:wildcard">
+ <xs:attribute name="notQName" type="xs:qnameListA"
+ use="optional"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:group name="assertions">
<xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:element name="simpleType" minOccurs="0" type="xs:localSimpleType"/>
+ <xs:element name="assert" type="xs:assertion"
+ minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
- <xs:attribute name="ref" use="prohibited"/>
- <xs:attribute name="form" use="prohibited"/>
- <xs:attribute name="use" use="prohibited"/>
- <xs:attribute name="name" use="required" type="xs:NCName"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:group name="attrDecls">
- <xs:sequence>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="attribute" type="xs:attribute"/>
- <xs:element name="attributeGroup" type="xs:attributeGroupRef"/>
- </xs:choice>
- <xs:element ref="xs:anyAttribute" minOccurs="0"/>
- </xs:sequence>
- </xs:group>
-
- <xs:element name="anyAttribute" type="xs:wildcard" id="anyAttribute">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-anyAttribute"/>
- </xs:annotation>
- </xs:element>
-
- <xs:group name="complexTypeModel">
- <xs:choice>
+ </xs:group>
+ <xs:complexType name="assertion">
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:attribute name="test" type="xs:string"/>
+ <xs:attribute name="xpathDefaultNamespace" type="xs:xpathDefaultNamespace"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:group name="complexTypeModel">
+ <xs:choice>
<xs:element ref="xs:simpleContent"/>
<xs:element ref="xs:complexContent"/>
<xs:sequence>
- <xs:annotation>
- <xs:documentation>
+ <xs:annotation>
+ <xs:documentation>
This branch is short for
<complexContent>
<restriction base="xs:anyType">
...
</restriction>
</complexContent></xs:documentation>
- </xs:annotation>
- <xs:group ref="xs:typeDefParticle" minOccurs="0"/>
- <xs:group ref="xs:attrDecls"/>
+ </xs:annotation>
+ <xs:element ref="xs:openContent" minOccurs="0"/>
+ <xs:group ref="xs:typeDefParticle" minOccurs="0"/>
+ <xs:group ref="xs:attrDecls"/>
+ <xs:group ref="xs:assertions"/>
</xs:sequence>
- </xs:choice>
- </xs:group>
-
- <xs:complexType name="complexType" abstract="true">
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:group ref="xs:complexTypeModel"/>
- <xs:attribute name="name" type="xs:NCName">
- <xs:annotation>
- <xs:documentation>
- Will be restricted to required or forbidden</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="mixed" type="xs:boolean" use="optional" default="false">
- <xs:annotation>
- <xs:documentation>
+ </xs:choice>
+ </xs:group>
+ <xs:complexType name="complexType" abstract="true">
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:group ref="xs:complexTypeModel"/>
+ <xs:attribute name="name" type="xs:NCName">
+ <xs:annotation>
+ <xs:documentation>
+ Will be restricted to required or prohibited</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="mixed" type="xs:boolean" use="optional">
+ <xs:annotation>
+ <xs:documentation>
Not allowed if simpleContent child is chosen.
- May be overriden by setting on complexContent child.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="abstract" type="xs:boolean" use="optional" default="false"/>
- <xs:attribute name="final" type="xs:derivationSet"/>
- <xs:attribute name="block" type="xs:derivationSet"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="topLevelComplexType">
- <xs:complexContent>
- <xs:restriction base="xs:complexType">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:group ref="xs:complexTypeModel"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:NCName" use="required"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="localComplexType">
- <xs:complexContent>
- <xs:restriction base="xs:complexType">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:group ref="xs:complexTypeModel"/>
- </xs:sequence>
- <xs:attribute name="name" use="prohibited"/>
- <xs:attribute name="abstract" use="prohibited"/>
- <xs:attribute name="final" use="prohibited"/>
- <xs:attribute name="block" use="prohibited"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="restrictionType">
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:sequence>
- <xs:choice minOccurs="0">
- <xs:group ref="xs:typeDefParticle"/>
- <xs:group ref="xs:simpleRestrictionModel"/>
- </xs:choice>
- <xs:group ref="xs:attrDecls"/>
- </xs:sequence>
- <xs:attribute name="base" type="xs:QName" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="complexRestrictionType">
- <xs:complexContent>
- <xs:restriction base="xs:restrictionType">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:choice minOccurs="0">
- <xs:annotation>
- <xs:documentation>This choice is added simply to
- make this a valid restriction per the REC</xs:documentation>
- </xs:annotation>
- <xs:group ref="xs:typeDefParticle"/>
- </xs:choice>
- <xs:group ref="xs:attrDecls"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="extensionType">
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:sequence>
- <xs:group ref="xs:typeDefParticle" minOccurs="0"/>
- <xs:group ref="xs:attrDecls"/>
- </xs:sequence>
- <xs:attribute name="base" type="xs:QName" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:element name="complexContent" id="complexContent">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-complexContent"/>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:choice>
- <xs:element name="restriction" type="xs:complexRestrictionType"/>
- <xs:element name="extension" type="xs:extensionType"/>
- </xs:choice>
- <xs:attribute name="mixed" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>
- Overrides any setting on complexType parent.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
+ May be overridden by setting on complexContent child.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="abstract" type="xs:boolean" default="false"
+ use="optional"/>
+ <xs:attribute name="final" type="xs:derivationSet"/>
+ <xs:attribute name="block" type="xs:derivationSet"/>
+ <xs:attribute name="defaultAttributesApply" type="xs:boolean"
+ default="true" use="optional"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
- </xs:element>
-
- <xs:complexType name="simpleRestrictionType">
- <xs:complexContent>
- <xs:restriction base="xs:restrictionType">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:choice minOccurs="0">
- <xs:annotation>
- <xs:documentation>This choice is added simply to
- make this a valid restriction per the REC</xs:documentation>
- </xs:annotation>
- <xs:group ref="xs:simpleRestrictionModel"/>
- </xs:choice>
- <xs:group ref="xs:attrDecls"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="simpleExtensionType">
- <xs:complexContent>
- <xs:restriction base="xs:extensionType">
- <xs:sequence>
- <xs:annotation>
- <xs:documentation>
+ <xs:complexType name="topLevelComplexType">
+ <xs:complexContent>
+ <xs:restriction base="xs:complexType">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:group ref="xs:complexTypeModel"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:NCName" use="required"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="localComplexType">
+ <xs:complexContent>
+ <xs:restriction base="xs:complexType">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:group ref="xs:complexTypeModel"/>
+ </xs:sequence>
+ <xs:attribute name="name" use="prohibited"/>
+ <xs:attribute name="abstract" use="prohibited"/>
+ <xs:attribute name="final" use="prohibited"/>
+ <xs:attribute name="block" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="restrictionType">
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:sequence>
+ <xs:choice minOccurs="0">
+
+ <xs:sequence>
+ <xs:element ref="xs:openContent" minOccurs="0"/>
+ <xs:group ref="xs:typeDefParticle"/>
+ </xs:sequence>
+ <xs:group ref="xs:simpleRestrictionModel"/>
+ </xs:choice>
+ <xs:group ref="xs:attrDecls"/>
+ <xs:group ref="xs:assertions"/>
+ </xs:sequence>
+ <xs:attribute name="base" type="xs:QName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="complexRestrictionType">
+ <xs:complexContent>
+ <xs:restriction base="xs:restrictionType">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>This choice is added simply to
+ make this a valid restriction per the REC</xs:documentation>
+ </xs:annotation>
+
+ <xs:sequence>
+ <xs:element ref="xs:openContent" minOccurs="0"/>
+ <xs:group ref="xs:typeDefParticle"/>
+ </xs:sequence>
+ </xs:choice>
+ <xs:group ref="xs:attrDecls"/>
+ <xs:group ref="xs:assertions"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="extensionType">
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:sequence>
+ <xs:element ref="xs:openContent" minOccurs="0"/>
+ <xs:group ref="xs:typeDefParticle" minOccurs="0"/>
+ <xs:group ref="xs:attrDecls"/>
+ <xs:group ref="xs:assertions"/>
+ </xs:sequence>
+ <xs:attribute name="base" type="xs:QName" use="required"/>
+
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:element name="complexContent" id="complexContent">
+ <xs:annotation>
+ <xs:documentation
+ source="../structures/structures.html#element-complexContent"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:choice>
+ <xs:element name="restriction" type="xs:complexRestrictionType"/>
+ <xs:element name="extension" type="xs:extensionType"/>
+ </xs:choice>
+ <xs:attribute name="mixed" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>
+ Overrides any setting on complexType parent.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="openContent" id="openContent">
+ <xs:annotation>
+ <xs:documentation
+ source="../structures/structures.html#element-openContent"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:sequence>
+ <xs:element name="any" minOccurs="0" type="xs:wildcard"/>
+ </xs:sequence>
+ <xs:attribute name="mode" default="interleave" use="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="none"/>
+ <xs:enumeration value="interleave"/>
+ <xs:enumeration value="suffix"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="defaultOpenContent" id="defaultOpenContent">
+ <xs:annotation>
+ <xs:documentation
+ source="../structures/structures.html#element-defaultOpenContent"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:sequence>
+ <xs:element name="any" type="xs:wildcard"/>
+ </xs:sequence>
+ <xs:attribute name="appliesToEmpty" type="xs:boolean"
+ default="false" use="optional"/>
+ <xs:attribute name="mode" default="interleave" use="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="interleave"/>
+ <xs:enumeration value="suffix"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:complexType name="simpleRestrictionType">
+ <xs:complexContent>
+ <xs:restriction base="xs:restrictionType">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>This choice is added simply to
+ make this a valid restriction per the REC</xs:documentation>
+ </xs:annotation>
+ <xs:group ref="xs:simpleRestrictionModel"/>
+ </xs:choice>
+ <xs:group ref="xs:attrDecls"/>
+ <xs:group ref="xs:assertions"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="simpleExtensionType">
+ <xs:complexContent>
+ <xs:restriction base="xs:extensionType">
+ <xs:sequence>
+ <xs:annotation>
+ <xs:documentation>
No typeDefParticle group reference</xs:documentation>
- </xs:annotation>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:group ref="xs:attrDecls"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:element name="simpleContent" id="simpleContent">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-simpleContent"/>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:choice>
- <xs:element name="restriction" type="xs:simpleRestrictionType"/>
- <xs:element name="extension" type="xs:simpleExtensionType"/>
- </xs:choice>
- </xs:extension>
- </xs:complexContent>
+ </xs:annotation>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:group ref="xs:attrDecls"/>
+ <xs:group ref="xs:assertions"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
</xs:complexType>
- </xs:element>
-
- <xs:element name="complexType" type="xs:topLevelComplexType" id="complexType">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-complexType"/>
- </xs:annotation>
- </xs:element>
-
-
+ <xs:element name="simpleContent" id="simpleContent">
+ <xs:annotation>
+ <xs:documentation
+ source="../structures/structures.html#element-simpleContent"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:choice>
+ <xs:element name="restriction" type="xs:simpleRestrictionType"/>
+ <xs:element name="extension" type="xs:simpleExtensionType"/>
+ </xs:choice>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="complexType" type="xs:topLevelComplexType" id="complexType">
+ <xs:annotation>
+ <xs:documentation
+ source="../structures/structures.html#element-complexType"/>
+ </xs:annotation>
+ </xs:element>
<xs:simpleType name="blockSet">
- <xs:annotation>
- <xs:documentation>
+ <xs:annotation>
+ <xs:documentation>
A utility type, not for public use</xs:documentation>
- <xs:documentation>
+ <xs:documentation>
#all or (possibly empty) subset of {substitution, extension,
restriction}</xs:documentation>
- </xs:annotation>
- <xs:union>
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="#all"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType>
- <xs:list>
+ </xs:annotation>
+ <xs:union>
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="#all"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType>
- <xs:restriction base="xs:derivationControl">
- <xs:enumeration value="extension"/>
- <xs:enumeration value="restriction"/>
- <xs:enumeration value="substitution"/>
- </xs:restriction>
+ <xs:list>
+ <xs:simpleType>
+ <xs:restriction base="xs:derivationControl">
+ <xs:enumeration value="extension"/>
+ <xs:enumeration value="restriction"/>
+ <xs:enumeration value="substitution"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:list>
</xs:simpleType>
- </xs:list>
- </xs:simpleType>
- </xs:union>
+ </xs:union>
</xs:simpleType>
-
- <xs:complexType name="element" abstract="true">
- <xs:annotation>
- <xs:documentation>
+ <xs:complexType name="element" abstract="true">
+ <xs:annotation>
+ <xs:documentation>
The element element can be used either
at the top level to define an element-type binding globally,
or within a content model to either reference a globally-defined
element or type or declare an element-type binding locally.
The ref form is not allowed at the top level.</xs:documentation>
- </xs:annotation>
-
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:sequence>
- <xs:choice minOccurs="0">
- <xs:element name="simpleType" type="xs:localSimpleType"/>
- <xs:element name="complexType" type="xs:localComplexType"/>
- </xs:choice>
- <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attributeGroup ref="xs:defRef"/>
- <xs:attribute name="type" type="xs:QName"/>
- <xs:attribute name="substitutionGroup" type="xs:QName"/>
- <xs:attributeGroup ref="xs:occurs"/>
- <xs:attribute name="default" type="xs:string"/>
- <xs:attribute name="fixed" type="xs:string"/>
- <xs:attribute name="nillable" type="xs:boolean" use="optional" default="false"/>
- <xs:attribute name="abstract" type="xs:boolean" use="optional" default="false"/>
- <xs:attribute name="final" type="xs:derivationSet"/>
- <xs:attribute name="block" type="xs:blockSet"/>
- <xs:attribute name="form" type="xs:formChoice"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="topLevelElement">
- <xs:complexContent>
- <xs:restriction base="xs:element">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:choice minOccurs="0">
- <xs:element name="simpleType" type="xs:localSimpleType"/>
- <xs:element name="complexType" type="xs:localComplexType"/>
- </xs:choice>
- <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="ref" use="prohibited"/>
- <xs:attribute name="form" use="prohibited"/>
- <xs:attribute name="minOccurs" use="prohibited"/>
- <xs:attribute name="maxOccurs" use="prohibited"/>
- <xs:attribute name="name" use="required" type="xs:NCName"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="localElement">
- <xs:complexContent>
- <xs:restriction base="xs:element">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:choice minOccurs="0">
- <xs:element name="simpleType" type="xs:localSimpleType"/>
- <xs:element name="complexType" type="xs:localComplexType"/>
- </xs:choice>
- <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="substitutionGroup" use="prohibited"/>
- <xs:attribute name="final" use="prohibited"/>
- <xs:attribute name="abstract" use="prohibited"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:element name="element" type="xs:topLevelElement" id="element">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-element"/>
- </xs:annotation>
- </xs:element>
-
- <xs:complexType name="group" abstract="true">
- <xs:annotation>
- <xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:sequence>
+ <xs:choice minOccurs="0">
+ <xs:element name="simpleType" type="xs:localSimpleType"/>
+ <xs:element name="complexType" type="xs:localComplexType"/>
+ </xs:choice>
+ <xs:element name="alternative" type="xs:altType"
+ minOccurs="0" maxOccurs="unbounded"/>
+ <xs:group ref="xs:identityConstraint" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="xs:defRef"/>
+ <xs:attribute name="type" type="xs:QName"/>
+
+ <xs:attribute name="substitutionGroup">
+ <xs:simpleType>
+ <xs:list itemType="xs:QName"/>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attributeGroup ref="xs:occurs"/>
+ <xs:attribute name="default" type="xs:string"/>
+ <xs:attribute name="fixed" type="xs:string"/>
+ <xs:attribute name="nillable" type="xs:boolean" use="optional"/>
+ <xs:attribute name="abstract" type="xs:boolean" default="false"
+ use="optional"/>
+ <xs:attribute name="final" type="xs:derivationSet"/>
+ <xs:attribute name="block" type="xs:blockSet"/>
+ <xs:attribute name="form" type="xs:formChoice"/>
+ <xs:attribute name="targetNamespace" type="xs:anyURI"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="topLevelElement">
+ <xs:complexContent>
+ <xs:restriction base="xs:element">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0">
+ <xs:element name="simpleType" type="xs:localSimpleType"/>
+ <xs:element name="complexType" type="xs:localComplexType"/>
+ </xs:choice>
+ <xs:element name="alternative" type="xs:altType"
+ minOccurs="0" maxOccurs="unbounded"/>
+ <xs:group ref="xs:identityConstraint" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="ref" use="prohibited"/>
+ <xs:attribute name="form" use="prohibited"/>
+ <xs:attribute name="targetNamespace" use="prohibited"/>
+ <xs:attribute name="minOccurs" use="prohibited"/>
+ <xs:attribute name="maxOccurs" use="prohibited"/>
+ <xs:attribute name="name" type="xs:NCName" use="required"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="localElement">
+ <xs:complexContent>
+ <xs:restriction base="xs:element">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0">
+ <xs:element name="simpleType" type="xs:localSimpleType"/>
+ <xs:element name="complexType" type="xs:localComplexType"/>
+ </xs:choice>
+ <xs:element name="alternative" type="xs:altType"
+ minOccurs="0" maxOccurs="unbounded"/>
+ <xs:group ref="xs:identityConstraint" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="substitutionGroup" use="prohibited"/>
+ <xs:attribute name="final" use="prohibited"/>
+ <xs:attribute name="abstract" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:element name="element" type="xs:topLevelElement" id="element">
+ <xs:annotation>
+ <xs:documentation
+ source="../structures/structures.html#element-element"/>
+ </xs:annotation>
+ </xs:element>
+ <xs:complexType name="altType">
+ <xs:annotation>
+ <xs:documentation>
+ This type is used for 'alternative' elements.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:choice minOccurs="0">
+ <xs:element name="simpleType" type="xs:localSimpleType"/>
+ <xs:element name="complexType" type="xs:localComplexType"/>
+ </xs:choice>
+ <xs:attribute name="test" type="xs:string" use="optional"/>
+ <xs:attribute name="type" type="xs:QName" use="optional"/>
+ <xs:attribute name="xpathDefaultNamespace" type="xs:xpathDefaultNamespace"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="group" abstract="true">
+ <xs:annotation>
+ <xs:documentation>
group type for explicit groups, named top-level groups and
group references</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:group ref="xs:particle" minOccurs="0" maxOccurs="unbounded"/>
- <xs:attributeGroup ref="xs:defRef"/>
- <xs:attributeGroup ref="xs:occurs"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="realGroup">
- <xs:complexContent>
- <xs:restriction base="xs:group">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element ref="xs:all"/>
- <xs:element ref="xs:choice"/>
- <xs:element ref="xs:sequence"/>
- </xs:choice>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="namedGroup">
- <xs:complexContent>
- <xs:restriction base="xs:realGroup">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:choice minOccurs="1" maxOccurs="1">
- <xs:element name="all">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="xs:all">
- <xs:group ref="xs:allModel"/>
- <xs:attribute name="minOccurs" use="prohibited"/>
- <xs:attribute name="maxOccurs" use="prohibited"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="choice" type="xs:simpleExplicitGroup"/>
- <xs:element name="sequence" type="xs:simpleExplicitGroup"/>
- </xs:choice>
- </xs:sequence>
- <xs:attribute name="name" use="required" type="xs:NCName"/>
- <xs:attribute name="ref" use="prohibited"/>
- <xs:attribute name="minOccurs" use="prohibited"/>
- <xs:attribute name="maxOccurs" use="prohibited"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="groupRef">
- <xs:complexContent>
- <xs:restriction base="xs:realGroup">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="ref" use="required" type="xs:QName"/>
- <xs:attribute name="name" use="prohibited"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="explicitGroup">
- <xs:annotation>
- <xs:documentation>
- group type for the three kinds of group</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:restriction base="xs:group">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:NCName" use="prohibited"/>
- <xs:attribute name="ref" type="xs:QName" use="prohibited"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="simpleExplicitGroup">
- <xs:complexContent>
- <xs:restriction base="xs:explicitGroup">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="minOccurs" use="prohibited"/>
- <xs:attribute name="maxOccurs" use="prohibited"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:group name="allModel">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>This choice with min/max is here to
- avoid a pblm with the Elt:All/Choice/Seq
- Particle derivation constraint</xs:documentation>
- </xs:annotation>
- <xs:element name="element" type="xs:narrowMaxMin"/>
- </xs:choice>
- </xs:sequence>
- </xs:group>
-
-
- <xs:complexType name="narrowMaxMin">
- <xs:annotation>
- <xs:documentation>restricted max/min</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:restriction base="xs:localElement">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:choice minOccurs="0">
- <xs:element name="simpleType" type="xs:localSimpleType"/>
- <xs:element name="complexType" type="xs:localComplexType"/>
- </xs:choice>
- <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="minOccurs" use="optional" default="1">
- <xs:simpleType>
- <xs:restriction base="xs:nonNegativeInteger">
- <xs:enumeration value="0"/>
- <xs:enumeration value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="maxOccurs" use="optional" default="1">
- <xs:simpleType>
- <xs:restriction base="xs:allNNI">
- <xs:enumeration value="0"/>
- <xs:enumeration value="1"/>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+
+ <xs:group ref="xs:particle" minOccurs="0" maxOccurs="unbounded"/>
+
+ <xs:attributeGroup ref="xs:defRef"/>
+ <xs:attributeGroup ref="xs:occurs"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="realGroup">
+ <xs:complexContent>
+ <xs:restriction base="xs:group">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element ref="xs:all"/>
+ <xs:element ref="xs:choice"/>
+ <xs:element ref="xs:sequence"/>
+ </xs:choice>
+
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="all">
- <xs:annotation>
- <xs:documentation>
- Only elements allowed inside</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:restriction base="xs:explicitGroup">
- <xs:group ref="xs:allModel"/>
- <xs:attribute name="minOccurs" use="optional" default="1">
- <xs:simpleType>
- <xs:restriction base="xs:nonNegativeInteger">
- <xs:enumeration value="0"/>
- <xs:enumeration value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="maxOccurs" use="optional" default="1">
- <xs:simpleType>
- <xs:restriction base="xs:allNNI">
- <xs:enumeration value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
+ </xs:complexContent>
</xs:complexType>
-
- <xs:element name="all" id="all" type="xs:all">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-all"/>
- </xs:annotation>
- </xs:element>
-
- <xs:element name="choice" type="xs:explicitGroup" id="choice">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-choice"/>
- </xs:annotation>
- </xs:element>
-
- <xs:element name="sequence" type="xs:explicitGroup" id="sequence">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-sequence"/>
- </xs:annotation>
- </xs:element>
-
- <xs:element name="group" type="xs:namedGroup" id="group">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-group"/>
- </xs:annotation>
- </xs:element>
-
- <xs:complexType name="wildcard">
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:attribute name="namespace" type="xs:namespaceList" use="optional" default="##any"/>
- <xs:attribute name="processContents" use="optional" default="strict">
- <xs:simpleType>
- <xs:restriction base="xs:NMTOKEN">
- <xs:enumeration value="skip"/>
- <xs:enumeration value="lax"/>
- <xs:enumeration value="strict"/>
+ <xs:complexType name="namedGroup">
+ <xs:complexContent>
+ <xs:restriction base="xs:realGroup">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="1" maxOccurs="1">
+ <xs:element name="all">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:restriction base="xs:all">
+ <xs:group ref="xs:allModel"/>
+ <xs:attribute name="minOccurs" use="prohibited"/>
+ <xs:attribute name="maxOccurs" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="choice" type="xs:simpleExplicitGroup"/>
+ <xs:element name="sequence" type="xs:simpleExplicitGroup"/>
+ </xs:choice>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:NCName" use="required"/>
+ <xs:attribute name="ref" use="prohibited"/>
+ <xs:attribute name="minOccurs" use="prohibited"/>
+ <xs:attribute name="maxOccurs" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:element name="any" id="any">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-any"/>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="xs:wildcard">
- <xs:attributeGroup ref="xs:occurs"/>
- </xs:extension>
- </xs:complexContent>
+ </xs:complexContent>
</xs:complexType>
- </xs:element>
-
- <xs:annotation>
- <xs:documentation>
- simple type for the value of the 'namespace' attr of
- 'any' and 'anyAttribute'</xs:documentation>
- </xs:annotation>
- <xs:annotation>
- <xs:documentation>
- Value is
- ##any - - any non-conflicting WFXML/attribute at all
-
- ##other - - any non-conflicting WFXML/attribute from
- namespace other than targetNS
-
- ##local - - any unqualified non-conflicting WFXML/attribute
-
- one or - - any non-conflicting WFXML/attribute from
- more URI the listed namespaces
- references
- (space separated)
-
- ##targetNamespace or ##local may appear in the above list, to
- refer to the targetNamespace of the enclosing
- schema or an absent targetNamespace respectively</xs:documentation>
- </xs:annotation>
-
- <xs:simpleType name="namespaceList">
- <xs:annotation>
- <xs:documentation>
- A utility type, not for public use</xs:documentation>
- </xs:annotation>
- <xs:union>
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="##any"/>
- <xs:enumeration value="##other"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType>
- <xs:list>
- <xs:simpleType>
- <xs:union memberTypes="xs:anyURI">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="##targetNamespace"/>
- <xs:enumeration value="##local"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:union>
- </xs:simpleType>
- </xs:list>
- </xs:simpleType>
- </xs:union>
- </xs:simpleType>
-
- <xs:element name="attribute" type="xs:topLevelAttribute" id="attribute">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-attribute"/>
- </xs:annotation>
- </xs:element>
-
- <xs:complexType name="attributeGroup" abstract="true">
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:group ref="xs:attrDecls"/>
- <xs:attributeGroup ref="xs:defRef"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="namedAttributeGroup">
- <xs:complexContent>
- <xs:restriction base="xs:attributeGroup">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:group ref="xs:attrDecls"/>
- </xs:sequence>
- <xs:attribute name="name" use="required" type="xs:NCName"/>
- <xs:attribute name="ref" use="prohibited"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="attributeGroupRef">
- <xs:complexContent>
- <xs:restriction base="xs:attributeGroup">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="ref" use="required" type="xs:QName"/>
- <xs:attribute name="name" use="prohibited"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:element name="attributeGroup" type="xs:namedAttributeGroup" id="attributeGroup">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-attributeGroup"/>
- </xs:annotation>
- </xs:element>
-
- <xs:element name="include" id="include">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-include"/>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/>
- </xs:extension>
- </xs:complexContent>
+ <xs:complexType name="groupRef">
+ <xs:complexContent>
+ <xs:restriction base="xs:realGroup">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="ref" type="xs:QName" use="required"/>
+ <xs:attribute name="name" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
</xs:complexType>
- </xs:element>
-
- <xs:element name="redefine" id="redefine">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-redefine"/>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="xs:openAttrs">
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="xs:annotation"/>
- <xs:group ref="xs:redefinable"/>
- </xs:choice>
- <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/>
- <xs:attribute name="id" type="xs:ID"/>
- </xs:extension>
- </xs:complexContent>
+ <xs:complexType name="explicitGroup">
+ <xs:annotation>
+ <xs:documentation>
+ group type for the three kinds of group</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:restriction base="xs:group">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" use="prohibited"/>
+ <xs:attribute name="ref" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
</xs:complexType>
- </xs:element>
-
- <xs:element name="import" id="import">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-import"/>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:attribute name="namespace" type="xs:anyURI"/>
- <xs:attribute name="schemaLocation" type="xs:anyURI"/>
- </xs:extension>
- </xs:complexContent>
+ <xs:complexType name="simpleExplicitGroup">
+ <xs:complexContent>
+ <xs:restriction base="xs:explicitGroup">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="minOccurs" use="prohibited"/>
+ <xs:attribute name="maxOccurs" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
</xs:complexType>
- </xs:element>
-
- <xs:element name="selector" id="selector">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-selector"/>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:attribute name="xpath" use="required">
- <xs:simpleType>
- <xs:annotation>
- <xs:documentation>A subset of XPath expressions for use
-in selectors</xs:documentation>
- <xs:documentation>A utility type, not for public
-use</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:token">
- <xs:annotation>
- <xs:documentation>The following pattern is intended to allow XPath
- expressions per the following EBNF:
- Selector ::= Path ( '|' Path )*
- Path ::= ('.//')? Step ( '/' Step )*
- Step ::= '.' | NameTest
- NameTest ::= QName | '*' | NCName ':' '*'
- child:: is also allowed
- </xs:documentation>
- </xs:annotation>
- <xs:pattern value="(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*(\|(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*)*">
- </xs:pattern>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="field" id="field">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-field"/>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:attribute name="xpath" use="required">
- <xs:simpleType>
- <xs:annotation>
- <xs:documentation>A subset of XPath expressions for use
-in fields</xs:documentation>
- <xs:documentation>A utility type, not for public
-use</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:token">
+ <xs:group name="allModel">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
- <xs:documentation>The following pattern is intended to allow XPath
- expressions per the same EBNF as for selector,
- with the following change:
- Path ::= ('.//')? ( Step '/' )* ( Step | '@' NameTest )
- </xs:documentation>
+ <xs:documentation>This choice with min/max is here to
+ avoid a pblm with the Elt:All/Choice/Seq
+ Particle derivation constraint</xs:documentation>
</xs:annotation>
- <xs:pattern value="(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*))))(\|(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*)))))*">
- </xs:pattern>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:complexType name="keybase">
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:sequence>
- <xs:element ref="xs:selector"/>
- <xs:element ref="xs:field" minOccurs="1" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:NCName" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:group name="identityConstraint">
- <xs:annotation>
- <xs:documentation>The three kinds of identity constraints, all with
- type of or derived from 'keybase'.
- </xs:documentation>
- </xs:annotation>
- <xs:choice>
- <xs:element ref="xs:unique"/>
- <xs:element ref="xs:key"/>
- <xs:element ref="xs:keyref"/>
- </xs:choice>
- </xs:group>
-
- <xs:element name="unique" type="xs:keybase" id="unique">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-unique"/>
- </xs:annotation>
- </xs:element>
- <xs:element name="key" type="xs:keybase" id="key">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-key"/>
- </xs:annotation>
- </xs:element>
- <xs:element name="keyref" id="keyref">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-keyref"/>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="xs:keybase">
- <xs:attribute name="refer" type="xs:QName" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="notation" id="notation">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-notation"/>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="xs:annotated">
- <xs:attribute name="name" type="xs:NCName" use="required"/>
- <xs:attribute name="public" type="xs:public"/>
- <xs:attribute name="system" type="xs:anyURI"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:simpleType name="public">
- <xs:annotation>
- <xs:documentation>
- A utility type, not for public use</xs:documentation>
- <xs:documentation>
- A public identifier, per ISO 8879</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:token"/>
- </xs:simpleType>
-
- <xs:element name="appinfo" id="appinfo">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-appinfo"/>
- </xs:annotation>
- <xs:complexType mixed="true">
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:any processContents="lax"/>
- </xs:sequence>
- <xs:attribute name="source" type="xs:anyURI"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="documentation" id="documentation">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-documentation"/>
- </xs:annotation>
- <xs:complexType mixed="true">
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:any processContents="lax"/>
+ <xs:element name="element" type="xs:localElement"/>
+ <xs:element ref="xs:any"/>
+ <xs:element name="group">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:restriction base="xs:groupRef">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="minOccurs" fixed="1" type="xs:nonNegativeInteger"/>
+ <xs:attribute name="maxOccurs" fixed="1" type="xs:nonNegativeInteger"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
</xs:sequence>
- <xs:attribute name="source" type="xs:anyURI"/>
- <xs:attribute ref="xml:lang"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="annotation" id="annotation">
- <xs:annotation>
- <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-annotation"/>
- </xs:annotation>
- <xs:complexType>
+ </xs:group>
+ <xs:complexType name="all">
+ <xs:annotation>
+ <xs:documentation>
+ Only elements allowed inside</xs:documentation>
+ </xs:annotation>
<xs:complexContent>
- <xs:extension base="xs:openAttrs">
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="xs:appinfo"/>
- <xs:element ref="xs:documentation"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:ID"/>
- </xs:extension>
+ <xs:restriction base="xs:explicitGroup">
+ <xs:group ref="xs:allModel"/>
+ <xs:attribute name="minOccurs" default="1" use="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:nonNegativeInteger">
+ <xs:enumeration value="0"/>
+ <xs:enumeration value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="maxOccurs" default="1" use="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:allNNI">
+ <xs:enumeration value="0"/>
+ <xs:enumeration value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
</xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:annotation>
- <xs:documentation>
- notations for use within XML Schema schemas</xs:documentation>
- </xs:annotation>
-
- <xs:notation name="XMLSchemaStructures" public="structures" system="http://www.w3.org/2000/08/XMLSchema.xsd"/>
- <xs:notation name="XML" public="REC-xml-19980210" system="http://www.w3.org/TR/1998/REC-xml-19980210"/>
-
- <xs:complexType name="anyType" mixed="true">
- <xs:annotation>
- <xs:documentation>
- Not the real urType, but as close an approximation as we can
- get in the XML representation</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
- </xs:sequence>
- <xs:anyAttribute processContents="lax"/>
- </xs:complexType>
-
- <xs:annotation>
- <xs:documentation>
- First the built-in primitive datatypes. These definitions are for
- information only, the real built-in definitions are magic.
- </xs:documentation>
-
- <xs:documentation>
- For each built-in datatype in this schema (both primitive and
- derived) can be uniquely addressed via a URI constructed
- as follows:
- 1) the base URI is the URI of the XML Schema namespace
- 2) the fragment identifier is the name of the datatype
-
- For example, to address the int datatype, the URI is:
-
- http://www.w3.org/2001/XMLSchema#int
-
- Additionally, each facet definition element can be uniquely
- addressed via a URI constructed as follows:
- 1) the base URI is the URI of the XML Schema namespace
- 2) the fragment identifier is the name of the facet
-
- For example, to address the maxInclusive facet, the URI is:
-
- http://www.w3.org/2001/XMLSchema#maxInclusive
-
- Additionally, each facet usage in a built-in datatype definition
- can be uniquely addressed via a URI constructed as follows:
- 1) the base URI is the URI of the XML Schema namespace
- 2) the fragment identifier is the name of the datatype, followed
- by a period (".") followed by the name of the facet
-
- For example, to address the usage of the maxInclusive facet in
- the definition of int, the URI is:
-
- http://www.w3.org/2001/XMLSchema#int.maxInclusive
-
- </xs:documentation>
- </xs:annotation>
-
- <xs:simpleType name="string" id="string">
- <xs:annotation>
- <xs:appinfo>
- <hfp:hasFacet name="length"/>
- <hfp:hasFacet name="minLength"/>
- <hfp:hasFacet name="maxLength"/>
- <hfp:hasFacet name="pattern"/>
- <hfp:hasFacet name="enumeration"/>
- <hfp:hasFacet name="whiteSpace"/>
- <hfp:hasProperty name="ordered" value="false"/>
- <hfp:hasProperty name="bounded" value="false"/>
- <hfp:hasProperty name="cardinality" value="countably infinite"/>
- <hfp:hasProperty name="numeric" value="false"/>
- </xs:appinfo>
- <xs:documentation
- source="http://www.w3.org/TR/xmlschema-2/#string"/>
- </xs:annotation>
- <xs:restriction base="xs:anySimpleType">
- <xs:whiteSpace value="preserve" id="string.preserve"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="boolean" id="boolean">
- <xs:annotation>
- <xs:appinfo>
- <hfp:hasFacet name="pattern"/>
- <hfp:hasFacet name="whiteSpace"/>
- <hfp:hasProperty name="ordered" value="false"/>
- <hfp:hasProperty name="bounded" value="false"/>
- <hfp:hasProperty name="cardinality" value="finite"/>
- <hfp:hasProperty name="numeric" value="false"/>
- </xs:appinfo>
- <xs:documentation
- source="http://www.w3.org/TR/xmlschema-2/#boolean"/>
- </xs:annotation>
- <xs:restriction base="xs:anySimpleType">
- <xs:whiteSpace value="collapse" fixed="true"
- id="boolean.whiteSpace"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="float" id="float">
- <xs:annotation>
- <xs:appinfo>
- <hfp:hasFacet name="pattern"/>
- <hfp:hasFacet name="enumeration"/>
- <hfp:hasFacet name="whiteSpace"/>
- <hfp:hasFacet name="maxInclusive"/>
- <hfp:hasFacet name="maxExclusive"/>
- <hfp:hasFacet name="minInclusive"/>
- <hfp:hasFacet name="minExclusive"/>
- <hfp:hasProperty name="ordered" value="total"/>
- <hfp:hasProperty name="bounded" value="true"/>
- <hfp:hasProperty name="cardinality" value="finite"/>
- <hfp:hasProperty name="numeric" value="true"/>
- </xs:appinfo>
- <xs:documentation
- source="http://www.w3.org/TR/xmlschema-2/#float"/>
+ </xs:complexType>
+ <xs:element name="all" type="xs:all" id="all">
+ <xs:annotation>
+ <xs:documentation source="../structures/structures.html#element-all"/>
</xs:annotation>
- <xs:restriction base="xs:anySimpleType">
- <xs:whiteSpace value="collapse" fixed="true"
- id="float.whiteSpace"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="double" id="double">
- <xs:annotation>
- <xs:appinfo>
- <hfp:hasFacet name="pattern"/>
- <hfp:hasFacet name="enumeration"/>
- <hfp:hasFacet name="whiteSpace"/>
- <hfp:hasFacet name="maxInclusive"/>
- <hfp:hasFacet name="maxExclusive"/>
- <hfp:hasFacet name="minInclusive"/>
- <hfp:hasFacet name="minExclusive"/>
- <hfp:hasProperty name="ordered" value="total"/>
- <hfp:hasProperty name="bounded" value="true"/>
- <hfp:hasProperty name="cardinality" value="finite"/>
- <hfp:hasProperty name="numeric" value="true"/>
- </xs:appinfo>
+ </xs:element>
+ <xs:element name="choice" type="xs:explicitGroup" id="choice">
+ <xs:annotation>
<xs:documentation
- source="http://www.w3.org/TR/xmlschema-2/#double"/>
+ source="../structures/structures.html#element-choice"/>
</xs:annotation>
- <xs:restriction base="xs:anySimpleType">
- <xs:whiteSpace value="collapse" fixed="true"
- id="double.whiteSpace"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="decimal" id="decimal">
- <xs:annotation>
- <xs:appinfo>
- <hfp:hasFacet name="totalDigits"/>
- <hfp:hasFacet name="fractionDigits"/>
- <hfp:hasFacet name="pattern"/>
- <hfp:hasFacet name="whiteSpace"/>
- <hfp:hasFacet name="enumeration"/>
- <hfp:hasFacet name="maxInclusive"/>
- <hfp:hasFacet name="maxExclusive"/>
- <hfp:hasFacet name="minInclusive"/>
- <hfp:hasFacet name="minExclusive"/>
- <hfp:hasProperty name="ordered" value="total"/>
- <hfp:hasProperty name="bounded" value="false"/>
- <hfp:hasProperty name="cardinality"
- value="countably infinite"/>
- <hfp:hasProperty name="numeric" value="true"/>
- </xs:appinfo>
+ </xs:element>
+ <xs:element name="sequence" type="xs:explicitGroup" id="sequence">
+ <xs:annotation>
<xs:documentation
- source="http://www.w3.org/TR/xmlschema-2/#decimal"/>
+ source="../structures/structures.html#element-sequence"/>
</xs:annotation>
- <xs:restriction base="xs:anySimpleType">
- <xs:whiteSpace value="collapse" fixed="true"
- id="decimal.whiteSpace"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="duration" id="duration">
- <xs:annotation>
- <xs:appinfo>
- <hfp:hasFacet name="pattern"/>
- <hfp:hasFacet name="enumeration"/>
- <hfp:hasFacet name="whiteSpace"/>
- <hfp:hasFacet name="maxInclusive"/>
- <hfp:hasFacet name="maxExclusive"/>
- <hfp:hasFacet name="minInclusive"/>
- <hfp:hasFacet name="minExclusive"/>
- <hfp:hasProperty name="ordered" value="partial"/>
- <hfp:hasProperty name="bounded" value="false"/>
- <hfp:hasProperty name="cardinality"
- value="countably infinite"/>
- <hfp:hasProperty name="numeric" value="false"/>
- </xs:appinfo>
- <xs:documentation
- source="http://www.w3.org/TR/xmlschema-2/#duration"/>
+ </xs:element>
+ <xs:element name="group" type="xs:namedGroup" id="group">
+ <xs:annotation>
+ <xs:documentation source="../structures/structures.html#element-group"/>
</xs:annotation>
- <xs:restriction base="xs:anySimpleType">
- <xs:whiteSpace value="collapse" fixed="true"
- id="duration
<TRUNCATED>
[18/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.jaxb.api
Posted by ma...@apache.org.
[NETBEANS-54] Modules review xml.jaxb.api
- external library jsr173_api.jar was removed, as StAX api was moved
into java platform
- external libraries jaxb-api and activation were moved to maven
coordinates and version was corrected
- checked Rat report: updates license header in Bundle.properties
- skimmed through module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/a948b443
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/a948b443
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/a948b443
Branch: refs/heads/master
Commit: a948b443b0679f9b74778f6cbd3ec76963faf3b2
Parents: c5009b8
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Fri Oct 6 20:51:58 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:53 2017 +0200
----------------------------------------------------------------------
xml.jaxb.api/external/binaries-list | 5 +-
xml.jaxb.api/external/jaxb-2.2.5-license.txt | 722 -------------------
xml.jaxb.api/external/jaxb-2.2.6-license.txt | 722 +++++++++++++++++++
xml.jaxb.api/nbproject/project.properties | 8 +-
.../modules/xml/jaxb/api/Bundle.properties | 54 +-
5 files changed, 741 insertions(+), 770 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/a948b443/xml.jaxb.api/external/binaries-list
----------------------------------------------------------------------
diff --git a/xml.jaxb.api/external/binaries-list b/xml.jaxb.api/external/binaries-list
index 443aec3..7b95e38 100644
--- a/xml.jaxb.api/external/binaries-list
+++ b/xml.jaxb.api/external/binaries-list
@@ -14,6 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-E1233CB9A6101F5CC1098AC26AD6D11ADB1ABFA2 activation.jar
-71F434378F822B09A57174AF6C75D37408687C57 jaxb-api.jar
-3BD00A1595529E6A43F2118B551A9CA906BE4CF3 jsr173_1.0_api.jar
+485DE3A253E23F645037828C07F1D7F1AF40763A javax.activation:activation:1.1.1
+71F434378F822B09A57174AF6C75D37408687C57 javax.xml.bind:jaxb-api:2.2.6
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/a948b443/xml.jaxb.api/external/jaxb-2.2.5-license.txt
----------------------------------------------------------------------
diff --git a/xml.jaxb.api/external/jaxb-2.2.5-license.txt b/xml.jaxb.api/external/jaxb-2.2.5-license.txt
deleted file mode 100644
index 6204f56..0000000
--- a/xml.jaxb.api/external/jaxb-2.2.5-license.txt
+++ /dev/null
@@ -1,722 +0,0 @@
-Name: JAXB
-Version: 2.2.5
-Description: JAXB Reference Implementation
-License: CDDL-1.1, GPLv2
-OSR: 4116
-Origin: https://jaxb.java.net/
-Files: activation.jar jaxb-api.jar jsr173_api.jar
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
-
-1. Definitions.
-
- 1.1. "Contributor" means each individual or entity that creates or
- contributes to the creation of Modifications.
-
- 1.2. "Contributor Version" means the combination of the Original
- Software, prior Modifications used by a Contributor (if any), and the
- Modifications made by that particular Contributor.
-
- 1.3. "Covered Software" means (a) the Original Software, or (b)
- Modifications, or (c) the combination of files containing Original
- Software with files containing Modifications, in each case including
- portions thereof.
-
- 1.4. "Executable" means the Covered Software in any form other than
- Source Code.
-
- 1.5. "Initial Developer" means the individual or entity that first makes
- Original Software available under this License.
-
- 1.6. "Larger Work" means a work which combines Covered Software or
- portions thereof with code not governed by the terms of this License.
-
- 1.7. "License" means this document.
-
- 1.8. "Licensable" means having the right to grant, to the maximum extent
- possible, whether at the time of the initial grant or subsequently
- acquired, any and all of the rights conveyed herein.
-
- 1.9. "Modifications" means the Source Code and Executable form of any of
- the following:
-
- A. Any file that results from an addition to, deletion from or
- modification of the contents of a file containing Original Software or
- previous Modifications;
-
- B. Any new file that contains any part of the Original Software or
- previous Modification; or
-
- C. Any new file that is contributed or otherwise made available under
- the terms of this License.
-
- 1.10. "Original Software" means the Source Code and Executable form of
- computer software code that is originally released under this License.
-
- 1.11. "Patent Claims" means any patent claim(s), now owned or hereafter
- acquired, including without limitation, method, process, and apparatus
- claims, in any patent Licensable by grantor.
-
- 1.12. "Source Code" means (a) the common form of computer software code
- in which modifications are made and (b) associated documentation
- included in or with such code.
-
- 1.13. "You" (or "Your") means an individual or a legal entity exercising
- rights under, and complying with all of the terms of, this License. For
- legal entities, "You" includes any entity which controls, is controlled
- by, or is under common control with You. For purposes of this
- definition, "control" means (a) the power, direct or indirect, to cause
- the direction or management of such entity, whether by contract or
- otherwise, or (b) ownership of more than fifty percent (50%) of the
- outstanding shares or beneficial ownership of such entity.
-
-2. License Grants.
-
- 2.1. The Initial Developer Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and subject to
- third party intellectual property claims, the Initial Developer hereby
- grants You a world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or trademark)
- Licensable by Initial Developer, to use, reproduce, modify, display,
- perform, sublicense and distribute the Original Software (or portions
- thereof), with or without Modifications, and/or as part of a Larger
- Work; and
-
- (b) under Patent Claims infringed by the making, using or selling of
- Original Software, to make, have made, use, practice, sell, and offer
- for sale, and/or otherwise dispose of the Original Software (or portions
- thereof).
-
- (c) The licenses granted in Sections 2.1(a) and (b) are effective on the
- date Initial Developer first distributes or otherwise makes the Original
- Software available to a third party under the terms of this License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent license is granted:
- (1) for code that You delete from the Original Software, or (2) for
- infringements caused by: (i) the modification of the Original Software,
- or (ii) the combination of the Original Software with other software or
- devices.
-
- 2.2. Contributor Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and subject to
- third party intellectual property claims, each Contributor hereby grants
- You a world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or trademark)
- Licensable by Contributor to use, reproduce, modify, display, perform,
- sublicense and distribute the Modifications created by such Contributor
- (or portions thereof), either on an unmodified basis, with other
- Modifications, as Covered Software and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using, or selling of
- Modifications made by that Contributor either alone and/or in
- combination with its Contributor Version (or portions of such
- combination), to make, use, sell, offer for sale, have made, and/or
- otherwise dispose of: (1) Modifications made by that Contributor (or
- portions thereof); and (2) the combination of Modifications made by that
- Contributor with its Contributor Version (or portions of such
- combination).
-
- (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on
- the date Contributor first distributes or otherwise makes the
- Modifications available to a third party.
-
- (d) Notwithstanding Section 2.2(b) above, no patent license is granted:
- (1) for any code that Contributor has deleted from the Contributor
- Version; (2) for infringements caused by: (i) third party modifications
- of Contributor Version, or (ii) the combination of Modifications made by
- that Contributor with other software (except as part of the Contributor
- Version) or other devices; or (3) under Patent Claims infringed by
- Covered Software in the absence of Modifications made by that
- Contributor.
-
-3. Distribution Obligations.
-
- 3.1. Availability of Source Code.
-
- Any Covered Software that You distribute or otherwise make available in
- Executable form must also be made available in Source Code form and that
- Source Code form must be distributed only under the terms of this
- License. You must include a copy of this License with every copy of the
- Source Code form of the Covered Software You distribute or otherwise
- make available. You must inform recipients of any such Covered Software
- in Executable form as to how they can obtain such Covered Software in
- Source Code form in a reasonable manner on or through a medium
- customarily used for software exchange.
-
- 3.2. Modifications.
-
- The Modifications that You create or to which You contribute are
- governed by the terms of this License. You represent that You believe
- Your Modifications are Your original creation(s) and/or You have
- sufficient rights to grant the rights conveyed by this License.
-
- 3.3. Required Notices.
-
- You must include a notice in each of Your Modifications that identifies
- You as the Contributor of the Modification. You may not remove or alter
- any copyright, patent or trademark notices contained within the Covered
- Software, or any notices of licensing or any descriptive text giving
- attribution to any Contributor or the Initial Developer.
-
- 3.4. Application of Additional Terms.
-
- You may not offer or impose any terms on any Covered Software in Source
- Code form that alters or restricts the applicable version of this
- License or the recipients' rights hereunder. You may choose to offer,
- and to charge a fee for, warranty, support, indemnity or liability
- obligations to one or more recipients of Covered Software. However, you
- may do so only on Your own behalf, and not on behalf of the Initial
- Developer or any Contributor. You must make it absolutely clear that any
- such warranty, support, indemnity or liability obligation is offered by
- You alone, and You hereby agree to indemnify the Initial Developer and
- every Contributor for any liability incurred by the Initial Developer or
- such Contributor as a result of warranty, support, indemnity or
- liability terms You offer.
-
- 3.5. Distribution of Executable Versions.
-
- You may distribute the Executable form of the Covered Software under the
- terms of this License or under the terms of a license of Your choice,
- which may contain terms different from this License, provided that You
- are in compliance with the terms of this License and that the license
- for the Executable form does not attempt to limit or alter the
- recipient's rights in the Source Code form from the rights set forth in
- this License. If You distribute the Covered Software in Executable form
- under a different license, You must make it absolutely clear that any
- terms which differ from this License are offered by You alone, not by
- the Initial Developer or Contributor. You hereby agree to indemnify the
- Initial Developer and every Contributor for any liability incurred by
- the Initial Developer or such Contributor as a result of any such terms
- You offer.
-
- 3.6. Larger Works.
-
- You may create a Larger Work by combining Covered Software with other
- code not governed by the terms of this License and distribute the Larger
- Work as a single product. In such a case, You must make sure the
- requirements of this License are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
- 4.1. New Versions.
-
- Oracle is the initial license steward and may publish revised and/or new
- versions of this License from time to time. Each version will be given a
- distinguishing version number. Except as provided in Section 4.3, no one
- other than the license steward has the right to modify this License.
-
- 4.2. Effect of New Versions.
-
- You may always continue to use, distribute or otherwise make the Covered
- Software available under the terms of the version of the License under
- which You originally received the Covered Software. If the Initial
- Developer includes a notice in the Original Software prohibiting it from
- being distributed or otherwise made available under any subsequent
- version of the License, You must distribute and make the Covered
- Software available under the terms of the version of the License under
- which You originally received the Covered Software. Otherwise, You may
- also choose to use, distribute or otherwise make the Covered Software
- available under the terms of any subsequent version of the License
- published by the license steward.
-
- 4.3. Modified Versions.
-
- When You are an Initial Developer and You want to create a new license
- for Your Original Software, You may create and use a modified version of
- this License if You: (a) rename the license and remove any references to
- the name of the license steward (except to note that the license differs
- from this License); and (b) otherwise make it clear that the license
- contains terms which differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
- COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
- DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
- THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
- SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY
- RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME
- THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS
- DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO
- USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
- DISCLAIMER.
-
-6. TERMINATION.
-
- 6.1. This License and the rights granted hereunder will terminate
- automatically if You fail to comply with terms herein and fail to cure
- such breach within 30 days of becoming aware of the breach. Provisions
- which, by their nature, must remain in effect beyond the termination of
- this License shall survive.
-
- 6.2. If You assert a patent infringement claim (excluding declaratory
- judgment actions) against Initial Developer or a Contributor (the
- Initial Developer or Contributor against whom You assert such claim is
- referred to as "Participant") alleging that the Participant Software
- (meaning the Contributor Version where the Participant is a Contributor
- or the Original Software where the Participant is the Initial Developer)
- directly or indirectly infringes any patent, then any and all rights
- granted directly or indirectly to You by such Participant, the Initial
- Developer (if the Initial Developer is not the Participant) and all
- Contributors under Sections 2.1 and/or 2.2 of this License shall, upon
- 60 days notice from Participant terminate prospectively and
- automatically at the expiration of such 60 day notice period, unless if
- within such 60 day period You withdraw Your claim with respect to the
- Participant Software against such Participant either unilaterally or
- pursuant to a written agreement with Participant.
-
- 6.3. If You assert a patent infringement claim against Participant
- alleging that the Participant Software directly or indirectly infringes
- any patent where such claim is resolved (such as by license or
- settlement) prior to the initiation of patent infringement litigation,
- then the reasonable value of the licenses granted by such Participant
- under Sections 2.1 or 2.2 shall be taken into account in determining the
- amount or value of any payment or license.
-
- 6.4. In the event of termination under Sections 6.1 or 6.2 above, all
- end user licenses that have been validly granted by You or any
- distributor hereunder prior to termination (excluding licenses granted
- to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
- (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
- DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED
- SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY
- PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
- GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL
- OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
- INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
- LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
- RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
- PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
- OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
- AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
- The Covered Software is a "commercial item," as that term is defined in
- 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
- software" (as that term is defined at 48 C.F.R. � 252.227-7014(a)(1))
- and "commercial computer software documentation" as such terms are used
- in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and
- 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government
- End Users acquire Covered Software with only those rights set forth
- herein. This U.S. Government Rights clause is in lieu of, and
- supersedes, any other FAR, DFAR, or other clause or provision that
- addresses Government rights in computer software under this License.
-
-9. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject matter
- hereof. If any provision of this License is held to be unenforceable,
- such provision shall be reformed only to the extent necessary to make it
- enforceable. This License shall be governed by the law of the
- jurisdiction specified in a notice contained within the Original
- Software (except to the extent applicable law, if any, provides
- otherwise), excluding such jurisdiction's conflict-of-law provisions.
- Any litigation relating to this License shall be subject to the
- jurisdiction of the courts located in the jurisdiction and venue
- specified in a notice contained within the Original Software, with the
- losing party responsible for costs, including, without limitation, court
- costs and reasonable attorneys' fees and expenses. The application of
- the United Nations Convention on Contracts for the International Sale of
- Goods is expressly excluded. Any law or regulation which provides that
- the language of a contract shall be construed against the drafter shall
- not apply to this License. You agree that You alone are responsible for
- compliance with the United States export administration regulations (and
- the export control laws and regulation of any other countries) when You
- use, distribute or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is
- responsible for claims and damages arising, directly or indirectly, out
- of its utilization of rights under this License and You agree to work
- with Initial Developer and Contributors to distribute such
- responsibility on an equitable basis. Nothing herein is intended or
- shall be deemed to constitute any admission of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
-LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws of the
-State of California (excluding conflict-of-law provisions). Any
-litigation relating to this License shall be subject to the jurisdiction
-of the Federal Courts of the Northern District of California and the
-state courts of the State of California, with venue lying in Santa Clara
-County, California.
-
-
-
-
-The GNU General Public License (GPL) Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place,
-Suite 330, Boston, MA 02111-1307 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to
-share and change it. By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free software--to
-make sure the software is free for all its users. This General Public
-License applies to most of the Free Software Foundation's software and
-to any other program whose authors commit to using it. (Some other Free
-Software Foundation software is covered by the GNU Library General
-Public License instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price.
-Our General Public Licenses are designed to make sure that you have the
-freedom to distribute copies of free software (and charge for this
-service if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone
-to deny you these rights or to ask you to surrender the rights. These
-restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis
-or for a fee, you must give the recipients all the rights that you have.
-You must make sure that they, too, receive or can get the source code.
-And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-Finally, any free program is threatened constantly by software patents.
-We wish to avoid the danger that redistributors of a free program will
-individually obtain patent licenses, in effect making the program
-proprietary. To prevent this, we have made it clear that any patent must
-be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a
-notice placed by the copyright holder saying it may be distributed under
-the terms of this General Public License. The "Program", below, refers
-to any such program or work, and a "work based on the Program" means
-either the Program or any derivative work under copyright law: that is
-to say, a work containing the Program or a portion of it, either
-verbatim or with modifications and/or translated into another language.
-(Hereinafter, translation is included without limitation in the term
-"modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of running
-the Program is not restricted, and the output from the Program is
-covered only if its contents constitute a work based on the Program
-(independent of having been made by running the Program). Whether that
-is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously
-and appropriately publish on each copy an appropriate copyright notice
-and disclaimer of warranty; keep intact all the notices that refer to
-this License and to the absence of any warranty; and give any other
-recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of
-it, thus forming a work based on the Program, and copy and distribute
-such modifications or work under the terms of Section 1 above, provided
-that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices stating
- that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in whole
- or in part contains or is derived from the Program or any part thereof,
- to be licensed as a whole at no charge to all third parties under the
- terms of this License.
-
- c) If the modified program normally reads commands interactively when
- run, you must cause it, when started running for such interactive use in
- the most ordinary way, to print or display an announcement including an
- appropriate copyright notice and a notice that there is no warranty (or
- else, saying that you provide a warranty) and that users may
- redistribute the program under these conditions, and telling the user
- how to view a copy of this License. (Exception: if the Program itself is
- interactive but does not normally print such an announcement, your work
- based on the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program, and
-can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based on
-the Program, the distribution of the whole must be on the terms of this
-License, whose permissions for other licensees extend to the entire
-whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of a
-storage or distribution medium does not bring the other work under the
-scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections
-1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable source
- code, which must be distributed under the terms of Sections 1 and 2
- above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three years, to
- give any third party, for a charge no more than your cost of physically
- performing source distribution, a complete machine-readable copy of the
- corresponding source code, to be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer to
- distribute corresponding source code. (This alternative is allowed only
- for noncommercial distribution and only if you received the program in
- object code or executable form with such an offer, in accord with
- Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source code
-means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to control
-compilation and installation of the executable. However, as a special
-exception, the source code distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies the
-executable.
-
-If distribution of executable or object code is made by offering access
-to copy from a designated place, then offering equivalent access to copy
-the source code from the same place counts as distribution of the source
-code, even though third parties are not compelled to copy the source
-along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt otherwise
-to copy, modify, sublicense or distribute the Program is void, and will
-automatically terminate your rights under this License. However, parties
-who have received copies, or rights, from you under this License will
-not have their licenses terminated so long as such parties remain in
-full compliance.
-
-5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and all
-its terms and conditions for copying, distributing or modifying the
-Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further restrictions
-on the recipients' exercise of the rights granted herein. You are not
-responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot distribute
-so as to satisfy simultaneously your obligations under this License and
-any other pertinent obligations, then as a consequence you may not
-distribute the Program at all. For example, if a patent license would
-not permit royalty-free redistribution of the Program by all those who
-receive copies directly or indirectly through you, then the only way you
-could satisfy both it and this License would be to refrain entirely from
-distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is implemented
-by public license practices. Many people have made generous
-contributions to the wide range of software distributed through that
-system in reliance on consistent application of that system; it is up to
-the author/donor to decide if he or she is willing to distribute
-software through any other system and a licensee cannot impose that
-choice.
-
-This section is intended to make thoroughly clear what is believed to be
-a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License may
-add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among countries
-not thus excluded. In such case, this License incorporates the
-limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Program does not specify a version
-number of this License, you may choose any version ever published by the
-Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the
-author to ask for permission. For software which is copyrighted by the
-Free Software Foundation, write to the Free Software Foundation; we
-sometimes make exceptions for this. Our decision will be guided by the
-two goals of preserving the free status of all derivatives of our free
-software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
-EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
-ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
-YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
-DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
-DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
-(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
-THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
-OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
-
-To do so, attach the following notices to the program. It is safest to
-attach them to the start of each source file to most effectively convey
-the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- One line to give the program's name and a brief idea of what it does.
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author Gnomovision
- comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is
- free software, and you are welcome to redistribute it under certain
- conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public License. Of course, the commands
-you use may be called something other than `show w' and `show c'; they
-could even be mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- signature of Ty Coon, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications
-with the library. If this is what you want to do, use the GNU Library
-General Public License instead of this License.
-
-#
-
-"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
-
-Certain source files distributed by Oracle are subject to the following
-clarification and special exception to the GPL Version 2, but only where
-Oracle has expressly included in the particular source file's header the
-words "Oracle designates this particular file as subject to the
-"Classpath" exception as provided by Oracle in the License file that
-accompanied this code."
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License Version 2 cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under terms
-of your choice, provided that you also meet, for each linked independent
-module, the terms and conditions of the license of that module. An
-independent module is a module which is not derived from or based on
-this library. If you modify this library, you may extend this exception
-to your version of the library, but you are not obligated to do so. If
-you do not wish to do so, delete this exception statement from your
-version.
-
-
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/a948b443/xml.jaxb.api/external/jaxb-2.2.6-license.txt
----------------------------------------------------------------------
diff --git a/xml.jaxb.api/external/jaxb-2.2.6-license.txt b/xml.jaxb.api/external/jaxb-2.2.6-license.txt
new file mode 100644
index 0000000..80792e7
--- /dev/null
+++ b/xml.jaxb.api/external/jaxb-2.2.6-license.txt
@@ -0,0 +1,722 @@
+Name: JAXB
+Version: 2.2.6
+Description: JAXB Reference Implementation
+License: CDDL-1.1, GPLv2
+OSR: 4116
+Origin: https://jaxb.java.net/
+Files: activation-1.1.1.jar jaxb-api-2.2.6.jar
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
+
+1. Definitions.
+
+ 1.1. "Contributor" means each individual or entity that creates or
+ contributes to the creation of Modifications.
+
+ 1.2. "Contributor Version" means the combination of the Original
+ Software, prior Modifications used by a Contributor (if any), and the
+ Modifications made by that particular Contributor.
+
+ 1.3. "Covered Software" means (a) the Original Software, or (b)
+ Modifications, or (c) the combination of files containing Original
+ Software with files containing Modifications, in each case including
+ portions thereof.
+
+ 1.4. "Executable" means the Covered Software in any form other than
+ Source Code.
+
+ 1.5. "Initial Developer" means the individual or entity that first makes
+ Original Software available under this License.
+
+ 1.6. "Larger Work" means a work which combines Covered Software or
+ portions thereof with code not governed by the terms of this License.
+
+ 1.7. "License" means this document.
+
+ 1.8. "Licensable" means having the right to grant, to the maximum extent
+ possible, whether at the time of the initial grant or subsequently
+ acquired, any and all of the rights conveyed herein.
+
+ 1.9. "Modifications" means the Source Code and Executable form of any of
+ the following:
+
+ A. Any file that results from an addition to, deletion from or
+ modification of the contents of a file containing Original Software or
+ previous Modifications;
+
+ B. Any new file that contains any part of the Original Software or
+ previous Modification; or
+
+ C. Any new file that is contributed or otherwise made available under
+ the terms of this License.
+
+ 1.10. "Original Software" means the Source Code and Executable form of
+ computer software code that is originally released under this License.
+
+ 1.11. "Patent Claims" means any patent claim(s), now owned or hereafter
+ acquired, including without limitation, method, process, and apparatus
+ claims, in any patent Licensable by grantor.
+
+ 1.12. "Source Code" means (a) the common form of computer software code
+ in which modifications are made and (b) associated documentation
+ included in or with such code.
+
+ 1.13. "You" (or "Your") means an individual or a legal entity exercising
+ rights under, and complying with all of the terms of, this License. For
+ legal entities, "You" includes any entity which controls, is controlled
+ by, or is under common control with You. For purposes of this
+ definition, "control" means (a) the power, direct or indirect, to cause
+ the direction or management of such entity, whether by contract or
+ otherwise, or (b) ownership of more than fifty percent (50%) of the
+ outstanding shares or beneficial ownership of such entity.
+
+2. License Grants.
+
+ 2.1. The Initial Developer Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and subject to
+ third party intellectual property claims, the Initial Developer hereby
+ grants You a world-wide, royalty-free, non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or trademark)
+ Licensable by Initial Developer, to use, reproduce, modify, display,
+ perform, sublicense and distribute the Original Software (or portions
+ thereof), with or without Modifications, and/or as part of a Larger
+ Work; and
+
+ (b) under Patent Claims infringed by the making, using or selling of
+ Original Software, to make, have made, use, practice, sell, and offer
+ for sale, and/or otherwise dispose of the Original Software (or portions
+ thereof).
+
+ (c) The licenses granted in Sections 2.1(a) and (b) are effective on the
+ date Initial Developer first distributes or otherwise makes the Original
+ Software available to a third party under the terms of this License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent license is granted:
+ (1) for code that You delete from the Original Software, or (2) for
+ infringements caused by: (i) the modification of the Original Software,
+ or (ii) the combination of the Original Software with other software or
+ devices.
+
+ 2.2. Contributor Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and subject to
+ third party intellectual property claims, each Contributor hereby grants
+ You a world-wide, royalty-free, non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or trademark)
+ Licensable by Contributor to use, reproduce, modify, display, perform,
+ sublicense and distribute the Modifications created by such Contributor
+ (or portions thereof), either on an unmodified basis, with other
+ Modifications, as Covered Software and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using, or selling of
+ Modifications made by that Contributor either alone and/or in
+ combination with its Contributor Version (or portions of such
+ combination), to make, use, sell, offer for sale, have made, and/or
+ otherwise dispose of: (1) Modifications made by that Contributor (or
+ portions thereof); and (2) the combination of Modifications made by that
+ Contributor with its Contributor Version (or portions of such
+ combination).
+
+ (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on
+ the date Contributor first distributes or otherwise makes the
+ Modifications available to a third party.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent license is granted:
+ (1) for any code that Contributor has deleted from the Contributor
+ Version; (2) for infringements caused by: (i) third party modifications
+ of Contributor Version, or (ii) the combination of Modifications made by
+ that Contributor with other software (except as part of the Contributor
+ Version) or other devices; or (3) under Patent Claims infringed by
+ Covered Software in the absence of Modifications made by that
+ Contributor.
+
+3. Distribution Obligations.
+
+ 3.1. Availability of Source Code.
+
+ Any Covered Software that You distribute or otherwise make available in
+ Executable form must also be made available in Source Code form and that
+ Source Code form must be distributed only under the terms of this
+ License. You must include a copy of this License with every copy of the
+ Source Code form of the Covered Software You distribute or otherwise
+ make available. You must inform recipients of any such Covered Software
+ in Executable form as to how they can obtain such Covered Software in
+ Source Code form in a reasonable manner on or through a medium
+ customarily used for software exchange.
+
+ 3.2. Modifications.
+
+ The Modifications that You create or to which You contribute are
+ governed by the terms of this License. You represent that You believe
+ Your Modifications are Your original creation(s) and/or You have
+ sufficient rights to grant the rights conveyed by this License.
+
+ 3.3. Required Notices.
+
+ You must include a notice in each of Your Modifications that identifies
+ You as the Contributor of the Modification. You may not remove or alter
+ any copyright, patent or trademark notices contained within the Covered
+ Software, or any notices of licensing or any descriptive text giving
+ attribution to any Contributor or the Initial Developer.
+
+ 3.4. Application of Additional Terms.
+
+ You may not offer or impose any terms on any Covered Software in Source
+ Code form that alters or restricts the applicable version of this
+ License or the recipients' rights hereunder. You may choose to offer,
+ and to charge a fee for, warranty, support, indemnity or liability
+ obligations to one or more recipients of Covered Software. However, you
+ may do so only on Your own behalf, and not on behalf of the Initial
+ Developer or any Contributor. You must make it absolutely clear that any
+ such warranty, support, indemnity or liability obligation is offered by
+ You alone, and You hereby agree to indemnify the Initial Developer and
+ every Contributor for any liability incurred by the Initial Developer or
+ such Contributor as a result of warranty, support, indemnity or
+ liability terms You offer.
+
+ 3.5. Distribution of Executable Versions.
+
+ You may distribute the Executable form of the Covered Software under the
+ terms of this License or under the terms of a license of Your choice,
+ which may contain terms different from this License, provided that You
+ are in compliance with the terms of this License and that the license
+ for the Executable form does not attempt to limit or alter the
+ recipient's rights in the Source Code form from the rights set forth in
+ this License. If You distribute the Covered Software in Executable form
+ under a different license, You must make it absolutely clear that any
+ terms which differ from this License are offered by You alone, not by
+ the Initial Developer or Contributor. You hereby agree to indemnify the
+ Initial Developer and every Contributor for any liability incurred by
+ the Initial Developer or such Contributor as a result of any such terms
+ You offer.
+
+ 3.6. Larger Works.
+
+ You may create a Larger Work by combining Covered Software with other
+ code not governed by the terms of this License and distribute the Larger
+ Work as a single product. In such a case, You must make sure the
+ requirements of this License are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+ 4.1. New Versions.
+
+ Oracle is the initial license steward and may publish revised and/or new
+ versions of this License from time to time. Each version will be given a
+ distinguishing version number. Except as provided in Section 4.3, no one
+ other than the license steward has the right to modify this License.
+
+ 4.2. Effect of New Versions.
+
+ You may always continue to use, distribute or otherwise make the Covered
+ Software available under the terms of the version of the License under
+ which You originally received the Covered Software. If the Initial
+ Developer includes a notice in the Original Software prohibiting it from
+ being distributed or otherwise made available under any subsequent
+ version of the License, You must distribute and make the Covered
+ Software available under the terms of the version of the License under
+ which You originally received the Covered Software. Otherwise, You may
+ also choose to use, distribute or otherwise make the Covered Software
+ available under the terms of any subsequent version of the License
+ published by the license steward.
+
+ 4.3. Modified Versions.
+
+ When You are an Initial Developer and You want to create a new license
+ for Your Original Software, You may create and use a modified version of
+ this License if You: (a) rename the license and remove any references to
+ the name of the license steward (except to note that the license differs
+ from this License); and (b) otherwise make it clear that the license
+ contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+ COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+ DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+ THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
+ SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY
+ RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME
+ THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS
+ DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO
+ USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+ DISCLAIMER.
+
+6. TERMINATION.
+
+ 6.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to cure
+ such breach within 30 days of becoming aware of the breach. Provisions
+ which, by their nature, must remain in effect beyond the termination of
+ this License shall survive.
+
+ 6.2. If You assert a patent infringement claim (excluding declaratory
+ judgment actions) against Initial Developer or a Contributor (the
+ Initial Developer or Contributor against whom You assert such claim is
+ referred to as "Participant") alleging that the Participant Software
+ (meaning the Contributor Version where the Participant is a Contributor
+ or the Original Software where the Participant is the Initial Developer)
+ directly or indirectly infringes any patent, then any and all rights
+ granted directly or indirectly to You by such Participant, the Initial
+ Developer (if the Initial Developer is not the Participant) and all
+ Contributors under Sections 2.1 and/or 2.2 of this License shall, upon
+ 60 days notice from Participant terminate prospectively and
+ automatically at the expiration of such 60 day notice period, unless if
+ within such 60 day period You withdraw Your claim with respect to the
+ Participant Software against such Participant either unilaterally or
+ pursuant to a written agreement with Participant.
+
+ 6.3. If You assert a patent infringement claim against Participant
+ alleging that the Participant Software directly or indirectly infringes
+ any patent where such claim is resolved (such as by license or
+ settlement) prior to the initiation of patent infringement litigation,
+ then the reasonable value of the licenses granted by such Participant
+ under Sections 2.1 or 2.2 shall be taken into account in determining the
+ amount or value of any payment or license.
+
+ 6.4. In the event of termination under Sections 6.1 or 6.2 above, all
+ end user licenses that have been validly granted by You or any
+ distributor hereunder prior to termination (excluding licenses granted
+ to You by any distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+ (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+ DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED
+ SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY
+ PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
+ GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL
+ OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+ INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+ LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+ RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+ PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
+ OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
+ AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+ The Covered Software is a "commercial item," as that term is defined in
+ 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+ software" (as that term is defined at 48 C.F.R. � 252.227-7014(a)(1))
+ and "commercial computer software documentation" as such terms are used
+ in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and
+ 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government
+ End Users acquire Covered Software with only those rights set forth
+ herein. This U.S. Government Rights clause is in lieu of, and
+ supersedes, any other FAR, DFAR, or other clause or provision that
+ addresses Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject matter
+ hereof. If any provision of this License is held to be unenforceable,
+ such provision shall be reformed only to the extent necessary to make it
+ enforceable. This License shall be governed by the law of the
+ jurisdiction specified in a notice contained within the Original
+ Software (except to the extent applicable law, if any, provides
+ otherwise), excluding such jurisdiction's conflict-of-law provisions.
+ Any litigation relating to this License shall be subject to the
+ jurisdiction of the courts located in the jurisdiction and venue
+ specified in a notice contained within the Original Software, with the
+ losing party responsible for costs, including, without limitation, court
+ costs and reasonable attorneys' fees and expenses. The application of
+ the United Nations Convention on Contracts for the International Sale of
+ Goods is expressly excluded. Any law or regulation which provides that
+ the language of a contract shall be construed against the drafter shall
+ not apply to this License. You agree that You alone are responsible for
+ compliance with the United States export administration regulations (and
+ the export control laws and regulation of any other countries) when You
+ use, distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is
+ responsible for claims and damages arising, directly or indirectly, out
+ of its utilization of rights under this License and You agree to work
+ with Initial Developer and Contributors to distribute such
+ responsibility on an equitable basis. Nothing herein is intended or
+ shall be deemed to constitute any admission of liability.
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+LICENSE (CDDL)
+
+The code released under the CDDL shall be governed by the laws of the
+State of California (excluding conflict-of-law provisions). Any
+litigation relating to this License shall be subject to the jurisdiction
+of the Federal Courts of the Northern District of California and the
+state courts of the State of California, with venue lying in Santa Clara
+County, California.
+
+
+
+
+The GNU General Public License (GPL) Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place,
+Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to
+share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free software--to
+make sure the software is free for all its users. This General Public
+License applies to most of the Free Software Foundation's software and
+to any other program whose authors commit to using it. (Some other Free
+Software Foundation software is covered by the GNU Library General
+Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price.
+Our General Public Licenses are designed to make sure that you have the
+freedom to distribute copies of free software (and charge for this
+service if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone
+to deny you these rights or to ask you to surrender the rights. These
+restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis
+or for a fee, you must give the recipients all the rights that you have.
+You must make sure that they, too, receive or can get the source code.
+And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+Finally, any free program is threatened constantly by software patents.
+We wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program
+proprietary. To prevent this, we have made it clear that any patent must
+be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a
+notice placed by the copyright holder saying it may be distributed under
+the terms of this General Public License. The "Program", below, refers
+to any such program or work, and a "work based on the Program" means
+either the Program or any derivative work under copyright law: that is
+to say, a work containing the Program or a portion of it, either
+verbatim or with modifications and/or translated into another language.
+(Hereinafter, translation is included without limitation in the term
+"modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of running
+the Program is not restricted, and the output from the Program is
+covered only if its contents constitute a work based on the Program
+(independent of having been made by running the Program). Whether that
+is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously
+and appropriately publish on each copy an appropriate copyright notice
+and disclaimer of warranty; keep intact all the notices that refer to
+this License and to the absence of any warranty; and give any other
+recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of
+it, thus forming a work based on the Program, and copy and distribute
+such modifications or work under the terms of Section 1 above, provided
+that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices stating
+ that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in whole
+ or in part contains or is derived from the Program or any part thereof,
+ to be licensed as a whole at no charge to all third parties under the
+ terms of this License.
+
+ c) If the modified program normally reads commands interactively when
+ run, you must cause it, when started running for such interactive use in
+ the most ordinary way, to print or display an announcement including an
+ appropriate copyright notice and a notice that there is no warranty (or
+ else, saying that you provide a warranty) and that users may
+ redistribute the program under these conditions, and telling the user
+ how to view a copy of this License. (Exception: if the Program itself is
+ interactive but does not normally print such an announcement, your work
+ based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program, and
+can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based on
+the Program, the distribution of the whole must be on the terms of this
+License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of a
+storage or distribution medium does not bring the other work under the
+scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections
+1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable source
+ code, which must be distributed under the terms of Sections 1 and 2
+ above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three years, to
+ give any third party, for a charge no more than your cost of physically
+ performing source distribution, a complete machine-readable copy of the
+ corresponding source code, to be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer to
+ distribute corresponding source code. (This alternative is allowed only
+ for noncommercial distribution and only if you received the program in
+ object code or executable form with such an offer, in accord with
+ Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source code
+means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to control
+compilation and installation of the executable. However, as a special
+exception, the source code distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies the
+executable.
+
+If distribution of executable or object code is made by offering access
+to copy from a designated place, then offering equivalent access to copy
+the source code from the same place counts as distribution of the source
+code, even though third parties are not compelled to copy the source
+along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt otherwise
+to copy, modify, sublicense or distribute the Program is void, and will
+automatically terminate your rights under this License. However, parties
+who have received copies, or rights, from you under this License will
+not have their licenses terminated so long as such parties remain in
+full compliance.
+
+5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and all
+its terms and conditions for copying, distributing or modifying the
+Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further restrictions
+on the recipients' exercise of the rights granted herein. You are not
+responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot distribute
+so as to satisfy simultaneously your obligations under this License and
+any other pertinent obligations, then as a consequence you may not
+distribute the Program at all. For example, if a patent license would
+not permit royalty-free redistribution of the Program by all those who
+receive copies directly or indirectly through you, then the only way you
+could satisfy both it and this License would be to refrain entirely from
+distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is implemented
+by public license practices. Many people have made generous
+contributions to the wide range of software distributed through that
+system in reliance on consistent application of that system; it is up to
+the author/donor to decide if he or she is willing to distribute
+software through any other system and a licensee cannot impose that
+choice.
+
+This section is intended to make thoroughly clear what is believed to be
+a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License may
+add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among countries
+not thus excluded. In such case, this License incorporates the
+limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Program does not specify a version
+number of this License, you may choose any version ever published by the
+Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the
+author to ask for permission. For software which is copyrighted by the
+Free Software Foundation, write to the Free Software Foundation; we
+sometimes make exceptions for this. Our decision will be guided by the
+two goals of preserving the free status of all derivatives of our free
+software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
+ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
+YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
+DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
+(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
+THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
+OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ One line to give the program's name and a brief idea of what it does.
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author Gnomovision
+ comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is
+ free software, and you are welcome to redistribute it under certain
+ conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License. Of course, the commands
+you use may be called something other than `show w' and `show c'; they
+could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ signature of Ty Coon, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications
+with the library. If this is what you want to do, use the GNU Library
+General Public License instead of this License.
+
+#
+
+"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+
+Certain source files distributed by Oracle are subject to the following
+clarification and special exception to the GPL Version 2, but only where
+Oracle has expressly included in the particular source file's header the
+words "Oracle designates this particular file as subject to the
+"Classpath" exception as provided by Oracle in the License file that
+accompanied this code."
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License Version 2 cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under terms
+of your choice, provided that you also meet, for each linked independent
+module, the terms and conditions of the license of that module. An
+independent module is a module which is not derived from or based on
+this library. If you modify this library, you may extend this exception
+to your version of the library, but you are not obligated to do so. If
+you do not wish to do so, delete this exception statement from your
+version.
+
+
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/a948b443/xml.jaxb.api/nbproject/project.properties
----------------------------------------------------------------------
diff --git a/xml.jaxb.api/nbproject/project.properties b/xml.jaxb.api/nbproject/project.properties
index ec5f39d..6b59ee4 100644
--- a/xml.jaxb.api/nbproject/project.properties
+++ b/xml.jaxb.api/nbproject/project.properties
@@ -19,11 +19,9 @@ is.autoload=true
jnlp.indirect.jars=\
modules/ext/jaxb/activation.jar,\
- modules/ext/jaxb/api/jaxb-api.jar,\
- modules/ext/jaxb/api/jsr173_1.0_api.jar
+ modules/ext/jaxb/api/jaxb-api.jar
-release.external/activation.jar=modules/ext/jaxb/activation.jar
-release.external/jaxb-api.jar=modules/ext/jaxb/api/jaxb-api.jar
-release.external/jsr173_1.0_api.jar=modules/ext/jaxb/api/jsr173_1.0_api.jar
+release.external/activation-1.1.1.jar=modules/ext/jaxb/activation.jar
+release.external/jaxb-api-2.2.6.jar=modules/ext/jaxb/api/jaxb-api.jar
sigtest.gen.fail.on.error=false
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/a948b443/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties
----------------------------------------------------------------------
diff --git a/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties b/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties
index 70bc42a..42eb7fa 100644
--- a/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties
+++ b/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties
@@ -1,45 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-# Sample ResourceBundle properties file
+# 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.
OpenIDE-Module-Name=JAXB API
[11/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.axi
Posted by ma...@apache.org.
[NETBEANS-54] Modules review xml.axi
- no external library
- checked Rat report: excluded test-data from rat (no IP value)
- disable tests that fail because referenced files were not donated
- skimmed through module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/b810589c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/b810589c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/b810589c
Branch: refs/heads/master
Commit: b810589cae3398b25d37c0629a97fa309080288a
Parents: 00155f1
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Thu Oct 5 20:38:16 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:53 2017 +0200
----------------------------------------------------------------------
nbbuild/build.xml | 1 +
.../modules/xml/axi/AXIModelExTest.java | 4 +++-
.../modules/xml/axi/AXIModelPerfTest.java | 5 +++--
.../netbeans/modules/xml/axi/AXIModelTest.java | 11 +++++-----
.../modules/xml/axi/CheckParentTest.java | 4 +++-
.../modules/xml/axi/ContentModelTest.java | 4 +++-
.../modules/xml/axi/ProxyComponentTest.java | 4 +++-
.../xml/axi/SchemaGeneratorDatatypesTest.java | 5 +++--
.../modules/xml/axi/SchemaTransformTest.java | 13 +++++++-----
.../xml/axi/datatype/DatatypeFactoryTest.java | 5 +++--
.../xml/axi/datatype/DatatypePerfTest.java | 5 +++--
.../modules/xml/axi/datatype/DatatypeTest.java | 5 +++--
.../modules/xml/axi/sync/MultiFileSyncTest.java | 4 +++-
.../modules/xml/axi/sync/StateChangeTest.java | 4 +++-
.../modules/xml/axi/sync/SyncDeadlockTest.java | 4 +++-
.../modules/xml/axi/sync/SyncElementTest.java | 21 ++++++++++----------
.../netbeans/modules/xml/axi/sync/SyncTest.java | 7 ++++---
17 files changed, 66 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 7a59cc1..cd8f069 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1972,6 +1972,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="utilities/test/unit/src/org/netbeans/modules/openfile/resources/recent_files/*" /> <!--test data-->
<exclude name="**/*.url" /> <!--no degree of creativity-->
<exclude name="spi.navigator/test/unit/src/org/netbeans/modules/navigator/resources/lastsel/file.lastsel_mime1" /> <!--empty file-->
+ <exclude name="xml.axi/test/unit/src/org/netbeans/modules/xml/axi/resources/**" /> <!-- test data -->
<exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/DTDExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
<exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/XMLExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
<exclude name="xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/**/data/**" /> <!-- test data -->
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelExTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelExTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelExTest.java
index c92e34e..4e26276 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelExTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelExTest.java
@@ -52,7 +52,9 @@ public class AXIModelExTest extends AXIModelTest {
}
public static Test suite() {
- TestSuite suite = new TestSuite(AXIModelExTest.class);
+ TestSuite suite = new TestSuite();
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTestSuite(AXIModelExTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelPerfTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelPerfTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelPerfTest.java
index 01b37fd..067e217 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelPerfTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelPerfTest.java
@@ -47,8 +47,9 @@ public class AXIModelPerfTest extends AbstractTestCase {
}
public static Test suite() {
- TestSuite suite = new TestSuite(AXIModelPerfTest.class);
-
+ TestSuite suite = new TestSuite();
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTestSuite(AXIModelPerfTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelTest.java
index 3a0d744..875fa17 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelTest.java
@@ -57,11 +57,12 @@ public class AXIModelTest extends AbstractTestCase {
public static Test suite() {
TestSuite suite = new TestSuite();
- suite.addTest(new AXIModelTest("testAXIModel"));
- suite.addTest(new AXIModelTest("testAXIModelForMetaSchema"));
- suite.addTest(new AXIModelTest("testRecursiveResolve1"));
- suite.addTest(new AXIModelTest("testRecursiveResolve2"));
- suite.addTest(new AXIModelTest("testSubstitutionGroup"));
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTest(new AXIModelTest("testAXIModel"));
+// suite.addTest(new AXIModelTest("testAXIModelForMetaSchema"));
+// suite.addTest(new AXIModelTest("testRecursiveResolve1"));
+// suite.addTest(new AXIModelTest("testRecursiveResolve2"));
+// suite.addTest(new AXIModelTest("testSubstitutionGroup"));
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/CheckParentTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/CheckParentTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/CheckParentTest.java
index 4777ae2..113f90f 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/CheckParentTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/CheckParentTest.java
@@ -37,7 +37,9 @@ public class CheckParentTest extends AbstractTestCase {
}
public static Test suite() {
- TestSuite suite = new TestSuite(CheckParentTest.class);
+ TestSuite suite = new TestSuite();
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTestSuite(CheckParentTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ContentModelTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ContentModelTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ContentModelTest.java
index acdc6f8..5c70c30 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ContentModelTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ContentModelTest.java
@@ -37,7 +37,9 @@ public class ContentModelTest extends AbstractTestCase {
}
public static Test suite() {
- TestSuite suite = new TestSuite(ContentModelTest.class);
+ TestSuite suite = new TestSuite();
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTestSuite(ContentModelTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ProxyComponentTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ProxyComponentTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ProxyComponentTest.java
index 276e504..230d3d0 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ProxyComponentTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ProxyComponentTest.java
@@ -39,7 +39,9 @@ public class ProxyComponentTest extends AbstractTestCase {
}
public static Test suite() {
- TestSuite suite = new TestSuite(ProxyComponentTest.class);
+ TestSuite suite = new TestSuite();
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTestSuite(ProxyComponentTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaGeneratorDatatypesTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaGeneratorDatatypesTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaGeneratorDatatypesTest.java
index 38fe942..b455e83 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaGeneratorDatatypesTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaGeneratorDatatypesTest.java
@@ -46,8 +46,9 @@ public class SchemaGeneratorDatatypesTest extends AbstractTestCase {
}
public static Test suite() {
- TestSuite suite = new TestSuite(SchemaGeneratorDatatypesTest.class);
-
+ TestSuite suite = new TestSuite();
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTestSuite(SchemaGeneratorDatatypesTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaTransformTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaTransformTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaTransformTest.java
index a7d49a4..a2c92b4 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaTransformTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaTransformTest.java
@@ -78,13 +78,16 @@ public class SchemaTransformTest extends AbstractTestCase {
suite.addTest(new SchemaTransformTest("testLineSalamiSlice"));
suite.addTest(new SchemaTransformTest("testLineVenetianBlind"));
suite.addTest(new SchemaTransformTest("testLineRussianDoll"));
- suite.addTest(new SchemaTransformTest("testTypes"));
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTest(new SchemaTransformTest("testTypes"));
//FIXME suite.addTest(new SchemaTransformTest("testLoanApp"));
suite.addTest(new SchemaTransformTest("testAnnotation"));
- suite.addTest(new SchemaTransformTest("testPurchaseOrder"));
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTest(new SchemaTransformTest("testPurchaseOrder"));
//FIXME suite.addTest(new SchemaTransformTest("testDiscardTransform"));
suite.addTest(new SchemaTransformTest("testRenameAfterTransform"));
- suite.addTest(new SchemaTransformTest("testNewApproach"));
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTest(new SchemaTransformTest("testNewApproach"));
suite.addTest(new SchemaTransformTest("testMultiSchemaInclude"));
suite.addTest(new SchemaTransformTest("testMultiSchemaImport"));
suite.addTest(new SchemaTransformTest("testGlobalElementReuse"));
@@ -533,7 +536,7 @@ public class SchemaTransformTest extends AbstractTestCase {
assertTrue("Should not be here", false);
}
validateSchema(axiModel.getSchemaModel());
-
+
// printDocument();
assertEquals("global complex types",0,getSchemaModel().getSchema().getComplexTypes().size());
assertEquals("global simple types",0,getSchemaModel().getSchema().getSimpleTypes().size());
@@ -801,7 +804,7 @@ public class SchemaTransformTest extends AbstractTestCase {
assertTrue("Should not be here", false);
}
validateSchema(axiModel.getSchemaModel());
-
+
// printDocument();
assertEquals("global complex types",3,getSchemaModel().getSchema().getComplexTypes().size());
// assertEquals("global simple types",2,getSchemaModel().getSchema().getSimpleTypes().size());
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeFactoryTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeFactoryTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeFactoryTest.java
index 5751126..f71ba0b 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeFactoryTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeFactoryTest.java
@@ -52,8 +52,9 @@ public class DatatypeFactoryTest extends AbstractTestCase {
}
public static Test suite() {
- TestSuite suite = new TestSuite(DatatypeFactoryTest.class);
-
+ TestSuite suite = new TestSuite();
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTestSuite(DatatypeFactoryTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypePerfTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypePerfTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypePerfTest.java
index 8d025c1..7916cad 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypePerfTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypePerfTest.java
@@ -47,8 +47,9 @@ public class DatatypePerfTest extends AbstractTestCase {
}
public static Test suite() {
- TestSuite suite = new TestSuite(DatatypePerfTest.class);
-
+ TestSuite suite = new TestSuite();
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTestSuite(DatatypePerfTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeTest.java
index d6a0436..c1e793b 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeTest.java
@@ -50,8 +50,9 @@ public class DatatypeTest extends AbstractTestCase {
public static Test suite() {
TestSuite suite = new TestSuite();
- suite.addTest(new DatatypeTest("testDatatypeEnumerations"));
- suite.addTest(new DatatypeTest("testCreateDatatype"));
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTest(new DatatypeTest("testDatatypeEnumerations"));
+// suite.addTest(new DatatypeTest("testCreateDatatype"));
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/MultiFileSyncTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/MultiFileSyncTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/MultiFileSyncTest.java
index 512fb42..3e6e83f 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/MultiFileSyncTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/MultiFileSyncTest.java
@@ -59,7 +59,9 @@ public class MultiFileSyncTest extends AbstractSyncTestCase {
}
public static Test suite() {
- TestSuite suite = new TestSuite(MultiFileSyncTest.class);
+ TestSuite suite = new TestSuite();
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTestSuite(MultiFileSyncTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/StateChangeTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/StateChangeTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/StateChangeTest.java
index 84cf79f..0152c56 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/StateChangeTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/StateChangeTest.java
@@ -66,7 +66,9 @@ public class StateChangeTest extends AbstractSyncTestCase {
}
public static Test suite() {
- TestSuite suite = new TestSuite(StateChangeTest.class);
+ TestSuite suite = new TestSuite();
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTestSuite(StateChangeTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncDeadlockTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncDeadlockTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncDeadlockTest.java
index 927a167..87b7b0c 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncDeadlockTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncDeadlockTest.java
@@ -48,7 +48,9 @@ public class SyncDeadlockTest extends AbstractSyncTestCase {
}
public static Test suite() {
- TestSuite suite = new TestSuite(SyncDeadlockTest.class);
+ TestSuite suite = new TestSuite();
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTestSuite(SyncDeadlockTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncElementTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncElementTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncElementTest.java
index 2710047..ee644a1 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncElementTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncElementTest.java
@@ -70,16 +70,17 @@ public class SyncElementTest extends AbstractSyncTestCase {
public static Test suite() {
TestSuite suite = new TestSuite();
- suite.addTest(new SyncElementTest("testRemoveElementFromType"));
- suite.addTest(new SyncElementTest("testRemoveAttributeFromAttrGroup"));
- suite.addTest(new SyncElementTest("testChangeType"));
- suite.addTest(new SyncElementTest("testChangeAttributeRef"));
- suite.addTest(new SyncElementTest("testChangeTypeContent"));
- suite.addTest(new SyncElementTest("testChangeNameOfElement"));
- suite.addTest(new SyncElementTest("testRemoveGlobalElement"));
- suite.addTest(new SyncElementTest("testAddGlobalElement"));
- suite.addTest(new SyncElementTest("testChangeElementRef"));
- suite.addTest(new SyncElementTest("testChangeBase"));
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTest(new SyncElementTest("testRemoveElementFromType"));
+// suite.addTest(new SyncElementTest("testRemoveAttributeFromAttrGroup"));
+// suite.addTest(new SyncElementTest("testChangeType"));
+// suite.addTest(new SyncElementTest("testChangeAttributeRef"));
+// suite.addTest(new SyncElementTest("testChangeTypeContent"));
+// suite.addTest(new SyncElementTest("testChangeNameOfElement"));
+// suite.addTest(new SyncElementTest("testRemoveGlobalElement"));
+// suite.addTest(new SyncElementTest("testAddGlobalElement"));
+// suite.addTest(new SyncElementTest("testChangeElementRef"));
+// suite.addTest(new SyncElementTest("testChangeBase"));
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b810589c/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncTest.java
----------------------------------------------------------------------
diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncTest.java
index d608ac5..340dbee 100644
--- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncTest.java
+++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncTest.java
@@ -50,9 +50,10 @@ public class SyncTest extends AbstractSyncTestCase {
public static Test suite() {
TestSuite suite = new TestSuite();
- suite.addTest(new SyncTest("testSync"));
- suite.addTest(new SyncTest("testOTASyncPerformance"));
- //suite.addTest(new SyncPerfTest("testHealthcareSchemaSyncPerformance"));
+// Disabled as referenced XSD file were partly not donated by oracle to apache
+// suite.addTest(new SyncTest("testSync"));
+// suite.addTest(new SyncTest("testOTASyncPerformance"));
+// //suite.addTest(new SyncPerfTest("testHealthcareSchemaSyncPerformance"));
return suite;
}
[09/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.catalog
Posted by ma...@apache.org.
[NETBEANS-54] Modules review xml.catalog
- removed external binary (contained XML Schemas and DTDs), added
license header to files and added them to the source code, where the
binary was expanded at build time
- checked Rat report: added missing headers
- skimmed through module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/bce3d247
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/bce3d247
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/bce3d247
Branch: refs/heads/master
Commit: bce3d24789daaccfd243837e91c9d48685ccda66
Parents: 9ee7210
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Fri Oct 6 23:26:42 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:53 2017 +0200
----------------------------------------------------------------------
.gitignore | 7 +-
nbbuild/build.xml | 4 +
xml.catalog/build.xml | 4 +-
xml.catalog/external/binaries-list | 17 -
.../external/xml-catalog-resources-license.txt | 1 -
.../xml/catalog/resources/XMLNamespace.xsd | 334 +++
.../catalog/resources/XMLSchema-instance.xsd | 84 +
.../modules/xml/catalog/resources/XMLSchema.dtd | 449 +++
.../modules/xml/catalog/resources/XMLSchema.xsd | 2581 ++++++++++++++++++
.../modules/xml/catalog/resources/datatypes.dtd | 250 ++
.../qa-functional/data/Catalog/OASISCatalog.xml | 20 +
.../test/qa-functional/data/Catalog/catalog.dtd | 152 +-
.../test/qa-functional/data/Catalog/catalog.xsd | 47 +-
.../xml/catalog/impl/sun/data/a space/empty.dtd | 20 +
.../xml/catalog/impl/sun/data/catalog.xml | 19 +
.../modules/xml/catalog/impl/sun/data/empty.dtd | 20 +
16 files changed, 3897 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index ab346fa..53e3b3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,9 +42,4 @@
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth/
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl20061109.xsd
-/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd
-/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLNamespace.xsd
-/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema-instance.xsd
-/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.dtd
-/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.xsd
-/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/datatypes.dtd
+/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 8f85aca..729b68c 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1950,7 +1950,11 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<rat:substringMatcher licenseFamilyCategory="w3c2" licenseFamilyName="W3C Software and Document Notice and License">
<pattern substring="W3C Software and Document Notice and License"/>
</rat:substringMatcher>
+ <rat:substringMatcher licenseFamilyCategory="oasis" licenseFamilyName="OASIS">
+ <pattern substring="[OASIS]"/>
+ </rat:substringMatcher>
<rat:approvedLicense familyName="W3C Software and Document Notice and License"/>
+ <rat:approvedLicense familyName="OASIS"/>
<fileset dir="${nb_all}">
<exclude name="*/build/**" />
<exclude name="nbbuild/netbeans/**" />
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/build.xml
----------------------------------------------------------------------
diff --git a/xml.catalog/build.xml b/xml.catalog/build.xml
index 73da4f6..5c1bf5b 100644
--- a/xml.catalog/build.xml
+++ b/xml.catalog/build.xml
@@ -22,7 +22,5 @@
<project name="xml.catalog" default="netbeans" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
- <target name="build-init" depends="projectized.build-init">
- <unzip src="external/xml-catalog-external-resources.zip" dest="src/org/netbeans/modules/xml/catalog/resources"/>
- </target>
+
</project>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/external/binaries-list
----------------------------------------------------------------------
diff --git a/xml.catalog/external/binaries-list b/xml.catalog/external/binaries-list
deleted file mode 100644
index c56e522..0000000
--- a/xml.catalog/external/binaries-list
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-52C8264EBDCB2782BA610463196832DC377814C3 xml-catalog-external-resources.zip
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/external/xml-catalog-resources-license.txt
----------------------------------------------------------------------
diff --git a/xml.catalog/external/xml-catalog-resources-license.txt b/xml.catalog/external/xml-catalog-resources-license.txt
deleted file mode 100644
index 4a344ab..0000000
--- a/xml.catalog/external/xml-catalog-resources-license.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLNamespace.xsd
----------------------------------------------------------------------
diff --git a/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLNamespace.xsd b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLNamespace.xsd
new file mode 100644
index 0000000..3dd72c1
--- /dev/null
+++ b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLNamespace.xsd
@@ -0,0 +1,334 @@
+<?xml version='1.0'?>
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- Added license header
+
+-->
+<?xml-stylesheet href="../2008/09/xsd.xsl" type="text/xsl"?>
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns ="http://www.w3.org/1999/xhtml"
+ xml:lang="en">
+
+ <xs:annotation>
+ <xs:documentation>
+ <div>
+ <h1>About the XML namespace</h1>
+
+ <div class="bodytext">
+ <p>
+ This schema document describes the XML namespace, in a form
+ suitable for import by other schema documents.
+ </p>
+ <p>
+ See <a href="http://www.w3.org/XML/1998/namespace.html">
+ http://www.w3.org/XML/1998/namespace.html</a> and
+ <a href="http://www.w3.org/TR/REC-xml">
+ http://www.w3.org/TR/REC-xml</a> for information
+ about this namespace.
+ </p>
+ <p>
+ Note that local names in this namespace are intended to be
+ defined only by the World Wide Web Consortium or its subgroups.
+ The names currently defined in this namespace are listed below.
+ They should not be used with conflicting semantics by any Working
+ Group, specification, or document instance.
+ </p>
+ <p>
+ See further below in this document for more information about <a
+ href="#usage">how to refer to this schema document from your own
+ XSD schema documents</a> and about <a href="#nsversioning">the
+ namespace-versioning policy governing this schema document</a>.
+ </p>
+ </div>
+ </div>
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:attribute name="lang">
+ <xs:annotation>
+ <xs:documentation>
+ <div>
+
+ <h3>lang (as an attribute name)</h3>
+ <p>
+ denotes an attribute whose value
+ is a language code for the natural language of the content of
+ any element; its value is inherited. This name is reserved
+ by virtue of its definition in the XML specification.</p>
+
+ </div>
+ <div>
+ <h4>Notes</h4>
+ <p>
+ Attempting to install the relevant ISO 2- and 3-letter
+ codes as the enumerated possible values is probably never
+ going to be a realistic possibility.
+ </p>
+ <p>
+ See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+ http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
+ and the IANA language subtag registry at
+ <a href="http://www.iana.org/assignments/language-subtag-registry">
+ http://www.iana.org/assignments/language-subtag-registry</a>
+ for further information.
+ </p>
+ <p>
+ The union allows for the 'un-declaration' of xml:lang with
+ the empty string.
+ </p>
+ </div>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:union memberTypes="xs:language">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value=""/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="space">
+ <xs:annotation>
+ <xs:documentation>
+ <div>
+
+ <h3>space (as an attribute name)</h3>
+ <p>
+ denotes an attribute whose
+ value is a keyword indicating what whitespace processing
+ discipline is intended for the content of the element; its
+ value is inherited. This name is reserved by virtue of its
+ definition in the XML specification.</p>
+
+ </div>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:NCName">
+ <xs:enumeration value="default"/>
+ <xs:enumeration value="preserve"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="base" type="xs:anyURI"> <xs:annotation>
+ <xs:documentation>
+ <div>
+
+ <h3>base (as an attribute name)</h3>
+ <p>
+ denotes an attribute whose value
+ provides a URI to be used as the base for interpreting any
+ relative URIs in the scope of the element on which it
+ appears; its value is inherited. This name is reserved
+ by virtue of its definition in the XML Base specification.</p>
+
+ <p>
+ See <a
+ href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a>
+ for information about this attribute.
+ </p>
+ </div>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="id" type="xs:ID">
+ <xs:annotation>
+ <xs:documentation>
+ <div>
+
+ <h3>id (as an attribute name)</h3>
+ <p>
+ denotes an attribute whose value
+ should be interpreted as if declared to be of type ID.
+ This name is reserved by virtue of its definition in the
+ xml:id specification.</p>
+
+ <p>
+ See <a
+ href="http://www.w3.org/TR/xml-id/">http://www.w3.org/TR/xml-id/</a>
+ for information about this attribute.
+ </p>
+ </div>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+
+ <xs:attributeGroup name="specialAttrs">
+ <xs:attribute ref="xml:base"/>
+ <xs:attribute ref="xml:lang"/>
+ <xs:attribute ref="xml:space"/>
+ <xs:attribute ref="xml:id"/>
+ </xs:attributeGroup>
+
+ <xs:annotation>
+ <xs:documentation>
+ <div>
+
+ <h3>Father (in any context at all)</h3>
+
+ <div class="bodytext">
+ <p>
+ denotes Jon Bosak, the chair of
+ the original XML Working Group. This name is reserved by
+ the following decision of the W3C XML Plenary and
+ XML Coordination groups:
+ </p>
+ <blockquote>
+ <p>
+ In appreciation for his vision, leadership and
+ dedication the W3C XML Plenary on this 10th day of
+ February, 2000, reserves for Jon Bosak in perpetuity
+ the XML name "xml:Father".
+ </p>
+ </blockquote>
+ </div>
+ </div>
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+ <xs:documentation>
+ <div xml:id="usage" id="usage">
+ <h2><a name="usage">About this schema document</a></h2>
+
+ <div class="bodytext">
+ <p>
+ This schema defines attributes and an attribute group suitable
+ for use by schemas wishing to allow <code>xml:base</code>,
+ <code>xml:lang</code>, <code>xml:space</code> or
+ <code>xml:id</code> attributes on elements they define.
+ </p>
+ <p>
+ To enable this, such a schema must import this schema for
+ the XML namespace, e.g. as follows:
+ </p>
+ <pre>
+ <schema . . .>
+ . . .
+ <import namespace="http://www.w3.org/XML/1998/namespace"
+ schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+ </pre>
+ <p>
+ or
+ </p>
+ <pre>
+ <import namespace="http://www.w3.org/XML/1998/namespace"
+ schemaLocation="http://www.w3.org/2009/01/xml.xsd"/>
+ </pre>
+ <p>
+ Subsequently, qualified reference to any of the attributes or the
+ group defined below will have the desired effect, e.g.
+ </p>
+ <pre>
+ <type . . .>
+ . . .
+ <attributeGroup ref="xml:specialAttrs"/>
+ </pre>
+ <p>
+ will define a type which will schema-validate an instance element
+ with any of those attributes.
+ </p>
+ </div>
+ </div>
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+ <xs:documentation>
+ <div id="nsversioning" xml:id="nsversioning">
+ <h2><a name="nsversioning">Versioning policy for this schema document</a></h2>
+ <div class="bodytext">
+ <p>
+ In keeping with the XML Schema WG's standard versioning
+ policy, this schema document will persist at
+ <a href="http://www.w3.org/2009/01/xml.xsd">
+ http://www.w3.org/2009/01/xml.xsd</a>.
+ </p>
+ <p>
+ At the date of issue it can also be found at
+ <a href="http://www.w3.org/2001/xml.xsd">
+ http://www.w3.org/2001/xml.xsd</a>.
+ </p>
+ <p>
+ The schema document at that URI may however change in the future,
+ in order to remain compatible with the latest version of XML
+ Schema itself, or with the XML namespace itself. In other words,
+ if the XML Schema or XML namespaces change, the version of this
+ document at <a href="http://www.w3.org/2001/xml.xsd">
+ http://www.w3.org/2001/xml.xsd
+ </a>
+ will change accordingly; the version at
+ <a href="http://www.w3.org/2009/01/xml.xsd">
+ http://www.w3.org/2009/01/xml.xsd
+ </a>
+ will not change.
+ </p>
+ <p>
+ Previous dated (and unchanging) versions of this schema
+ document are at:
+ </p>
+ <ul>
+ <li><a href="http://www.w3.org/2009/01/xml.xsd">
+ http://www.w3.org/2009/01/xml.xsd</a></li>
+ <li><a href="http://www.w3.org/2007/08/xml.xsd">
+ http://www.w3.org/2007/08/xml.xsd</a></li>
+ <li><a href="http://www.w3.org/2004/10/xml.xsd">
+ http://www.w3.org/2004/10/xml.xsd</a></li>
+ <li><a href="http://www.w3.org/2001/03/xml.xsd">
+ http://www.w3.org/2001/03/xml.xsd</a></li>
+ </ul>
+ </div>
+ </div>
+ </xs:documentation>
+ </xs:annotation>
+
+</xs:schema>
+
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema-instance.xsd
----------------------------------------------------------------------
diff --git a/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema-instance.xsd b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema-instance.xsd
new file mode 100644
index 0000000..7afdcdf
--- /dev/null
+++ b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema-instance.xsd
@@ -0,0 +1,84 @@
+<?xml version='1.0'?>
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- Added license header
+
+-->
+<!DOCTYPE xs:schema SYSTEM "XMLSchema.dtd" [
+<!ELEMENT p ANY>
+<!ELEMENT a ANY>
+<!ATTLIST a href CDATA #IMPLIED>
+<!ELEMENT hr ANY>
+<!ELEMENT h1 ANY>
+<!ELEMENT br ANY>
+]>
+<xs:schema targetNamespace="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns="http://www.w3.org/1999/xhtml">
+ <xs:annotation>
+ <xs:documentation>
+ <h1>XML Schema instance namespace</h1>
+ <p>See <a href="http://www.w3.org/TR/xmlschema-1/">the XML Schema
+ Recommendation</a> for an introduction</p>
+
+
+ <hr />
+ $Date: 2001/03/16 20:25:57 $<br />
+ $Id: XMLSchema-instance.xsd,v 1.4 2001/03/16 20:25:57 ht Exp $
+ </xs:documentation>
+ </xs:annotation>
+ <xs:annotation>
+ <xs:documentation><p>This schema should never be used as such:
+ <a href="http://www.w3.org/TR/xmlschema-1/#no-xsi">the XML
+ Schema Recommendation</a> forbids the declaration of
+ attributes in this namespace</p>
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:attribute name="nil"/>
+ <xs:attribute name="type"/>
+ <xs:attribute name="schemaLocation"/>
+ <xs:attribute name="noNamespaceSchemaLocation"/>
+</xs:schema>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.dtd
----------------------------------------------------------------------
diff --git a/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.dtd b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.dtd
new file mode 100644
index 0000000..8b3a726
--- /dev/null
+++ b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.dtd
@@ -0,0 +1,449 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- Added license header
+
+-->
+<!-- DTD for XML Schemas: Part 1: Structures
+ Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
+ Official Location: http://www.w3.org/2001/XMLSchema.dtd -->
+<!-- $Id$ -->
+<!-- Note this DTD is NOT normative, or even definitive. --> <!--d-->
+<!-- prose copy in the structures REC is the definitive version --> <!--d-->
+<!-- (which shouldn't differ from this one except for this --> <!--d-->
+<!-- comment and entity expansions, but just in case) --> <!--d-->
+<!-- With the exception of cases with multiple namespace
+ prefixes for the XML Schema namespace, any XML document which is
+ not valid per this DTD given redefinitions in its internal subset of the
+ 'p' and 's' parameter entities below appropriate to its namespace
+ declaration of the XML Schema namespace is almost certainly not
+ a valid schema. -->
+
+<!-- The simpleType element and its constituent parts
+ are defined in XML Schema: Part 2: Datatypes -->
+<!ENTITY % xs-datatypes PUBLIC 'datatypes' 'datatypes.dtd' >
+
+<!ENTITY % p 'xs:'> <!-- can be overriden in the internal subset of a
+ schema document to establish a different
+ namespace prefix -->
+<!ENTITY % s ':xs'> <!-- if %p is defined (e.g. as foo:) then you must
+ also define %s as the suffix for the appropriate
+ namespace declaration (e.g. :foo) -->
+<!ENTITY % nds 'xmlns%s;'>
+
+<!-- Define all the element names, with optional prefix -->
+<!ENTITY % schema "%p;schema">
+<!ENTITY % complexType "%p;complexType">
+<!ENTITY % complexContent "%p;complexContent">
+<!ENTITY % simpleContent "%p;simpleContent">
+<!ENTITY % extension "%p;extension">
+<!ENTITY % element "%p;element">
+<!ENTITY % unique "%p;unique">
+<!ENTITY % key "%p;key">
+<!ENTITY % keyref "%p;keyref">
+<!ENTITY % selector "%p;selector">
+<!ENTITY % field "%p;field">
+<!ENTITY % group "%p;group">
+<!ENTITY % all "%p;all">
+<!ENTITY % choice "%p;choice">
+<!ENTITY % sequence "%p;sequence">
+<!ENTITY % any "%p;any">
+<!ENTITY % anyAttribute "%p;anyAttribute">
+<!ENTITY % attribute "%p;attribute">
+<!ENTITY % attributeGroup "%p;attributeGroup">
+<!ENTITY % include "%p;include">
+<!ENTITY % import "%p;import">
+<!ENTITY % redefine "%p;redefine">
+<!ENTITY % notation "%p;notation">
+
+<!-- annotation elements -->
+<!ENTITY % annotation "%p;annotation">
+<!ENTITY % appinfo "%p;appinfo">
+<!ENTITY % documentation "%p;documentation">
+
+<!-- Customisation entities for the ATTLIST of each element type.
+ Define one of these if your schema takes advantage of the
+ anyAttribute='##other' in the schema for schemas -->
+
+<!ENTITY % schemaAttrs ''>
+<!ENTITY % complexTypeAttrs ''>
+<!ENTITY % complexContentAttrs ''>
+<!ENTITY % simpleContentAttrs ''>
+<!ENTITY % extensionAttrs ''>
+<!ENTITY % elementAttrs ''>
+<!ENTITY % groupAttrs ''>
+<!ENTITY % allAttrs ''>
+<!ENTITY % choiceAttrs ''>
+<!ENTITY % sequenceAttrs ''>
+<!ENTITY % anyAttrs ''>
+<!ENTITY % anyAttributeAttrs ''>
+<!ENTITY % attributeAttrs ''>
+<!ENTITY % attributeGroupAttrs ''>
+<!ENTITY % uniqueAttrs ''>
+<!ENTITY % keyAttrs ''>
+<!ENTITY % keyrefAttrs ''>
+<!ENTITY % selectorAttrs ''>
+<!ENTITY % fieldAttrs ''>
+<!ENTITY % includeAttrs ''>
+<!ENTITY % importAttrs ''>
+<!ENTITY % redefineAttrs ''>
+<!ENTITY % notationAttrs ''>
+<!ENTITY % annotationAttrs ''>
+<!ENTITY % appinfoAttrs ''>
+<!ENTITY % documentationAttrs ''>
+
+<!ENTITY % complexDerivationSet "CDATA">
+ <!-- #all or space-separated list drawn from derivationChoice -->
+<!ENTITY % blockSet "CDATA">
+ <!-- #all or space-separated list drawn from
+ derivationChoice + 'substitution' -->
+
+<!ENTITY % mgs '%all; | %choice; | %sequence;'>
+<!ENTITY % cs '%choice; | %sequence;'>
+<!ENTITY % formValues '(qualified|unqualified)'>
+
+
+<!ENTITY % attrDecls '((%attribute;| %attributeGroup;)*,(%anyAttribute;)?)'>
+
+<!ENTITY % particleAndAttrs '((%mgs; | %group;)?, %attrDecls;)'>
+
+<!-- This is used in part2 -->
+<!ENTITY % restriction1 '((%mgs; | %group;)?)'>
+
+%xs-datatypes;
+
+<!-- the duplication below is to produce an unambiguous content model
+ which allows annotation everywhere -->
+<!ELEMENT %schema; ((%include; | %import; | %redefine; | %annotation;)*,
+ ((%simpleType; | %complexType;
+ | %element; | %attribute;
+ | %attributeGroup; | %group;
+ | %notation; ),
+ (%annotation;)*)* )>
+<!ATTLIST %schema;
+ targetNamespace %URIref; #IMPLIED
+ version CDATA #IMPLIED
+ %nds; %URIref; #FIXED 'http://www.w3.org/2001/XMLSchema'
+ xmlns CDATA #IMPLIED
+ finalDefault %complexDerivationSet; ''
+ blockDefault %blockSet; ''
+ id ID #IMPLIED
+ elementFormDefault %formValues; 'unqualified'
+ attributeFormDefault %formValues; 'unqualified'
+ xml:lang CDATA #IMPLIED
+ %schemaAttrs;>
+<!-- Note the xmlns declaration is NOT in the Schema for Schemas,
+ because at the Infoset level where schemas operate,
+ xmlns(:prefix) is NOT an attribute! -->
+<!-- The declaration of xmlns is a convenience for schema authors -->
+
+<!-- The id attribute here and below is for use in external references
+ from non-schemas using simple fragment identifiers.
+ It is NOT used for schema-to-schema reference, internal or
+ external. -->
+
+<!-- a type is a named content type specification which allows attribute
+ declarations-->
+<!-- -->
+
+<!ELEMENT %complexType; ((%annotation;)?,
+ (%simpleContent;|%complexContent;|
+ %particleAndAttrs;))>
+
+<!ATTLIST %complexType;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ abstract %boolean; #IMPLIED
+ final %complexDerivationSet; #IMPLIED
+ block %complexDerivationSet; #IMPLIED
+ mixed (true|false) 'false'
+ %complexTypeAttrs;>
+
+<!-- particleAndAttrs is shorthand for a root type -->
+<!-- mixed is disallowed if simpleContent, overriden if complexContent
+ has one too. -->
+
+<!-- If anyAttribute appears in one or more referenced attributeGroups
+ and/or explicitly, the intersection of the permissions is used -->
+
+<!ELEMENT %complexContent; ((%annotation;)?, (%restriction;|%extension;))>
+<!ATTLIST %complexContent;
+ mixed (true|false) #IMPLIED
+ id ID #IMPLIED
+ %complexContentAttrs;>
+
+<!-- restriction should use the branch defined above, not the simple
+ one from part2; extension should use the full model -->
+
+<!ELEMENT %simpleContent; ((%annotation;)?, (%restriction;|%extension;))>
+<!ATTLIST %simpleContent;
+ id ID #IMPLIED
+ %simpleContentAttrs;>
+
+<!-- restriction should use the simple branch from part2, not the
+ one defined above; extension should have no particle -->
+
+<!ELEMENT %extension; ((%annotation;)?, (%particleAndAttrs;))>
+<!ATTLIST %extension;
+ base %QName; #REQUIRED
+ id ID #IMPLIED
+ %extensionAttrs;>
+
+<!-- an element is declared by either:
+ a name and a type (either nested or referenced via the type attribute)
+ or a ref to an existing element declaration -->
+
+<!ELEMENT %element; ((%annotation;)?, (%complexType;| %simpleType;)?,
+ (%unique; | %key; | %keyref;)*)>
+<!-- simpleType or complexType only if no type|ref attribute -->
+<!-- ref not allowed at top level -->
+<!ATTLIST %element;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ type %QName; #IMPLIED
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ nillable %boolean; #IMPLIED
+ substitutionGroup %QName; #IMPLIED
+ abstract %boolean; #IMPLIED
+ final %complexDerivationSet; #IMPLIED
+ block %blockSet; #IMPLIED
+ default CDATA #IMPLIED
+ fixed CDATA #IMPLIED
+ form %formValues; #IMPLIED
+ %elementAttrs;>
+<!-- type and ref are mutually exclusive.
+ name and ref are mutually exclusive, one is required -->
+<!-- In the absence of type AND ref, type defaults to type of
+ substitutionGroup, if any, else the ur-type, i.e. unconstrained -->
+<!-- default and fixed are mutually exclusive -->
+
+<!ELEMENT %group; ((%annotation;)?,(%mgs;)?)>
+<!ATTLIST %group;
+ name %NCName; #IMPLIED
+ ref %QName; #IMPLIED
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %groupAttrs;>
+
+<!ELEMENT %all; ((%annotation;)?, (%element;)*)>
+<!ATTLIST %all;
+ minOccurs (1) #IMPLIED
+ maxOccurs (1) #IMPLIED
+ id ID #IMPLIED
+ %allAttrs;>
+
+<!ELEMENT %choice; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
+<!ATTLIST %choice;
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %choiceAttrs;>
+
+<!ELEMENT %sequence; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
+<!ATTLIST %sequence;
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %sequenceAttrs;>
+
+<!-- an anonymous grouping in a model, or
+ a top-level named group definition, or a reference to same -->
+
+<!-- Note that if order is 'all', group is not allowed inside.
+ If order is 'all' THIS group must be alone (or referenced alone) at
+ the top level of a content model -->
+<!-- If order is 'all', minOccurs==maxOccurs==1 on element/any inside -->
+<!-- Should allow minOccurs=0 inside order='all' . . . -->
+
+<!ELEMENT %any; (%annotation;)?>
+<!ATTLIST %any;
+ namespace CDATA '##any'
+ processContents (skip|lax|strict) 'strict'
+ minOccurs %nonNegativeInteger; '1'
+ maxOccurs CDATA '1'
+ id ID #IMPLIED
+ %anyAttrs;>
+
+<!-- namespace is interpreted as follows:
+ ##any - - any non-conflicting WFXML at all
+
+ ##other - - any non-conflicting WFXML from namespace other
+ than targetNamespace
+
+ ##local - - any unqualified non-conflicting WFXML/attribute
+ one or - - any non-conflicting WFXML from
+ more URI the listed namespaces
+ references
+
+ ##targetNamespace ##local may appear in the above list,
+ with the obvious meaning -->
+
+<!ELEMENT %anyAttribute; (%annotation;)?>
+<!ATTLIST %anyAttribute;
+ namespace CDATA '##any'
+ processContents (skip|lax|strict) 'strict'
+ id ID #IMPLIED
+ %anyAttributeAttrs;>
+<!-- namespace is interpreted as for 'any' above -->
+
+<!-- simpleType only if no type|ref attribute -->
+<!-- ref not allowed at top level, name iff at top level -->
+<!ELEMENT %attribute; ((%annotation;)?, (%simpleType;)?)>
+<!ATTLIST %attribute;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ type %QName; #IMPLIED
+ use (prohibited|optional|required) #IMPLIED
+ default CDATA #IMPLIED
+ fixed CDATA #IMPLIED
+ form %formValues; #IMPLIED
+ %attributeAttrs;>
+<!-- type and ref are mutually exclusive.
+ name and ref are mutually exclusive, one is required -->
+<!-- default for use is optional when nested, none otherwise -->
+<!-- default and fixed are mutually exclusive -->
+<!-- type attr and simpleType content are mutually exclusive -->
+
+<!-- an attributeGroup is a named collection of attribute decls, or a
+ reference thereto -->
+<!ELEMENT %attributeGroup; ((%annotation;)?,
+ (%attribute; | %attributeGroup;)*,
+ (%anyAttribute;)?) >
+<!ATTLIST %attributeGroup;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ %attributeGroupAttrs;>
+
+<!-- ref iff no content, no name. ref iff not top level -->
+
+<!-- better reference mechanisms -->
+<!ELEMENT %unique; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %unique;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ %uniqueAttrs;>
+
+<!ELEMENT %key; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %key;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ %keyAttrs;>
+
+<!ELEMENT %keyref; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %keyref;
+ name %NCName; #REQUIRED
+ refer %QName; #REQUIRED
+ id ID #IMPLIED
+ %keyrefAttrs;>
+
+<!ELEMENT %selector; ((%annotation;)?)>
+<!ATTLIST %selector;
+ xpath %XPathExpr; #REQUIRED
+ id ID #IMPLIED
+ %selectorAttrs;>
+<!ELEMENT %field; ((%annotation;)?)>
+<!ATTLIST %field;
+ xpath %XPathExpr; #REQUIRED
+ id ID #IMPLIED
+ %fieldAttrs;>
+
+<!-- Schema combination mechanisms -->
+<!ELEMENT %include; (%annotation;)?>
+<!ATTLIST %include;
+ schemaLocation %URIref; #REQUIRED
+ id ID #IMPLIED
+ %includeAttrs;>
+
+<!ELEMENT %import; (%annotation;)?>
+<!ATTLIST %import;
+ namespace %URIref; #IMPLIED
+ schemaLocation %URIref; #IMPLIED
+ id ID #IMPLIED
+ %importAttrs;>
+
+<!ELEMENT %redefine; (%annotation; | %simpleType; | %complexType; |
+ %attributeGroup; | %group;)*>
+<!ATTLIST %redefine;
+ schemaLocation %URIref; #REQUIRED
+ id ID #IMPLIED
+ %redefineAttrs;>
+
+<!ELEMENT %notation; (%annotation;)?>
+<!ATTLIST %notation;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ public CDATA #REQUIRED
+ system %URIref; #IMPLIED
+ %notationAttrs;>
+
+<!-- Annotation is either application information or documentation -->
+<!-- By having these here they are available for datatypes as well
+ as all the structures elements -->
+
+<!ELEMENT %annotation; (%appinfo; | %documentation;)*>
+<!ATTLIST %annotation; %annotationAttrs;>
+
+<!-- User must define annotation elements in internal subset for this
+ to work -->
+<!ELEMENT %appinfo; ANY> <!-- too restrictive -->
+<!ATTLIST %appinfo;
+ source %URIref; #IMPLIED
+ id ID #IMPLIED
+ %appinfoAttrs;>
+<!ELEMENT %documentation; ANY> <!-- too restrictive -->
+<!ATTLIST %documentation;
+ source %URIref; #IMPLIED
+ id ID #IMPLIED
+ xml:lang CDATA #IMPLIED
+ %documentationAttrs;>
+
+<!NOTATION XMLSchemaStructures PUBLIC
+ 'structures' 'http://www.w3.org/2001/XMLSchema.xsd' >
+<!NOTATION XML PUBLIC
+ 'REC-xml-1998-0210' 'http://www.w3.org/TR/1998/REC-xml-19980210' >
[16/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.schema.completion
Posted by ma...@apache.org.
[NETBEANS-54] Modules review xml.schema.completion
- no external library
- checked Rat report: excluded test-data from rat (no IP value), updated
XMLSchema.xsd and added w3c document and software license and
made sure license is picked up by rat report
- disable tests that fail because referenced files were not donated
- skimmed through module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/f29b9587
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/f29b9587
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/f29b9587
Branch: refs/heads/master
Commit: f29b9587fee2bed172635e1e3606f48e0cbdd679
Parents: 188f2b5
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Fri Oct 6 20:17:03 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:53 2017 +0200
----------------------------------------------------------------------
nbbuild/build.xml | 5 +
.../xml/schema/completion/util/XMLSchema.xsd | 3740 ++++++++----------
.../schema/completion/BasicCompletionTest.java | 29 +-
.../schema/completion/CompletionPerfTest.java | 4 +-
4 files changed, 1656 insertions(+), 2122 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/f29b9587/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index cd8f069..ca3ab8f 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1947,6 +1947,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
</classpath>
</taskdef>
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportfile="build/rat-report.txt">
+ <rat:substringMatcher licenseFamilyCategory="w3c2" licenseFamilyName="W3C Software and Document Notice and License">
+ <pattern substring="W3C Software and Document Notice and License"/>
+ </rat:substringMatcher>
+ <rat:approvedLicense familyName="W3C Software and Document Notice and License"/>
<fileset dir="${nb_all}">
<exclude name="*/build/**" />
<exclude name="nbbuild/netbeans/**" />
@@ -1973,6 +1977,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="**/*.url" /> <!--no degree of creativity-->
<exclude name="spi.navigator/test/unit/src/org/netbeans/modules/navigator/resources/lastsel/file.lastsel_mime1" /> <!--empty file-->
<exclude name="xml.axi/test/unit/src/org/netbeans/modules/xml/axi/resources/**" /> <!-- test data -->
+ <exclude name="xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/resources/**" /> <!-- test data -->
<exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/DTDExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
<exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/XMLExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
<exclude name="xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/**/data/**" /> <!-- test data -->
[20/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml
Posted by ma...@apache.org.
[NETBEANS-54] Modules review xml
- no external library
- checked Rat report: excluded test-data from rat (no IP value),
updated/added license headers, exclude templates from rat (jira
issue was raised)
- disable tests that fail because referenced files were not donated
- skimmed through module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/b136e120
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/b136e120
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/b136e120
Branch: refs/heads/master
Commit: b136e1207405ed7e13826666de1b0929b356b184
Parents: ff9557f
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sat Oct 7 14:23:18 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:54 2017 +0200
----------------------------------------------------------------------
.gitignore | 5 ++++-
nbbuild/build.xml | 2 ++
.../ActionsTestProject/nbproject/ant-deploy.xml | 20 +++++++++++++++++++
.../data/ActionsTestProject/web/DTDformed.dtd | 20 +++++++++++++++++++
.../data/ActionsTestProject/web/DTDformed.xml | 20 +++++++++++++++++++
.../ActionsTestProject/web/META-INF/context.xml | 20 +++++++++++++++++++
.../data/ActionsTestProject/web/WEB-INF/web.xml | 19 ++++++++++++++++++
.../ActionsTestProject/web/XMLSchema2GUI.xslt | 21 +++++++++++++++++++-
.../data/ActionsTestProject/web/index.jsp | 20 +++++++++++++++++++
.../ActionsTestProject/web/sampleXMLSchema.xml | 20 +++++++++++++++++++
.../data/ActionsTestProject/web/shiporder.xsd | 20 +++++++++++++++++++
.../data/ActionsTestProject/web/shiporders.xml | 20 +++++++++++++++++++
.../data/ActionsTestProject/web/well.xml | 19 ++++++++++++++++++
.../nbproject/ant-deploy.xml | 20 +++++++++++++++++++
.../nbproject/jax-ws.xml | 20 +++++++++++++++++++
.../web/META-INF/context.xml | 20 +++++++++++++++++++
.../web/WEB-INF/web.xml | 19 ++++++++++++++++++
.../nbproject/ant-deploy.xml | 20 +++++++++++++++++++
.../web/META-INF/context.xml | 20 +++++++++++++++++++
.../DTDActionsTestProject/web/WEB-INF/web.xml | 19 ++++++++++++++++++
.../data/DTDActionsTestProject/web/testDTD.dtd | 21 +++++++++++++++++++-
xml/test/qa-functional/data/people.xsd | 20 +++++++++++++++++++
xml/test/qa-functional/data/sample.dtd | 20 +++++++++++++++++++
xml/test/unit/data/dummyXMLDocument.xml | 20 +++++++++++++++++++
.../netbeans/modules/xml/wizard/data/dtd.dtd | 20 +++++++++++++++++++
.../modules/xml/wizard/data/schemaWithNS.xsd | 20 +++++++++++++++++++
26 files changed, 482 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 53e3b3c..c5088f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,4 +42,7 @@
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth/
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl20061109.xsd
-/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd
\ No newline at end of file
+/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd
+/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/private/
+/xml/test/qa-functional/data/ActionsTestProject/nbproject/private/
+/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/private/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 55656a2..b05c6f4 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1986,6 +1986,8 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="utilities/test/unit/src/org/netbeans/modules/openfile/resources/recent_files/*" /> <!--test data-->
<exclude name="**/*.url" /> <!--no degree of creativity-->
<exclude name="spi.navigator/test/unit/src/org/netbeans/modules/navigator/resources/lastsel/file.lastsel_mime1" /> <!--empty file-->
+ <exclude name="xml/test/unit/src/org/netbeans/modules/xml/resources/*" /> <!-- test data -->
+ <exclude name="xml/src/org/netbeans/modules/xml/resources/templates/*" /> <!-- template files - tracked by https://issues.apache.org/jira/browse/NETBEANS-85 -->
<exclude name="xml.axi/test/unit/src/org/netbeans/modules/xml/axi/resources/**" /> <!-- test data -->
<exclude name="xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/resources/**" /> <!-- test data -->
<exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.wsdl" /> <!-- test data -->
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/ActionsTestProject/nbproject/ant-deploy.xml
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/ActionsTestProject/nbproject/ant-deploy.xml b/xml/test/qa-functional/data/ActionsTestProject/nbproject/ant-deploy.xml
index 7ec8e30..f879516 100644
--- a/xml/test/qa-functional/data/ActionsTestProject/nbproject/ant-deploy.xml
+++ b/xml/test/qa-functional/data/ActionsTestProject/nbproject/ant-deploy.xml
@@ -1,4 +1,24 @@
<?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 default="-deploy-ant" basedir=".">
<target name="-init-cl-deployment-env" if="deploy.ant.enabled">
<property file="${deploy.ant.properties.file}" />
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.dtd
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.dtd b/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.dtd
index 63a7f3a..33637d9 100644
--- a/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.dtd
+++ b/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.dtd
@@ -1,4 +1,24 @@
<?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.
+
+-->
<!--
Document : DTDexample.dtd
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.xml
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.xml b/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.xml
index 7640822..91c1066 100644
--- a/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.xml
+++ b/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<!--
Document : newXMLDocument.xml
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/ActionsTestProject/web/META-INF/context.xml
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/META-INF/context.xml b/xml/test/qa-functional/data/ActionsTestProject/web/META-INF/context.xml
index 2ec66ad..672c9d8 100644
--- a/xml/test/qa-functional/data/ActionsTestProject/web/META-INF/context.xml
+++ b/xml/test/qa-functional/data/ActionsTestProject/web/META-INF/context.xml
@@ -1,2 +1,22 @@
<?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.
+
+-->
<Context path="/ActionsTestProject"/>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/ActionsTestProject/web/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/WEB-INF/web.xml b/xml/test/qa-functional/data/ActionsTestProject/web/WEB-INF/web.xml
index 9c98471..960ff54 100644
--- a/xml/test/qa-functional/data/ActionsTestProject/web/WEB-INF/web.xml
+++ b/xml/test/qa-functional/data/ActionsTestProject/web/WEB-INF/web.xml
@@ -1,5 +1,24 @@
<?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.
+
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/ActionsTestProject/web/XMLSchema2GUI.xslt
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/XMLSchema2GUI.xslt b/xml/test/qa-functional/data/ActionsTestProject/web/XMLSchema2GUI.xslt
index 6bb1f42..6fae36f 100644
--- a/xml/test/qa-functional/data/ActionsTestProject/web/XMLSchema2GUI.xslt
+++ b/xml/test/qa-functional/data/ActionsTestProject/web/XMLSchema2GUI.xslt
@@ -1,5 +1,24 @@
<?xml version="1.0"?>
-
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<!-- XML Schema ==> HTML form corresponding the Schema -->
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/ActionsTestProject/web/index.jsp
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/index.jsp b/xml/test/qa-functional/data/ActionsTestProject/web/index.jsp
index e5dd68a..c933893 100644
--- a/xml/test/qa-functional/data/ActionsTestProject/web/index.jsp
+++ b/xml/test/qa-functional/data/ActionsTestProject/web/index.jsp
@@ -1,3 +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.
+
+-->
<%@page contentType="text/html"%>
<%@page pageEncoding="UTF-8"%>
<%--
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/ActionsTestProject/web/sampleXMLSchema.xml
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/sampleXMLSchema.xml b/xml/test/qa-functional/data/ActionsTestProject/web/sampleXMLSchema.xml
index 7d3be71..cd54d4f 100644
--- a/xml/test/qa-functional/data/ActionsTestProject/web/sampleXMLSchema.xml
+++ b/xml/test/qa-functional/data/ActionsTestProject/web/sampleXMLSchema.xml
@@ -1,4 +1,24 @@
<?xml version='1.0'?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<!-- Commented out for IE5 which doesn't understand :
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/ActionsTestProject/web/shiporder.xsd
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/shiporder.xsd b/xml/test/qa-functional/data/ActionsTestProject/web/shiporder.xsd
index a1a632b..7a56e8b 100644
--- a/xml/test/qa-functional/data/ActionsTestProject/web/shiporder.xsd
+++ b/xml/test/qa-functional/data/ActionsTestProject/web/shiporder.xsd
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+
+ 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.
+
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:simpleType name="stringtype">
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/ActionsTestProject/web/shiporders.xml
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/shiporders.xml b/xml/test/qa-functional/data/ActionsTestProject/web/shiporders.xml
index d453fa2..aea6b21 100644
--- a/xml/test/qa-functional/data/ActionsTestProject/web/shiporders.xml
+++ b/xml/test/qa-functional/data/ActionsTestProject/web/shiporders.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<shiporders >
<shiporder orderid="188923">
<orderperson>John Smith</orderperson>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/ActionsTestProject/web/well.xml
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/well.xml b/xml/test/qa-functional/data/ActionsTestProject/web/well.xml
index c33face..b75bd30 100644
--- a/xml/test/qa-functional/data/ActionsTestProject/web/well.xml
+++ b/xml/test/qa-functional/data/ActionsTestProject/web/well.xml
@@ -1,5 +1,24 @@
<?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.
+
+-->
<!DOCTYPE note [
<!ELEMENT note (to, from, heading, body)>
<!ELEMENT to (#PCDATA)>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/ant-deploy.xml
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/ant-deploy.xml b/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/ant-deploy.xml
index 7ec8e30..f879516 100644
--- a/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/ant-deploy.xml
+++ b/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/ant-deploy.xml
@@ -1,4 +1,24 @@
<?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 default="-deploy-ant" basedir=".">
<target name="-init-cl-deployment-env" if="deploy.ant.enabled">
<property file="${deploy.ant.properties.file}" />
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/jax-ws.xml
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/jax-ws.xml b/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/jax-ws.xml
index ce67900..e365c43 100644
--- a/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/jax-ws.xml
+++ b/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/jax-ws.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<jax-ws xmlns="http://www.netbeans.org/ns/jax-ws/1">
<services/>
<clients/>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/CoreTemplatesTestProject/web/META-INF/context.xml
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/CoreTemplatesTestProject/web/META-INF/context.xml b/xml/test/qa-functional/data/CoreTemplatesTestProject/web/META-INF/context.xml
index 5f812e0..c77bfb3 100644
--- a/xml/test/qa-functional/data/CoreTemplatesTestProject/web/META-INF/context.xml
+++ b/xml/test/qa-functional/data/CoreTemplatesTestProject/web/META-INF/context.xml
@@ -1,2 +1,22 @@
<?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.
+
+-->
<Context path="/CoreTemplatesTestProject"/>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/CoreTemplatesTestProject/web/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/CoreTemplatesTestProject/web/WEB-INF/web.xml b/xml/test/qa-functional/data/CoreTemplatesTestProject/web/WEB-INF/web.xml
index 9c98471..960ff54 100644
--- a/xml/test/qa-functional/data/CoreTemplatesTestProject/web/WEB-INF/web.xml
+++ b/xml/test/qa-functional/data/CoreTemplatesTestProject/web/WEB-INF/web.xml
@@ -1,5 +1,24 @@
<?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.
+
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/ant-deploy.xml
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/ant-deploy.xml b/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/ant-deploy.xml
index 7ec8e30..f879516 100644
--- a/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/ant-deploy.xml
+++ b/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/ant-deploy.xml
@@ -1,4 +1,24 @@
<?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 default="-deploy-ant" basedir=".">
<target name="-init-cl-deployment-env" if="deploy.ant.enabled">
<property file="${deploy.ant.properties.file}" />
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/DTDActionsTestProject/web/META-INF/context.xml
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/DTDActionsTestProject/web/META-INF/context.xml b/xml/test/qa-functional/data/DTDActionsTestProject/web/META-INF/context.xml
index 2894b70..5beabcc 100644
--- a/xml/test/qa-functional/data/DTDActionsTestProject/web/META-INF/context.xml
+++ b/xml/test/qa-functional/data/DTDActionsTestProject/web/META-INF/context.xml
@@ -1,2 +1,22 @@
<?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.
+
+-->
<Context path="/DTDActionsTestProject"/>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/DTDActionsTestProject/web/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/DTDActionsTestProject/web/WEB-INF/web.xml b/xml/test/qa-functional/data/DTDActionsTestProject/web/WEB-INF/web.xml
index 9c98471..960ff54 100644
--- a/xml/test/qa-functional/data/DTDActionsTestProject/web/WEB-INF/web.xml
+++ b/xml/test/qa-functional/data/DTDActionsTestProject/web/WEB-INF/web.xml
@@ -1,5 +1,24 @@
<?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.
+
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/DTDActionsTestProject/web/testDTD.dtd
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/DTDActionsTestProject/web/testDTD.dtd b/xml/test/qa-functional/data/DTDActionsTestProject/web/testDTD.dtd
index ad7a1be..857ee68 100644
--- a/xml/test/qa-functional/data/DTDActionsTestProject/web/testDTD.dtd
+++ b/xml/test/qa-functional/data/DTDActionsTestProject/web/testDTD.dtd
@@ -1,5 +1,24 @@
<?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.
+
+-->
<!ENTITY AUTHOR "John Doe">
<!ENTITY COMPANY "JD Power Tools, Inc.">
<!ENTITY EMAIL "jd@jd-tools.com">
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/people.xsd
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/people.xsd b/xml/test/qa-functional/data/people.xsd
index dbde8bc..e717e80 100644
--- a/xml/test/qa-functional/data/people.xsd
+++ b/xml/test/qa-functional/data/people.xsd
@@ -1,3 +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.
+
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<!--deklarace jednoduchých typů -->
<xs:simpleType name="plat">
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/qa-functional/data/sample.dtd
----------------------------------------------------------------------
diff --git a/xml/test/qa-functional/data/sample.dtd b/xml/test/qa-functional/data/sample.dtd
index a0a7f9f..ee1b075 100644
--- a/xml/test/qa-functional/data/sample.dtd
+++ b/xml/test/qa-functional/data/sample.dtd
@@ -1,4 +1,24 @@
<?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.
+
+-->
<!--
Document : newemptyDTD.dtd
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/unit/data/dummyXMLDocument.xml
----------------------------------------------------------------------
diff --git a/xml/test/unit/data/dummyXMLDocument.xml b/xml/test/unit/data/dummyXMLDocument.xml
index 466dfdd..e91c609 100644
--- a/xml/test/unit/data/dummyXMLDocument.xml
+++ b/xml/test/unit/data/dummyXMLDocument.xml
@@ -1,2 +1,22 @@
<?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.
+
+-->
<root></root>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/dtd.dtd
----------------------------------------------------------------------
diff --git a/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/dtd.dtd b/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/dtd.dtd
index 7c59070..edc16c3 100644
--- a/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/dtd.dtd
+++ b/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/dtd.dtd
@@ -1,4 +1,24 @@
<?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.
+
+-->
<!--
Document : dtd.dtd
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b136e120/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/schemaWithNS.xsd
----------------------------------------------------------------------
diff --git a/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/schemaWithNS.xsd b/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/schemaWithNS.xsd
index 6965129..d6ca481 100644
--- a/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/schemaWithNS.xsd
+++ b/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/schemaWithNS.xsd
@@ -1,4 +1,24 @@
<?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.
+
+-->
<!--
Document : schemaWithNS.xsd
[21/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.schema.model
Posted by ma...@apache.org.
[NETBEANS-54] Modules review xml.schema.model
- no external library
- checked Rat report: excluded test-data from rat (no IP value), covered
zip files contains simple XSD samples as groups
- disable tests that fail because referenced files were not donated
- skimmed through module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/51ea9c01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/51ea9c01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/51ea9c01
Branch: refs/heads/master
Commit: 51ea9c0115738d6659e3e484e168e0f3d4988c53
Parents: ae66687
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sat Oct 7 12:15:02 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:54 2017 +0200
----------------------------------------------------------------------
nbbuild/build.xml | 4 +
.../xml/schema/model/SchemaRefCacheTest.java | 3 +-
.../xml/schema/model/impl/MultiFileTest.java | 147 +++++++++----------
.../model/impl/SchemaComponentImplTest.java | 91 ++++++------
.../xml/schema/model/impl/xdm/CutPasteTest.java | 116 +++++++--------
.../xml/schema/model/impl/xdm/SyncTest.java | 43 +++---
.../model/visitor/FindUsageVisitorTest.java | 13 +-
7 files changed, 211 insertions(+), 206 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/51ea9c01/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index a9a0c59..9bf1d06 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1991,6 +1991,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="xml.tools/test/qa-functional/src/org/netbeans/modules/**/*.xml" /> <!-- test data -->
<exclude name="xml.tools/test/qa-functional/src/org/netbeans/modules/**/*.dtd" /> <!-- test data -->
<exclude name="xml.tools/test/qa-functional/src/org/netbeans/modules/**/*.txt" /> <!-- test data -->
+ <exclude name="xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/**/*.xsd" /> <!-- test data -->
+ <exclude name="xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/resources/*.xml" /> <!-- test data -->
+ <exclude name="xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/resources/*.zip" /> <!-- test data -->
+ <exclude name="xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/resources/dummyProject/nbproject/private/tmpfile" /> <!-- test data -->
<exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/DTDExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
<exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/XMLExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
<exclude name="xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/**/data/**" /> <!-- test data -->
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/51ea9c01/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/SchemaRefCacheTest.java
----------------------------------------------------------------------
diff --git a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/SchemaRefCacheTest.java b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/SchemaRefCacheTest.java
index 2f492c4..3ba848a 100644
--- a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/SchemaRefCacheTest.java
+++ b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/SchemaRefCacheTest.java
@@ -76,7 +76,8 @@ public class SchemaRefCacheTest extends TestCase {
suite.addTest(new SchemaRefCacheTest("testRedefinedTargetNamespaceChanged")); // NOI18N
suite.addTest(new SchemaRefCacheTest("testImportedTargetNamespaceDeleted")); // NOI18N
suite.addTest(new SchemaRefCacheTest("testDetachedSchemaGarbageCollected")); // NOI18N
- suite.addTest(new SchemaRefCacheTest("testCacheContainsRelevantComponents")); // NOI18N
+// Disabled as referenced files were partly not donated by oracle to apache
+// suite.addTest(new SchemaRefCacheTest("testCacheContainsRelevantComponents")); // NOI18N
return suite;
}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/51ea9c01/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/MultiFileTest.java
----------------------------------------------------------------------
diff --git a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/MultiFileTest.java b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/MultiFileTest.java
index 9395877..be7cc00 100644
--- a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/MultiFileTest.java
+++ b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/MultiFileTest.java
@@ -40,78 +40,77 @@ import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
/**
- *
- * @author Administrator
+ * Disabled as referenced files were partly not donated by oracle to apache
*/
-public class MultiFileTest extends TestCase {
-
- private static String TEST_XSD = "resources/OrgChart.xsd";
-
- public MultiFileTest(String testName) {
- super(testName);
- }
-
- protected void setUp() throws Exception {
- }
-
- protected void tearDown() throws Exception {
- TestCatalogModel.getDefault().clearDocumentPool();
- }
-
- public void testGetImportedModelSources() throws Exception {
- if ( ! NamespaceLocation.ADDRESS.getResourceFile().exists() ) {
- NamespaceLocation.ADDRESS.refreshResourceFile();
- }
- SchemaModel sm = TestCatalogModel.getDefault().getSchemaModel(NamespaceLocation.ORGCHART);
- // get imported model sources
- SchemaImpl schema = (SchemaImpl)sm.getSchema();
- Collection<Import> importedModelSources = new LinkedList<Import>(schema.getImports());
- assertEquals("should be six imports", 6 ,importedModelSources.size());
- Iterator<Import> itr = importedModelSources.iterator();
- while(itr.hasNext()) {
- Import i = itr.next();
- try {
- SchemaModel sm2 = i.resolveReferencedModel();
- } catch (CatalogModelException ex) {
- itr.remove();
- }
- }
- assertEquals("only two imports are reachable", 1,importedModelSources.size());
-
- ModelSource importedModelSource = importedModelSources.iterator().next().resolveReferencedModel().getModelSource();
- assertEquals("address.xsd",((FileObject)importedModelSource.getLookup().lookup(FileObject.class)).getNameExt());
- // get imported model
- ModelSource testImportedModelSource = TestCatalogModel.getDefault().createTestModelSource((FileObject) importedModelSource.getLookup().lookup(FileObject.class), false);
- SchemaModel sm1 = SchemaModelFactory.getDefault().getModel(testImportedModelSource);
- assertNotNull(sm1);
- assertEquals("http://www.altova.com/IPO",sm1.getSchema().getTargetNamespace());
- }
-
- public void testGetIncludedModelSources() throws Exception {
- // get the model for OrgChart.xsd
- URL orgChartUrl = getClass().getResource("../resources/ipo.xsd");
- File orgChartFile = new File(orgChartUrl.toURI());
- FileObject orgChartFileObj = FileUtil.toFileObject(orgChartFile);
- //ModelSource localTestModelSource = new TestModelSource(orgChartFileObj,false);
- ModelSource testModelSource = TestCatalogModel.getDefault().createTestModelSource(orgChartFileObj, false);
- SchemaModel sm = SchemaModelFactory.getDefault().getModel(testModelSource);
-
- //register address.xsd with relative location (this is to be done only once
- URL addressUrl = getClass().getResource("../resources/address.xsd");
- TestCatalogModel.getDefault().addURI(new URI("address.xsd"),addressUrl.toURI());
-
- // get included model sources
- SchemaImpl schema = (SchemaImpl)sm.getSchema();
- Collection<Include> includedModelSources = schema.getIncludes();
- assertEquals(1,includedModelSources.size());
-
- ModelSource importedModelSource = includedModelSources.iterator().next().resolveReferencedModel().getModelSource();
- assertEquals("address.xsd",((FileObject)importedModelSource.getLookup().lookup(FileObject.class)).getNameExt());
-
- // get included model
- ModelSource testImportedModelSource = TestCatalogModel.getDefault().createTestModelSource((FileObject) importedModelSource.getLookup().lookup(FileObject.class), false);
- SchemaModel sm1 = SchemaModelFactory.getDefault().getModel(testImportedModelSource);
- assertNotNull(sm1);
- assertEquals(schema.getTargetNamespace(),sm1.getSchema().getTargetNamespace());
- }
-}
+//public class MultiFileTest extends TestCase {
+//
+// private static String TEST_XSD = "resources/OrgChart.xsd";
+//
+// public MultiFileTest(String testName) {
+// super(testName);
+// }
+//
+// protected void setUp() throws Exception {
+// }
+//
+// protected void tearDown() throws Exception {
+// TestCatalogModel.getDefault().clearDocumentPool();
+// }
+//
+// public void testGetImportedModelSources() throws Exception {
+// if ( ! NamespaceLocation.ADDRESS.getResourceFile().exists() ) {
+// NamespaceLocation.ADDRESS.refreshResourceFile();
+// }
+// SchemaModel sm = TestCatalogModel.getDefault().getSchemaModel(NamespaceLocation.ORGCHART);
+// // get imported model sources
+// SchemaImpl schema = (SchemaImpl)sm.getSchema();
+// Collection<Import> importedModelSources = new LinkedList<Import>(schema.getImports());
+// assertEquals("should be six imports", 6 ,importedModelSources.size());
+// Iterator<Import> itr = importedModelSources.iterator();
+// while(itr.hasNext()) {
+// Import i = itr.next();
+// try {
+// SchemaModel sm2 = i.resolveReferencedModel();
+// } catch (CatalogModelException ex) {
+// itr.remove();
+// }
+// }
+// assertEquals("only two imports are reachable", 1,importedModelSources.size());
+//
+// ModelSource importedModelSource = importedModelSources.iterator().next().resolveReferencedModel().getModelSource();
+// assertEquals("address.xsd",((FileObject)importedModelSource.getLookup().lookup(FileObject.class)).getNameExt());
+// // get imported model
+// ModelSource testImportedModelSource = TestCatalogModel.getDefault().createTestModelSource((FileObject) importedModelSource.getLookup().lookup(FileObject.class), false);
+// SchemaModel sm1 = SchemaModelFactory.getDefault().getModel(testImportedModelSource);
+// assertNotNull(sm1);
+// assertEquals("http://www.altova.com/IPO",sm1.getSchema().getTargetNamespace());
+// }
+//
+// public void testGetIncludedModelSources() throws Exception {
+// // get the model for OrgChart.xsd
+// URL orgChartUrl = getClass().getResource("../resources/ipo.xsd");
+// File orgChartFile = new File(orgChartUrl.toURI());
+// FileObject orgChartFileObj = FileUtil.toFileObject(orgChartFile);
+// //ModelSource localTestModelSource = new TestModelSource(orgChartFileObj,false);
+// ModelSource testModelSource = TestCatalogModel.getDefault().createTestModelSource(orgChartFileObj, false);
+// SchemaModel sm = SchemaModelFactory.getDefault().getModel(testModelSource);
+//
+// //register address.xsd with relative location (this is to be done only once
+// URL addressUrl = getClass().getResource("../resources/address.xsd");
+// TestCatalogModel.getDefault().addURI(new URI("address.xsd"),addressUrl.toURI());
+//
+// // get included model sources
+// SchemaImpl schema = (SchemaImpl)sm.getSchema();
+// Collection<Include> includedModelSources = schema.getIncludes();
+// assertEquals(1,includedModelSources.size());
+//
+// ModelSource importedModelSource = includedModelSources.iterator().next().resolveReferencedModel().getModelSource();
+// assertEquals("address.xsd",((FileObject)importedModelSource.getLookup().lookup(FileObject.class)).getNameExt());
+//
+// // get included model
+// ModelSource testImportedModelSource = TestCatalogModel.getDefault().createTestModelSource((FileObject) importedModelSource.getLookup().lookup(FileObject.class), false);
+// SchemaModel sm1 = SchemaModelFactory.getDefault().getModel(testImportedModelSource);
+// assertNotNull(sm1);
+// assertEquals(schema.getTargetNamespace(),sm1.getSchema().getTargetNamespace());
+// }
+//}
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/51ea9c01/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/SchemaComponentImplTest.java
----------------------------------------------------------------------
diff --git a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/SchemaComponentImplTest.java b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/SchemaComponentImplTest.java
index d32d56d..4a6fd88 100644
--- a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/SchemaComponentImplTest.java
+++ b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/SchemaComponentImplTest.java
@@ -133,51 +133,52 @@ public class SchemaComponentImplTest extends TestCase {
assertNotNull("only one annotation should be present", ann);
}
- public void testSetGlobalReference() throws Exception {
- SchemaModel mod = Util.loadSchemaModel("resources/ipo.xsd");
- Schema schema = mod.getSchema();
- SchemaComponentFactory fact = mod.getFactory();
-
- mod.startTransaction();
- GlobalAttributeGroup gap = fact.createGlobalAttributeGroup();
- schema.addAttributeGroup(gap);
- gap.setName("myAttrGroup2");
- LocalAttribute ga = fact.createLocalAttribute();
- gap.addLocalAttribute(ga);
- ga.setName("ga");
- GlobalSimpleType gst = FindSchemaComponentFromDOM.find(
- GlobalSimpleType.class, schema, "/schema/simpleType[@name='Sku']");
- ga.setType(ga.createReferenceTo(gst, GlobalSimpleType.class));
-
- mod.endTransaction();
-
- String v = ((AbstractDocumentComponent)ga).getPeer().getAttribute("type");
- assertEquals("ref should have prefix", "ipo:Sku", v);
-
- mod.startTransaction();
- /*
- <complexType name="myCT">
- <sequence>
- <simpleType name="productName" type="xsd:string"/>
- <attributeGroup ref="ipo:myAttrGroup2"/>
- </complexType>
- */
- GlobalComplexType gct = fact.createGlobalComplexType();
- schema.addComplexType(gct);
- gct.setName("myCT");
- Sequence seq = Util.createSequence(mod, gct);
- LocalElement le = Util.createLocalElement(mod, seq, "productName", 0);
- le.setType(le.createReferenceTo(Util.getPrimitiveType("string"), GlobalSimpleType.class));
-
- AttributeGroupReference agr = fact.createAttributeGroupReference();
- gct.addAttributeGroupReference(agr);
- agr.setGroup(agr.createReferenceTo(gap, GlobalAttributeGroup.class));
-
- mod.endTransaction();
-
- v = ((AbstractDocumentComponent)agr).getPeer().getAttribute("ref");
- assertEquals("ref should have prefix", "ipo:myAttrGroup2", v);
- }
+// Disabled as referenced files were partly not donated by oracle to apache
+// public void testSetGlobalReference() throws Exception {
+// SchemaModel mod = Util.loadSchemaModel("resources/ipo.xsd");
+// Schema schema = mod.getSchema();
+// SchemaComponentFactory fact = mod.getFactory();
+//
+// mod.startTransaction();
+// GlobalAttributeGroup gap = fact.createGlobalAttributeGroup();
+// schema.addAttributeGroup(gap);
+// gap.setName("myAttrGroup2");
+// LocalAttribute ga = fact.createLocalAttribute();
+// gap.addLocalAttribute(ga);
+// ga.setName("ga");
+// GlobalSimpleType gst = FindSchemaComponentFromDOM.find(
+// GlobalSimpleType.class, schema, "/schema/simpleType[@name='Sku']");
+// ga.setType(ga.createReferenceTo(gst, GlobalSimpleType.class));
+//
+// mod.endTransaction();
+//
+// String v = ((AbstractDocumentComponent)ga).getPeer().getAttribute("type");
+// assertEquals("ref should have prefix", "ipo:Sku", v);
+//
+// mod.startTransaction();
+// /*
+// <complexType name="myCT">
+// <sequence>
+// <simpleType name="productName" type="xsd:string"/>
+// <attributeGroup ref="ipo:myAttrGroup2"/>
+// </complexType>
+// */
+// GlobalComplexType gct = fact.createGlobalComplexType();
+// schema.addComplexType(gct);
+// gct.setName("myCT");
+// Sequence seq = Util.createSequence(mod, gct);
+// LocalElement le = Util.createLocalElement(mod, seq, "productName", 0);
+// le.setType(le.createReferenceTo(Util.getPrimitiveType("string"), GlobalSimpleType.class));
+//
+// AttributeGroupReference agr = fact.createAttributeGroupReference();
+// gct.addAttributeGroupReference(agr);
+// agr.setGroup(agr.createReferenceTo(gap, GlobalAttributeGroup.class));
+//
+// mod.endTransaction();
+//
+// v = ((AbstractDocumentComponent)agr).getPeer().getAttribute("ref");
+// assertEquals("ref should have prefix", "ipo:myAttrGroup2", v);
+// }
public void testSetAndGetID() throws Exception {
assertNull("id attribute is optional", schema.getId());
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/51ea9c01/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/CutPasteTest.java
----------------------------------------------------------------------
diff --git a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/CutPasteTest.java b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/CutPasteTest.java
index 0325a24..f4aae0a 100644
--- a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/CutPasteTest.java
+++ b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/CutPasteTest.java
@@ -113,65 +113,63 @@ public class CutPasteTest extends TestCase {
((NodeImpl)leti.getPeer()).getId()!=((NodeImpl)le2.getPeer()).getId());
}
- /**
- * testMultipleDnDAndUndo
- */
- public void testMultipleDnDAndUndo() throws Exception {
- SchemaModel model = Util.loadSchemaModel("resources/PO_copypasteundoSequence.xsd");
- UndoManager um = new UndoManager();
- model.addUndoableEditListener(um);
-
- Sequence seq = (Sequence)Util.findComponent(
- model.getSchema(),
- "/schema/complexType[@name='PurchaseOrderType']/sequence");
- assert(seq != null);
- LocalElement shipTo = (LocalElement)Util.findComponent(
- model.getSchema(),
- "/schema/complexType[@name='PurchaseOrderType']/" +
- "sequence/element[@name='shipTo']");
- assert(shipTo != null);
- ElementReference comment = (ElementReference)Util.findComponent(
- model.getSchema(),
- "/schema/complexType[@name='PurchaseOrderType']/" +
- "sequence/element[@ref='comment']");
- assert(comment != null);
-
- assertEquals(4, seq.getChildren().size());
- LocalElement copy_shipTo = (LocalElement) shipTo.copy(seq);
- model.startTransaction();
- seq.removeContent(shipTo);
- seq.addContent(copy_shipTo, 3);
- model.endTransaction();
- assertEquals(4, seq.getChildren().size());
-
- um.undo();
- assertEquals(4, seq.getChildren().size());
-
- seq = (Sequence)Util.findComponent(
- model.getSchema(),
- "/schema/complexType[@name='PurchaseOrderType']/sequence");
- assert(seq != null);
- shipTo = (LocalElement)Util.findComponent(
- model.getSchema(),
- "/schema/complexType[@name='PurchaseOrderType']/" +
- "sequence/element[@name='shipTo']");
- assert(shipTo != null);
- comment = (ElementReference)Util.findComponent(
- model.getSchema(),
- "/schema/complexType[@name='PurchaseOrderType']/" +
- "sequence/element[@ref='comment']");
- assert(comment != null);
-
- ElementReference copy_comment = (ElementReference) comment.copy(seq);
- model.startTransaction();
- seq.removeContent(comment);
- seq.addContent(copy_comment, 1);
- model.endTransaction();
- assertEquals(4, seq.getChildren().size());
-
- um.undo();
- assertEquals(4, seq.getChildren().size());
- }
+// Disabled as referenced files were partly not donated by oracle to apache
+// public void testMultipleDnDAndUndo() throws Exception {
+// SchemaModel model = Util.loadSchemaModel("resources/PO_copypasteundoSequence.xsd");
+// UndoManager um = new UndoManager();
+// model.addUndoableEditListener(um);
+//
+// Sequence seq = (Sequence)Util.findComponent(
+// model.getSchema(),
+// "/schema/complexType[@name='PurchaseOrderType']/sequence");
+// assert(seq != null);
+// LocalElement shipTo = (LocalElement)Util.findComponent(
+// model.getSchema(),
+// "/schema/complexType[@name='PurchaseOrderType']/" +
+// "sequence/element[@name='shipTo']");
+// assert(shipTo != null);
+// ElementReference comment = (ElementReference)Util.findComponent(
+// model.getSchema(),
+// "/schema/complexType[@name='PurchaseOrderType']/" +
+// "sequence/element[@ref='comment']");
+// assert(comment != null);
+//
+// assertEquals(4, seq.getChildren().size());
+// LocalElement copy_shipTo = (LocalElement) shipTo.copy(seq);
+// model.startTransaction();
+// seq.removeContent(shipTo);
+// seq.addContent(copy_shipTo, 3);
+// model.endTransaction();
+// assertEquals(4, seq.getChildren().size());
+//
+// um.undo();
+// assertEquals(4, seq.getChildren().size());
+//
+// seq = (Sequence)Util.findComponent(
+// model.getSchema(),
+// "/schema/complexType[@name='PurchaseOrderType']/sequence");
+// assert(seq != null);
+// shipTo = (LocalElement)Util.findComponent(
+// model.getSchema(),
+// "/schema/complexType[@name='PurchaseOrderType']/" +
+// "sequence/element[@name='shipTo']");
+// assert(shipTo != null);
+// comment = (ElementReference)Util.findComponent(
+// model.getSchema(),
+// "/schema/complexType[@name='PurchaseOrderType']/" +
+// "sequence/element[@ref='comment']");
+// assert(comment != null);
+//
+// ElementReference copy_comment = (ElementReference) comment.copy(seq);
+// model.startTransaction();
+// seq.removeContent(comment);
+// seq.addContent(copy_comment, 1);
+// model.endTransaction();
+// assertEquals(4, seq.getChildren().size());
+//
+// um.undo();
+// assertEquals(4, seq.getChildren().size());
+// }
private Document sd;
private SchemaModel model;
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/51ea9c01/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/SyncTest.java
----------------------------------------------------------------------
diff --git a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/SyncTest.java b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/SyncTest.java
index 039fba2..f77f530 100644
--- a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/SyncTest.java
+++ b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/SyncTest.java
@@ -532,27 +532,28 @@ public class SyncTest extends TestCase {
assertEquals(3, seqChildren.size());
}
- public void testUndoSequenceCopy() throws Exception {
- SchemaModel model = Util.loadSchemaModel("resources/PO_copypasteundoSequence.xsd");
- UndoManager um = new UndoManager();
- model.addUndoableEditListener(um);
-
- GlobalComplexType gct = (GlobalComplexType)Util.findComponent(
- model.getSchema(), "/schema/complexType[@name='Items']");
- Sequence seq1 = (Sequence) Util.findComponent(
- model.getSchema(), "/schema/complexType[@name='USAddress']/sequence");
- assertEquals(1, gct.getDefinition().getChildren().size());
- assertEquals(5, seq1.getChildren().size());
-
- Sequence seq2 = (Sequence) seq1.copy(gct);
- model.startTransaction();
- gct.setDefinition(seq2);
- model.endTransaction();
- assertEquals(5, gct.getDefinition().getChildren().size());
-
- um.undo();
- assertEquals(1, gct.getDefinition().getChildren().size());
- }
+// Disabled as referenced files were partly not donated by oracle to apache
+// public void testUndoSequenceCopy() throws Exception {
+// SchemaModel model = Util.loadSchemaModel("resources/PO_copypasteundoSequence.xsd");
+// UndoManager um = new UndoManager();
+// model.addUndoableEditListener(um);
+//
+// GlobalComplexType gct = (GlobalComplexType)Util.findComponent(
+// model.getSchema(), "/schema/complexType[@name='Items']");
+// Sequence seq1 = (Sequence) Util.findComponent(
+// model.getSchema(), "/schema/complexType[@name='USAddress']/sequence");
+// assertEquals(1, gct.getDefinition().getChildren().size());
+// assertEquals(5, seq1.getChildren().size());
+//
+// Sequence seq2 = (Sequence) seq1.copy(gct);
+// model.startTransaction();
+// gct.setDefinition(seq2);
+// model.endTransaction();
+// assertEquals(5, gct.getDefinition().getChildren().size());
+//
+// um.undo();
+// assertEquals(1, gct.getDefinition().getChildren().size());
+// }
public void testSyncAnnotationRemoveId() throws Exception {
SchemaModel model = Util.loadSchemaModel("resources/loanApplication_id.xsd");
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/51ea9c01/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/visitor/FindUsageVisitorTest.java
----------------------------------------------------------------------
diff --git a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/visitor/FindUsageVisitorTest.java b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/visitor/FindUsageVisitorTest.java
index df7001c..3352cb9 100644
--- a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/visitor/FindUsageVisitorTest.java
+++ b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/visitor/FindUsageVisitorTest.java
@@ -100,12 +100,13 @@ public class FindUsageVisitorTest extends TestCase {
return suite;
}
- public void testFindPath() throws Exception {
- setUp1();
- this.assertEquals(49, findUsageCountForItem(global_element));
- this.assertEquals(3, findUsageCountForItem(global_type));
- this.assertEquals(4, findUsageCountForItem(global_attribute_group));
- }
+// Disabled as referenced files were partly not donated by oracle to apache
+// public void testFindPath() throws Exception {
+// setUp1();
+// this.assertEquals(49, findUsageCountForItem(global_element));
+// this.assertEquals(3, findUsageCountForItem(global_type));
+// this.assertEquals(4, findUsageCountForItem(global_attribute_group));
+// }
public int findUsageCountForItem(NamedReferenceable<SchemaComponent> ref) {
long startTime = System.currentTimeMillis();
[06/24] incubator-netbeans git commit: [NETBEANS-54] Module review xsl
Posted by ma...@apache.org.
[NETBEANS-54] Module review xsl
- no external library
- checked Rat report; added testfiles to exclude list for rat
- skimmed through the module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/498cc4f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/498cc4f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/498cc4f6
Branch: refs/heads/master
Commit: 498cc4f6da83e0ae7af9ff1ce384c6841f59b87b
Parents: c7cc995
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Tue Oct 3 19:57:06 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:52 2017 +0200
----------------------------------------------------------------------
nbbuild/build.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/498cc4f6/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index c4f99a2..61679db 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1971,6 +1971,9 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="javafx2.project/src/org/netbeans/modules/javafx2/project/templates/**" /> <!--license would be visible when users edit the templates inside their IDE-->
<exclude name="utilities/test/unit/src/org/netbeans/modules/openfile/resources/recent_files/*" /> <!--test data-->
<exclude name="**/*.url" /> <!--no degree of creativity-->
+ <exclude name="spi.navigator/test/unit/src/org/netbeans/modules/navigator/resources/lastsel/file.lastsel_mime1" /> <!--empty file-->
+ <exclude name="xsl/src/org/netbeans/modules/xsl/resources/templates/stylesheet.xsl" /> <!-- Template for user - very limited degree of creativity -->
+ <exclude name="xsl/test/unit/src/org/netbeans/modules/xsl/utils/data/*" /> <!--test data-->
<exclude name="spi.navigator/test/unit/src/org/netbeans/modules/navigator/resources/lastsel/file.lastsel_mime1" /> <!--empty file-->
<exclude name="templates/src/org/netbeans/modules/templates/resources/userprop.txt" /> <!--no degree of creativity-->
<exclude name="api.search/test/unit/data/textFiles/utf8file.txt" /> <!--test data-->
[02/24] incubator-netbeans git commit: [NETBEANS-54] Module review
xml.retriever
Posted by ma...@apache.org.
[NETBEANS-54] Module review xml.retriever
- no external library
- checked Rat report; added license header to testfiles
- skimmed through the module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/c70e37a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/c70e37a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/c70e37a8
Branch: refs/heads/master
Commit: c70e37a8c3cf5b2b9c5cee1e1b526ed73c5bf82b
Parents: 0ff3498
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Tue Oct 3 19:07:59 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:15 2017 +0200
----------------------------------------------------------------------
.../xml/retriever/catalog/impl/catalog.xml | 20 +++++++++++++++++++
.../xml/retriever/catalog/impl/dummyFile.txt | 21 ++++++++++++++++++++
.../xml/retriever/catalog/model/catalog.xml | 20 +++++++++++++++++++
.../xml/retriever/catalog/model/empty.xml | 20 +++++++++++++++++++
4 files changed, 81 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c70e37a8/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/catalog.xml
----------------------------------------------------------------------
diff --git a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/catalog.xml b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/catalog.xml
index cc84b1e..70a7419 100644
--- a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/catalog.xml
+++ b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/catalog.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+ 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.
+
+-->
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
<system referencingFile="refFileAttr" systemId="sysIDAttr" uri="uriAttr" xprojectCatalogFileLocation="xprojCatRefAttr"/>
<nextCatalog catalog="catalogAttr"/>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c70e37a8/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/dummyFile.txt
----------------------------------------------------------------------
diff --git a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/dummyFile.txt b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/dummyFile.txt
index e69de29..b65e1da 100644
--- a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/dummyFile.txt
+++ b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/dummyFile.txt
@@ -0,0 +1,21 @@
+<!--
+
+ 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.
+
+-->
+Dummy File
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c70e37a8/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/catalog.xml
----------------------------------------------------------------------
diff --git a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/catalog.xml b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/catalog.xml
index cc84b1e..70a7419 100644
--- a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/catalog.xml
+++ b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/catalog.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+ 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.
+
+-->
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
<system referencingFile="refFileAttr" systemId="sysIDAttr" uri="uriAttr" xprojectCatalogFileLocation="xprojCatRefAttr"/>
<nextCatalog catalog="catalogAttr"/>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c70e37a8/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/empty.xml
----------------------------------------------------------------------
diff --git a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/empty.xml b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/empty.xml
index da480cf..82087b9 100644
--- a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/empty.xml
+++ b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/empty.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+ 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.
+
+-->
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
<system systemId="dummy/dummy" uri="file:/D:/workspace/release551/xml/retriever/build/test/unit/classes/org/netbeans/modules/xml/retriever/catalog/impl/dummyFile.txt"/>
</catalog>
[12/24] incubator-netbeans git commit: [NETBEANS-54] Module review
xml.text
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_tagAtStatOfLine.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_tagAtStatOfLine.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_tagAtStatOfLine.xml
index 17cf399..ce2aafb 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_tagAtStatOfLine.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_tagAtStatOfLine.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_withpreserve.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_withpreserve.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_withpreserve.xml
index 158eaa2..a433c86 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_withpreserve.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_withpreserve.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<root>
<node>
<nest xml:space="preserve"><child>Do not format</child><child>And do not format this</child></nest>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml
index ae45b83..5093417 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml
@@ -1,4 +1,24 @@
<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<root>
<
<A>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/00155f15/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml
----------------------------------------------------------------------
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml
index 50740e4..3d30c04 100644
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml
@@ -1,4 +1,24 @@
<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<company name="Sun Microsystems Inc.">
<employee ssn="xxx-xx-xxxx" id="123"
address="16 Network Circle"
[22/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.tools
Posted by ma...@apache.org.
[NETBEANS-54] Modules review xml.tools
- no external library
- checked Rat report: excluded test-data from rat (no IP value)
- skimmed through module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/ae66687c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/ae66687c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/ae66687c
Branch: refs/heads/master
Commit: ae66687ccf31d9860e02f18932d6d63107ffe206
Parents: ed10c5a
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Fri Oct 6 23:49:10 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:54 2017 +0200
----------------------------------------------------------------------
nbbuild/build.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ae66687c/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index b98d30f..a9a0c59 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1988,6 +1988,9 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.bpel" /> <!-- test data -->
<exclude name="xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/resources/*.dtd" /> <!-- test data -->
<exclude name="xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/resources/*.xml" /> <!-- test data -->
+ <exclude name="xml.tools/test/qa-functional/src/org/netbeans/modules/**/*.xml" /> <!-- test data -->
+ <exclude name="xml.tools/test/qa-functional/src/org/netbeans/modules/**/*.dtd" /> <!-- test data -->
+ <exclude name="xml.tools/test/qa-functional/src/org/netbeans/modules/**/*.txt" /> <!-- test data -->
<exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/DTDExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
<exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/XMLExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
<exclude name="xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/**/data/**" /> <!-- test data -->
[17/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.xam
Posted by ma...@apache.org.
[NETBEANS-54] Modules review xml.xam
- no external library
- checked Rat report: manually updated missed license header and added
missing headers
- skimmed through module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/188f2b59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/188f2b59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/188f2b59
Branch: refs/heads/master
Commit: 188f2b59859bca080a0b95b12820dae45505b130
Parents: b810589
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Thu Oct 5 21:18:47 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:53 2017 +0200
----------------------------------------------------------------------
xml.xam/apichanges.xml | 1 -
.../modules/xml/xam/dom/ReadOnlyAccessTest.java | 32 ++++++++++----------
.../modules/xml/xam/locator/api/dummyFile.txt | 18 +++++++++++
.../modules/xml/xam/resources/test1.xml | 20 ++++++++++++
4 files changed, 54 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/188f2b59/xml.xam/apichanges.xml
----------------------------------------------------------------------
diff --git a/xml.xam/apichanges.xml b/xml.xam/apichanges.xml
index 5040d62..f43409a 100644
--- a/xml.xam/apichanges.xml
+++ b/xml.xam/apichanges.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Search for CHANGEME in this document when copying and using it: -->
<!--
Licensed to the Apache Software Foundation (ASF) under one
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/188f2b59/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/dom/ReadOnlyAccessTest.java
----------------------------------------------------------------------
diff --git a/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/dom/ReadOnlyAccessTest.java b/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/dom/ReadOnlyAccessTest.java
index 3f1c08d..f6ead9d 100644
--- a/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/dom/ReadOnlyAccessTest.java
+++ b/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/dom/ReadOnlyAccessTest.java
@@ -49,58 +49,58 @@ public class ReadOnlyAccessTest extends TestCase {
public void testFindPosition() throws Exception {
TestModel2 model = Util.loadModel("resources/test1.xml");
- assertEquals(38 + lsl, model.getRootComponent().findPosition());
+ assertEquals(860 + lsl, model.getRootComponent().findPosition());
assertEquals(4, model.getRootComponent().getChildren().size());
TestComponent2 component = model.getRootComponent().getChildren().get(0);
assertEquals("a", component.getPeer().getLocalName());
- assertEquals(133 + lsl * 4, component.findPosition());
+ assertEquals(955 + lsl * 4, component.findPosition());
}
public void testFindPositionWithPrefix() throws Exception {
TestModel2 model = Util.loadModel("resources/test1.xml");
TestComponent2.B b = model.getRootComponent().getChildren(TestComponent2.B.class).get(0);
TestComponent2.Aa aa = b.getChildren(TestComponent2.Aa.class).get(0);
- assertEquals(206 + lsl * 6, aa.findPosition());
+ assertEquals(1028 + lsl * 6, aa.findPosition());
}
public void testFindPositionWithElementTagInAttr() throws Exception {
TestModel2 model = Util.loadModel("resources/test1.xml");
TestComponent2.C c = model.getRootComponent().getChildren(TestComponent2.C.class).get(0);
- assertEquals(245 + lsl * 8, c.findPosition());
+ assertEquals(1067 + lsl * 8, c.findPosition());
}
public void testFindElement() throws Exception {
TestModel2 model = Util.loadModel("resources/test1.xml");
TestComponent2 component = model.getRootComponent().getChildren().get(0);
- assertEquals(component, model.findComponent(133 + lsl * 4));
- assertEquals(component, model.findComponent(147 + lsl * 4));
- assertEquals(component, model.findComponent(161 + lsl * 5));
+ assertEquals(component, model.findComponent(955 + lsl * 4));
+ assertEquals(component, model.findComponent(969 + lsl * 4));
+ assertEquals(component, model.findComponent(983 + lsl * 5));
}
public void testFindElementWithPrefix() throws Exception {
TestModel2 model = Util.loadModel("resources/test1.xml");
TestComponent2.B b = model.getRootComponent().getChildren(TestComponent2.B.class).get(0);
TestComponent2.Aa aa = b.getChildren(TestComponent2.Aa.class).get(0);
- assertEquals(aa, model.findComponent(206 + lsl * 6));
- assertEquals(aa, model.findComponent(218 + lsl * 6));
- assertEquals(aa, model.findComponent(232 + lsl * 6));
+ assertEquals(aa, model.findComponent(1028 + lsl * 6));
+ assertEquals(aa, model.findComponent(1040 + lsl * 6));
+ assertEquals(aa, model.findComponent(1054 + lsl * 6));
}
public void testFindElementWithTagInAttr() throws Exception {
TestModel2 model = Util.loadModel("resources/test1.xml");
TestComponent2.C c = model.getRootComponent().getChildren(TestComponent2.C.class).get(0);
- assertEquals(c, model.findComponent(245 + lsl * 8));
- assertEquals(c, model.findComponent(249 + lsl * 8));
- assertEquals(c, model.findComponent(261 + lsl * 8));
+ assertEquals(c, model.findComponent(1067 + lsl * 8));
+ assertEquals(c, model.findComponent(1071 + lsl * 8));
+ assertEquals(c, model.findComponent(1083 + lsl * 8));
}
public void testFindElementGivenTextPosition() throws Exception {
TestModel2 model = Util.loadModel("resources/test1.xml");
TestComponent2 root = model.getRootComponent();
TestComponent2.B b = root.getChildren(TestComponent2.B.class).get(0);
- assertEquals(b, model.findComponent(201 + lsl * 5));
- assertEquals(root, model.findComponent(244 + lsl * 8));
- assertEquals(root, model.findComponent(265 + lsl * 9));
+ assertEquals(b, model.findComponent(1023 + lsl * 5));
+ assertEquals(root, model.findComponent(1066 + lsl * 8));
+ assertEquals(root, model.findComponent(1087 + lsl * 9));
}
public void testGetXmlFragment() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/188f2b59/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/locator/api/dummyFile.txt
----------------------------------------------------------------------
diff --git a/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/locator/api/dummyFile.txt b/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/locator/api/dummyFile.txt
index e69de29..d0d4024 100644
--- a/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/locator/api/dummyFile.txt
+++ b/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/locator/api/dummyFile.txt
@@ -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.
+
+Dummy file
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/188f2b59/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/resources/test1.xml
----------------------------------------------------------------------
diff --git a/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/resources/test1.xml b/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/resources/test1.xml
index 55d5f12..ef93eb7 100644
--- a/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/resources/test1.xml
+++ b/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/resources/test1.xml
@@ -1,4 +1,24 @@
<?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.
+
+-->
<test xmlns="http://www.test.com/TestModel"
xmlns:t2="http://www.test2.com/TestModel"
>
[07/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.catalog
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/datatypes.dtd
----------------------------------------------------------------------
diff --git a/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/datatypes.dtd b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/datatypes.dtd
new file mode 100644
index 0000000..130bc89
--- /dev/null
+++ b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/datatypes.dtd
@@ -0,0 +1,250 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- Added license header
+
+-->
+<!--
+ DTD for XML Schemas: Part 2: Datatypes
+ $Id$
+ Note this DTD is NOT normative, or even definitive. - - the
+ prose copy in the datatypes REC is the definitive version
+ (which shouldn't differ from this one except for this comment
+ and entity expansions, but just in case)
+ -->
+
+<!--
+ This DTD cannot be used on its own, it is intended
+ only for incorporation in XMLSchema.dtd, q.v.
+ -->
+
+<!-- Define all the element names, with optional prefix -->
+<!ENTITY % simpleType "%p;simpleType">
+<!ENTITY % restriction "%p;restriction">
+<!ENTITY % list "%p;list">
+<!ENTITY % union "%p;union">
+<!ENTITY % maxExclusive "%p;maxExclusive">
+<!ENTITY % minExclusive "%p;minExclusive">
+<!ENTITY % maxInclusive "%p;maxInclusive">
+<!ENTITY % minInclusive "%p;minInclusive">
+<!ENTITY % totalDigits "%p;totalDigits">
+<!ENTITY % fractionDigits "%p;fractionDigits">
+<!ENTITY % length "%p;length">
+<!ENTITY % minLength "%p;minLength">
+<!ENTITY % maxLength "%p;maxLength">
+<!ENTITY % enumeration "%p;enumeration">
+<!ENTITY % whiteSpace "%p;whiteSpace">
+<!ENTITY % pattern "%p;pattern">
+
+<!--
+ Customisation entities for the ATTLIST of each element
+ type. Define one of these if your schema takes advantage
+ of the anyAttribute='##other' in the schema for schemas
+ -->
+
+<!ENTITY % simpleTypeAttrs "">
+<!ENTITY % restrictionAttrs "">
+<!ENTITY % listAttrs "">
+<!ENTITY % unionAttrs "">
+<!ENTITY % maxExclusiveAttrs "">
+<!ENTITY % minExclusiveAttrs "">
+<!ENTITY % maxInclusiveAttrs "">
+<!ENTITY % minInclusiveAttrs "">
+<!ENTITY % totalDigitsAttrs "">
+<!ENTITY % fractionDigitsAttrs "">
+<!ENTITY % lengthAttrs "">
+<!ENTITY % minLengthAttrs "">
+<!ENTITY % maxLengthAttrs "">
+<!ENTITY % enumerationAttrs "">
+<!ENTITY % whiteSpaceAttrs "">
+<!ENTITY % patternAttrs "">
+
+<!-- Define some entities for informative use as attribute
+ types -->
+<!ENTITY % URIref "CDATA">
+<!ENTITY % XPathExpr "CDATA">
+<!ENTITY % QName "NMTOKEN">
+<!ENTITY % QNames "NMTOKENS">
+<!ENTITY % NCName "NMTOKEN">
+<!ENTITY % nonNegativeInteger "NMTOKEN">
+<!ENTITY % boolean "(true|false)">
+<!ENTITY % simpleDerivationSet "CDATA">
+<!--
+ #all or space-separated list drawn from derivationChoice
+ -->
+
+<!--
+ Note that the use of 'facet' below is less restrictive
+ than is really intended: There should in fact be no
+ more than one of each of minInclusive, minExclusive,
+ maxInclusive, maxExclusive, totalDigits, fractionDigits,
+ length, maxLength, minLength within datatype,
+ and the min- and max- variants of Inclusive and Exclusive
+ are mutually exclusive. On the other hand, pattern and
+ enumeration may repeat.
+ -->
+<!ENTITY % minBound "(%minInclusive; | %minExclusive;)">
+<!ENTITY % maxBound "(%maxInclusive; | %maxExclusive;)">
+<!ENTITY % bounds "%minBound; | %maxBound;">
+<!ENTITY % numeric "%totalDigits; | %fractionDigits;">
+<!ENTITY % ordered "%bounds; | %numeric;">
+<!ENTITY % unordered
+ "%pattern; | %enumeration; | %whiteSpace; | %length; |
+ %maxLength; | %minLength;">
+<!ENTITY % facet "%ordered; | %unordered;">
+<!ENTITY % facetAttr
+ "value CDATA #REQUIRED
+ id ID #IMPLIED">
+<!ENTITY % fixedAttr "fixed %boolean; #IMPLIED">
+<!ENTITY % facetModel "(%annotation;)?">
+<!ELEMENT %simpleType;
+ ((%annotation;)?, (%restriction; | %list; | %union;))>
+<!ATTLIST %simpleType;
+ name %NCName; #IMPLIED
+ final %simpleDerivationSet; #IMPLIED
+ id ID #IMPLIED
+ %simpleTypeAttrs;>
+<!-- name is required at top level -->
+<!ELEMENT %restriction; ((%annotation;)?,
+ (%restriction1; |
+ ((%simpleType;)?,(%facet;)*)),
+ (%attrDecls;))>
+<!ATTLIST %restriction;
+ base %QName; #IMPLIED
+ id ID #IMPLIED
+ %restrictionAttrs;>
+<!--
+ base and simpleType child are mutually exclusive,
+ one is required.
+
+ restriction is shared between simpleType and
+ simpleContent and complexContent (in XMLSchema.xsd).
+ restriction1 is for the latter cases, when this
+ is restricting a complex type, as is attrDecls.
+ -->
+<!ELEMENT %list; ((%annotation;)?,(%simpleType;)?)>
+<!ATTLIST %list;
+ itemType %QName; #IMPLIED
+ id ID #IMPLIED
+ %listAttrs;>
+<!--
+ itemType and simpleType child are mutually exclusive,
+ one is required
+ -->
+<!ELEMENT %union; ((%annotation;)?,(%simpleType;)*)>
+<!ATTLIST %union;
+ id ID #IMPLIED
+ memberTypes %QNames; #IMPLIED
+ %unionAttrs;>
+<!--
+ At least one item in memberTypes or one simpleType
+ child is required
+ -->
+
+<!ELEMENT %maxExclusive; %facetModel;>
+<!ATTLIST %maxExclusive;
+ %facetAttr;
+ %fixedAttr;
+ %maxExclusiveAttrs;>
+<!ELEMENT %minExclusive; %facetModel;>
+<!ATTLIST %minExclusive;
+ %facetAttr;
+ %fixedAttr;
+ %minExclusiveAttrs;>
+
+<!ELEMENT %maxInclusive; %facetModel;>
+<!ATTLIST %maxInclusive;
+ %facetAttr;
+ %fixedAttr;
+ %maxInclusiveAttrs;>
+<!ELEMENT %minInclusive; %facetModel;>
+<!ATTLIST %minInclusive;
+ %facetAttr;
+ %fixedAttr;
+ %minInclusiveAttrs;>
+
+<!ELEMENT %totalDigits; %facetModel;>
+<!ATTLIST %totalDigits;
+ %facetAttr;
+ %fixedAttr;
+ %totalDigitsAttrs;>
+<!ELEMENT %fractionDigits; %facetModel;>
+<!ATTLIST %fractionDigits;
+ %facetAttr;
+ %fixedAttr;
+ %fractionDigitsAttrs;>
+
+<!ELEMENT %length; %facetModel;>
+<!ATTLIST %length;
+ %facetAttr;
+ %fixedAttr;
+ %lengthAttrs;>
+<!ELEMENT %minLength; %facetModel;>
+<!ATTLIST %minLength;
+ %facetAttr;
+ %fixedAttr;
+ %minLengthAttrs;>
+<!ELEMENT %maxLength; %facetModel;>
+<!ATTLIST %maxLength;
+ %facetAttr;
+ %fixedAttr;
+ %maxLengthAttrs;>
+
+<!-- This one can be repeated -->
+<!ELEMENT %enumeration; %facetModel;>
+<!ATTLIST %enumeration;
+ %facetAttr;
+ %enumerationAttrs;>
+
+<!ELEMENT %whiteSpace; %facetModel;>
+<!ATTLIST %whiteSpace;
+ %facetAttr;
+ %fixedAttr;
+ %whiteSpaceAttrs;>
+
+<!-- This one can be repeated -->
+<!ELEMENT %pattern; %facetModel;>
+<!ATTLIST %pattern;
+ %facetAttr;
+ %patternAttrs;>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/test/qa-functional/data/Catalog/OASISCatalog.xml
----------------------------------------------------------------------
diff --git a/xml.catalog/test/qa-functional/data/Catalog/OASISCatalog.xml b/xml.catalog/test/qa-functional/data/Catalog/OASISCatalog.xml
index a75b935..bb38151 100644
--- a/xml.catalog/test/qa-functional/data/Catalog/OASISCatalog.xml
+++ b/xml.catalog/test/qa-functional/data/Catalog/OASISCatalog.xml
@@ -1,3 +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.
+
+-->
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<public publicId="public ID"
uri="xmlcatdtd.dtd"/>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/test/qa-functional/data/Catalog/catalog.dtd
----------------------------------------------------------------------
diff --git a/xml.catalog/test/qa-functional/data/Catalog/catalog.dtd b/xml.catalog/test/qa-functional/data/Catalog/catalog.dtd
index ac5c6a7..a0326d3 100644
--- a/xml.catalog/test/qa-functional/data/Catalog/catalog.dtd
+++ b/xml.catalog/test/qa-functional/data/Catalog/catalog.dtd
@@ -1,4 +1,34 @@
-<!-- -->
+<!--
+
+Copyright � 2000, 2001 The Organization for the Advancement of Structured
+Information Standards [OASIS]. All Rights Reserved.
+
+This document and translations of it may be copied and furnished to others, and
+derivative works that comment on or otherwise explain it or assist in its
+implementation may be prepared, copied, published and distributed, in whole or
+in part, without restriction of any kind, provided that the above copyright
+notice and this paragraph are included on all such copies and derivative works.
+However, this document itself may not be modified in any way, such as by
+removing the copyright notice or references to OASIS, except as needed for the
+purpose of developing OASIS specifications, in which case the procedures for
+copyrights defined in the OASIS Intellectual Property Rights document must be
+followed, or as required to translate it into languages other than English.
+
+The limited permissions granted above are perpetual and will not be revoked by
+OASIS or its successors or assigns.
+
+This document and the information contained herein is provided on an "AS IS"
+basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE
+ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A
+PARTICULAR PURPOSE.
+
+Original XSD can be found here:
+https://www.oasis-open.org/committees/entity/spec-2001-08-06.html
+
+-->
+
+<!-- $Id: catalog.dtd,v 1.9 2001/06/12 14:26:00 ndw Exp $ -->
<!ENTITY % pubIdChars "CDATA">
<!ENTITY % publicIdentifier "%pubIdChars;">
@@ -23,127 +53,95 @@
<!ENTITY % nextCatalog "%p;nextCatalog">
<!ENTITY % group "%p;group">
-<!ENTITY % local.catalog.mix "">
<!ENTITY % local.catalog.attribs "">
<!ELEMENT %catalog; (%public;|%system;|%uri;
|%rewriteSystem;|%rewriteURI;
|%delegatePublic;|%delegateSystem;|%delegateURI;
- |%nextCatalog;|%group; %local.catalog.mix;)+>
+ |%nextCatalog;|%group;)+>
<!ATTLIST %catalog;
- %nsdecl; %uriReference; #FIXED
- 'urn:oasis:names:tc:entity:xmlns:xml:catalog'
- prefer %systemOrPublic; #IMPLIED
- xml:base %uriReference; #IMPLIED
- %local.catalog.attribs;
+ %nsdecl; %uriReference; #FIXED
+ 'urn:oasis:names:tc:entity:xmlns:xml:catalog'
+ prefer %systemOrPublic; #IMPLIED
+ xml:base %uriReference; #IMPLIED
+ %local.catalog.attribs;
>
-<!ENTITY % local.public.attribs "">
-
<!ELEMENT %public; EMPTY>
<!ATTLIST %public;
- id ID #IMPLIED
- publicId %publicIdentifier; #REQUIRED
- uri %uriReference; #REQUIRED
- xml:base %uriReference; #IMPLIED
- %local.public.attribs;
+ id ID #IMPLIED
+ publicId %publicIdentifier; #REQUIRED
+ uri %uriReference; #REQUIRED
+ xml:base %uriReference; #IMPLIED
>
-<!ENTITY % local.system.attribs "">
-
<!ELEMENT %system; EMPTY>
<!ATTLIST %system;
- id ID #IMPLIED
- systemId %string; #REQUIRED
- uri %uriReference; #REQUIRED
- xml:base %uriReference; #IMPLIED
- %local.system.attribs;
+ id ID #IMPLIED
+ systemId %string; #REQUIRED
+ uri %uriReference; #REQUIRED
+ xml:base %uriReference; #IMPLIED
>
-<!ENTITY % local.uri.attribs "">
-
<!ELEMENT %uri; EMPTY>
<!ATTLIST %uri;
- id ID #IMPLIED
- name %string; #REQUIRED
- uri %uriReference; #REQUIRED
- xml:base %uriReference; #IMPLIED
- %local.uri.attribs;
+ id ID #IMPLIED
+ name %string; #REQUIRED
+ uri %uriReference; #REQUIRED
+ xml:base %uriReference; #IMPLIED
>
-<!ENTITY % local.rewriteSystem.attribs "">
-
<!ELEMENT %rewriteSystem; EMPTY>
<!ATTLIST %rewriteSystem;
- id ID #IMPLIED
- systemIdStartString %string; #REQUIRED
- rewritePrefix %string; #REQUIRED
- %local.rewriteSystem.attribs;
+ id ID #IMPLIED
+ systemIdStartString %string; #REQUIRED
+ rewritePrefix %string; #REQUIRED
>
-<!ENTITY % local.rewriteURI.attribs "">
-
<!ELEMENT %rewriteURI; EMPTY>
<!ATTLIST %rewriteURI;
- id ID #IMPLIED
- uriStartString %string; #REQUIRED
- rewritePrefix %string; #REQUIRED
- %local.rewriteURI.attribs;
+ id ID #IMPLIED
+ uriStartString %string; #REQUIRED
+ rewritePrefix %string; #REQUIRED
>
-<!ENTITY % local.delegatePublic.attribs "">
-
<!ELEMENT %delegatePublic; EMPTY>
<!ATTLIST %delegatePublic;
- id ID #IMPLIED
- publicIdStartString %partialPublicIdentifier; #REQUIRED
- catalog %uriReference; #REQUIRED
- xml:base %uriReference; #IMPLIED
- %local.delegatePublic.attribs;
+ id ID #IMPLIED
+ publicIdStartString %partialPublicIdentifier; #REQUIRED
+ catalog %uriReference; #REQUIRED
+ xml:base %uriReference; #IMPLIED
>
-<!ENTITY % local.delegateSystem.attribs "">
-
<!ELEMENT %delegateSystem; EMPTY>
<!ATTLIST %delegateSystem;
- id ID #IMPLIED
- systemIdStartString %string; #REQUIRED
- catalog %uriReference; #REQUIRED
- xml:base %uriReference; #IMPLIED
- %local.delegateSystem.attribs;
+ id ID #IMPLIED
+ systemIdStartString %string; #REQUIRED
+ catalog %uriReference; #REQUIRED
+ xml:base %uriReference; #IMPLIED
>
-<!ENTITY % local.delegateURI.attribs "">
-
<!ELEMENT %delegateURI; EMPTY>
<!ATTLIST %delegateURI;
- id ID #IMPLIED
- uriStartString %string; #REQUIRED
- catalog %uriReference; #REQUIRED
- xml:base %uriReference; #IMPLIED
- %local.delegateURI.attribs;
+ id ID #IMPLIED
+ uriStartString %string; #REQUIRED
+ catalog %uriReference; #REQUIRED
+ xml:base %uriReference; #IMPLIED
>
-<!ENTITY % local.nextCatalog.attribs "">
-
<!ELEMENT %nextCatalog; EMPTY>
<!ATTLIST %nextCatalog;
- id ID #IMPLIED
- catalog %uriReference; #REQUIRED
- xml:base %uriReference; #IMPLIED
- %local.nextCatalog.attribs;
+ id ID #IMPLIED
+ catalog %uriReference; #REQUIRED
+ xml:base %uriReference; #IMPLIED
>
-<!ENTITY % local.group.mix "">
-<!ENTITY % local.group.attribs "">
-
<!ELEMENT %group; (%public;|%system;|%uri;
|%rewriteSystem;|%rewriteURI;
|%delegatePublic;|%delegateSystem;|%delegateURI;
- |%nextCatalog; %local.group.mix;)+>
+ |%nextCatalog;)+>
<!ATTLIST %group;
- id ID #IMPLIED
- prefer %systemOrPublic; #IMPLIED
- xml:base %uriReference; #IMPLIED
- %local.group.attribs;
->
+ id ID #IMPLIED
+ prefer %systemOrPublic; #IMPLIED
+ xml:base %uriReference; #IMPLIED
+>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/test/qa-functional/data/Catalog/catalog.xsd
----------------------------------------------------------------------
diff --git a/xml.catalog/test/qa-functional/data/Catalog/catalog.xsd b/xml.catalog/test/qa-functional/data/Catalog/catalog.xsd
index a987e3c..3c6974d 100644
--- a/xml.catalog/test/qa-functional/data/Catalog/catalog.xsd
+++ b/xml.catalog/test/qa-functional/data/Catalog/catalog.xsd
@@ -1,22 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Copyright � 2000, 2001 The Organization for the Advancement of Structured
+Information Standards [OASIS]. All Rights Reserved.
+
+This document and translations of it may be copied and furnished to others, and
+derivative works that comment on or otherwise explain it or assist in its
+implementation may be prepared, copied, published and distributed, in whole or
+in part, without restriction of any kind, provided that the above copyright
+notice and this paragraph are included on all such copies and derivative works.
+However, this document itself may not be modified in any way, such as by
+removing the copyright notice or references to OASIS, except as needed for the
+purpose of developing OASIS specifications, in which case the procedures for
+copyrights defined in the OASIS Intellectual Property Rights document must be
+followed, or as required to translate it into languages other than English.
+
+The limited permissions granted above are perpetual and will not be revoked by
+OASIS or its successors or assigns.
+
+This document and the information contained herein is provided on an "AS IS"
+basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE
+ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A
+PARTICULAR PURPOSE.
+
+Original XSD can be found here:
+https://www.oasis-open.org/committees/entity/spec-2001-08-06.html
+
+-->
+<!DOCTYPE xs:schema SYSTEM "http://www.w3.org/2001/XMLSchema.dtd" [
+<!ENTITY % schemaAttrs "
+ xmlns:er CDATA #IMPLIED
+">
+]>
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
xmlns:er='urn:oasis:names:tc:entity:xmlns:xml:catalog'
targetNamespace='urn:oasis:names:tc:entity:xmlns:xml:catalog'
elementFormDefault='qualified'>
- <!-- -->
+ <!-- $Id: catalog.xsd,v 1.9 2001/07/30 19:40:04 ndw Exp $ -->
<xs:simpleType name='pubIdChars'>
<!-- A string of the characters defined as pubIdChar in production 13
- of the Second Edition of the XML 1.0 Recommendation. Does not include
- the whitespace characters because they're normalized by XML parsing. -->
- <xs:restriction base='xs:string'>
- <xs:pattern value="[a-zA-Z0-9-'()+,./:=?;!*#@$_%]*"/>
- </xs:restriction>
+ of the Second Edition of the XML 1.0 Recommendation -->
+ <xs:restriction base='xs:string'/>
</xs:simpleType>
<xs:simpleType name='publicIdentifier'>
- <xs:restriction base='er:pubIdChars'/>
+ <xs:restriction base='xs:string'/>
</xs:simpleType>
<xs:simpleType name='partialPublicIdentifier'>
@@ -193,4 +224,4 @@
<xs:element name="nextCatalog" type="er:nextCatalog"/>
<xs:element name="group" type="er:group"/>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/a space/empty.dtd
----------------------------------------------------------------------
diff --git a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/a space/empty.dtd b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/a space/empty.dtd
index e126f84..7a6f992 100644
--- a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/a space/empty.dtd
+++ b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/a space/empty.dtd
@@ -1 +1,21 @@
+<!--
+
+ 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.
+
+-->
<!-- EMPTY -->
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/catalog.xml
----------------------------------------------------------------------
diff --git a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/catalog.xml b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/catalog.xml
index f2b88e2..4e72c01 100644
--- a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/catalog.xml
+++ b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/catalog.xml
@@ -1,5 +1,24 @@
<?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.
+
+-->
<!--
Tests treating of spaces in catalog paths.
Three URL space syntaxes are supported:
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/empty.dtd
----------------------------------------------------------------------
diff --git a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/empty.dtd b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/empty.dtd
index e126f84..7a6f992 100644
--- a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/empty.dtd
+++ b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/empty.dtd
@@ -1 +1,21 @@
+<!--
+
+ 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.
+
+-->
<!-- EMPTY -->
[08/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.catalog
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bce3d247/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.xsd
----------------------------------------------------------------------
diff --git a/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.xsd b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.xsd
new file mode 100644
index 0000000..fbb0c44
--- /dev/null
+++ b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.xsd
@@ -0,0 +1,2581 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- Added license header
+
+-->
+<!-- XML Schema schema for XML Schemas: Part 1: Structures -->
+<!-- Note this schema is NOT the normative structures schema. -->
+<!-- The prose copy in the structures REC is the normative -->
+<!-- version (which shouldn't differ from this one except for -->
+<!-- this comment and entity expansions, but just in case -->
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" [
+
+<!-- provide ID type information even for parsers which only read the
+ internal subset -->
+<!ATTLIST xs:schema id ID #IMPLIED>
+<!ATTLIST xs:complexType id ID #IMPLIED>
+<!ATTLIST xs:complexContent id ID #IMPLIED>
+<!ATTLIST xs:simpleContent id ID #IMPLIED>
+<!ATTLIST xs:extension id ID #IMPLIED>
+<!ATTLIST xs:element id ID #IMPLIED>
+<!ATTLIST xs:group id ID #IMPLIED>
+<!ATTLIST xs:all id ID #IMPLIED>
+<!ATTLIST xs:choice id ID #IMPLIED>
+<!ATTLIST xs:sequence id ID #IMPLIED>
+<!ATTLIST xs:any id ID #IMPLIED>
+<!ATTLIST xs:anyAttribute id ID #IMPLIED>
+<!ATTLIST xs:attribute id ID #IMPLIED>
+<!ATTLIST xs:attributeGroup id ID #IMPLIED>
+<!ATTLIST xs:unique id ID #IMPLIED>
+<!ATTLIST xs:key id ID #IMPLIED>
+<!ATTLIST xs:keyref id ID #IMPLIED>
+<!ATTLIST xs:selector id ID #IMPLIED>
+<!ATTLIST xs:field id ID #IMPLIED>
+<!ATTLIST xs:include id ID #IMPLIED>
+<!ATTLIST xs:import id ID #IMPLIED>
+<!ATTLIST xs:redefine id ID #IMPLIED>
+<!ATTLIST xs:notation id ID #IMPLIED>
+<!--
+ keep this schema XML1.0 DTD valid
+ -->
+ <!ENTITY % schemaAttrs 'xmlns:hfp CDATA #IMPLIED'>
+
+ <!ELEMENT hfp:hasFacet EMPTY>
+ <!ATTLIST hfp:hasFacet
+ name NMTOKEN #REQUIRED>
+
+ <!ELEMENT hfp:hasProperty EMPTY>
+ <!ATTLIST hfp:hasProperty
+ name NMTOKEN #REQUIRED
+ value CDATA #REQUIRED>
+<!--
+ Make sure that processors that do not read the external
+ subset will know about the various IDs we declare
+ -->
+ <!ATTLIST xs:simpleType id ID #IMPLIED>
+ <!ATTLIST xs:maxExclusive id ID #IMPLIED>
+ <!ATTLIST xs:minExclusive id ID #IMPLIED>
+ <!ATTLIST xs:maxInclusive id ID #IMPLIED>
+ <!ATTLIST xs:minInclusive id ID #IMPLIED>
+ <!ATTLIST xs:totalDigits id ID #IMPLIED>
+ <!ATTLIST xs:fractionDigits id ID #IMPLIED>
+ <!ATTLIST xs:length id ID #IMPLIED>
+ <!ATTLIST xs:minLength id ID #IMPLIED>
+ <!ATTLIST xs:maxLength id ID #IMPLIED>
+ <!ATTLIST xs:enumeration id ID #IMPLIED>
+ <!ATTLIST xs:pattern id ID #IMPLIED>
+ <!ATTLIST xs:appinfo id ID #IMPLIED>
+ <!ATTLIST xs:documentation id ID #IMPLIED>
+ <!ATTLIST xs:list id ID #IMPLIED>
+ <!ATTLIST xs:union id ID #IMPLIED>
+ ]>
+<xs:schema targetNamespace="http://www.w3.org/2001/XMLSchema" blockDefault="#all" elementFormDefault="qualified" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="EN" xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty">
+ <xs:annotation>
+ <xs:documentation>
+ Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp
+ Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/2004/PER-xmlschema-1-20040318/structures.html">
+ The schema corresponding to this document is normative,
+ with respect to the syntactic constraints it expresses in the
+ XML Schema language. The documentation (within <documentation> elements)
+ below, is not normative, but rather highlights important aspects of
+ the W3C Recommendation of which this is a part</xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+ <xs:documentation>
+ The simpleType element and all of its members are defined
+ towards the end of this schema document</xs:documentation>
+ </xs:annotation>
+
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd">
+ <xs:annotation>
+ <xs:documentation>
+ Get access to the xml: attribute groups for xml:lang
+ as declared on 'schema' and 'documentation' below
+ </xs:documentation>
+ </xs:annotation>
+ </xs:import>
+
+ <xs:complexType name="openAttrs">
+ <xs:annotation>
+ <xs:documentation>
+ This type is extended by almost all schema types
+ to allow attributes from other namespaces to be
+ added to user schemas.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:restriction base="xs:anyType">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="annotated">
+ <xs:annotation>
+ <xs:documentation>
+ This type is extended by all types which allow annotation
+ other than <schema> itself
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="xs:openAttrs">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:ID"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:group name="schemaTop">
+ <xs:annotation>
+ <xs:documentation>
+ This group is for the
+ elements which occur freely at the top level of schemas.
+ All of their types are based on the "annotated" type by extension.</xs:documentation>
+ </xs:annotation>
+ <xs:choice>
+ <xs:group ref="xs:redefinable"/>
+ <xs:element ref="xs:element"/>
+ <xs:element ref="xs:attribute"/>
+ <xs:element ref="xs:notation"/>
+ </xs:choice>
+ </xs:group>
+
+ <xs:group name="redefinable">
+ <xs:annotation>
+ <xs:documentation>
+ This group is for the
+ elements which can self-redefine (see <redefine> below).</xs:documentation>
+ </xs:annotation>
+ <xs:choice>
+ <xs:element ref="xs:simpleType"/>
+ <xs:element ref="xs:complexType"/>
+ <xs:element ref="xs:group"/>
+ <xs:element ref="xs:attributeGroup"/>
+ </xs:choice>
+ </xs:group>
+
+ <xs:simpleType name="formChoice">
+ <xs:annotation>
+ <xs:documentation>
+ A utility type, not for public use</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="qualified"/>
+ <xs:enumeration value="unqualified"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="reducedDerivationControl">
+ <xs:annotation>
+ <xs:documentation>
+ A utility type, not for public use</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:derivationControl">
+ <xs:enumeration value="extension"/>
+ <xs:enumeration value="restriction"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="derivationSet">
+ <xs:annotation>
+ <xs:documentation>
+ A utility type, not for public use</xs:documentation>
+ <xs:documentation>
+ #all or (possibly empty) subset of {extension, restriction}</xs:documentation>
+ </xs:annotation>
+ <xs:union>
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="#all"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType>
+ <xs:list itemType="xs:reducedDerivationControl"/>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+
+ <xs:simpleType name="typeDerivationControl">
+ <xs:annotation>
+ <xs:documentation>
+ A utility type, not for public use</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:derivationControl">
+ <xs:enumeration value="extension"/>
+ <xs:enumeration value="restriction"/>
+ <xs:enumeration value="list"/>
+ <xs:enumeration value="union"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="fullDerivationSet">
+ <xs:annotation>
+ <xs:documentation>
+ A utility type, not for public use</xs:documentation>
+ <xs:documentation>
+ #all or (possibly empty) subset of {extension, restriction, list, union}</xs:documentation>
+ </xs:annotation>
+ <xs:union>
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="#all"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType>
+ <xs:list itemType="xs:typeDerivationControl"/>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+
+ <xs:element name="schema" id="schema">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-schema"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:openAttrs">
+ <xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="xs:include"/>
+ <xs:element ref="xs:import"/>
+ <xs:element ref="xs:redefine"/>
+ <xs:element ref="xs:annotation"/>
+ </xs:choice>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:group ref="xs:schemaTop"/>
+ <xs:element ref="xs:annotation" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:sequence>
+ <xs:attribute name="targetNamespace" type="xs:anyURI"/>
+ <xs:attribute name="version" type="xs:token"/>
+ <xs:attribute name="finalDefault" type="xs:fullDerivationSet" use="optional" default=""/>
+ <xs:attribute name="blockDefault" type="xs:blockSet" use="optional" default=""/>
+ <xs:attribute name="attributeFormDefault" type="xs:formChoice" use="optional" default="unqualified"/>
+ <xs:attribute name="elementFormDefault" type="xs:formChoice" use="optional" default="unqualified"/>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute ref="xml:lang"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:key name="element">
+ <xs:selector xpath="xs:element"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+
+ <xs:key name="attribute">
+ <xs:selector xpath="xs:attribute"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+
+ <xs:key name="type">
+ <xs:selector xpath="xs:complexType|xs:simpleType"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+
+ <xs:key name="group">
+ <xs:selector xpath="xs:group"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+
+ <xs:key name="attributeGroup">
+ <xs:selector xpath="xs:attributeGroup"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+
+ <xs:key name="notation">
+ <xs:selector xpath="xs:notation"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+
+ <xs:key name="identityConstraint">
+ <xs:selector xpath=".//xs:key|.//xs:unique|.//xs:keyref"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+
+ </xs:element>
+
+ <xs:simpleType name="allNNI">
+ <xs:annotation><xs:documentation>
+ for maxOccurs</xs:documentation></xs:annotation>
+ <xs:union memberTypes="xs:nonNegativeInteger">
+ <xs:simpleType>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="unbounded"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+
+ <xs:attributeGroup name="occurs">
+ <xs:annotation><xs:documentation>
+ for all particles</xs:documentation></xs:annotation>
+ <xs:attribute name="minOccurs" type="xs:nonNegativeInteger" use="optional" default="1"/>
+ <xs:attribute name="maxOccurs" type="xs:allNNI" use="optional" default="1"/>
+ </xs:attributeGroup>
+
+ <xs:attributeGroup name="defRef">
+ <xs:annotation><xs:documentation>
+ for element, group and attributeGroup,
+ which both define and reference</xs:documentation></xs:annotation>
+ <xs:attribute name="name" type="xs:NCName"/>
+ <xs:attribute name="ref" type="xs:QName"/>
+ </xs:attributeGroup>
+
+ <xs:group name="typeDefParticle">
+ <xs:annotation>
+ <xs:documentation>
+ 'complexType' uses this</xs:documentation></xs:annotation>
+ <xs:choice>
+ <xs:element name="group" type="xs:groupRef"/>
+ <xs:element ref="xs:all"/>
+ <xs:element ref="xs:choice"/>
+ <xs:element ref="xs:sequence"/>
+ </xs:choice>
+ </xs:group>
+
+
+
+ <xs:group name="nestedParticle">
+ <xs:choice>
+ <xs:element name="element" type="xs:localElement"/>
+ <xs:element name="group" type="xs:groupRef"/>
+ <xs:element ref="xs:choice"/>
+ <xs:element ref="xs:sequence"/>
+ <xs:element ref="xs:any"/>
+ </xs:choice>
+ </xs:group>
+
+ <xs:group name="particle">
+ <xs:choice>
+ <xs:element name="element" type="xs:localElement"/>
+ <xs:element name="group" type="xs:groupRef"/>
+ <xs:element ref="xs:all"/>
+ <xs:element ref="xs:choice"/>
+ <xs:element ref="xs:sequence"/>
+ <xs:element ref="xs:any"/>
+ </xs:choice>
+ </xs:group>
+
+ <xs:complexType name="attribute">
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:sequence>
+ <xs:element name="simpleType" minOccurs="0" type="xs:localSimpleType"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="xs:defRef"/>
+ <xs:attribute name="type" type="xs:QName"/>
+ <xs:attribute name="use" use="optional" default="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="prohibited"/>
+ <xs:enumeration value="optional"/>
+ <xs:enumeration value="required"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="default" type="xs:string"/>
+ <xs:attribute name="fixed" type="xs:string"/>
+ <xs:attribute name="form" type="xs:formChoice"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="topLevelAttribute">
+ <xs:complexContent>
+ <xs:restriction base="xs:attribute">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:element name="simpleType" minOccurs="0" type="xs:localSimpleType"/>
+ </xs:sequence>
+ <xs:attribute name="ref" use="prohibited"/>
+ <xs:attribute name="form" use="prohibited"/>
+ <xs:attribute name="use" use="prohibited"/>
+ <xs:attribute name="name" use="required" type="xs:NCName"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:group name="attrDecls">
+ <xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="attribute" type="xs:attribute"/>
+ <xs:element name="attributeGroup" type="xs:attributeGroupRef"/>
+ </xs:choice>
+ <xs:element ref="xs:anyAttribute" minOccurs="0"/>
+ </xs:sequence>
+ </xs:group>
+
+ <xs:element name="anyAttribute" type="xs:wildcard" id="anyAttribute">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-anyAttribute"/>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:group name="complexTypeModel">
+ <xs:choice>
+ <xs:element ref="xs:simpleContent"/>
+ <xs:element ref="xs:complexContent"/>
+ <xs:sequence>
+ <xs:annotation>
+ <xs:documentation>
+ This branch is short for
+ <complexContent>
+ <restriction base="xs:anyType">
+ ...
+ </restriction>
+ </complexContent></xs:documentation>
+ </xs:annotation>
+ <xs:group ref="xs:typeDefParticle" minOccurs="0"/>
+ <xs:group ref="xs:attrDecls"/>
+ </xs:sequence>
+ </xs:choice>
+ </xs:group>
+
+ <xs:complexType name="complexType" abstract="true">
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:group ref="xs:complexTypeModel"/>
+ <xs:attribute name="name" type="xs:NCName">
+ <xs:annotation>
+ <xs:documentation>
+ Will be restricted to required or forbidden</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="mixed" type="xs:boolean" use="optional" default="false">
+ <xs:annotation>
+ <xs:documentation>
+ Not allowed if simpleContent child is chosen.
+ May be overriden by setting on complexContent child.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="abstract" type="xs:boolean" use="optional" default="false"/>
+ <xs:attribute name="final" type="xs:derivationSet"/>
+ <xs:attribute name="block" type="xs:derivationSet"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="topLevelComplexType">
+ <xs:complexContent>
+ <xs:restriction base="xs:complexType">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:group ref="xs:complexTypeModel"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:NCName" use="required"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="localComplexType">
+ <xs:complexContent>
+ <xs:restriction base="xs:complexType">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:group ref="xs:complexTypeModel"/>
+ </xs:sequence>
+ <xs:attribute name="name" use="prohibited"/>
+ <xs:attribute name="abstract" use="prohibited"/>
+ <xs:attribute name="final" use="prohibited"/>
+ <xs:attribute name="block" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="restrictionType">
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:sequence>
+ <xs:choice minOccurs="0">
+ <xs:group ref="xs:typeDefParticle"/>
+ <xs:group ref="xs:simpleRestrictionModel"/>
+ </xs:choice>
+ <xs:group ref="xs:attrDecls"/>
+ </xs:sequence>
+ <xs:attribute name="base" type="xs:QName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="complexRestrictionType">
+ <xs:complexContent>
+ <xs:restriction base="xs:restrictionType">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>This choice is added simply to
+ make this a valid restriction per the REC</xs:documentation>
+ </xs:annotation>
+ <xs:group ref="xs:typeDefParticle"/>
+ </xs:choice>
+ <xs:group ref="xs:attrDecls"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="extensionType">
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:sequence>
+ <xs:group ref="xs:typeDefParticle" minOccurs="0"/>
+ <xs:group ref="xs:attrDecls"/>
+ </xs:sequence>
+ <xs:attribute name="base" type="xs:QName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="complexContent" id="complexContent">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-complexContent"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:choice>
+ <xs:element name="restriction" type="xs:complexRestrictionType"/>
+ <xs:element name="extension" type="xs:extensionType"/>
+ </xs:choice>
+ <xs:attribute name="mixed" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>
+ Overrides any setting on complexType parent.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:complexType name="simpleRestrictionType">
+ <xs:complexContent>
+ <xs:restriction base="xs:restrictionType">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>This choice is added simply to
+ make this a valid restriction per the REC</xs:documentation>
+ </xs:annotation>
+ <xs:group ref="xs:simpleRestrictionModel"/>
+ </xs:choice>
+ <xs:group ref="xs:attrDecls"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="simpleExtensionType">
+ <xs:complexContent>
+ <xs:restriction base="xs:extensionType">
+ <xs:sequence>
+ <xs:annotation>
+ <xs:documentation>
+ No typeDefParticle group reference</xs:documentation>
+ </xs:annotation>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:group ref="xs:attrDecls"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="simpleContent" id="simpleContent">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-simpleContent"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:choice>
+ <xs:element name="restriction" type="xs:simpleRestrictionType"/>
+ <xs:element name="extension" type="xs:simpleExtensionType"/>
+ </xs:choice>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="complexType" type="xs:topLevelComplexType" id="complexType">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-complexType"/>
+ </xs:annotation>
+ </xs:element>
+
+
+ <xs:simpleType name="blockSet">
+ <xs:annotation>
+ <xs:documentation>
+ A utility type, not for public use</xs:documentation>
+ <xs:documentation>
+ #all or (possibly empty) subset of {substitution, extension,
+ restriction}</xs:documentation>
+ </xs:annotation>
+ <xs:union>
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="#all"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType>
+ <xs:list>
+ <xs:simpleType>
+ <xs:restriction base="xs:derivationControl">
+ <xs:enumeration value="extension"/>
+ <xs:enumeration value="restriction"/>
+ <xs:enumeration value="substitution"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:list>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+
+ <xs:complexType name="element" abstract="true">
+ <xs:annotation>
+ <xs:documentation>
+ The element element can be used either
+ at the top level to define an element-type binding globally,
+ or within a content model to either reference a globally-defined
+ element or type or declare an element-type binding locally.
+ The ref form is not allowed at the top level.</xs:documentation>
+ </xs:annotation>
+
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:sequence>
+ <xs:choice minOccurs="0">
+ <xs:element name="simpleType" type="xs:localSimpleType"/>
+ <xs:element name="complexType" type="xs:localComplexType"/>
+ </xs:choice>
+ <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="xs:defRef"/>
+ <xs:attribute name="type" type="xs:QName"/>
+ <xs:attribute name="substitutionGroup" type="xs:QName"/>
+ <xs:attributeGroup ref="xs:occurs"/>
+ <xs:attribute name="default" type="xs:string"/>
+ <xs:attribute name="fixed" type="xs:string"/>
+ <xs:attribute name="nillable" type="xs:boolean" use="optional" default="false"/>
+ <xs:attribute name="abstract" type="xs:boolean" use="optional" default="false"/>
+ <xs:attribute name="final" type="xs:derivationSet"/>
+ <xs:attribute name="block" type="xs:blockSet"/>
+ <xs:attribute name="form" type="xs:formChoice"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="topLevelElement">
+ <xs:complexContent>
+ <xs:restriction base="xs:element">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0">
+ <xs:element name="simpleType" type="xs:localSimpleType"/>
+ <xs:element name="complexType" type="xs:localComplexType"/>
+ </xs:choice>
+ <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="ref" use="prohibited"/>
+ <xs:attribute name="form" use="prohibited"/>
+ <xs:attribute name="minOccurs" use="prohibited"/>
+ <xs:attribute name="maxOccurs" use="prohibited"/>
+ <xs:attribute name="name" use="required" type="xs:NCName"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="localElement">
+ <xs:complexContent>
+ <xs:restriction base="xs:element">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0">
+ <xs:element name="simpleType" type="xs:localSimpleType"/>
+ <xs:element name="complexType" type="xs:localComplexType"/>
+ </xs:choice>
+ <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="substitutionGroup" use="prohibited"/>
+ <xs:attribute name="final" use="prohibited"/>
+ <xs:attribute name="abstract" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="element" type="xs:topLevelElement" id="element">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-element"/>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:complexType name="group" abstract="true">
+ <xs:annotation>
+ <xs:documentation>
+ group type for explicit groups, named top-level groups and
+ group references</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:group ref="xs:particle" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:attributeGroup ref="xs:defRef"/>
+ <xs:attributeGroup ref="xs:occurs"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="realGroup">
+ <xs:complexContent>
+ <xs:restriction base="xs:group">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element ref="xs:all"/>
+ <xs:element ref="xs:choice"/>
+ <xs:element ref="xs:sequence"/>
+ </xs:choice>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="namedGroup">
+ <xs:complexContent>
+ <xs:restriction base="xs:realGroup">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="1" maxOccurs="1">
+ <xs:element name="all">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:restriction base="xs:all">
+ <xs:group ref="xs:allModel"/>
+ <xs:attribute name="minOccurs" use="prohibited"/>
+ <xs:attribute name="maxOccurs" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="choice" type="xs:simpleExplicitGroup"/>
+ <xs:element name="sequence" type="xs:simpleExplicitGroup"/>
+ </xs:choice>
+ </xs:sequence>
+ <xs:attribute name="name" use="required" type="xs:NCName"/>
+ <xs:attribute name="ref" use="prohibited"/>
+ <xs:attribute name="minOccurs" use="prohibited"/>
+ <xs:attribute name="maxOccurs" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="groupRef">
+ <xs:complexContent>
+ <xs:restriction base="xs:realGroup">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="ref" use="required" type="xs:QName"/>
+ <xs:attribute name="name" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="explicitGroup">
+ <xs:annotation>
+ <xs:documentation>
+ group type for the three kinds of group</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:restriction base="xs:group">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:NCName" use="prohibited"/>
+ <xs:attribute name="ref" type="xs:QName" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="simpleExplicitGroup">
+ <xs:complexContent>
+ <xs:restriction base="xs:explicitGroup">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="minOccurs" use="prohibited"/>
+ <xs:attribute name="maxOccurs" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:group name="allModel">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>This choice with min/max is here to
+ avoid a pblm with the Elt:All/Choice/Seq
+ Particle derivation constraint</xs:documentation>
+ </xs:annotation>
+ <xs:element name="element" type="xs:narrowMaxMin"/>
+ </xs:choice>
+ </xs:sequence>
+ </xs:group>
+
+
+ <xs:complexType name="narrowMaxMin">
+ <xs:annotation>
+ <xs:documentation>restricted max/min</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:restriction base="xs:localElement">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0">
+ <xs:element name="simpleType" type="xs:localSimpleType"/>
+ <xs:element name="complexType" type="xs:localComplexType"/>
+ </xs:choice>
+ <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="minOccurs" use="optional" default="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:nonNegativeInteger">
+ <xs:enumeration value="0"/>
+ <xs:enumeration value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="maxOccurs" use="optional" default="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:allNNI">
+ <xs:enumeration value="0"/>
+ <xs:enumeration value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="all">
+ <xs:annotation>
+ <xs:documentation>
+ Only elements allowed inside</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:restriction base="xs:explicitGroup">
+ <xs:group ref="xs:allModel"/>
+ <xs:attribute name="minOccurs" use="optional" default="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:nonNegativeInteger">
+ <xs:enumeration value="0"/>
+ <xs:enumeration value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="maxOccurs" use="optional" default="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:allNNI">
+ <xs:enumeration value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="all" id="all" type="xs:all">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-all"/>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:element name="choice" type="xs:explicitGroup" id="choice">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-choice"/>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:element name="sequence" type="xs:explicitGroup" id="sequence">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-sequence"/>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:element name="group" type="xs:namedGroup" id="group">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-group"/>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:complexType name="wildcard">
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:attribute name="namespace" type="xs:namespaceList" use="optional" default="##any"/>
+ <xs:attribute name="processContents" use="optional" default="strict">
+ <xs:simpleType>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="skip"/>
+ <xs:enumeration value="lax"/>
+ <xs:enumeration value="strict"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="any" id="any">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-any"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:wildcard">
+ <xs:attributeGroup ref="xs:occurs"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:annotation>
+ <xs:documentation>
+ simple type for the value of the 'namespace' attr of
+ 'any' and 'anyAttribute'</xs:documentation>
+ </xs:annotation>
+ <xs:annotation>
+ <xs:documentation>
+ Value is
+ ##any - - any non-conflicting WFXML/attribute at all
+
+ ##other - - any non-conflicting WFXML/attribute from
+ namespace other than targetNS
+
+ ##local - - any unqualified non-conflicting WFXML/attribute
+
+ one or - - any non-conflicting WFXML/attribute from
+ more URI the listed namespaces
+ references
+ (space separated)
+
+ ##targetNamespace or ##local may appear in the above list, to
+ refer to the targetNamespace of the enclosing
+ schema or an absent targetNamespace respectively</xs:documentation>
+ </xs:annotation>
+
+ <xs:simpleType name="namespaceList">
+ <xs:annotation>
+ <xs:documentation>
+ A utility type, not for public use</xs:documentation>
+ </xs:annotation>
+ <xs:union>
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="##any"/>
+ <xs:enumeration value="##other"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType>
+ <xs:list>
+ <xs:simpleType>
+ <xs:union memberTypes="xs:anyURI">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="##targetNamespace"/>
+ <xs:enumeration value="##local"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+ </xs:list>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+
+ <xs:element name="attribute" type="xs:topLevelAttribute" id="attribute">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-attribute"/>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:complexType name="attributeGroup" abstract="true">
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:group ref="xs:attrDecls"/>
+ <xs:attributeGroup ref="xs:defRef"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="namedAttributeGroup">
+ <xs:complexContent>
+ <xs:restriction base="xs:attributeGroup">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:group ref="xs:attrDecls"/>
+ </xs:sequence>
+ <xs:attribute name="name" use="required" type="xs:NCName"/>
+ <xs:attribute name="ref" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="attributeGroupRef">
+ <xs:complexContent>
+ <xs:restriction base="xs:attributeGroup">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="ref" use="required" type="xs:QName"/>
+ <xs:attribute name="name" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="attributeGroup" type="xs:namedAttributeGroup" id="attributeGroup">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-attributeGroup"/>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:element name="include" id="include">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-include"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="redefine" id="redefine">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-redefine"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:openAttrs">
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="xs:annotation"/>
+ <xs:group ref="xs:redefinable"/>
+ </xs:choice>
+ <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/>
+ <xs:attribute name="id" type="xs:ID"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="import" id="import">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-import"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:attribute name="namespace" type="xs:anyURI"/>
+ <xs:attribute name="schemaLocation" type="xs:anyURI"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="selector" id="selector">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-selector"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:attribute name="xpath" use="required">
+ <xs:simpleType>
+ <xs:annotation>
+ <xs:documentation>A subset of XPath expressions for use
+in selectors</xs:documentation>
+ <xs:documentation>A utility type, not for public
+use</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:token">
+ <xs:annotation>
+ <xs:documentation>The following pattern is intended to allow XPath
+ expressions per the following EBNF:
+ Selector ::= Path ( '|' Path )*
+ Path ::= ('.//')? Step ( '/' Step )*
+ Step ::= '.' | NameTest
+ NameTest ::= QName | '*' | NCName ':' '*'
+ child:: is also allowed
+ </xs:documentation>
+ </xs:annotation>
+ <xs:pattern value="(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*(\|(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*)*">
+ </xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="field" id="field">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-field"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:attribute name="xpath" use="required">
+ <xs:simpleType>
+ <xs:annotation>
+ <xs:documentation>A subset of XPath expressions for use
+in fields</xs:documentation>
+ <xs:documentation>A utility type, not for public
+use</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:token">
+ <xs:annotation>
+ <xs:documentation>The following pattern is intended to allow XPath
+ expressions per the same EBNF as for selector,
+ with the following change:
+ Path ::= ('.//')? ( Step '/' )* ( Step | '@' NameTest )
+ </xs:documentation>
+ </xs:annotation>
+ <xs:pattern value="(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*))))(\|(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*)))))*">
+ </xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:complexType name="keybase">
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:sequence>
+ <xs:element ref="xs:selector"/>
+ <xs:element ref="xs:field" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:group name="identityConstraint">
+ <xs:annotation>
+ <xs:documentation>The three kinds of identity constraints, all with
+ type of or derived from 'keybase'.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:choice>
+ <xs:element ref="xs:unique"/>
+ <xs:element ref="xs:key"/>
+ <xs:element ref="xs:keyref"/>
+ </xs:choice>
+ </xs:group>
+
+ <xs:element name="unique" type="xs:keybase" id="unique">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-unique"/>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="key" type="xs:keybase" id="key">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-key"/>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="keyref" id="keyref">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-keyref"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:keybase">
+ <xs:attribute name="refer" type="xs:QName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="notation" id="notation">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-notation"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:attribute name="name" type="xs:NCName" use="required"/>
+ <xs:attribute name="public" type="xs:public"/>
+ <xs:attribute name="system" type="xs:anyURI"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:simpleType name="public">
+ <xs:annotation>
+ <xs:documentation>
+ A utility type, not for public use</xs:documentation>
+ <xs:documentation>
+ A public identifier, per ISO 8879</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:token"/>
+ </xs:simpleType>
+
+ <xs:element name="appinfo" id="appinfo">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-appinfo"/>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:any processContents="lax"/>
+ </xs:sequence>
+ <xs:attribute name="source" type="xs:anyURI"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="documentation" id="documentation">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-documentation"/>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:any processContents="lax"/>
+ </xs:sequence>
+ <xs:attribute name="source" type="xs:anyURI"/>
+ <xs:attribute ref="xml:lang"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="annotation" id="annotation">
+ <xs:annotation>
+ <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-annotation"/>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xs:openAttrs">
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="xs:appinfo"/>
+ <xs:element ref="xs:documentation"/>
+ </xs:choice>
+ <xs:attribute name="id" type="xs:ID"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:annotation>
+ <xs:documentation>
+ notations for use within XML Schema schemas</xs:documentation>
+ </xs:annotation>
+
+ <xs:notation name="XMLSchemaStructures" public="structures" system="http://www.w3.org/2000/08/XMLSchema.xsd"/>
+ <xs:notation name="XML" public="REC-xml-19980210" system="http://www.w3.org/TR/1998/REC-xml-19980210"/>
+
+ <xs:complexType name="anyType" mixed="true">
+ <xs:annotation>
+ <xs:documentation>
+ Not the real urType, but as close an approximation as we can
+ get in the XML representation</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
+ </xs:sequence>
+ <xs:anyAttribute processContents="lax"/>
+ </xs:complexType>
+
+ <xs:annotation>
+ <xs:documentation>
+ First the built-in primitive datatypes. These definitions are for
+ information only, the real built-in definitions are magic.
+ </xs:documentation>
+
+ <xs:documentation>
+ For each built-in datatype in this schema (both primitive and
+ derived) can be uniquely addressed via a URI constructed
+ as follows:
+ 1) the base URI is the URI of the XML Schema namespace
+ 2) the fragment identifier is the name of the datatype
+
+ For example, to address the int datatype, the URI is:
+
+ http://www.w3.org/2001/XMLSchema#int
+
+ Additionally, each facet definition element can be uniquely
+ addressed via a URI constructed as follows:
+ 1) the base URI is the URI of the XML Schema namespace
+ 2) the fragment identifier is the name of the facet
+
+ For example, to address the maxInclusive facet, the URI is:
+
+ http://www.w3.org/2001/XMLSchema#maxInclusive
+
+ Additionally, each facet usage in a built-in datatype definition
+ can be uniquely addressed via a URI constructed as follows:
+ 1) the base URI is the URI of the XML Schema namespace
+ 2) the fragment identifier is the name of the datatype, followed
+ by a period (".") followed by the name of the facet
+
+ For example, to address the usage of the maxInclusive facet in
+ the definition of int, the URI is:
+
+ http://www.w3.org/2001/XMLSchema#int.maxInclusive
+
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:simpleType name="string" id="string">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="length"/>
+ <hfp:hasFacet name="minLength"/>
+ <hfp:hasFacet name="maxLength"/>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasProperty name="ordered" value="false"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality" value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#string"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="preserve" id="string.preserve"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="boolean" id="boolean">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasProperty name="ordered" value="false"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality" value="finite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#boolean"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="boolean.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="float" id="float">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="maxInclusive"/>
+ <hfp:hasFacet name="maxExclusive"/>
+ <hfp:hasFacet name="minInclusive"/>
+ <hfp:hasFacet name="minExclusive"/>
+ <hfp:hasProperty name="ordered" value="total"/>
+ <hfp:hasProperty name="bounded" value="true"/>
+ <hfp:hasProperty name="cardinality" value="finite"/>
+ <hfp:hasProperty name="numeric" value="true"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#float"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="float.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="double" id="double">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="maxInclusive"/>
+ <hfp:hasFacet name="maxExclusive"/>
+ <hfp:hasFacet name="minInclusive"/>
+ <hfp:hasFacet name="minExclusive"/>
+ <hfp:hasProperty name="ordered" value="total"/>
+ <hfp:hasProperty name="bounded" value="true"/>
+ <hfp:hasProperty name="cardinality" value="finite"/>
+ <hfp:hasProperty name="numeric" value="true"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#double"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="double.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="decimal" id="decimal">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="totalDigits"/>
+ <hfp:hasFacet name="fractionDigits"/>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="maxInclusive"/>
+ <hfp:hasFacet name="maxExclusive"/>
+ <hfp:hasFacet name="minInclusive"/>
+ <hfp:hasFacet name="minExclusive"/>
+ <hfp:hasProperty name="ordered" value="total"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="true"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#decimal"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="decimal.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="duration" id="duration">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="maxInclusive"/>
+ <hfp:hasFacet name="maxExclusive"/>
+ <hfp:hasFacet name="minInclusive"/>
+ <hfp:hasFacet name="minExclusive"/>
+ <hfp:hasProperty name="ordered" value="partial"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#duration"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="duration.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="dateTime" id="dateTime">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="maxInclusive"/>
+ <hfp:hasFacet name="maxExclusive"/>
+ <hfp:hasFacet name="minInclusive"/>
+ <hfp:hasFacet name="minExclusive"/>
+ <hfp:hasProperty name="ordered" value="partial"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#dateTime"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="dateTime.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="time" id="time">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="maxInclusive"/>
+ <hfp:hasFacet name="maxExclusive"/>
+ <hfp:hasFacet name="minInclusive"/>
+ <hfp:hasFacet name="minExclusive"/>
+ <hfp:hasProperty name="ordered" value="partial"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#time"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="time.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="date" id="date">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="maxInclusive"/>
+ <hfp:hasFacet name="maxExclusive"/>
+ <hfp:hasFacet name="minInclusive"/>
+ <hfp:hasFacet name="minExclusive"/>
+ <hfp:hasProperty name="ordered" value="partial"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#date"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="date.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="gYearMonth" id="gYearMonth">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="maxInclusive"/>
+ <hfp:hasFacet name="maxExclusive"/>
+ <hfp:hasFacet name="minInclusive"/>
+ <hfp:hasFacet name="minExclusive"/>
+ <hfp:hasProperty name="ordered" value="partial"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#gYearMonth"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="gYearMonth.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="gYear" id="gYear">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="maxInclusive"/>
+ <hfp:hasFacet name="maxExclusive"/>
+ <hfp:hasFacet name="minInclusive"/>
+ <hfp:hasFacet name="minExclusive"/>
+ <hfp:hasProperty name="ordered" value="partial"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#gYear"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="gYear.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="gMonthDay" id="gMonthDay">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="maxInclusive"/>
+ <hfp:hasFacet name="maxExclusive"/>
+ <hfp:hasFacet name="minInclusive"/>
+ <hfp:hasFacet name="minExclusive"/>
+ <hfp:hasProperty name="ordered" value="partial"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#gMonthDay"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="gMonthDay.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="gDay" id="gDay">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="maxInclusive"/>
+ <hfp:hasFacet name="maxExclusive"/>
+ <hfp:hasFacet name="minInclusive"/>
+ <hfp:hasFacet name="minExclusive"/>
+ <hfp:hasProperty name="ordered" value="partial"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#gDay"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="gDay.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="gMonth" id="gMonth">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="maxInclusive"/>
+ <hfp:hasFacet name="maxExclusive"/>
+ <hfp:hasFacet name="minInclusive"/>
+ <hfp:hasFacet name="minExclusive"/>
+ <hfp:hasProperty name="ordered" value="partial"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#gMonth"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="gMonth.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="hexBinary" id="hexBinary">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="length"/>
+ <hfp:hasFacet name="minLength"/>
+ <hfp:hasFacet name="maxLength"/>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasProperty name="ordered" value="false"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#binary"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="hexBinary.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="base64Binary" id="base64Binary">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="length"/>
+ <hfp:hasFacet name="minLength"/>
+ <hfp:hasFacet name="maxLength"/>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasProperty name="ordered" value="false"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#base64Binary"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="base64Binary.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="anyURI" id="anyURI">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="length"/>
+ <hfp:hasFacet name="minLength"/>
+ <hfp:hasFacet name="maxLength"/>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasProperty name="ordered" value="false"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#anyURI"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="anyURI.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="QName" id="QName">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="length"/>
+ <hfp:hasFacet name="minLength"/>
+ <hfp:hasFacet name="maxLength"/>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasProperty name="ordered" value="false"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#QName"/>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="QName.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="NOTATION" id="NOTATION">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="length"/>
+ <hfp:hasFacet name="minLength"/>
+ <hfp:hasFacet name="maxLength"/>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasProperty name="ordered" value="false"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#NOTATION"/>
+ <xs:documentation>
+ NOTATION cannot be used directly in a schema; rather a type
+ must be derived from it by specifying at least one enumeration
+ facet whose value is the name of a NOTATION declared in the
+ schema.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:anySimpleType">
+ <xs:whiteSpace value="collapse" fixed="true"
+ id="NOTATION.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:annotation>
+ <xs:documentation>
+ Now the derived primitive types
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:simpleType name="normalizedString" id="normalizedString">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#normalizedString"/>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:whiteSpace value="replace"
+ id="normalizedString.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="token" id="token">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#token"/>
+ </xs:annotation>
+ <xs:restriction base="xs:normalizedString">
+ <xs:whiteSpace value="collapse" id="token.whiteSpace"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="language" id="language">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#language"/>
+ </xs:annotation>
+ <xs:restriction base="xs:token">
+ <xs:pattern
+ value="[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*"
+ id="language.pattern">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.ietf.org/rfc/rfc3066.txt">
+ pattern specifies the content of section 2.12 of XML 1.0e2
+ and RFC 3066 (Revised version of RFC 1766).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="IDREFS" id="IDREFS">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="length"/>
+ <hfp:hasFacet name="minLength"/>
+ <hfp:hasFacet name="maxLength"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasProperty name="ordered" value="false"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#IDREFS"/>
+ </xs:annotation>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="xs:IDREF"/>
+ </xs:simpleType>
+ <xs:minLength value="1" id="IDREFS.minLength"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="ENTITIES" id="ENTITIES">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="length"/>
+ <hfp:hasFacet name="minLength"/>
+ <hfp:hasFacet name="maxLength"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasProperty name="ordered" value="false"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#ENTITIES"/>
+ </xs:annotation>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="xs:ENTITY"/>
+ </xs:simpleType>
+ <xs:minLength value="1" id="ENTITIES.minLength"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="NMTOKEN" id="NMTOKEN">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#NMTOKEN"/>
+ </xs:annotation>
+ <xs:restriction base="xs:token">
+ <xs:pattern value="\c+" id="NMTOKEN.pattern">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/REC-xml#NT-Nmtoken">
+ pattern matches production 7 from the XML spec
+ </xs:documentation>
+ </xs:annotation>
+ </xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="NMTOKENS" id="NMTOKENS">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasFacet name="length"/>
+ <hfp:hasFacet name="minLength"/>
+ <hfp:hasFacet name="maxLength"/>
+ <hfp:hasFacet name="enumeration"/>
+ <hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="pattern"/>
+ <hfp:hasProperty name="ordered" value="false"/>
+ <hfp:hasProperty name="bounded" value="false"/>
+ <hfp:hasProperty name="cardinality"
+ value="countably infinite"/>
+ <hfp:hasProperty name="numeric" value="false"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#NMTOKENS"/>
+ </xs:annotation>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="xs:NMTOKEN"/>
+ </xs:simpleType>
+ <xs:minLength value="1" id="NMTOKENS.minLength"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="Name" id="Name">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#Name"/>
+ </xs:annotation>
+ <xs:restriction base="xs:token">
+ <xs:pattern value="\i\c*" id="Name.pattern">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/REC-xml#NT-Name">
+ pattern matches production 5 from the XML spec
+ </xs:documentation>
+ </xs:annotation>
+ </xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="NCName" id="NCName">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#NCName"/>
+ </xs:annotation>
+ <xs:restriction base="xs:Name">
+ <xs:pattern value="[\i-[:]][\c-[:]]*" id="NCName.pattern">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/REC-xml-names/#NT-NCName">
+ pattern matches production 4 from the Namespaces in XML spec
+ </xs:documentation>
+ </xs:annotation>
+ </xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="ID" id="ID">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#ID"/>
+ </xs:annotation>
+ <xs:restriction base="xs:NCName"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="IDREF" id="IDREF">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#IDREF"/>
+ </xs:annotation>
+ <xs:restriction base="xs:NCName"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="ENTITY" id="ENTITY">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#ENTITY"/>
+ </xs:annotation>
+ <xs:restriction base="xs:NCName"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="integer" id="integer">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#integer"/>
+ </xs:annotation>
+ <xs:restriction base="xs:decimal">
+ <xs:fractionDigits value="0" fixed="true" id="integer.fractionDigits"/>
+ <xs:pattern value="[\-+]?[0-9]+"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="nonPositiveInteger" id="nonPositiveInteger">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger"/>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <xs:maxInclusive value="0" id="nonPositiveInteger.maxInclusive"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="negativeInteger" id="negativeInteger">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#negativeInteger"/>
+ </xs:annotation>
+ <xs:restriction base="xs:nonPositiveInteger">
+ <xs:maxInclusive value="-1" id="negativeInteger.maxInclusive"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="long" id="long">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasProperty name="bounded" value="true"/>
+ <hfp:hasProperty name="cardinality" value="finite"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#long"/>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <xs:minInclusive value="-9223372036854775808" id="long.minInclusive"/>
+ <xs:maxInclusive value="9223372036854775807" id="long.maxInclusive"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="int" id="int">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#int"/>
+ </xs:annotation>
+ <xs:restriction base="xs:long">
+ <xs:minInclusive value="-2147483648" id="int.minInclusive"/>
+ <xs:maxInclusive value="2147483647" id="int.maxInclusive"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="short" id="short">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#short"/>
+ </xs:annotation>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="-32768" id="short.minInclusive"/>
+ <xs:maxInclusive value="32767" id="short.maxInclusive"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="byte" id="byte">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#byte"/>
+ </xs:annotation>
+ <xs:restriction base="xs:short">
+ <xs:minInclusive value="-128" id="byte.minInclusive"/>
+ <xs:maxInclusive value="127" id="byte.maxInclusive"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="nonNegativeInteger" id="nonNegativeInteger">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger"/>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <xs:minInclusive value="0" id="nonNegativeInteger.minInclusive"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="unsignedLong" id="unsignedLong">
+ <xs:annotation>
+ <xs:appinfo>
+ <hfp:hasProperty name="bounded" value="true"/>
+ <hfp:hasProperty name="cardinality" value="finite"/>
+ </xs:appinfo>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#unsignedLong"/>
+ </xs:annotation>
+ <xs:restriction base="xs:nonNegativeInteger">
+ <xs:maxInclusive value="18446744073709551615"
+ id="unsignedLong.maxInclusive"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="unsignedInt" id="unsignedInt">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#unsignedInt"/>
+ </xs:annotation>
+ <xs:restriction base="xs:unsignedLong">
+ <xs:maxInclusive value="4294967295"
+ id="unsignedInt.maxInclusive"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="unsignedShort" id="unsignedShort">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#unsignedShort"/>
+ </xs:annotation>
+ <xs:restriction base="xs:unsignedInt">
+ <xs:maxInclusive value="65535"
+ id="unsignedShort.maxInclusive"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="unsignedByte" id="unsignedByte">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#unsignedByte"/>
+ </xs:annotation>
+ <xs:restriction base="xs:unsignedShort">
+ <xs:maxInclusive value="255" id="unsignedByte.maxInclusive"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="positiveInteger" id="positiveInteger">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#positiveInteger"/>
+ </xs:annotation>
+ <xs:restriction base="xs:nonNegativeInteger">
+ <xs:minInclusive value="1" id="positiveInteger.minInclusive"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="derivationControl">
+ <xs:annotation>
+ <xs:documentation>
+ A utility type, not for public use</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="substitution"/>
+ <xs:enumeration value="extension"/>
+ <xs:enumeration value="restriction"/>
+ <xs:enumeration value="list"/>
+ <xs:enumeration value="union"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:group name="simpleDerivation">
+ <xs:choice>
+ <xs:element ref="xs:restriction"/>
+ <xs:element ref="xs:list"/>
+ <xs:element ref="xs:union"/>
+ </xs:choice>
+ </xs:group>
+
+ <xs:simpleType name="simpleDerivationSet">
+ <xs:annotation>
+ <xs:documentation>
+ #all or (possibly empty) subset of {restriction, union, list}
+ </xs:documentation>
+ <xs:documentation>
+ A utility type, not for public use</xs:documentation>
+ </xs:annotation>
+ <xs:union>
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="#all"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType>
+ <xs:list>
+ <xs:simpleType>
+ <xs:restriction base="xs:derivationControl">
+ <xs:enumeration value="list"/>
+ <xs:enumeration value="union"/>
+ <xs:enumeration value="restriction"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:list>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+
+ <xs:complexType name="simpleType" abstract="true">
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:group ref="xs:simpleDerivation"/>
+ <xs:attribute name="final" type="xs:simpleDerivationSet"/>
+ <xs:attribute name="name" type="xs:NCName">
+ <xs:annotation>
+ <xs:documentation>
+ Can be restricted to required or forbidden
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="topLevelSimpleType">
+ <xs:complexContent>
+ <xs:restriction base="xs:simpleType">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:group ref="xs:simpleDerivation"/>
+ </xs:sequence>
+ <xs:attribute name="name" use="required"
+ type="xs:NCName">
+ <xs:annotation>
+ <xs:documentation>
+ Required at the top level
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="localSimpleType">
+ <xs:complexContent>
+ <xs:restriction base="xs:simpleType">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:group ref="xs:simpleDerivation"/>
+ </xs:sequence>
+ <xs:attribute name="name" use="prohibited">
+ <xs:annotation>
+ <xs:documentation>
+ Forbidden when nested
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="final" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="simpleType" type="xs:topLevelSimpleType" id="simpleType">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#element-simpleType"/>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:group name="facets">
+ <xs:annotation>
+ <xs:documentation>
+ We should use a substitution group for facets, but
+ that's ruled out because it would allow users to
+ add their own, which we're not ready for yet.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:choice>
+ <xs:element ref="xs:minExclusive"/>
+ <xs:element ref="xs:minInclusive"/>
+ <xs:element ref="xs:maxExclusive"/>
+ <xs:element ref="xs:maxInclusive"/>
+ <xs:element ref="xs:totalDigits"/>
+ <xs:element ref="xs:fractionDigits"/>
+ <xs:element ref="xs:length"/>
+ <xs:element ref="xs:minLength"/>
+ <xs:element ref="xs:maxLength"/>
+ <xs:element ref="xs:enumeration"/>
+ <xs:element ref="xs:whiteSpace"/>
+ <xs:element ref="xs:pattern"/>
+ </xs:choice>
+ </xs:group>
+
+ <xs:group name="simpleRestrictionModel">
+ <xs:sequence>
+ <xs:element name="simpleType" type="xs:localSimpleType" minOccurs="0"/>
+ <xs:group ref="xs:facets" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:group>
+
+ <xs:element name="restriction" id="restriction">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#element-restriction">
+ base attribute and simpleType child are mutually
+ exclusive, but one or other is required
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:group ref="xs:simpleRestrictionModel"/>
+ <xs:attribute name="base" type="xs:QName" use="optional"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="list" id="list">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#element-list">
+ itemType attribute and simpleType child are mutually
+ exclusive, but one or other is required
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:sequence>
+ <xs:element name="simpleType" type="xs:localSimpleType"
+ minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="itemType" type="xs:QName" use="optional"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="union" id="union">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#element-union">
+ memberTypes attribute must be non-empty or there must be
+ at least one simpleType child
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:sequence>
+ <xs:element name="simpleType" type="xs:localSimpleType"
+ minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="memberTypes" use="optional">
+ <xs:simpleType>
+ <xs:list itemType="xs:QName"/>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:complexType name="facet">
+ <xs:complexContent>
+ <xs:extension base="xs:annotated">
+ <xs:attribute name="value" use="required"/>
+ <xs:attribute name="fixed" type="xs:boolean" use="optional"
+ default="false"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="noFixedFacet">
+ <xs:complexContent>
+ <xs:restriction base="xs:facet">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="fixed" use="prohibited"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="minExclusive" id="minExclusive" type="xs:facet">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#element-minExclusive"/>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="minInclusive" id="minInclusive" type="xs:facet">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#element-minInclusive"/>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:element name="maxExclusive" id="maxExclusive" type="xs:facet">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#element-maxExclusive"/>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="maxInclusive" id="maxInclusive" type="xs:facet">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#element-maxInclusive"/>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:complexType name="numFacet">
+ <xs:complexContent>
+ <xs:restriction base="xs:facet">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="value" type="xs:nonNegativeInteger" use="required"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="totalDigits" id="totalDigits">
+ <xs:annotation>
+ <xs:documentation
+ source="http://www.w3.org/TR/xmlschema-2/#element-totalDigi
<TRUNCATED>
[24/24] incubator-netbeans git commit: [NETBEANS-54] Modules review
xml.wsdl.model
Posted by ma...@apache.org.
[NETBEANS-54] Modules review xml.wsdl.model
- no external library
- checked Rat report: manully updated missed license headers
- readded undonated wsdl-2004-08-24.xsd from source and added license
to it (fixes functionality)
- disable tests that fail because referenced files were not donated
- skimmed through module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/ff9557fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/ff9557fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/ff9557fb
Branch: refs/heads/master
Commit: ff9557fb1c6da84dad6c2f447083ef884c7fc748
Parents: 51ea9c0
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sat Oct 7 13:15:20 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 19:04:54 2017 +0200
----------------------------------------------------------------------
nbbuild/build.xml | 9 +
.../http/validation/Bundle.properties | 50 +--
.../mime/validation/Bundle.properties | 50 +--
.../soap/validation/Bundle.properties | 50 +--
.../soap12/validation/Bundle.properties | 50 +--
.../validator/resources/wsdl-2004-08-24.xsd | 306 +++++++++++++++++++
.../modules/xml/wsdl/model/ImportTest.java | 28 +-
7 files changed, 386 insertions(+), 157 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ff9557fb/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 9bf1d06..55656a2 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1953,8 +1953,14 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<rat:substringMatcher licenseFamilyCategory="oasis" licenseFamilyName="OASIS">
<pattern substring="[OASIS]"/>
</rat:substringMatcher>
+ <rat:fullTextMatcher licenseFamilyCategory="wsdl" licenseFamilyName="WSDL Schema Files">
+ International Business Machines Corporation and Microsoft Corporation
+ All Rights Reserved
+ License for WSDL Schema Files
+ </rat:fullTextMatcher>
<rat:approvedLicense familyName="W3C Software and Document Notice and License"/>
<rat:approvedLicense familyName="OASIS"/>
+ <rat:approvedLicense familyName="WSDL Schema Files" />
<fileset dir="${nb_all}">
<exclude name="*/build/**" />
<exclude name="nbbuild/netbeans/**" />
@@ -1995,6 +2001,9 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/resources/*.xml" /> <!-- test data -->
<exclude name="xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/resources/*.zip" /> <!-- test data -->
<exclude name="xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/resources/dummyProject/nbproject/private/tmpfile" /> <!-- test data -->
+ <exclude name="xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/**/*.wsdl" /> <!-- test data -->
+ <exclude name="xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/**/*.xsd" /> <!-- test data -->
+ <exclude name="xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/**/*.xml" /> <!-- test data -->
<exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/DTDExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
<exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/XMLExample" /> <!-- GUI sample file to demonstrate syntax highlighting -->
<exclude name="xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/**/data/**" /> <!-- test data -->
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ff9557fb/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/http/validation/Bundle.properties
----------------------------------------------------------------------
diff --git a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/http/validation/Bundle.properties b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/http/validation/Bundle.properties
index d857424..fe371d5 100644
--- a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/http/validation/Bundle.properties
+++ b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/http/validation/Bundle.properties
@@ -1,41 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-# Package specific ResourceBundle properties file
+# 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.
HTTPBindingValidator.One_binding_allowed=Only one <http:binding> element is allowed per binding.
HTTPBindingValidator.Verb_required=The <http:binding> element requires a verb attribute with a value of either "GET" or "POST".
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ff9557fb/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/Bundle.properties
----------------------------------------------------------------------
diff --git a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/Bundle.properties b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/Bundle.properties
index 967df10..6638d5e 100644
--- a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/Bundle.properties
+++ b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/Bundle.properties
@@ -1,41 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
#
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-# Package specific ResourceBundle properties file
+# 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.
AP2901_INPUT=WS-I(AP2901): The <wsdl:input> uses neither the WSDL MIME Binding as described in WSDL 1.1 Section 5 nor WSDL SOAP binding as described in WSDL 1.1 Section 3.
AP2901_OUTPUT=WS-I(AP2901): The <wsdl:output> uses neither the WSDL MIME Binding as described in WSDL 1.1 Section 5 nor WSDL SOAP binding as described in WSDL 1.1 Section 3.
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ff9557fb/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap/validation/Bundle.properties
----------------------------------------------------------------------
diff --git a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap/validation/Bundle.properties b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap/validation/Bundle.properties
index 375a690..9ff0c93 100644
--- a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap/validation/Bundle.properties
+++ b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap/validation/Bundle.properties
@@ -1,41 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-# Package specific ResourceBundle properties file
+# 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.
SOAPBindingValidator.Transport_URI_required=Transport URI required on <soap:binding> element
SOAPBindingValidator.Unsupported_transport=The <soap:binding> element only supports a transport URI of http://schemas.xmlsoap.org/soap/http. No other transport is currently supported.
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ff9557fb/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap12/validation/Bundle.properties
----------------------------------------------------------------------
diff --git a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap12/validation/Bundle.properties b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap12/validation/Bundle.properties
index 542b564..59f4816 100644
--- a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap12/validation/Bundle.properties
+++ b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap12/validation/Bundle.properties
@@ -1,41 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
#
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-# Package specific ResourceBundle properties file
+# 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.
SOAPBindingValidator.Transport_URI_required=Transport URI required on <soap:binding> element
SOAPBindingValidator.Unsupported_transport=The <soap:binding> element only supports a transport URI of http://schemas.xmlsoap.org/soap/http OR http://www.w3.org/2003/05/soap/bindings/HTTP/. No other transport is currently supported.
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ff9557fb/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/resources/wsdl-2004-08-24.xsd
----------------------------------------------------------------------
diff --git a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/resources/wsdl-2004-08-24.xsd b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/resources/wsdl-2004-08-24.xsd
new file mode 100644
index 0000000..70c31ff
--- /dev/null
+++ b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/resources/wsdl-2004-08-24.xsd
@@ -0,0 +1,306 @@
+<?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>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ff9557fb/xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/model/ImportTest.java
----------------------------------------------------------------------
diff --git a/xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/model/ImportTest.java b/xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/model/ImportTest.java
index 92dcfd1..4ff56bd 100644
--- a/xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/model/ImportTest.java
+++ b/xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/model/ImportTest.java
@@ -126,20 +126,22 @@ public class ImportTest extends TestCase {
assertEquals("string", gt.getName());
}
- public void testImportSameNamespaceWsdl() throws Exception {
- WSDLModel model = Util.loadWSDLModel("resources/GoogleFlow.wsdl");
- Operation op = model.findComponentByName("initiate", Operation.class);
- Message referencedMessage = op.getInput().getMessage().get();
- assertEquals("Imported model has same namespace", model.getDefinitions().getTargetNamespace(),
- referencedMessage.getModel().getDefinitions().getTargetNamespace());
- }
+// Disabled as referenced files were partly not donated by oracle to apache
+// public void testImportSameNamespaceWsdl() throws Exception {
+// WSDLModel model = Util.loadWSDLModel("resources/GoogleFlow.wsdl");
+// Operation op = model.findComponentByName("initiate", Operation.class);
+// Message referencedMessage = op.getInput().getMessage().get();
+// assertEquals("Imported model has same namespace", model.getDefinitions().getTargetNamespace(),
+// referencedMessage.getModel().getDefinitions().getTargetNamespace());
+// }
- public void testUnqualifiedSchemaReference() throws Exception {
- WSDLModelImpl model = (WSDLModelImpl)Util.loadWSDLModel("resources/SiebelInterface.wsdl");
- String xpath = "/definitions/message[@name='SiebelInterfaceRequest']/part[@name='SWEExtData']";
- Part part = Util.find(Part.class, model, xpath);
- assertNotNull("part.element should resolve w/o prefix", part.getElement().get());
- }
+// Disabled as referenced files were partly not donated by oracle to apache
+// public void testUnqualifiedSchemaReference() throws Exception {
+// WSDLModelImpl model = (WSDLModelImpl)Util.loadWSDLModel("resources/SiebelInterface.wsdl");
+// String xpath = "/definitions/message[@name='SiebelInterfaceRequest']/part[@name='SWEExtData']";
+// Part part = Util.find(Part.class, model, xpath);
+// assertNotNull("part.element should resolve w/o prefix", part.getElement().get());
+// }
public void testReferenceToOtherEmbededSchema() throws Exception {
WSDLModelImpl model = (WSDLModelImpl)Util.loadWSDLModel("resources/Sumador.wsdl");