svn commit: r1918536 - in /xmlbeans/trunk/src: main/java/org/apache/xmlbeans/impl/common/ main/java/org/apache/xmlbeans/impl/inst2xsd/util/ main/java/org/apache/xmlbeans/impl/schema/ main/java/org/apache/xmlbeans/impl/store/ test/java/compile/scomp/che...

[fanningpj]

Author: fanningpj
Date: Mon Jun 24 10:29:23 2024
New Revision: 1918536

URL: http://svn.apache.org/viewvc?rev=1918536&view=rev
Log:
remove test added in error

Removed:
    xmlbeans/trunk/src/test/resources/xbean/compile/scomp/ScéimreSonraí/
Modified:
    
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java
    
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscState.java
    
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java
    xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java?rev=1918536&r1=1918535&r2=1918536&view=diff
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java 
(original)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java 
Mon Jun 24 10:29:23 2024
@@ -54,7 +54,7 @@ public class XMLNameHelper
         if (name == null)
             return "null";
 
-        if (name.getNamespaceUri() == null || name.getNamespaceUri().isEmpty())
+        if (name.getNamespaceUri() == null || name.getNamespaceURI().isEmpty())
             return name.getLocalName();
         
         return name.getLocalName() + "@" + name.getNamespaceUri();
@@ -109,7 +109,7 @@ public class XMLNameHelper
 
     public static String hexsafedir(XMLName name)
     {
-        if (name.getNamespaceUri() == null || name.getNamespaceUri().isEmpty())
+        if (name.getNamespaceUri() == null || name.getNamespaceURI().isEmpty())
             return "_nons/" + hexsafe(name.getLocalName());
         return hexsafe(name.getNamespaceUri()) + "/" + 
hexsafe(name.getLocalName());
     }

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java?rev=1918536&r1=1918535&r2=1918536&view=diff
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
 (original)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
 Mon Jun 24 10:29:23 2024
@@ -177,7 +177,7 @@ public class TypeSystemHolder
         if (!element.isRef())
         {
             assert element.getName().getNamespaceURI().equals(tns) ||
-                element.getName().getNamespaceUri().isEmpty();
+                element.getName().getNamespaceURI().isEmpty();
             fillUpTypeOnElement(element.getType(), localSElement, tns);
             localSElement.setName(element.getName().getLocalPart());
         }

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscState.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscState.java?rev=1918536&r1=1918535&r2=1918536&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscState.java 
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscState.java 
Mon Jun 24 10:29:23 2024
@@ -539,7 +539,7 @@ public class StscState {
      */
     private QName compatName(QName name, String chameleonNamespace) {
         // first check for a chameleonNamespace namespace
-        if (name.getNamespaceUri().isEmpty() && chameleonNamespace != null && 
chameleonNamespace.length() > 0) {
+        if (name.getNamespaceURI().isEmpty() && chameleonNamespace != null && 
chameleonNamespace.length() > 0) {
             name = new QName(chameleonNamespace, name.getLocalPart());
         }
 

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java?rev=1918536&r1=1918535&r2=1918536&view=diff
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
 (original)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
 Mon Jun 24 10:29:23 2024
@@ -1387,7 +1387,7 @@ public class StscTranslator {
                 state.error(XmlErrorCodes.NO_XSI, new 
Object[]{"http://www.w3.org/2001/XMLSchema-instance"}, xsdAttr.xgetName());
             }
 
-            if (qname.getNamespaceUri().isEmpty() && 
qname.getLocalPart().equals("xmlns")) {
+            if (qname.getNamespaceURI().isEmpty() && 
qname.getLocalPart().equals("xmlns")) {
                 state.error(XmlErrorCodes.NO_XMLNS, null, xsdAttr.xgetName());
             }
 

Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java?rev=1918536&r1=1918535&r2=1918536&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java 
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java Mon 
Jun 24 10:29:23 2024
@@ -394,7 +394,7 @@ abstract class Saver {
         // which has no namespace, then we must make sure that pushing
         // the mappings causes the default namespace to be empty
 
-        boolean ensureDefaultEmpty = name.getNamespaceUri().isEmpty();
+        boolean ensureDefaultEmpty = name.getNamespaceURI().isEmpty();
 
         pushMappings(_cur, ensureDefaultEmpty);
 

Modified: 
xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java?rev=1918536&r1=1918535&r2=1918536&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java 
(original)
+++ xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java 
Mon Jun 24 10:29:23 2024
@@ -314,23 +314,6 @@ public class CompilationTests {
     }
 
     @Test
-    void testScéimreSonraí() {
-        deltree(xbeanOutput("compile/scomp/scéimresonraí"));
-        // First, compile schema
-        File srcdir = xbeanOutput("compile/scomp/scéimresonraí/src");
-        File classesdir = xbeanOutput("compile/scomp/scéimresonraí/classes");
-        File outputjar = 
xbeanOutput("compile/scomp/scéimresonraí/scéimresonraí.jar");
-        Parameters params = new Parameters();
-        params.setXsdFiles(xbeanCase("ScéimreSonraí/scéimresonraí.xsd"));
-        params.setSrcDir(srcdir);
-        params.setClassesDir(classesdir);
-        params.setOutputJar(outputjar);
-        params.setVerbose(true);
-        assertTrue(SchemaCompiler.compile(params), "Build failed " + fwroot);
-        assertTrue(outputjar.exists(), "Cannot find " + outputjar);
-    }
-
-    @Test
     void testBase64Binary() {
         deltree(xbeanOutput("compile/scomp/base64Binary"));
         // First, compile schema



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org