This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-xmlschema.git
The following commit(s) were added to refs/heads/master by this push:
new e01e393f Do not declare an empty prefix for an unhandled attribute
value (#173)
e01e393f is described below
commit e01e393f56df258d7289c4229f1c8135e7cb79e6
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Thu Sep 24 12:09:49 2026 +0100
Do not declare an empty prefix for an unhandled attribute value (#173)
---
.../apache/ws/commons/schema/SchemaBuilder.java | 5 +-
.../test/java/tests/UnhandledAttributeTest.java | 83 ++++++++++++++++++++++
2 files changed, 87 insertions(+), 1 deletion(-)
diff --git
a/xmlschema-core/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
b/xmlschema-core/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
index d038cad2..0009c03a 100644
---
a/xmlschema-core/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
+++
b/xmlschema-core/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
@@ -1167,7 +1167,10 @@ public class SchemaBuilder {
attrs.add(att);
String value = att.getValue();
- if (value.indexOf(':') > -1) {
+ // A value starting with ':' is not a QName, so it has no
prefix to declare; the
+ // empty prefix would otherwise resolve to the default
namespace and "xmlns:" is
+ // not a legal attribute name.
+ if (value.indexOf(':') > 0) {
// there is a possibility of some namespace mapping
String prefix = value.substring(0, value.indexOf(':'));
if (ctx == null) {
diff --git a/xmlschema-core/src/test/java/tests/UnhandledAttributeTest.java
b/xmlschema-core/src/test/java/tests/UnhandledAttributeTest.java
new file mode 100644
index 00000000..1132176d
--- /dev/null
+++ b/xmlschema-core/src/test/java/tests/UnhandledAttributeTest.java
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package tests;
+
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import javax.xml.namespace.QName;
+
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaAttribute;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.w3c.dom.Attr;
+
+/**
+ * An unrecognised attribute on xs:attribute is kept, and when its value looks
like a QName the
+ * declaration of its prefix is kept with it.
+ */
+public class UnhandledAttributeTest extends Assert {
+
+ private static XmlSchemaAttribute readAttribute(String value) {
+ XmlSchema schema = new XmlSchemaCollection().read(new
StringReader(schemaWith(value)));
+ return schema.getAttributeByName(new QName("urn:t", "a"));
+ }
+
+ private static String schemaWith(String value) {
+ return "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\";
xmlns:t=\"urn:t\""
+ + " xmlns=\"urn:default\" targetNamespace=\"urn:t\">"
+ + "<xs:attribute name=\"a\" foo=\"" + value +
"\"/></xs:schema>";
+ }
+
+ private static String declarationOf(XmlSchemaAttribute attribute, String
prefix) {
+ for (Attr attr : attribute.getUnhandledAttributes()) {
+ if (("xmlns:" + prefix).equals(attr.getName())) {
+ return attr.getValue();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * A value starting with ':' has no prefix. It used to be read as the
empty prefix, which
+ * resolved to the default namespace and threw a DOMException creating an
"xmlns:" attribute.
+ */
+ @Test
+ public void testValueStartingWithAColonIsKeptAsIs() throws Exception {
+ XmlSchemaAttribute attribute = readAttribute(":x");
+ assertEquals(1, attribute.getUnhandledAttributes().length);
+ assertEquals(":x", attribute.getUnhandledAttributes()[0].getValue());
+
+ StringWriter written = new StringWriter();
+ new XmlSchemaCollection().read(new
StringReader(schemaWith(":x"))).write(written);
+ XmlSchema reread = new XmlSchemaCollection().read(new
StringReader(written.toString()));
+ assertNotNull(reread.getAttributeByName(new QName("urn:t", "a")));
+ }
+
+ @Test
+ public void testPrefixedValueStillKeepsItsDeclaration() throws Exception {
+ XmlSchemaAttribute attribute = readAttribute("t:x");
+ assertEquals("urn:t", declarationOf(attribute, "t"));
+ }
+}
