diff options
| author | lana <none@none> | 2013-08-29 16:18:31 -0700 |
|---|---|---|
| committer | lana <none@none> | 2013-08-29 16:18:31 -0700 |
| commit | 7a367a01150fcf72bebdb3a7283ec3c8768d26f5 (patch) | |
| tree | 60ab29486ae2b34846d801390df8e8114f0f76a8 | |
| parent | 08bdb97156ea2d95e84ec81f5541f1306851924e (diff) | |
| parent | 9ee0bedc5665676711b0e4816d1f7ed490791baa (diff) | |
Mergejdk8-b106
367 files changed, 6815 insertions, 4909 deletions
diff --git a/src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java b/src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java index 50cfa747..5ed042ed 100644 --- a/src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java +++ b/src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -211,6 +211,7 @@ public class ParallelWorldClassLoader extends ClassLoader implements Closeable { throw new ClassNotFoundException("Loaded outside a jar "+url); url = url.substring(4); // cut off jar: url = url.substring(0,url.lastIndexOf('!')); // cut off everything after '!' + url = url.replaceAll(" ", "%20"); // support white spaces in path return new URL(url); } } diff --git a/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java b/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java index e66c91ac..04ff4c48 100644 --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,5 +47,8 @@ public @interface Probe { public boolean self() default false; public String providerName() default ""; public String moduleName() default ""; - + public boolean stateful() default false; + public String profileNames() default ""; + public boolean statefulReturn() default false; + public boolean statefulException() default false; } diff --git a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java index 3f6df885..bbba5738 100644 --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; import com.sun.org.glassfish.external.statistics.AverageRangeStatistic; @@ -139,6 +138,8 @@ public final class AverageRangeStatisticImpl extends StatisticImpl implements // todo: equals implementation public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + checkMethod(method); + Object result; try { result = method.invoke(this, args); @@ -147,7 +148,6 @@ public final class AverageRangeStatisticImpl extends StatisticImpl implements } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff --git a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java index 5eeafaf5..633771fa 100644 --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.BoundaryStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -81,6 +80,8 @@ public final class BoundaryStatisticImpl extends StatisticImpl // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -89,7 +90,6 @@ public final class BoundaryStatisticImpl extends StatisticImpl } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff --git a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java index 9cbf7b5f..52c8479d 100644 --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,8 +26,8 @@ package com.sun.org.glassfish.external.statistics.impl; + import com.sun.org.glassfish.external.statistics.BoundedRangeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -145,6 +145,8 @@ public final class BoundedRangeStatisticImpl extends StatisticImpl // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -153,7 +155,6 @@ public final class BoundedRangeStatisticImpl extends StatisticImpl } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff --git a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java index f593de23..351627b6 100644 --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.CountStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -103,6 +102,8 @@ public final class CountStatisticImpl extends StatisticImpl // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -111,7 +112,6 @@ public final class CountStatisticImpl extends StatisticImpl } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff --git a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java index cfe702a0..9f6ec99d 100644 --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.RangeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -125,6 +124,8 @@ public final class RangeStatisticImpl extends StatisticImpl // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -133,7 +134,6 @@ public final class RangeStatisticImpl extends StatisticImpl } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff --git a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java index 708f06a5..d257019a 100644 --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,8 +26,8 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.Statistic; -import java.io.Serializable; -import java.util.concurrent.atomic.AtomicLong; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -133,4 +133,13 @@ public abstract class StatisticImpl implements Statistic { protected static boolean isValidString(String str) { return (str!=null && str.length()>0); } + + protected void checkMethod(Method method) { + if (method == null || method.getDeclaringClass() == null + || !Statistic.class.isAssignableFrom(method.getDeclaringClass()) + || Modifier.isStatic(method.getModifiers())) { + throw new RuntimeException("Invalid method on invoke"); + } + } + } diff --git a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java index 972f1c17..f8486daf 100644 --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -90,6 +90,8 @@ public final class StringStatisticImpl extends StatisticImpl // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -98,7 +100,6 @@ public final class StringStatisticImpl extends StatisticImpl } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff --git a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java index 6e6bd723..27936b7e 100644 --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.TimeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -145,6 +144,8 @@ public final class TimeStatisticImpl extends StatisticImpl // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -153,7 +154,6 @@ public final class TimeStatisticImpl extends StatisticImpl } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties index c1805f1f..430a8d8e 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties @@ -30,10 +30,10 @@ BASEDIR_DOESNT_EXIST = \ Non-existent directory: {0} VERSION = \ - schemagen 2.2.8-b01 + schemagen 2.2.8-b20130806.1801 FULLVERSION = \ - schemagen full version "2.2.8-b01" + schemagen full version "2.2.8-b20130806.1801" USAGE = \ Usage: schemagen [-options ...] <java files> \n\ diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_de.properties b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_de.properties index 971c1709..ddf736fa 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_de.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_de.properties @@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = Nicht erkanntes {0} in Zeile {1} Spalte {2} BASEDIR_DOESNT_EXIST = Nicht vorhandenes Verzeichnis: {0} -VERSION = schemagen 2.2.8-b01 +VERSION = schemagen 2.2.8-b20130806.1801 -FULLVERSION = schemagen vollst\u00E4ndige Version "2.2.8-b01" +FULLVERSION = schemagen vollst\u00E4ndige Version "2.2.8-b20130806.1801" USAGE = Verwendung: schemagen [-options ...] <java files> \nOptionen: \n\\ \\ \\ \\ -d <path> : Gibt an, wo die von Prozessor und javac generierten Klassendateien gespeichert werden sollen\n\\ \\ \\ \\ -cp <path> : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -classpath <path> : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -encoding <encoding> : Gibt die Codierung f\u00FCr die Annotationsverarbeitung/den javac-Aufruf an \n\\ \\ \\ \\ -episode <file> : Generiert Episodendatei f\u00FCr separate Kompilierung\n\\ \\ \\ \\ -version : Zeigt Versionsinformation an\n\\ \\ \\ \\ -fullversion : Zeigt vollst\u00E4ndige Versionsinformationen an\n\\ \\ \\ \\ -help : Zeigt diese Verwendungsmeldung an diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_es.properties b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_es.properties index 03004726..d9a1b2ee 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_es.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_es.properties @@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = Aparece un {0} inesperado en la l\u00EDnea {1} y la colu BASEDIR_DOESNT_EXIST = Directorio no existente: {0} -VERSION = schemagen 2.2.8-b01 +VERSION = schemagen 2.2.8-b20130806.1801 -FULLVERSION = versi\u00F3n completa de schemagen "2.2.8-b01" +FULLVERSION = versi\u00F3n completa de schemagen "2.2.8-b20130806.1801" USAGE = Sintaxis: schemagen [-options ...] <archivos java> \nOpciones: \n\\ \\ \\ \\ -d <ruta de acceso> : especifique d\u00F3nde se colocan los archivos de clase generados por javac y el procesador\n\\ \\ \\ \\ -cp <ruta de acceso> : especifique d\u00F3nde se encuentran los archivos especificados por el usuario\n\\ \\ \\ \\ -encoding <codificaci\u00F3n> : especifique la codificaci\u00F3n que se va a utilizar para el procesamiento de anotaciones/llamada de javac\n\\ \\ \\ \\ -episode <archivo> : genera un archivo de episodio para una compilaci\u00F3n diferente\n\\ \\ \\ \\ -version : muestra la informaci\u00F3n de la versi\u00F3n\n\\ \\ \\ \\ -fullversion : muestra la informaci\u00F3n completa de la versi\u00F3n\n\\ \\ \\ \\ -help : muestra este mensaje de sintaxis diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties index b3107ee4..1ed6126b 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties @@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = Un \u00E9l\u00E9ment {0} inattendu appara\u00EEt \u00E0 BASEDIR_DOESNT_EXIST = R\u00E9pertoire {0} inexistant -VERSION = schemagen 2.2.8-b01 +VERSION = schemagen 2.2.8-b20130806.1801 -FULLVERSION = version compl\u00E8te de schemagen "2.2.8-b01" +FULLVERSION = version compl\u00E8te de schemagen "2.2.8-b20130806.1801" USAGE = Syntaxe : schemagen [-options ...] <java files> \nOptions : \n\ \ \ \ -d <path> : indiquez o\u00F9 placer les fichiers de classe g\u00E9n\u00E9r\u00E9s par le processeur et le compilateur javac\n\ \ \ \ -cp <path> : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -classpath <path> : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -encoding <encoding> : indiquez l'encodage \u00E0 utiliser pour l'appel de javac/traitement de l'annotation \n\ \ \ \ -episode <file> : g\u00E9n\u00E9rez un fichier d'\u00E9pisode pour la compilation s\u00E9par\u00E9e\n\ \ \ \ -version : affichez les informations de version\n\ \ \ \ -fullversion : affichez les informations compl\u00E8tes de version\n\ \ \ \ -help : affichez ce message de syntaxe diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_it.properties b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_it.properties index 0aa7cf4c..0208b662 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_it.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_it.properties @@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = {0} imprevisto visualizzato sulla riga {1} colonna {2} BASEDIR_DOESNT_EXIST = Directory non esistente: {0} -VERSION = schemagen 2.2.8-b01 +VERSION = schemagen 2.2.8-b20130806.1801 -FULLVERSION = versione completa schemagen "2.2.8-b01" +FULLVERSION = versione completa schemagen "2.2.8-b20130806.1801" USAGE = Uso: schemagen [-options ...] <java files> \nOpzioni: \n\ \ \ \ -d <path> : specifica dove posizionare il processore e i file della classe generata javac\n\ \ \ \ -cp <path> : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -classpath <path> : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -encoding <encoding> : specifica la codifica da usare per l'elaborazione dell'annotazione/richiamo javac \n\ \ \ \ -episode <file> : genera il file di episodio per la compilazione separata\n\ \ \ \ -version : visualizza le informazioni sulla versione\n\ \ \ \ -fullversion : visualizza le informazioni sulla versione completa\n\ \ \ \ -help : visualizza questo messaggio sull'uso diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties index b8889bb6..7678e5d8 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties @@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = \u4E88\u671F\u3057\u306A\u3044{0}\u304C\u884C{1}\u3001\u BASEDIR_DOESNT_EXIST = \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0} -VERSION = schemagen 2.2.8-b01 +VERSION = schemagen 2.2.8-b20130806.1801 -FULLVERSION = schemagen\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.8-b01" +FULLVERSION = schemagen\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.8-b20130806.1801" USAGE = \u4F7F\u7528\u65B9\u6CD5: schemagen [-options ...] <java files> \n\u30AA\u30D7\u30B7\u30E7\u30F3: \n\ \ \ \ -d <path> : \u30D7\u30ED\u30BB\u30C3\u30B5\u304A\u3088\u3073javac\u304C\u751F\u6210\u3057\u305F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u7F6E\u304F\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -cp <path> : \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -classpath <path> : \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -encoding <encoding> : \u6CE8\u91C8\u51E6\u7406/javac\u547C\u51FA\u3057\u306B\u4F7F\u7528\u3059\u308B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -episode <file> : \u30B3\u30F3\u30D1\u30A4\u30EB\u3054\u3068\u306B\u30A8\u30D4\u30BD\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3057\u307E\u3059\n\ \ \ \ -version : \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -fullversion : \u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -help : \u3053\u306E\u4F7F\u7528\u4F8B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059 diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties index b89650bd..cfc4364d 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties @@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = \uC608\uC0C1\uCE58 \uC54A\uC740 {0}\uC774(\uAC00) {1}\uD BASEDIR_DOESNT_EXIST = \uC874\uC7AC\uD558\uC9C0 \uC54A\uB294 \uB514\uB809\uD1A0\uB9AC: {0} -VERSION = schemagen 2.2.8-b01 +VERSION = schemagen 2.2.8-b20130806.1801 -FULLVERSION = schemagen \uC815\uC2DD \uBC84\uC804 "2.2.8-b01" +FULLVERSION = schemagen \uC815\uC2DD \uBC84\uC804 "2.2.8-b20130806.1801" USAGE = \uC0AC\uC6A9\uBC95: schemagen [-options ...] <java files> \n\uC635\uC158: \n\ \ \ \ -d <path> : \uD504\uB85C\uC138\uC11C \uBC0F javac\uC5D0\uC11C \uC0DD\uC131\uD55C \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uBC30\uCE58\uD560 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -cp <path> : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -classpath <path> : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -encoding <encoding> : \uC8FC\uC11D \uCC98\uB9AC/javac \uD638\uCD9C\uC5D0 \uC0AC\uC6A9\uD560 \uC778\uCF54\uB529\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4. \n\ \ \ \ -episode <file> : \uBCC4\uB3C4 \uCEF4\uD30C\uC77C\uC744 \uC704\uD574 episode \uD30C\uC77C\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n\ \ \ \ -version : \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -fullversion : \uC815\uC2DD \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -help : \uC774 \uC0AC\uC6A9\uBC95 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4. diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties index fc9f8afb..318ab2c5 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties @@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = {0} inesperado aparece na linha {1} coluna {2} BASEDIR_DOESNT_EXIST = Diret\u00F3rio n\u00E3o existente: {0} -VERSION = gera\u00E7\u00E3o do esquema 2.2.8-b01 +VERSION = gera\u00E7\u00E3o do esquema 2.2.8-b20130806.1801 -FULLVERSION = vers\u00E3o completa da gera\u00E7\u00E3o do esquema "2.2.8-b01" +FULLVERSION = vers\u00E3o completa da gera\u00E7\u00E3o do esquema "2.2.8-b20130806.1801" USAGE = Uso: gera\u00E7\u00E3o do esquema [-options ...] <java files> \nOp\u00E7\u00F5es: \n\\ \\ \\ \\ -d <path> : especificar onde colocar o processador e os arquivos da classe gerados por javac\n\\ \\ \\ \\ -cp <path> : especificar onde localizar arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -classpath <path> : especificar onde localizar os arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -encoding <encoding> : especificar codifica\u00E7\u00E3o a ser usada para processamento de anota\u00E7\u00E3o/chamada javac \n\\ \\ \\ \\ -episode <file> : gerar arquivo do epis\u00F3dio para compila\u00E7\u00E3o separada\n\\ \\ \\ \\ -version : exibir informa\u00E7\u00F5es da vers\u00E3o\n\\ \\ \\ \\ -fullversion : exibir informa\u00E7\u00F5es da vers\u00E3o completa\n\\ \\ \\ \\ -help : exibir esta mensagem de uso diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties index 4493b23d..87636c0d 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties @@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = \u5728\u7B2C {1} \u884C, \u7B2C {2} \u5217\u51FA\u73B0\u BASEDIR_DOESNT_EXIST = \u4E0D\u5B58\u5728\u7684\u76EE\u5F55: {0} -VERSION = schemagen 2.2.8-b01 +VERSION = schemagen 2.2.8-b20130806.1801 -FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.8-b01" +FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.8-b20130806.1801" USAGE = \u7528\u6CD5: schemagen [-options ...] <java files> \n\u9009\u9879: \n\ \ \ \ -d <path> : \u6307\u5B9A\u653E\u7F6E\u5904\u7406\u7A0B\u5E8F\u548C javac \u751F\u6210\u7684\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -cp <path> : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -classpath <path> : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -encoding <encoding> : \u6307\u5B9A\u7528\u4E8E\u6CE8\u91CA\u5904\u7406/javac \u8C03\u7528\u7684\u7F16\u7801\n\ \ \ \ -episode <file> : \u751F\u6210\u7247\u6BB5\u6587\u4EF6\u4EE5\u4F9B\u5355\u72EC\u7F16\u8BD1\n\ \ \ \ -version : \u663E\u793A\u7248\u672C\u4FE1\u606F\n\ \ \ \ -fullversion : \u663E\u793A\u5B8C\u6574\u7684\u7248\u672C\u4FE1\u606F\n\ \ \ \ -help : \u663E\u793A\u6B64\u7528\u6CD5\u6D88\u606F diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties index 45748f11..d828ed5f 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties @@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = \u672A\u9810\u671F\u7684 {0} \u986F\u793A\u65BC\u884C {1 BASEDIR_DOESNT_EXIST = \u4E0D\u5B58\u5728\u7684\u76EE\u9304: {0} -VERSION = schemagen 2.2.8-b01 +VERSION = schemagen 2.2.8-b20130806.1801 -FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.8-b01" +FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.8-b20130806.1801" USAGE = \u7528\u6CD5: schemagen [-options ...] <java files> \n\u9078\u9805: \n\\ \\ \\ \\ -d <path> : \u6307\u5B9A\u8655\u7406\u5668\u4EE5\u53CA javac \u7522\u751F\u7684\u985E\u5225\u6A94\u6848\u653E\u7F6E\u4F4D\u7F6E\n\\ \\ \\ \\ -cp <path> : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -classpath <path> : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -encoding <encoding> : \u6307\u5B9A\u8981\u7528\u65BC\u8A3B\u89E3\u8655\u7406/javac \u547C\u53EB\u7684\u7DE8\u78BC \n\\ \\ \\ \\ -episode <file> : \u7522\u751F\u7368\u7ACB\u7DE8\u8B6F\u7684\u4E8B\u4EF6 (episode) \u6A94\u6848\n\\ \\ \\ \\ -version : \u986F\u793A\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -fullversion : \u986F\u793A\u5B8C\u6574\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -help : \u986F\u793A\u6B64\u7528\u6CD5\u8A0A\u606F diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java index be038f6a..6ad38ce1 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java @@ -64,6 +64,9 @@ import org.xml.sax.Attributes; * AttributeList} interface, it also includes a much more efficient * implementation using a single array rather than a set of Vectors.</p> * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * @since SAX 2.0 * @author David Megginson, * <a href="mailto:sax@megginson.com">sax@megginson.com</a> diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java index 60968c00..bbd1ba07 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java @@ -33,7 +33,11 @@ import com.sun.tools.internal.jxc.NGCCRuntimeEx; import java.util.List; import java.util.ArrayList; - +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public class Classes extends NGCCHandler { private String __text; private String exclude_content; @@ -78,17 +82,11 @@ public class Classes extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 4: - { - $_ngcc_current_state = 3; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; - case 11: + case 12: { - if(($__uri.equals("") && $__local.equals("includes"))) { + if(($__uri.equals("") && $__local.equals("classes"))) { $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - $_ngcc_current_state = 10; + $_ngcc_current_state = 11; } else { unexpectedEnterElement($__qname); @@ -107,22 +105,28 @@ public class Classes extends NGCCHandler { } } break; - case 0: + case 4: { - revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); + $_ngcc_current_state = 3; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } break; - case 12: + case 11: { - if(($__uri.equals("") && $__local.equals("classes"))) { + if(($__uri.equals("") && $__local.equals("includes"))) { $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - $_ngcc_current_state = 11; + $_ngcc_current_state = 10; } else { unexpectedEnterElement($__qname); } } break; + case 0: + { + revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; default: { unexpectedEnterElement($__qname); @@ -137,34 +141,45 @@ public class Classes extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 2: + { + $_ngcc_current_state = 1; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; case 4: { $_ngcc_current_state = 3; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 3: + case 1: { - if(($__uri.equals("") && $__local.equals("excludes"))) { + if(($__uri.equals("") && $__local.equals("classes"))) { $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 1; + $_ngcc_current_state = 0; } else { unexpectedLeaveElement($__qname); } } break; - case 1: + case 3: { - if(($__uri.equals("") && $__local.equals("classes"))) { + if(($__uri.equals("") && $__local.equals("excludes"))) { $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 0; + $_ngcc_current_state = 1; } else { unexpectedLeaveElement($__qname); } } break; + case 0: + { + revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); + } + break; case 8: { if(($__uri.equals("") && $__local.equals("includes"))) { @@ -176,17 +191,6 @@ public class Classes extends NGCCHandler { } } break; - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 0: - { - revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveElement($__qname); @@ -201,15 +205,15 @@ public class Classes extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 4: + case 2: { - $_ngcc_current_state = 3; + $_ngcc_current_state = 1; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 2: + case 4: { - $_ngcc_current_state = 1; + $_ngcc_current_state = 3; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; @@ -232,15 +236,15 @@ public class Classes extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 4: + case 2: { - $_ngcc_current_state = 3; + $_ngcc_current_state = 1; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 2: + case 4: { - $_ngcc_current_state = 1; + $_ngcc_current_state = 3; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; @@ -260,27 +264,19 @@ public class Classes extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 4: + case 2: { - exclude_content = $value; - $_ngcc_current_state = 3; - action0(); + $_ngcc_current_state = 1; + $runtime.sendText(super._cookie, $value); } break; - case 3: + case 4: { exclude_content = $value; $_ngcc_current_state = 3; action0(); } break; - case 9: - { - include_content = $value; - $_ngcc_current_state = 8; - action2(); - } - break; case 10: { __text = $value; @@ -288,6 +284,13 @@ public class Classes extends NGCCHandler { action3(); } break; + case 3: + { + exclude_content = $value; + $_ngcc_current_state = 3; + action0(); + } + break; case 6: { __text = $value; @@ -295,22 +298,23 @@ public class Classes extends NGCCHandler { action1(); } break; - case 8: + case 0: { - include_content = $value; - $_ngcc_current_state = 8; - action2(); + revertToParentFromText(this, super._cookie, $value); } break; - case 2: + case 9: { - $_ngcc_current_state = 1; - $runtime.sendText(super._cookie, $value); + include_content = $value; + $_ngcc_current_state = 8; + action2(); } break; - case 0: + case 8: { - revertToParentFromText(this, super._cookie, $value); + include_content = $value; + $_ngcc_current_state = 8; + action2(); } break; } diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java index f806a817..60aef42c 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java @@ -36,7 +36,11 @@ import java.util.List; import java.util.ArrayList; import java.io.File; - +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public class Config extends NGCCHandler { private String bd; private Schema _schema; @@ -74,15 +78,19 @@ public class Config extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: + case 0: + { + revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 1: { if(($__uri.equals("") && $__local.equals("schema"))) { - NGCCHandler h = new Schema(this, super._source, $runtime, 16, baseDir); + NGCCHandler h = new Schema(this, super._source, $runtime, 19, baseDir); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 1; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; @@ -100,7 +108,7 @@ public class Config extends NGCCHandler { case 4: { if(($__uri.equals("") && $__local.equals("classes"))) { - NGCCHandler h = new Classes(this, super._source, $runtime, 18); + NGCCHandler h = new Classes(this, super._source, $runtime, 22); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -108,19 +116,15 @@ public class Config extends NGCCHandler { } } break; - case 0: - { - revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; - case 1: + case 2: { if(($__uri.equals("") && $__local.equals("schema"))) { - NGCCHandler h = new Schema(this, super._source, $runtime, 15, baseDir); + NGCCHandler h = new Schema(this, super._source, $runtime, 20, baseDir); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 1; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; @@ -149,12 +153,6 @@ public class Config extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; case 0: { revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); @@ -171,6 +169,12 @@ public class Config extends NGCCHandler { } } break; + case 2: + { + $_ngcc_current_state = 1; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; case 7: { if(($ai = $runtime.getAttributeIndex("","baseDir"))>=0) { @@ -196,15 +200,15 @@ public class Config extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: + case 0: { - $_ngcc_current_state = 1; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; - case 0: + case 2: { - revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 1; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; case 7: @@ -231,10 +235,9 @@ public class Config extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: + case 0: { - $_ngcc_current_state = 1; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; case 5: @@ -247,9 +250,10 @@ public class Config extends NGCCHandler { } } break; - case 0: + case 2: { - revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 1; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; default: @@ -263,10 +267,9 @@ public class Config extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 2: + case 0: { - $_ngcc_current_state = 1; - $runtime.sendText(super._cookie, $value); + revertToParentFromText(this, super._cookie, $value); } break; case 6: @@ -276,9 +279,10 @@ public class Config extends NGCCHandler { action1(); } break; - case 0: + case 2: { - revertToParentFromText(this, super._cookie, $value); + $_ngcc_current_state = 1; + $runtime.sendText(super._cookie, $value); } break; case 7: @@ -294,20 +298,20 @@ public class Config extends NGCCHandler { public void onChildCompleted(Object result, int cookie, boolean needAttCheck)throws SAXException { switch(cookie) { - case 16: + case 19: { this._schema = ((Schema)result); action0(); $_ngcc_current_state = 1; } break; - case 18: + case 22: { this.classes = ((Classes)result); $_ngcc_current_state = 2; } break; - case 15: + case 20: { this._schema = ((Schema)result); action0(); diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java index 15fbe303..ee80bdf8 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java @@ -29,7 +29,9 @@ import org.xml.sax.Attributes; import org.xml.sax.SAXException; /** - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * * @author Kohsuke Kawaguchi (kk@kohsuke.org) */ diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java index b90624a9..f1ffb72d 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java @@ -29,7 +29,9 @@ import org.xml.sax.Attributes; import org.xml.sax.SAXException; /** - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * * @author Kohsuke Kawaguchi (kk@kohsuke.org) */ diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java index 8fe7a1a8..fe4d5e9b 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java @@ -29,7 +29,9 @@ import org.xml.sax.Attributes; import org.xml.sax.SAXException; /** - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * * @version $Id: NGCCHandler.java,v 1.9 2002/09/29 02:55:48 okajima Exp $ * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java index ddb02345..702b0bdb 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java @@ -32,6 +32,9 @@ import org.xml.sax.SAXException; * Dispatches incoming events into sub handlers appropriately * so that the interleaving semantics will be correctly realized. * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * @author Kohsuke Kawaguchi (kk@kohsuke.org) */ public abstract class NGCCInterleaveFilter implements NGCCEventSource, NGCCEventReceiver { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java index 74837e33..a9184d6f 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java @@ -50,7 +50,9 @@ import org.xml.sax.SAXParseException; * <li>manage mapping between namespace URIs and prefixes. * * <li>TODO: provide support for interleaving. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * @version $Id: NGCCRuntime.java,v 1.15 2002/09/29 02:55:48 okajima Exp $ * @author Kohsuke Kawaguchi (kk@kohsuke.org) */ diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java index 18de25f4..f238314c 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java @@ -32,7 +32,11 @@ import com.sun.tools.internal.jxc.NGCCRuntimeEx; import java.io.File; - +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public class Schema extends NGCCHandler { private File baseDir; private String loc; @@ -72,26 +76,26 @@ public class Schema extends NGCCHandler { revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); } break; - case 6: + case 2: { - if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { + if(($ai = $runtime.getAttributeIndex("","location"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 2; + $_ngcc_current_state = 1; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 2: + case 6: { - if(($ai = $runtime.getAttributeIndex("","location"))>=0) { + if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 2; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } @@ -121,23 +125,22 @@ public class Schema extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: - { - revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); - } - break; - case 6: + case 1: { - if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("schema"))) { + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 0; } else { - $_ngcc_current_state = 2; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + unexpectedLeaveElement($__qname); } } break; + case 0: + { + revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); + } + break; case 2: { if(($ai = $runtime.getAttributeIndex("","location"))>=0) { @@ -150,14 +153,15 @@ public class Schema extends NGCCHandler { } } break; - case 1: + case 6: { - if(($__uri.equals("") && $__local.equals("schema"))) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 0; + if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - unexpectedLeaveElement($__qname); + $_ngcc_current_state = 2; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; @@ -180,24 +184,24 @@ public class Schema extends NGCCHandler { revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; - case 6: + case 2: { - if(($__uri.equals("") && $__local.equals("namespace"))) { - $_ngcc_current_state = 8; + if(($__uri.equals("") && $__local.equals("location"))) { + $_ngcc_current_state = 4; } else { - $_ngcc_current_state = 2; + $_ngcc_current_state = 1; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; - case 2: + case 6: { - if(($__uri.equals("") && $__local.equals("location"))) { - $_ngcc_current_state = 4; + if(($__uri.equals("") && $__local.equals("namespace"))) { + $_ngcc_current_state = 8; } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 2; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } @@ -221,26 +225,20 @@ public class Schema extends NGCCHandler { revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; - case 7: + case 3: { - if(($__uri.equals("") && $__local.equals("namespace"))) { - $_ngcc_current_state = 2; + if(($__uri.equals("") && $__local.equals("location"))) { + $_ngcc_current_state = 1; } else { unexpectedLeaveAttribute($__qname); } } break; - case 6: - { - $_ngcc_current_state = 2; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 3: + case 7: { - if(($__uri.equals("") && $__local.equals("location"))) { - $_ngcc_current_state = 1; + if(($__uri.equals("") && $__local.equals("namespace"))) { + $_ngcc_current_state = 2; } else { unexpectedLeaveAttribute($__qname); @@ -253,6 +251,12 @@ public class Schema extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; + case 6: + { + $_ngcc_current_state = 2; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; default: { unexpectedLeaveAttribute($__qname); @@ -270,38 +274,38 @@ public class Schema extends NGCCHandler { $_ngcc_current_state = 7; } break; + case 4: + { + loc = $value; + $_ngcc_current_state = 3; + action0(); + } + break; case 0: { revertToParentFromText(this, super._cookie, $value); } break; - case 6: + case 2: { - if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { + if(($ai = $runtime.getAttributeIndex("","location"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 2; + $_ngcc_current_state = 1; $runtime.sendText(super._cookie, $value); } } break; - case 4: - { - loc = $value; - $_ngcc_current_state = 3; - action0(); - } - break; - case 2: + case 6: { - if(($ai = $runtime.getAttributeIndex("","location"))>=0) { + if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 2; $runtime.sendText(super._cookie, $value); } } diff --git a/src/share/jaxws_classes/com/sun/tools/internal/ws/version.properties b/src/share/jaxws_classes/com/sun/tools/internal/ws/version.properties index 5d7ed24b..9862bdc6 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/version.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/version.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ # questions. # -build-id=2.2.9-b14027 -build-version=JAX-WS RI 2.2.9-b14027 +build-id=2.2.9-b14140 +build-version=JAX-WS RI 2.2.9-b14140 major-version=2.2.9 -svn-revision=14027 +svn-revision=14140 diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle.properties b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle.properties index 4e64ca0c..bf21c1ee 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle.properties @@ -171,23 +171,23 @@ Driver.CompilingSchema = \ Driver.FailedToGenerateCode = \ Failed to produce code. -# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter> +# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter> Driver.FilePrologComment = \ - This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b01 \n\ + This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b20130806.1801 \n\ See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\ Any modifications to this file will be lost upon recompilation of the source schema. \n\ Generated on: {0} \n Driver.Version = \ - xjc 2.2.8-b01 + xjc 2.2.8-b20130806.1801 Driver.FullVersion = \ - xjc full version "2.2.8-b01-b28" + xjc full version "2.2.8-b20130806.1801" -Driver.BuildID = 2.2.8-b01 +Driver.BuildID = 2.2.8-b20130806.1801 # for JDK integration - include version in source zip -jaxb.jdk.version=2.2.8-b01 +jaxb.jdk.version=@@JAXB_JDK_VERSION@@ # see java.text.SimpleDateFormat for format syntax # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date. diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_de.properties b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_de.properties index 3fee895e..560d6b66 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_de.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_de.properties @@ -96,17 +96,17 @@ Driver.CompilingSchema = Ein Schema wird kompiliert ... Driver.FailedToGenerateCode = Code konnte nicht erzeugt werden. -# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter> -Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b01 generiert \nSiehe <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. \nGeneriert: {0} \n +# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter> +Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b20130806.1801 generiert \nSiehe <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. \nGeneriert: {0} \n -Driver.Version = xjc 2.2.8-b01 +Driver.Version = xjc 2.2.8-b20130806.1801 -Driver.FullVersion = xjc vollst\u00e4ndige Version "2.2.8-b01-b28" +Driver.FullVersion = xjc vollst\u00E4ndige Version "2.2.8-b20130806.1801" -Driver.BuildID = 2.2.8-b01 +Driver.BuildID = 2.2.8-b20130806.1801 # for JDK integration - include version in source zip -jaxb.jdk.version=2.2.8-b01 +jaxb.jdk.version=@@JAXB_JDK_VERSION@@ # see java.text.SimpleDateFormat for format syntax # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date. diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_es.properties b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_es.properties index ee3e09df..47a66fc7 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_es.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_es.properties @@ -96,17 +96,17 @@ Driver.CompilingSchema = Compilando un esquema... Driver.FailedToGenerateCode = Fallo al producir c\u00f3digo. -# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter> -Driver.FilePrologComment = Este archivo ha sido generado por la arquitectura JavaTM para la implantaci\u00f3n de la referencia de enlace (JAXB) XML v2.2.8-b01 \nVisite <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nTodas las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a compilar el esquema de origen. \nGenerado el: {0} \n +# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter> +Driver.FilePrologComment = Este archivo ha sido generado por la arquitectura JavaTM para la implantaci\u00f3n de la referencia de enlace (JAXB) XML v2.2.8-b20130806.1801 \nVisite <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nTodas las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a compilar el esquema de origen. \nGenerado el: {0} \n -Driver.Version = xjc 2.2.8-b01 +Driver.Version = xjc 2.2.8-b20130806.1801 -Driver.FullVersion = versi\u00f3n completa de xjc "2.2.8-b01-b28" +Driver.FullVersion = versi\u00F3n completa de xjc "2.2.8-b20130806.1801" -Driver.BuildID = 2.2.8-b01 +Driver.BuildID = 2.2.8-b20130806.1801 # for JDK integration - include version in source zip -jaxb.jdk.version=2.2.8-b01 +jaxb.jdk.version=@@JAXB_JDK_VERSION@@ # see java.text.SimpleDateFormat for format syntax # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date. diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties index d5a8fbba..a9dea414 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties @@ -96,17 +96,17 @@ Driver.CompilingSchema = compilation d'un sch\u00e9ma... Driver.FailedToGenerateCode = Echec de la production du code. -# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter> -Driver.FilePrologComment = Ce fichier a \u00e9t\u00e9 g\u00e9n\u00e9r\u00e9 par l''impl\u00e9mentation de r\u00e9f\u00e9rence JavaTM Architecture for XML Binding (JAXB), v2.2.8-b01 \nVoir <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nToute modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n +# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter> +Driver.FilePrologComment = Ce fichier a \u00e9t\u00e9 g\u00e9n\u00e9r\u00e9 par l''impl\u00e9mentation de r\u00e9f\u00e9rence JavaTM Architecture for XML Binding (JAXB), v2.2.8-b20130806.1801 \nVoir <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nToute modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n -Driver.Version = xjc 2.2.8-b01 +Driver.Version = xjc 2.2.8-b20130806.1801 -Driver.FullVersion = version compl\u00e8te xjc "2.2.8-b01-b28" +Driver.FullVersion = version compl\u00E8te xjc "2.2.8-b20130806.1801" -Driver.BuildID = 2.2.8-b01 +Driver.BuildID = 2.2.8-b20130806.1801 # for JDK integration - include version in source zip -jaxb.jdk.version=2.2.8-b01 +jaxb.jdk.version=@@JAXB_JDK_VERSION@@ # see java.text.SimpleDateFormat for format syntax # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date. diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_it.properties b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_it.properties index 33441891..b63eb553 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_it.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_it.properties @@ -96,17 +96,17 @@ Driver.CompilingSchema = compilazione di uno schema in corso... Driver.FailedToGenerateCode = Produzione del codice non riuscita. -# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter> -Driver.FilePrologComment = Questo file \u00e8 stato generato dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, v2.2.8-b01 \nVedere <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione dello schema di origine. \nGenerato il: {0} \n +# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter> +Driver.FilePrologComment = Questo file \u00e8 stato generato dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, v2.2.8-b20130806.1801 \nVedere <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione dello schema di origine. \nGenerato il: {0} \n -Driver.Version = xjc 2.2.8-b01 +Driver.Version = xjc 2.2.8-b20130806.1801 -Driver.FullVersion = versione completa xjc "2.2.8-b01-b28" +Driver.FullVersion = versione completa xjc "2.2.8-b20130806.1801" -Driver.BuildID = 2.2.8-b01 +Driver.BuildID = 2.2.8-b20130806.1801 # for JDK integration - include version in source zip -jaxb.jdk.version=2.2.8-b01 +jaxb.jdk.version=@@JAXB_JDK_VERSION@@ # see java.text.SimpleDateFormat for format syntax # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date. diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties index edd5c648..8dd5b8a8 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties @@ -96,17 +96,17 @@ Driver.CompilingSchema = \u30b9\u30ad\u30fc\u30de\u306e\u30b3\u30f3\u30d1\u30a4\ Driver.FailedToGenerateCode = \u30b3\u30fc\u30c9\u306e\u751f\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 -# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter> -Driver.FilePrologComment = \u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001JavaTM Architecture for XML Binding(JAXB) Reference Implementation\u3001v2.2.8-b01\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u307e\u3057\u305f \n<a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 \n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002 \n\u751f\u6210\u65e5: {0} \n +# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter> +Driver.FilePrologComment = \u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001JavaTM Architecture for XML Binding(JAXB) Reference Implementation\u3001v2.2.8-b20130806.1801\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u307e\u3057\u305f \n<a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 \n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002 \n\u751f\u6210\u65e5: {0} \n -Driver.Version = xjc 2.2.8-b01 +Driver.Version = xjc 2.2.8-b20130806.1801 -Driver.FullVersion = xjc\u30d5\u30eb\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3"2.2.8-b01-b28" +Driver.FullVersion = xjc\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.8-b20130806.1801" -Driver.BuildID = 2.2.8-b01 +Driver.BuildID = 2.2.8-b20130806.1801 # for JDK integration - include version in source zip -jaxb.jdk.version=2.2.8-b01 +jaxb.jdk.version=@@JAXB_JDK_VERSION@@ # see java.text.SimpleDateFormat for format syntax # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date. diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties index d493f5bd..3d0f6b9f 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties @@ -96,17 +96,17 @@ Driver.CompilingSchema = \uc2a4\ud0a4\ub9c8\ub97c \ucef4\ud30c\uc77c\ud558\ub294 Driver.FailedToGenerateCode = \ucf54\ub4dc \uc0dd\uc131\uc744 \uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4. -# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter> -Driver.FilePrologComment = \uc774 \ud30c\uc77c\uc740 JAXB(JavaTM Architecture for XML Binding) \ucc38\uc870 \uad6c\ud604 2.2.8-b01 \ubc84\uc804\uc744 \ud1b5\ud574 \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \n<a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c \uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 \uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n +# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter> +Driver.FilePrologComment = \uc774 \ud30c\uc77c\uc740 JAXB(JavaTM Architecture for XML Binding) \ucc38\uc870 \uad6c\ud604 2.2.8-b20130806.1801 \ubc84\uc804\uc744 \ud1b5\ud574 \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \n<a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c \uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 \uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n -Driver.Version = XJC 2.2.8-b01 +Driver.Version = XJC 2.2.8-b20130806.1801 -Driver.FullVersion = XJC \uc815\uc2dd \ubc84\uc804 "2.2.8-b01-b28" +Driver.FullVersion = XJC \uC815\uC2DD \uBC84\uC804 "2.2.8-b20130806.1801" -Driver.BuildID = 2.2.8-b01 +Driver.BuildID = 2.2.8-b20130806.1801 # for JDK integration - include version in source zip -jaxb.jdk.version=2.2.8-b01 +jaxb.jdk.version=@@JAXB_JDK_VERSION@@ # see java.text.SimpleDateFormat for format syntax # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date. diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties index 3ac7a0bf..c7eb0286 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties @@ -96,17 +96,17 @@ Driver.CompilingSchema = compilando um esquema... Driver.FailedToGenerateCode = Falha ao produzir o c\u00f3digo. -# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter> -Driver.FilePrologComment = Este arquivo foi gerado pela Arquitetura JavaTM para Implementa\u00e7\u00e3o de Refer\u00eancia (JAXB) de Bind XML, v2.2.8-b01 \nConsulte <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nTodas as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n +# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter> +Driver.FilePrologComment = Este arquivo foi gerado pela Arquitetura JavaTM para Implementa\u00e7\u00e3o de Refer\u00eancia (JAXB) de Bind XML, v2.2.8-b20130806.1801 \nConsulte <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nTodas as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n -Driver.Version = xjc 2.2.8-b01 +Driver.Version = xjc 2.2.8-b20130806.1801 -Driver.FullVersion = vers\u00e3o completa de xjc "2.2.8-b01-b28" +Driver.FullVersion = vers\u00E3o completa de xjc "2.2.8-b20130806.1801" -Driver.BuildID = 2.2.8-b01 +Driver.BuildID = 2.2.8-b20130806.1801 # for JDK integration - include version in source zip -jaxb.jdk.version=2.2.8-b01 +jaxb.jdk.version=@@JAXB_JDK_VERSION@@ # see java.text.SimpleDateFormat for format syntax # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date. diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties index 610bb1e3..748aab67 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties @@ -96,17 +96,17 @@ Driver.CompilingSchema = \u6b63\u5728\u7f16\u8bd1\u6a21\u5f0f... Driver.FailedToGenerateCode = \u65e0\u6cd5\u751f\u6210\u4ee3\u7801\u3002 -# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter> -Driver.FilePrologComment = \u6b64\u6587\u4ef6\u662f\u7531 JavaTM Architecture for XML Binding (JAXB) \u5f15\u7528\u5b9e\u73b0 v2.2.8-b01 \u751f\u6210\u7684\n\u8bf7\u8bbf\u95ee <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, \u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4: {0} \n +# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter> +Driver.FilePrologComment = \u6b64\u6587\u4ef6\u662f\u7531 JavaTM Architecture for XML Binding (JAXB) \u5f15\u7528\u5b9e\u73b0 v2.2.8-b20130806.1801 \u751f\u6210\u7684\n\u8bf7\u8bbf\u95ee <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, \u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4: {0} \n -Driver.Version = xjc 2.2.8-b01 +Driver.Version = xjc 2.2.8-b20130806.1801 -Driver.FullVersion = xjc \u5b8c\u6574\u7248\u672c "2.2.8-b01-b28" +Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.8-b20130806.1801" -Driver.BuildID = 2.2.8-b01 +Driver.BuildID = 2.2.8-b20130806.1801 # for JDK integration - include version in source zip -jaxb.jdk.version=2.2.8-b01 +jaxb.jdk.version=@@JAXB_JDK_VERSION@@ # see java.text.SimpleDateFormat for format syntax # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date. diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties index 3ed7786c..a305e7e7 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties @@ -96,17 +96,17 @@ Driver.CompilingSchema = \u6b63\u5728\u7de8\u8b6f\u7db1\u8981... Driver.FailedToGenerateCode = \u7121\u6cd5\u7522\u751f\u7a0b\u5f0f\u78bc. -# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter> -Driver.FilePrologComment = \u6b64\u6a94\u6848\u662f\u7531 JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b01 \u6240\u7522\u751f \n\u8acb\u53c3\u95b1 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, \u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931. \n\u7522\u751f\u6642\u9593: {0} \n +# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter> +Driver.FilePrologComment = \u6b64\u6a94\u6848\u662f\u7531 JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b20130806.1801 \u6240\u7522\u751f \n\u8acb\u53c3\u95b1 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, \u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931. \n\u7522\u751f\u6642\u9593: {0} \n -Driver.Version = xjc 2.2.8-b01 +Driver.Version = xjc 2.2.8-b20130806.1801 -Driver.FullVersion = xjc \u5b8c\u6574\u7248\u672c "2.2.8-b01-b28" +Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.8-b20130806.1801" -Driver.BuildID = 2.2.8-b01 +Driver.BuildID = 2.2.8-b20130806.1801 # for JDK integration - include version in source zip -jaxb.jdk.version=2.2.8-b01 +jaxb.jdk.version=@@JAXB_JDK_VERSION@@ # see java.text.SimpleDateFormat for format syntax # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date. diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.java index ca830235..c28fd50d 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,6 +35,8 @@ import com.sun.xml.internal.bind.v2.util.XmlFactory; import javax.xml.XMLConstants; import org.xml.sax.SAXException; +import static com.sun.xml.internal.bind.v2.util.XmlFactory.allowFileAccess; + /** * Wraps a JAXP {@link Schema} object and lazily instantiate it. * @@ -59,7 +61,7 @@ public final class SchemaCache { try { // do not disable secure processing - these are well-known schemas SchemaFactory sf = XmlFactory.createSchemaFactory(XMLConstants.W3C_XML_SCHEMA_NS_URI, false); - schema = sf.newSchema(source); + schema = allowFileAccess(sf, false).newSchema(source); } catch (SAXException e) { // we make sure that the schema is correct before we ship. throw new AssertionError(e); diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java index e394a36c..e5e8ecb8 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java @@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlAccessOrder; import javax.xml.bind.annotation.XmlAccessorOrder; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlAccessorOrderWriter extends JAnnotationWriter<XmlAccessorOrder> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java index 307991c2..ae7c008d 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java @@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlAccessorTypeWriter extends JAnnotationWriter<XmlAccessorType> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java index c17df86b..22d5b3d6 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlAnyAttribute; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlAnyAttributeWriter extends JAnnotationWriter<XmlAnyAttribute> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java index 14a96fe3..139a665d 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java @@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlAnyElement; import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JType; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlAnyElementWriter extends JAnnotationWriter<XmlAnyElement> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java index be5262b1..b9c8db48 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlAttachmentRef; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlAttachmentRefWriter extends JAnnotationWriter<XmlAttachmentRef> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java index 6596c951..fc32e7b8 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlAttribute; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlAttributeWriter extends JAnnotationWriter<XmlAttribute> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java index 6954df88..91981dfc 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java @@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlElementDecl; import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JType; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlElementDeclWriter extends JAnnotationWriter<XmlElementDecl> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java index abbd33fe..ebd9f434 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java @@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlElementRef; import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JType; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlElementRefWriter extends JAnnotationWriter<XmlElementRef> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java index c6f3a214..a7276b00 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlElementRefs; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlElementRefsWriter extends JAnnotationWriter<XmlElementRefs> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java index 36808950..bd604e3c 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlElementWrapper; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlElementWrapperWriter extends JAnnotationWriter<XmlElementWrapper> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java index c89073be..f78d0c8e 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java @@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlElement; import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JType; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlElementWriter extends JAnnotationWriter<XmlElement> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java index 204c1eb6..d7e165bc 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlElements; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlElementsWriter extends JAnnotationWriter<XmlElements> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java index cc2e7925..5f22405a 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlEnumValue; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlEnumValueWriter extends JAnnotationWriter<XmlEnumValue> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java index 93da5e06..814110e3 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java @@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlEnum; import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JType; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlEnumWriter extends JAnnotationWriter<XmlEnum> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java index ec5055dd..213d0b8b 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlIDREF; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlIDREFWriter extends JAnnotationWriter<XmlIDREF> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java index 1046aa6b..e6a0a74a 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlID; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlIDWriter extends JAnnotationWriter<XmlID> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java index 2bd4cc10..d82eee23 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlInlineBinaryData; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlInlineBinaryDataWriter extends JAnnotationWriter<XmlInlineBinaryData> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java index 05fc8f78..f7495457 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java @@ -29,6 +29,11 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JType; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlJavaTypeAdapterWriter extends JAnnotationWriter<XmlJavaTypeAdapter> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java index 46a88b80..5444bd85 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlList; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlListWriter extends JAnnotationWriter<XmlList> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java index e8b7b16c..2bf6dbba 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlMimeType; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlMimeTypeWriter extends JAnnotationWriter<XmlMimeType> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java index 43e9268f..9fb7ab24 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlMixed; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlMixedWriter extends JAnnotationWriter<XmlMixed> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java index f5892f33..e8d33c4b 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlNs; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlNsWriter extends JAnnotationWriter<XmlNs> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java index 9be6184d..b964e91a 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlRegistry; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlRegistryWriter extends JAnnotationWriter<XmlRegistry> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java index 743f979c..1071c904 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlRootElement; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlRootElementWriter extends JAnnotationWriter<XmlRootElement> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java index af4c9b96..7601f031 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java @@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlSchemaType; import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JType; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlSchemaTypeWriter extends JAnnotationWriter<XmlSchemaType> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java index d682b572..2f0957ea 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlSchemaTypes; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlSchemaTypesWriter extends JAnnotationWriter<XmlSchemaTypes> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java index 5eaa83dc..05849e65 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java @@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlNsForm; import javax.xml.bind.annotation.XmlSchema; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlSchemaWriter extends JAnnotationWriter<XmlSchema> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java index 908f9d8c..6b203799 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java @@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlSeeAlso; import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JType; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlSeeAlsoWriter extends JAnnotationWriter<XmlSeeAlso> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java index e3836020..61bfb4dd 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlTransient; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlTransientWriter extends JAnnotationWriter<XmlTransient> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java index 8f252dec..05172dbd 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java @@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlType; import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JType; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlTypeWriter extends JAnnotationWriter<XmlType> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java index 3e43d63b..308b93c6 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java @@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec; import javax.xml.bind.annotation.XmlValue; import com.sun.codemodel.internal.JAnnotationWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface XmlValueWriter extends JAnnotationWriter<XmlValue> { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties index aa1a7266..abcc8c55 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties @@ -26,7 +26,7 @@ METHOD_COLLISION = \ The "{0}" method is defined on both "{1}" and "{2}" and is causing a collision. -# {0} - enumeration constant value (but something that couldn?t be translated to a valid java identifier e.g. starting special character, number, ..) e.g. Cannot derive a valid Java identifier from "5.6.0". Specify a customization to change the name. +# {0} - enumeration constant value (but something that couldn�t be translated to a valid java identifier e.g. starting special character, number, ..) e.g. Cannot derive a valid Java identifier from "5.6.0". Specify a customization to change the name. ERR_UNUSABLE_NAME = \ Cannot derive a valid Java identifier from "{0}". Specify a customization to change the name. diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java index 53326ac1..99105262 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java @@ -29,6 +29,7 @@ import java.lang.annotation.Annotation; import java.util.Collection; import java.util.Map; +import javax.xml.XMLConstants; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; @@ -298,7 +299,7 @@ public abstract class CPropertyInfo implements PropertyInfo<NType,NClass>, CCust // this is anonymous type. can't have @XmlSchemaType return false; - if(!typeName.getNamespaceURI().equals(WellKnownNamespace.XML_SCHEMA)) + if(!XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(typeName.getNamespaceURI())) // if we put application-defined type name, it will be undefined // by the time we generate a schema. return false; diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeRef.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeRef.java index 4a622ae1..62416b0d 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeRef.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeRef.java @@ -25,6 +25,7 @@ package com.sun.tools.internal.xjc.model; +import javax.xml.XMLConstants; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; @@ -34,6 +35,7 @@ import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder; import com.sun.xml.internal.bind.v2.model.core.PropertyInfo; import com.sun.xml.internal.bind.v2.model.core.TypeRef; import com.sun.xml.internal.bind.v2.runtime.RuntimeUtil; +import com.sun.xml.internal.xsom.XSType; import com.sun.xml.internal.xsom.XmlString; import com.sun.xml.internal.xsom.XSElementDecl; import com.sun.istack.internal.Nullable; @@ -74,11 +76,34 @@ public final class CTypeRef implements TypeRef<NType,NClass> { } public static QName getSimpleTypeName(XSElementDecl decl) { - if(decl==null) return null; - QName typeName = null; - if(decl.getType().isSimpleType()) - typeName = BGMBuilder.getName(decl.getType()); - return typeName; + if(decl==null || !decl.getType().isSimpleType()) + return null; // null if not simple type + return resolveSimpleTypeName(decl.getType()); + } + + /** + * Recursively search for type name. + * + * This is needed to find correct type for refs like: + * + *<xs:simpleType name="parent"> + * <xs:restriction base="xs:date"/> + *</xs:simpleType> + *<xs:simpleType name="child"> + * <xs:restriction base="parent"/> + *</xs:simpleType> + * + *<xs:element name="testField" type="child"/> + * + * @param declType given type + * @return simpleTypeName or null + */ + private static QName resolveSimpleTypeName(XSType declType) { + QName name = BGMBuilder.getName(declType); + if (name != null && !XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(name.getNamespaceURI())) + return resolveSimpleTypeName(declType.getBaseType()); + else + return name; } public CTypeRef(CNonElement type, QName elementName, QName typeName, boolean nillable, XmlString defaultValue) { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/package-info.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/package-info.java index a9f9a24a..22bfb767 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/package-info.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -55,7 +55,3 @@ * </dl> */ package com.sun.tools.internal.xjc.model; - -import com.sun.xml.internal.xsom.XSComponent; - -import org.xml.sax.Locator; diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java index 8155ffc5..f0ec687b 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java @@ -25,29 +25,27 @@ package com.sun.tools.internal.xjc.reader.internalizer; -import java.io.IOException; -import java.io.File; -import java.net.URI; -import java.net.URISyntaxException; - import com.sun.istack.internal.SAXParseException2; - import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.helpers.XMLFilterImpl; +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + /** * XMLFilter that finds references to other schema files from * SAX events. - * + * <p/> * This implementation is a base implementation for typical case * where we just need to look for a particular attribute which * contains an URL to another schema file. * - * @author - * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) + * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) */ public abstract class AbstractReferenceFinderImpl extends XMLFilterImpl { @@ -61,12 +59,9 @@ public abstract class AbstractReferenceFinderImpl extends XMLFilterImpl { * IF the given element contains a reference to an external resource, * return its URL. * - * @param nsURI - * Namespace URI of the current element - * @param localName - * Local name of the current element - * @return - * It's OK to return a relative URL. + * @param nsURI Namespace URI of the current element + * @param localName Local name of the current element + * @return It's OK to return a relative URL. */ protected abstract String findExternalResource(String nsURI, String localName, Attributes atts); @@ -83,16 +78,21 @@ public abstract class AbstractReferenceFinderImpl extends XMLFilterImpl { // absolutize URL. String lsi = locator.getSystemId(); String ref; - if (lsi.startsWith("jar:")) { - int bangIdx = lsi.indexOf('!'); - if (bangIdx > 0) { - ref = lsi.substring(0, bangIdx + 1) - + new URI(lsi.substring(bangIdx + 1)).resolve(new URI(relativeRef)).toString(); + URI relRefURI = new URI(relativeRef); + if (relRefURI.isAbsolute()) + ref = relativeRef; + else { + if (lsi.startsWith("jar:")) { + int bangIdx = lsi.indexOf('!'); + if (bangIdx > 0) { + ref = lsi.substring(0, bangIdx + 1) + + new URI(lsi.substring(bangIdx + 1)).resolve(new URI(relativeRef)).toString(); + } else { + ref = relativeRef; + } } else { - ref = relativeRef; + ref = new URI(lsi).resolve(new URI(relativeRef)).toString(); } - } else { - ref = new URI(lsi).resolve(new URI(relativeRef)).toString(); } // then parse this schema as well, @@ -121,6 +121,7 @@ public abstract class AbstractReferenceFinderImpl extends XMLFilterImpl { throw spe; } } + private Locator locator; @Override @@ -128,4 +129,4 @@ public abstract class AbstractReferenceFinderImpl extends XMLFilterImpl { super.setDocumentLocator(locator); this.locator = locator; } -}; +} diff --git a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java index cdb3360a..b31ae389 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java @@ -25,18 +25,21 @@ package com.sun.tools.internal.xjc.reader.internalizer; -import java.io.IOException; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import com.sun.istack.internal.NotNull; +import com.sun.istack.internal.XMLStreamReaderToContentHandler; +import com.sun.tools.internal.xjc.ErrorReceiver; +import com.sun.tools.internal.xjc.Options; +import com.sun.tools.internal.xjc.reader.Const; +import com.sun.tools.internal.xjc.util.ErrorReceiverFilter; +import com.sun.xml.internal.bind.marshaller.DataWriter; +import com.sun.xml.internal.bind.v2.util.XmlFactory; +import com.sun.xml.internal.xsom.parser.JAXPParser; +import com.sun.xml.internal.xsom.parser.XMLParser; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.xml.sax.*; +import org.xml.sax.helpers.XMLFilterImpl; -import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -51,27 +54,13 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXResult; import javax.xml.transform.sax.SAXSource; import javax.xml.validation.SchemaFactory; +import java.io.IOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.util.*; -import com.sun.istack.internal.NotNull; -import com.sun.istack.internal.XMLStreamReaderToContentHandler; -import com.sun.tools.internal.xjc.ErrorReceiver; -import com.sun.tools.internal.xjc.Options; -import com.sun.tools.internal.xjc.reader.Const; -import com.sun.tools.internal.xjc.util.ErrorReceiverFilter; -import com.sun.xml.internal.bind.marshaller.DataWriter; -import com.sun.xml.internal.bind.v2.util.XmlFactory; -import com.sun.xml.internal.xsom.parser.JAXPParser; -import com.sun.xml.internal.xsom.parser.XMLParser; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.xml.sax.ContentHandler; -import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import org.xml.sax.XMLReader; -import org.xml.sax.helpers.XMLFilterImpl; +import static com.sun.xml.internal.bind.v2.util.XmlFactory.allowFileAccess; +import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI; /** @@ -471,7 +460,7 @@ public final class DOMForest { } try { - sf.newSchema(sources.toArray(new SAXSource[0])); + allowFileAccess(sf, options.disableXmlSecurity).newSchema(sources.toArray(new SAXSource[0])); } catch (SAXException e) { // error should have been reported. } catch (RuntimeException re) { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/Util.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/Util.java index 3f98a6a8..c6a077eb 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/Util.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/Util.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; /** * @author Kohsuke Kawaguchi */ -public abstract class Util { +public final class Util { private Util() {} // no instanciation /** diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.java index 0632d97f..17bcfdea 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,6 +40,8 @@ public enum Messages { NO_DEFAULT_CONSTRUCTOR_IN_INNER_CLASS, // 1 arg INVALID_TYPE_IN_MAP, // 0args INVALID_JAXP_IMPLEMENTATION, // 1 arg + JAXP_SUPPORTED_PROPERTY, // 1 arg + JAXP_UNSUPPORTED_PROPERTY, // 1 arg ; private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName()); diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.properties b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.properties index d4043dd2..98e2c8ab 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.properties +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -50,3 +50,9 @@ INVALID_TYPE_IN_MAP = \ INVALID_JAXP_IMPLEMENTATION = \ You are running with invalid JAXP api or implementation. JAXP api/implementation of version 1.3.1 (included in JDK6) or higher is required. In case you are using ant, make sure ant 1.7.0 or higher is used - older versions of ant contain JAXP api/impl version 1.2 (in xml-apis.jar). If you want to keep using older ant versions, you have to configure it to use higher the JAXP api/impl versions. + +JAXP_SUPPORTED_PROPERTY =\ + Property "{0}" is supported and has been successfully set by used JAXP implementation. + +JAXP_UNSUPPORTED_PROPERTY =\ + Property "{0}" is not supported by used JAXP implementation. diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java index d0796ec9..fd53efd4 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java @@ -25,7 +25,10 @@ package com.sun.xml.internal.bind.v2.model.annotation; - +/** + * <p><b>Auto-generated, do not edit.</b></p> + * + */ class Init { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java index 4caf7b2a..a7dee028 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation; import java.lang.annotation.Annotation; import javax.xml.bind.annotation.XmlAttribute; + +/** + * <p><b>Auto-generated, do not edit.</b></p> + * + */ final class XmlAttributeQuick extends Quick implements XmlAttribute diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java index 008fbf90..1bd5e568 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation; import java.lang.annotation.Annotation; import javax.xml.bind.annotation.XmlElementDecl; + +/** + * <p><b>Auto-generated, do not edit.</b></p> + * + */ final class XmlElementDeclQuick extends Quick implements XmlElementDecl diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java index 7db0a4b1..b745944d 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation; import java.lang.annotation.Annotation; import javax.xml.bind.annotation.XmlElement; + +/** + * <p><b>Auto-generated, do not edit.</b></p> + * + */ final class XmlElementQuick extends Quick implements XmlElement diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java index 5756f2fd..dffbe66c 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation; import java.lang.annotation.Annotation; import javax.xml.bind.annotation.XmlElementRef; + +/** + * <p><b>Auto-generated, do not edit.</b></p> + * + */ final class XmlElementRefQuick extends Quick implements XmlElementRef diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java index 294a233f..a5ef63bd 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java @@ -29,6 +29,11 @@ import java.lang.annotation.Annotation; import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlElementRefs; + +/** + * <p><b>Auto-generated, do not edit.</b></p> + * + */ final class XmlElementRefsQuick extends Quick implements XmlElementRefs diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java index d2c7698a..540ce654 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation; import java.lang.annotation.Annotation; import javax.xml.bind.annotation.XmlEnum; + +/** + * <p><b>Auto-generated, do not edit.</b></p> + * + */ final class XmlEnumQuick extends Quick implements XmlEnum diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java index e52cfcc9..fcf5eda3 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation; import java.lang.annotation.Annotation; import javax.xml.bind.annotation.XmlRootElement; + +/** + * <p><b>Auto-generated, do not edit.</b></p> + * + */ final class XmlRootElementQuick extends Quick implements XmlRootElement diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java index 1c4b782f..f1862ba9 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java @@ -30,6 +30,11 @@ import javax.xml.bind.annotation.XmlNs; import javax.xml.bind.annotation.XmlNsForm; import javax.xml.bind.annotation.XmlSchema; + +/** + * <p><b>Auto-generated, do not edit.</b></p> + * + */ final class XmlSchemaQuick extends Quick implements XmlSchema diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java index ad513f2f..58f6ecda 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation; import java.lang.annotation.Annotation; import javax.xml.bind.annotation.XmlSchemaType; + +/** + * <p><b>Auto-generated, do not edit.</b></p> + * + */ final class XmlSchemaTypeQuick extends Quick implements XmlSchemaType diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java index b0bf8f52..0200bad8 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation; import java.lang.annotation.Annotation; import javax.xml.bind.annotation.XmlTransient; + +/** + * <p><b>Auto-generated, do not edit.</b></p> + * + */ final class XmlTransientQuick extends Quick implements XmlTransient diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java index 3e33cd54..abb8541b 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation; import java.lang.annotation.Annotation; import javax.xml.bind.annotation.XmlType; + +/** + * <p><b>Auto-generated, do not edit.</b></p> + * + */ final class XmlTypeQuick extends Quick implements XmlType diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java index a6b39191..fdc0cb24 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation; import java.lang.annotation.Annotation; import javax.xml.bind.annotation.XmlValue; + +/** + * <p><b>Auto-generated, do not edit.</b></p> + * + */ final class XmlValueQuick extends Quick implements XmlValue diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/package-info.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/package-info.java index 1b6ad95b..1ac8d1eb 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/package-info.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,10 +59,6 @@ @XmlSchema(namespace="http://jaxb.dev.java.net/xjc/model",elementFormDefault=QUALIFIED) package com.sun.xml.internal.bind.v2.model.core; -import java.lang.reflect.Type; -import java.lang.reflect.Method; -import java.lang.reflect.Field; - import javax.xml.bind.annotation.XmlSchema; import static javax.xml.bind.annotation.XmlNsForm.QUALIFIED; diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java index f1a28b6a..4a2c160f 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java @@ -91,6 +91,9 @@ import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Base64Data; import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext; import com.sun.xml.internal.bind.v2.util.ByteArrayOutputStreamEx; import com.sun.xml.internal.bind.v2.util.DataSourceSource; +import java.util.logging.Logger; +import com.sun.xml.internal.bind.Util; +import java.util.logging.Level; import org.xml.sax.SAXException; @@ -105,6 +108,8 @@ import org.xml.sax.SAXException; public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<Type,Class> implements RuntimeBuiltinLeafInfo, Transducer<T> { + private static final Logger logger = Util.getClassLogger(); + private RuntimeBuiltinLeafInfoImpl(Class type, QName... typeNames) { super(type, typeNames); LEAVES.put(type,this); @@ -196,6 +201,7 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl< public static final List<RuntimeBuiltinLeafInfoImpl<?>> builtinBeanInfos; public static final String MAP_ANYURI_TO_URI = "mapAnyUriToUri"; + public static final String USE_OLD_GMONTH_MAPPING = "jaxb.ri.useOldGmonthMapping"; static { @@ -960,7 +966,14 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl< m.put(DatatypeConstants.DATETIME, "%Y-%M-%DT%h:%m:%s"+ "%z"); m.put(DatatypeConstants.DATE, "%Y-%M-%D" +"%z"); m.put(DatatypeConstants.TIME, "%h:%m:%s"+ "%z"); - m.put(DatatypeConstants.GMONTH, "--%M--%z"); + if (System.getProperty(USE_OLD_GMONTH_MAPPING) == null) { + m.put(DatatypeConstants.GMONTH, "--%M%z"); // E2-12 Error. http://www.w3.org/2001/05/xmlschema-errata#e2-12 + } else { // backw. compatibility + if (logger.isLoggable(Level.FINE)) { + logger.log(Level.FINE, "Old GMonth mapping used."); + } + m.put(DatatypeConstants.GMONTH, "--%M--%z"); + } m.put(DatatypeConstants.GDAY, "---%D" + "%z"); m.put(DatatypeConstants.GYEAR, "%Y" + "%z"); m.put(DatatypeConstants.GYEARMONTH, "%Y-%M" + "%z"); diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/package-info.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/package-info.java index bc2975af..b52f12cc 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/package-info.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/package-info.java @@ -180,7 +180,3 @@ * @ArchitectureDocument */ package com.sun.xml.internal.bind.v2; - -import javax.xml.bind.JAXBContext; - -import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl; diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java index d3afb476..252f0ea6 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java @@ -88,13 +88,11 @@ final class BridgeAdapter<OnWire,InMemory> extends InternalBridge<InMemory> { private OnWire adaptM(Marshaller m,InMemory v) throws JAXBException { XMLSerializer serializer = ((MarshallerImpl)m).serializer; - serializer.setThreadAffinity(); serializer.pushCoordinator(); try { return _adaptM(serializer, v); } finally { serializer.popCoordinator(); - serializer.resetThreadAffinity(); } } @@ -132,7 +130,6 @@ final class BridgeAdapter<OnWire,InMemory> extends InternalBridge<InMemory> { private @NotNull InMemory adaptU(Unmarshaller _u, OnWire v) throws JAXBException { UnmarshallerImpl u = (UnmarshallerImpl) _u; XmlAdapter<OnWire,InMemory> a = u.coordinator.getAdapter(adapter); - u.coordinator.setThreadAffinity(); u.coordinator.pushCoordinator(); try { return a.unmarshal(v); @@ -140,7 +137,6 @@ final class BridgeAdapter<OnWire,InMemory> extends InternalBridge<InMemory> { throw new UnmarshalException(e); } finally { u.coordinator.popCoordinator(); - u.coordinator.resetThreadAffinity(); } } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java index a76532ad..6e66188b 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java @@ -94,75 +94,37 @@ public abstract class Coordinator implements ErrorHandler, ValidationEventHandle return adapters.containsKey(type); } - /** - * The {@link Coordinator} in charge before this {@link Coordinator}. - */ - private Object old; - - /** - * A 'pointer' to a {@link Coordinator} that keeps track of the currently active {@link Coordinator}. - * Having this improves the runtime performance. - */ - private Object[] table; - - /** - * When we set {@link #table} to null, record who did it. - * This is for trouble-shooting a possible concurrency issue reported at: - * http://forums.java.net/jive/thread.jspa?threadID=15132 - */ - public Exception guyWhoSetTheTableToNull; - - /** - * Associates this {@link Coordinator} with the current thread. - * Should be called at the very beginning of the episode. - */ - protected final void setThreadAffinity() { - table = activeTable.get(); - assert table!=null; - } + // this much is necessary to avoid calling get and set twice when we push. + private static final ThreadLocal<Coordinator> activeTable = new ThreadLocal<Coordinator>(); /** - * Dis-associate this {@link Coordinator} with the current thread. - * Sohuld be called at the end of the episode to avoid memory leak. + * The {@link Coordinator} in charge before this {@link Coordinator}. */ - protected final void resetThreadAffinity() { - if (activeTable != null) { - activeTable.remove(); - } - if(debugTableNPE) - guyWhoSetTheTableToNull = new Exception(); // remember that we set it to null - table = null; - } + private Coordinator old; /** * Called whenever an execution flow enters the realm of this {@link Coordinator}. */ protected final void pushCoordinator() { - old = table[0]; - table[0] = this; + old = activeTable.get(); + activeTable.set(this); } /** * Called whenever an execution flow exits the realm of this {@link Coordinator}. */ protected final void popCoordinator() { - assert table[0]==this; - table[0] = old; + if (old != null) + activeTable.set(old); + else + activeTable.remove(); old = null; // avoid memory leak } public static Coordinator _getInstance() { - return (Coordinator) activeTable.get()[0]; + return activeTable.get(); } - // this much is necessary to avoid calling get and set twice when we push. - private static final ThreadLocal<Object[]> activeTable = new ThreadLocal<Object[]>() { - @Override - public Object[] initialValue() { - return new Object[1]; - } - }; - // // // ErrorHandler implementation @@ -207,13 +169,4 @@ public abstract class Coordinator implements ErrorHandler, ValidationEventHandle throw saxException; } } - - public static boolean debugTableNPE; - - static { - try { - debugTableNPE = Boolean.getBoolean(Coordinator.class.getName()+".debugTableNPE"); - } catch (SecurityException t) { - } - } } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java index 4c14187a..941b5684 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java @@ -812,7 +812,6 @@ public final class XMLSerializer extends Coordinator { * Similar to 'schemaLocation' but this one works for xsi:noNamespaceSchemaLocation */ public void startDocument(XmlOutput out,boolean fragment,String schemaLocation,String noNsSchemaLocation) throws IOException, SAXException, XMLStreamException { - setThreadAffinity(); pushCoordinator(); nsContext.reset(); nse = nsContext.getCurrent(); @@ -841,7 +840,6 @@ public final class XMLSerializer extends Coordinator { out = null; clearCurrentProperty(); popCoordinator(); - resetThreadAffinity(); } /** diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java index f0a0b4e4..853b2373 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java @@ -30,10 +30,13 @@ import com.sun.xml.internal.bind.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * B y t e ArrayLister is used as the master to generate the rest of the - * lister classes. Do not modify the generated copies. + * B y t e ArrayLister is used as the master to generate the rest of the + * lister classes. Do not modify the generated copies. + * </p> */ final class PrimitiveArrayListerBoolean<BeanT> extends Lister<BeanT,boolean[],Boolean,PrimitiveArrayListerBoolean.BooleanArrayPack> { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java index 3a0ab85c..c50f53b0 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java @@ -30,10 +30,13 @@ import com.sun.xml.internal.bind.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * B y t e ArrayLister is used as the master to generate the rest of the - * lister classes. Do not modify the generated copies. + * B y t e ArrayLister is used as the master to generate the rest of the + * lister classes. Do not modify the generated copies. + * </p> */ final class PrimitiveArrayListerCharacter<BeanT> extends Lister<BeanT,char[],Character,PrimitiveArrayListerCharacter.CharacterArrayPack> { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java index c85a9267..bd6e03cd 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java @@ -30,10 +30,13 @@ import com.sun.xml.internal.bind.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * B y t e ArrayLister is used as the master to generate the rest of the - * lister classes. Do not modify the generated copies. + * B y t e ArrayLister is used as the master to generate the rest of the + * lister classes. Do not modify the generated copies. + * </p> */ final class PrimitiveArrayListerDouble<BeanT> extends Lister<BeanT,double[],Double,PrimitiveArrayListerDouble.DoubleArrayPack> { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java index b5bd7e4e..5ced3035 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java @@ -30,10 +30,13 @@ import com.sun.xml.internal.bind.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * B y t e ArrayLister is used as the master to generate the rest of the - * lister classes. Do not modify the generated copies. + * B y t e ArrayLister is used as the master to generate the rest of the + * lister classes. Do not modify the generated copies. + * </p> */ final class PrimitiveArrayListerFloat<BeanT> extends Lister<BeanT,float[],Float,PrimitiveArrayListerFloat.FloatArrayPack> { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java index cdb8e58c..98a07546 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java @@ -30,10 +30,13 @@ import com.sun.xml.internal.bind.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * B y t e ArrayLister is used as the master to generate the rest of the - * lister classes. Do not modify the generated copies. + * B y t e ArrayLister is used as the master to generate the rest of the + * lister classes. Do not modify the generated copies. + * </p> */ final class PrimitiveArrayListerInteger<BeanT> extends Lister<BeanT,int[],Integer,PrimitiveArrayListerInteger.IntegerArrayPack> { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java index 5598ca66..4412b7ed 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java @@ -30,10 +30,13 @@ import com.sun.xml.internal.bind.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * B y t e ArrayLister is used as the master to generate the rest of the - * lister classes. Do not modify the generated copies. + * B y t e ArrayLister is used as the master to generate the rest of the + * lister classes. Do not modify the generated copies. + * </p> */ final class PrimitiveArrayListerLong<BeanT> extends Lister<BeanT,long[],Long,PrimitiveArrayListerLong.LongArrayPack> { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java index ddc61a78..8493f846 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java @@ -30,10 +30,13 @@ import com.sun.xml.internal.bind.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * B y t e ArrayLister is used as the master to generate the rest of the - * lister classes. Do not modify the generated copies. + * B y t e ArrayLister is used as the master to generate the rest of the + * lister classes. Do not modify the generated copies. + * </p> */ final class PrimitiveArrayListerShort<BeanT> extends Lister<BeanT,short[],Short,PrimitiveArrayListerShort.ShortArrayPack> { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java index 28cdee67..e1e36db9 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java @@ -29,10 +29,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean fields. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code> - * + * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code> + * </p> * @author Kohsuke Kawaguchi */ public class FieldAccessor_Boolean extends Accessor { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java index 3ec52cf0..171b42f7 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java @@ -29,10 +29,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for char fields. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code> - * + * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code> + * </p> * @author Kohsuke Kawaguchi */ public class FieldAccessor_Character extends Accessor { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java index 9ef4c1f4..be024e9a 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java @@ -29,10 +29,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for double fields. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code> - * + * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code> + * </p> * @author Kohsuke Kawaguchi */ public class FieldAccessor_Double extends Accessor { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java index a7651a64..d5e1af13 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java @@ -29,10 +29,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for float fields. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code> - * + * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code> + * </p> * @author Kohsuke Kawaguchi */ public class FieldAccessor_Float extends Accessor { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java index db6cb8eb..467fa79a 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java @@ -29,10 +29,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for int fields. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code> - * + * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code> + * </p> * @author Kohsuke Kawaguchi */ public class FieldAccessor_Integer extends Accessor { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java index 60adf9d4..1980cb33 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java @@ -29,10 +29,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for long fields. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code> - * + * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code> + * </p> * @author Kohsuke Kawaguchi */ public class FieldAccessor_Long extends Accessor { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java index 84315f63..49a000ae 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java @@ -29,10 +29,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for short fields. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code> - * + * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code> + * </p> * @author Kohsuke Kawaguchi */ public class FieldAccessor_Short extends Accessor { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java index 8176a657..07fde9b0 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java @@ -29,10 +29,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code> - * + * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code> + * </p> * @author Kohsuke Kawaguchi */ public class MethodAccessor_Boolean extends Accessor { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java index 92c94901..856d3550 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java @@ -29,10 +29,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code> - * + * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code> + * </p> * @author Kohsuke Kawaguchi */ public class MethodAccessor_Character extends Accessor { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java index f7d9d873..4b12972b 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java @@ -29,10 +29,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code> - * + * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code> + * </p> * @author Kohsuke Kawaguchi */ public class MethodAccessor_Double extends Accessor { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java index 9b6f0f21..54d9af2c 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java @@ -29,10 +29,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code> - * + * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code> + * </p> * @author Kohsuke Kawaguchi */ public class MethodAccessor_Float extends Accessor { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java index 54462b3e..8b5ea50f 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java @@ -29,10 +29,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code> - * + * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code> + * </p> * @author Kohsuke Kawaguchi */ public class MethodAccessor_Integer extends Accessor { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java index 82beed25..f7d2c261 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java @@ -29,10 +29,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code> - * + * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code> + * </p> * @author Kohsuke Kawaguchi */ public class MethodAccessor_Long extends Accessor { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java index 5828e099..f91bc0b7 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java @@ -29,10 +29,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code> - * + * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code> + * </p> * @author Kohsuke Kawaguchi */ public class MethodAccessor_Short extends Accessor { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java index 38242c9f..54f7dbe6 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java @@ -31,10 +31,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.DefaultTransducedAccessor; /** * Template {@link TransducedAccessor} for a double field. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> - * + * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> + * </p> * @author Kohsuke Kawaguchi * * @see TransducedAccessor#get diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java index 5bd8d628..6b67f61e 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java @@ -31,10 +31,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.DefaultTransducedAccessor; /** * Template {@link TransducedAccessor} for a float field. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> - * + * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> + * </p> * @author Kohsuke Kawaguchi * * @see TransducedAccessor#get diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java index 367510fc..beb68e56 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java @@ -31,10 +31,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.DefaultTransducedAccessor; /** * Template {@link TransducedAccessor} for a long field. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> - * + * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> + * </p> * @author Kohsuke Kawaguchi * * @see TransducedAccessor#get diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java index 3713627f..437f9117 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java @@ -31,10 +31,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.DefaultTransducedAccessor; /** * Template {@link TransducedAccessor} for a short field. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> - * + * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> + * </p> * @author Kohsuke Kawaguchi * * @see TransducedAccessor#get diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java index c9fb036d..f7cd6ccd 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java @@ -31,10 +31,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.DefaultTransducedAccessor; /** * Template {@link TransducedAccessor} for a boolean field. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> - * + * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> + * </p> * @author Kohsuke Kawaguchi * * @see TransducedAccessor#get diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java index 958d998c..fe87c4bb 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java @@ -31,10 +31,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.DefaultTransducedAccessor; /** * Template {@link TransducedAccessor} for a double field. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> - * + * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> + * </p> * @author Kohsuke Kawaguchi * * @see TransducedAccessor#get diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java index 9ca22b97..16a51cfd 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java @@ -31,10 +31,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.DefaultTransducedAccessor; /** * Template {@link TransducedAccessor} for a float field. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> - * + * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> + * </p> * @author Kohsuke Kawaguchi * * @see TransducedAccessor#get diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java index 2a25f304..3ca90705 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java @@ -31,10 +31,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.DefaultTransducedAccessor; /** * Template {@link TransducedAccessor} for a long field. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> - * + * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> + * </p> * @author Kohsuke Kawaguchi * * @see TransducedAccessor#get diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java index b4b567ad..f4a50ef1 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java @@ -31,10 +31,12 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.DefaultTransducedAccessor; /** * Template {@link TransducedAccessor} for a short field. - * + * <p><b> + * Auto-generated, do not edit. + * </b></p> * <p> - * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> - * + * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code> + * </p> * @author Kohsuke Kawaguchi * * @see TransducedAccessor#get diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java index ef75619f..9c9ccea3 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java @@ -94,11 +94,15 @@ public abstract class Loader { @SuppressWarnings({"StringEquality"}) protected final void reportUnexpectedChildElement(TagName ea, boolean canRecover) throws SAXException { - if(canRecover && !UnmarshallingContext.getInstance().parent.hasEventHandler()) + if (canRecover) { // this error happens particurly often (when input documents contain a lot of unexpected elements to be ignored), // so don't bother computing all the messages and etc if we know that // there's no event handler to receive the error in the end. See #286 - return; + UnmarshallingContext context = UnmarshallingContext.getInstance(); + if (!context.parent.hasEventHandler() // is somebody listening? + || !context.shouldErrorBeReported()) // should we report error? + return; + } if(ea.uri!=ea.uri.intern() || ea.local!=ea.local.intern()) reportError(Messages.UNINTERNED_STRINGS.format(), canRecover ); else diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java index f37be69b..2390f67f 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java @@ -40,6 +40,7 @@ enum Messages { UNRECOGNIZED_TYPE_NAME_MAYBE, // 2 args UNABLE_TO_CREATE_MAP, // 1 arg UNINTERNED_STRINGS, // no args + ERRORS_LIMIT_EXCEEDED, // no arg ; private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName()); diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties index e6d4960f..b4eb4cc5 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties @@ -50,3 +50,7 @@ UNABLE_TO_CREATE_MAP = \ UNINTERNED_STRINGS = \ Namespace URIs and local names to the unmarshaller needs to be interned. + +# user have to set Logger.getLogger("com.sun.xml.internal.bind").setLevel(Level.FINEST) +ERRORS_LIMIT_EXCEEDED = \ + Errors limit exceeded. To receive all errors set 'com.sun.xml.internal.bind' logger to FINEST level. diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java index 7695de9e..44998166 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,11 +25,14 @@ package com.sun.xml.internal.bind.v2.runtime.unmarshaller; +import com.sun.xml.internal.bind.Util; import javax.xml.bind.JAXBException; import javax.xml.bind.UnmarshallerHandler; import com.sun.xml.internal.bind.WhiteSpaceProcessor; import com.sun.xml.internal.bind.v2.runtime.ClassBeanInfoImpl; +import java.util.logging.Level; +import java.util.logging.Logger; import org.xml.sax.Attributes; import org.xml.sax.Locator; @@ -44,6 +47,8 @@ public final class SAXConnector implements UnmarshallerHandler { private LocatorEx loc; + private static final Logger logger = Util.getClassLogger(); + /** * SAX may fire consecutive characters event, but we don't allow it. * so use this buffer to perform buffering. @@ -56,6 +61,7 @@ public final class SAXConnector implements UnmarshallerHandler { private static final class TagNameImpl extends TagName { String qname; + @Override public String getQname() { return qname; } @@ -76,6 +82,7 @@ public final class SAXConnector implements UnmarshallerHandler { this.loc = externalLocator; } + @Override public Object getResult() throws JAXBException, IllegalStateException { return context.getResult(); } @@ -84,6 +91,7 @@ public final class SAXConnector implements UnmarshallerHandler { return context; } + @Override public void setDocumentLocator(final Locator locator) { if(loc!=null) return; // we already have an external locator. ignore. @@ -91,23 +99,43 @@ public final class SAXConnector implements UnmarshallerHandler { this.loc = new LocatorExWrapper(locator); } + @Override public void startDocument() throws SAXException { + if (logger.isLoggable(Level.FINER)) { + logger.log(Level.FINER, "SAXConnector.startDocument"); + } next.startDocument(loc,null); } + @Override public void endDocument() throws SAXException { + if (logger.isLoggable(Level.FINER)) { + logger.log(Level.FINER, "SAXConnector.endDocument"); + } next.endDocument(); } + @Override public void startPrefixMapping(String prefix, String uri) throws SAXException { + if (logger.isLoggable(Level.FINER)) { + logger.log(Level.FINER, "SAXConnector.startPrefixMapping: {0}:{1}", new Object[]{prefix, uri}); + } next.startPrefixMapping(prefix,uri); } + @Override public void endPrefixMapping(String prefix) throws SAXException { + if (logger.isLoggable(Level.FINER)) { + logger.log(Level.FINER, "SAXConnector.endPrefixMapping: {0}", new Object[]{prefix}); + } next.endPrefixMapping(prefix); } + @Override public void startElement(String uri, String local, String qname, Attributes atts) throws SAXException { + if (logger.isLoggable(Level.FINER)) { + logger.log(Level.FINER, "SAXConnector.startElement: {0}:{1}:{2}, attrs: {3}", new Object[]{uri, local, qname, atts}); + } // work gracefully with misconfigured parsers that don't support namespaces if( uri==null || uri.length()==0 ) uri=""; @@ -135,7 +163,11 @@ public final class SAXConnector implements UnmarshallerHandler { next.startElement(tagName); } + @Override public void endElement(String uri, String localName, String qName) throws SAXException { + if (logger.isLoggable(Level.FINER)) { + logger.log(Level.FINER, "SAXConnector.startElement: {0}:{1}:{2}", new Object[]{uri, localName, qName}); + } processText(false); tagName.uri = uri; tagName.local = localName; @@ -144,19 +176,29 @@ public final class SAXConnector implements UnmarshallerHandler { } + @Override public final void characters( char[] buf, int start, int len ) { + if (logger.isLoggable(Level.FINEST)) { + logger.log(Level.FINEST, "SAXConnector.characters: {0}", buf); + } if( predictor.expectText() ) buffer.append(buf,start,len); } + @Override public final void ignorableWhitespace( char[] buf, int start, int len ) { + if (logger.isLoggable(Level.FINEST)) { + logger.log(Level.FINEST, "SAXConnector.characters{0}", buf); + } characters(buf,start,len); } + @Override public void processingInstruction(String target, String data) { // nop } + @Override public void skippedEntity(String name) { // nop } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java index 7362acc6..35519196 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,6 +35,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.concurrent.Callable; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.xml.XMLConstants; import javax.xml.bind.JAXBElement; @@ -51,6 +53,7 @@ import com.sun.istack.internal.NotNull; import com.sun.istack.internal.Nullable; import com.sun.istack.internal.SAXParseException2; import com.sun.xml.internal.bind.IDResolver; +import com.sun.xml.internal.bind.Util; import com.sun.xml.internal.bind.api.AccessorException; import com.sun.xml.internal.bind.api.ClassResolver; import com.sun.xml.internal.bind.unmarshaller.InfosetScanner; @@ -59,6 +62,8 @@ import com.sun.xml.internal.bind.v2.runtime.AssociationMap; import com.sun.xml.internal.bind.v2.runtime.Coordinator; import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl; import com.sun.xml.internal.bind.v2.runtime.JaxBeanInfo; +import java.util.logging.Level; +import java.util.logging.Logger; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; @@ -76,6 +81,8 @@ import org.xml.sax.helpers.LocatorImpl; public final class UnmarshallingContext extends Coordinator implements NamespaceContext, ValidationEventHandler, ErrorHandler, XmlVisitor, XmlVisitor.TextPredictor { + private static final Logger logger = Logger.getLogger(UnmarshallingContext.class.getName()); + /** * Root state. */ @@ -177,6 +184,14 @@ public final class UnmarshallingContext extends Coordinator public @Nullable ClassLoader classLoader; /** + * The variable introduced to avoid reporting n^10 similar errors. + * After error is reported counter is decremented. When it became 0 - errors should not be reported any more. + * + * volatile is required to ensure that concurrent threads will see changed value + */ + private static volatile int errorsCounter = 10; + + /** * State information for each element. */ public final class State { @@ -260,21 +275,32 @@ public final class UnmarshallingContext extends Coordinator return UnmarshallingContext.this; } + @SuppressWarnings("LeakingThisInConstructor") private State(State prev) { this.prev = prev; - if(prev!=null) + if (prev!=null) { prev.next = this; + } } private void push() { - if(next==null) + if (logger.isLoggable(Level.FINEST)) { + logger.log(Level.FINEST, "State.push"); + } + if (next==null) { + assert current == this; allocateMoreStates(); + } + nil = false; State n = next; n.numNsDecl = nsLen; current = n; } private void pop() { + if (logger.isLoggable(Level.FINEST)) { + logger.log(Level.FINEST, "State.pop"); + } assert prev!=null; loader = null; nil = false; @@ -381,8 +407,9 @@ public final class UnmarshallingContext extends Coordinator assert current.next==null; State s = current; - for( int i=0; i<8; i++ ) + for (int i=0; i<8; i++) { s = new State(s); + } } public void clearStates() { @@ -436,6 +463,7 @@ public final class UnmarshallingContext extends Coordinator } } + @Override public void startDocument(LocatorEx locator, NamespaceContext nsContext) throws SAXException { if(locator!=null) this.locator = locator; @@ -449,8 +477,6 @@ public final class UnmarshallingContext extends Coordinator isUnmarshalInProgress = true; nsLen=0; - setThreadAffinity(); - if(expectedType!=null) root.loader = EXPECTED_TYPE_ROOT_LOADER; else @@ -459,6 +485,7 @@ public final class UnmarshallingContext extends Coordinator idResolver.startDocument(this); } + @Override public void startElement(TagName tagName) throws SAXException { pushCoordinator(); try { @@ -486,6 +513,7 @@ public final class UnmarshallingContext extends Coordinator current.loader.startElement(current,tagName); } + @Override public void text(CharSequence pcdata) throws SAXException { State cur = current; pushCoordinator(); @@ -502,6 +530,7 @@ public final class UnmarshallingContext extends Coordinator } } + @Override public final void endElement(TagName tagName) throws SAXException { pushCoordinator(); try { @@ -526,6 +555,7 @@ public final class UnmarshallingContext extends Coordinator } } + @Override public void endDocument() throws SAXException { runPatchers(); idResolver.endDocument(); @@ -537,14 +567,13 @@ public final class UnmarshallingContext extends Coordinator // at the successful completion, scope must be all closed assert root==current; - - resetThreadAffinity(); } /** * You should be always calling this through {@link TextPredictor}. */ @Deprecated + @Override public boolean expectText() { return current.loader.expectText; } @@ -553,10 +582,12 @@ public final class UnmarshallingContext extends Coordinator * You should be always getting {@link TextPredictor} from {@link XmlVisitor}. */ @Deprecated + @Override public TextPredictor getPredictor() { return this; } + @Override public UnmarshallingContext getContext() { return this; } @@ -650,6 +681,7 @@ public final class UnmarshallingContext extends Coordinator event.getLinkedException() ) ); } + @Override public boolean handleEvent(ValidationEvent event) { try { // if the handler says "abort", we will not return the object. @@ -680,6 +712,7 @@ public final class UnmarshallingContext extends Coordinator handleEvent(new ValidationEventImpl(ValidationEvent.ERROR,msg,locator.getLocation())); } + @Override protected ValidationEventLocator getLocation() { return locator.getLocation(); } @@ -801,6 +834,7 @@ public final class UnmarshallingContext extends Coordinator private String[] nsBind = new String[16]; private int nsLen=0; + @Override public void startPrefixMapping( String prefix, String uri ) { if(nsBind.length==nsLen) { // expand the buffer @@ -811,6 +845,7 @@ public final class UnmarshallingContext extends Coordinator nsBind[nsLen++] = prefix; nsBind[nsLen++] = uri; } + @Override public void endPrefixMapping( String prefix ) { nsLen-=2; } @@ -868,6 +903,7 @@ public final class UnmarshallingContext extends Coordinator // NamespaceContext2 implementation // + @Override public Iterator<String> getPrefixes(String uri) { // TODO: could be implemented much faster // wrap it into unmodifiable list so that the remove method @@ -899,6 +935,7 @@ public final class UnmarshallingContext extends Coordinator return a; } + @Override public String getPrefix(String uri) { if( uri==null ) throw new IllegalArgumentException(); @@ -919,6 +956,7 @@ public final class UnmarshallingContext extends Coordinator return null; } + @Override public String getNamespaceURI(String prefix) { if (prefix == null) throw new IllegalArgumentException(); @@ -1059,6 +1097,7 @@ public final class UnmarshallingContext extends Coordinator return getInstance().getJAXBContext().getValidRootNames(); } + @Override public void receive(State state, Object o) { if(state.backup!=null) { ((JAXBElement<Object>)state.backup).setValue(o); @@ -1095,6 +1134,7 @@ public final class UnmarshallingContext extends Coordinator state.loader = new XsiNilLoader(context.expectedType.getLoader(null,true)); } + @Override public void receive(State state, Object o) { JAXBElement e = (JAXBElement)state.target; e.setValue(o); @@ -1233,4 +1273,27 @@ public final class UnmarshallingContext extends Coordinator return null; } + /** + * Based on current {@link Logger} {@link Level} and errorCounter value determines if error should be reported. + * + * If the method called and return true it is expected that error will be reported. And that's why + * errorCounter is automatically decremented during the check. + * + * NOT THREAD SAFE!!! In case of heave concurrency access several additional errors could be reported. It's not expected to be the + * problem. Otherwise add synchronization here. + * + * @return true in case if {@link Level#FINEST} is set OR we haven't exceed errors reporting limit. + */ + public boolean shouldErrorBeReported() throws SAXException { + if (logger.isLoggable(Level.FINEST)) + return true; + + if (errorsCounter >= 0) { + --errorsCounter; + if (errorsCounter == 0) // it's possible to miss this because of concurrency. If required add synchronization here + handleEvent(new ValidationEventImpl(ValidationEvent.WARNING, Messages.ERRORS_LIMIT_EXCEEDED.format(), + getLocator().getLocation(), null), true); + } + return errorsCounter >= 0; + } } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java index b577c3c4..f35a3f52 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java @@ -92,12 +92,15 @@ public class XsiTypeLoader extends Loader { return defaultBeanInfo; beanInfo = context.getJAXBContext().getGlobalType(type); - if(beanInfo==null) { - String nearest = context.getJAXBContext().getNearestTypeName(type); - if(nearest!=null) - reportError(Messages.UNRECOGNIZED_TYPE_NAME_MAYBE.format(type,nearest),true); - else - reportError(Messages.UNRECOGNIZED_TYPE_NAME.format(type),true); + if(beanInfo==null) { // let's report an error + if (context.parent.hasEventHandler() // is somebody listening? + && context.shouldErrorBeReported()) { // should we report error? + String nearest = context.getJAXBContext().getNearestTypeName(type); + if(nearest!=null) + reportError(Messages.UNRECOGNIZED_TYPE_NAME_MAYBE.format(type,nearest),true); + else + reportError(Messages.UNRECOGNIZED_TYPE_NAME.format(type),true); + } } // TODO: resurrect the following check // else diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java index 4b9165cd..c60dde2d 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java @@ -29,6 +29,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface Annotated extends TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java index 75c93a82..795f1257 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java @@ -29,6 +29,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("annotation") public interface Annotation extends TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java index 6765b2d6..7df5329c 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("any") public interface Any extends Occurs, Wildcard, TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java index 028d5052..b31d3092 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java @@ -29,6 +29,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("appinfo") public interface Appinfo extends TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java index 633ccad8..53c7ec26 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface AttrDecls extends TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java index 1a0169d7..4e0e2f6c 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java @@ -29,6 +29,11 @@ import javax.xml.namespace.QName; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface AttributeType extends SimpleTypeHost, TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java index 27e826e0..33eddd83 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java @@ -29,6 +29,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("complexContent") public interface ComplexContent extends Annotated, TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java index c80b11ce..b141601d 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("extension") public interface ComplexExtension extends AttrDecls, ExtensionType, TypeDefParticle, TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java index d08f1157..7919fc43 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java @@ -30,6 +30,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("restriction") public interface ComplexRestriction extends Annotated, AttrDecls, TypeDefParticle, TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java index 23b7a280..cda5e014 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java @@ -29,6 +29,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("complexType") public interface ComplexType extends Annotated, ComplexTypeModel, TypedXmlWriter @@ -36,16 +41,16 @@ public interface ComplexType @XmlAttribute("final") - public ComplexType _final(String value); + public ComplexType _final(String[] value); @XmlAttribute("final") - public ComplexType _final(String[] value); + public ComplexType _final(String value); @XmlAttribute - public ComplexType block(String value); + public ComplexType block(String[] value); @XmlAttribute - public ComplexType block(String[] value); + public ComplexType block(String value); @XmlAttribute("abstract") public ComplexType _abstract(boolean value); diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java index 3ac98c52..e0d02068 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface ComplexTypeHost extends TypeHost, TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java index afdcf0da..dc8493ca 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java @@ -29,6 +29,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface ComplexTypeModel extends AttrDecls, TypeDefParticle, TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java index 7661cc53..f8abb212 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java @@ -29,6 +29,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("documentation") public interface Documentation extends TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java index 20e2e91b..29ea473a 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java @@ -29,6 +29,11 @@ import javax.xml.namespace.QName; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface Element extends Annotated, ComplexTypeHost, FixedOrDefault, SimpleTypeHost, TypedXmlWriter { @@ -38,10 +43,10 @@ public interface Element public Element type(QName value); @XmlAttribute - public Element block(String value); + public Element block(String[] value); @XmlAttribute - public Element block(String[] value); + public Element block(String value); @XmlAttribute public Element nillable(boolean value); diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java index b8a83d57..60b324a9 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java @@ -27,6 +27,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface ExplicitGroup extends Annotated, NestedParticle, Occurs, TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java index 13da8c04..145fcb6f 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java @@ -29,6 +29,11 @@ import javax.xml.namespace.QName; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface ExtensionType extends Annotated, TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java index 74a2007f..5e47900a 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface FixedOrDefault extends TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java index ac5a24ca..d842c031 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java @@ -29,6 +29,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("import") public interface Import extends Annotated, TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java index 93517581..8cf2dafb 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java @@ -30,6 +30,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("list") public interface List extends Annotated, SimpleTypeHost, TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java index 4cde3d0f..6aab764d 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java @@ -30,6 +30,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("attribute") public interface LocalAttribute extends Annotated, AttributeType, FixedOrDefault, TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java index ef28b453..277b127f 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java @@ -30,6 +30,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("element") public interface LocalElement extends Element, Occurs, TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java index f3a46727..3a03e478 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface NestedParticle extends TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java index 8e4f91a2..0f357fa4 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface NoFixedFacet extends Annotated, TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java index eab4228a..a1a06dca 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface Occurs extends TypedXmlWriter { @@ -37,9 +42,9 @@ public interface Occurs public Occurs minOccurs(int value); @XmlAttribute - public Occurs maxOccurs(int value); + public Occurs maxOccurs(String value); @XmlAttribute - public Occurs maxOccurs(String value); + public Occurs maxOccurs(int value); } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java index 0b1e3795..6f1efab7 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java @@ -27,6 +27,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface Redefinable extends ComplexTypeHost, SimpleTypeHost, TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java index f5dd5807..d69edfff 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java @@ -29,6 +29,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("schema") public interface Schema extends SchemaTop, TypedXmlWriter @@ -57,18 +62,18 @@ public interface Schema public Schema attributeFormDefault(String value); @XmlAttribute - public Schema blockDefault(String value); - - @XmlAttribute public Schema blockDefault(String[] value); @XmlAttribute - public Schema finalDefault(String value); + public Schema blockDefault(String value); @XmlAttribute public Schema finalDefault(String[] value); @XmlAttribute + public Schema finalDefault(String value); + + @XmlAttribute public Schema version(String value); } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java index 4f081655..636aa269 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface SchemaTop extends Redefinable, TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java index aa97834c..b8c4d680 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("simpleContent") public interface SimpleContent extends Annotated, TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java index 6750c8ba..9f5eed6d 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface SimpleDerivation extends TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java index aad7b63b..5ee557f6 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("extension") public interface SimpleExtension extends AttrDecls, ExtensionType, TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java index 4350e0f1..84027ac2 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("restriction") public interface SimpleRestriction extends Annotated, AttrDecls, SimpleRestrictionModel, TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java index cbcaa7ba..04c2d42c 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java @@ -30,6 +30,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface SimpleRestrictionModel extends SimpleTypeHost, TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java index 676aa6c6..2fed7d4e 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java @@ -29,6 +29,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("simpleType") public interface SimpleType extends Annotated, SimpleDerivation, TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java index b1db7aed..1957ec4a 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface SimpleTypeHost extends TypeHost, TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java index 18a0d59a..324029f3 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java @@ -29,6 +29,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("attribute") public interface TopLevelAttribute extends Annotated, AttributeType, FixedOrDefault, TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java index 86af9f71..ad737c62 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java @@ -30,6 +30,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("element") public interface TopLevelElement extends Element, TypedXmlWriter @@ -37,10 +42,10 @@ public interface TopLevelElement @XmlAttribute("final") - public TopLevelElement _final(String value); + public TopLevelElement _final(String[] value); @XmlAttribute("final") - public TopLevelElement _final(String[] value); + public TopLevelElement _final(String value); @XmlAttribute("abstract") public TopLevelElement _abstract(boolean value); diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java index 10b2486f..9b826fb0 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface TypeDefParticle extends TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java index 3cbe6926..a3443ac8 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java @@ -27,6 +27,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface TypeHost extends TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java index 5878c937..077895db 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java @@ -30,6 +30,11 @@ import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; import com.sun.xml.internal.txw2.annotation.XmlElement; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ @XmlElement("union") public interface Union extends Annotated, SimpleTypeHost, TypedXmlWriter diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java index 1aa7c498..37a49e07 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java @@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.schemagen.xmlschema; import com.sun.xml.internal.txw2.TypedXmlWriter; import com.sun.xml.internal.txw2.annotation.XmlAttribute; +/** + * <p><b> + * Auto-generated, do not edit. + * </b></p> + */ public interface Wildcard extends Annotated, TypedXmlWriter { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/EditDistance.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/EditDistance.java index 36eba4d0..b2c82b5c 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/EditDistance.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/EditDistance.java @@ -25,8 +25,10 @@ package com.sun.xml.internal.bind.v2.util; -import java.util.Collection; +import java.util.AbstractMap; import java.util.Arrays; +import java.util.Collection; +import java.util.WeakHashMap; /** * Computes the string edit distance. @@ -41,13 +43,29 @@ import java.util.Arrays; public class EditDistance { /** + * Weak results cache to avoid additional computations. + * Because of high complexity caching is required. + */ + private static final WeakHashMap<AbstractMap.SimpleEntry<String,String>, Integer> CACHE = new WeakHashMap<AbstractMap.SimpleEntry<String, String>, Integer>(); + + /** * Computes the edit distance between two strings. * * <p> * The complexity is O(nm) where n=a.length() and m=b.length(). */ public static int editDistance( String a, String b ) { - return new EditDistance(a,b).calc(); + // let's check cache + AbstractMap.SimpleEntry<String,String> entry = new AbstractMap.SimpleEntry<String, String>(a, b); // using this class to avoid creation of my own which will handle PAIR of values + Integer result = null; + if (CACHE.containsKey(entry)) + result = CACHE.get(entry); // looks like we have it + + if (result == null) { + result = new EditDistance(a, b).calc(); + CACHE.put(entry, result); // cache the result + } + return result; } /** diff --git a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java index d64a689f..969cf451 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,6 +38,8 @@ import javax.xml.transform.TransformerFactory; import javax.xml.validation.SchemaFactory; import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactoryConfigurationException; + +import org.xml.sax.SAXException; import org.xml.sax.SAXNotRecognizedException; import org.xml.sax.SAXNotSupportedException; @@ -49,6 +51,9 @@ import org.xml.sax.SAXNotSupportedException; */ public class XmlFactory { + // not in older JDK, so must be duplicated here, otherwise javax.xml.XMLConstants should be used + public static final String ACCESS_EXTERNAL_SCHEMA = "http://javax.xml.XMLConstants/property/accessExternalSchema"; + private static final Logger LOGGER = Logger.getLogger(XmlFactory.class.getName()); /** @@ -186,4 +191,22 @@ public class XmlFactory { } } + public static SchemaFactory allowFileAccess(SchemaFactory sf, boolean disableSecureProcessing) { + + // if feature secure processing enabled, nothing to do, file is allowed, + // or user is able to control access by standard JAXP mechanisms + if (disableSecureProcessing) { + return sf; + } + + try { + sf.setProperty(ACCESS_EXTERNAL_SCHEMA, "file"); + LOGGER.log(Level.FINE, Messages.JAXP_SUPPORTED_PROPERTY.format(ACCESS_EXTERNAL_SCHEMA)); + } catch (SAXException ignored) { + // nothing to do; support depends on version JDK or SAX implementation + LOGGER.log(Level.CONFIG, Messages.JAXP_UNSUPPORTED_PROPERTY.format(ACCESS_EXTERNAL_SCHEMA), ignored); + } + return sf; + } + } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDEventListener.java b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDEventListener.java index 9a94f862..a5f64014 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDEventListener.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java index 9d24fbcd..2e7801a1 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java index e296ef54..68b7f6df 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -57,7 +57,7 @@ import java.util.Vector; * @author David Brownell * @author Janet Koenig * @author Kohsuke KAWAGUCHI - * @version $Id: DTDParser.java,v 1.2 2009-04-16 15:25:49 snajper Exp $ + * @version $Id: DTDParser.java,v 1.2 2009/04/16 15:25:49 snajper Exp $ */ public class DTDParser { public final static String TYPE_CDATA = "CDATA"; @@ -215,25 +215,25 @@ public class DTDParser { */ public void parse(String uri) throws IOException, SAXException { - InputSource inSource; + InputSource in; init(); // System.out.println ("parse (\"" + uri + "\")"); - inSource = resolver.resolveEntity(null, uri); + in = resolver.resolveEntity(null, uri); // If custom resolver punts resolution to parser, handle it ... - if (inSource == null) { - inSource = Resolver.createInputSource(new java.net.URL(uri), false); + if (in == null) { + in = Resolver.createInputSource(new java.net.URL(uri), false); // ... or if custom resolver doesn't correctly construct the // input entity, patch it up enough so relative URIs work, and // issue a warning to minimize later confusion. - } else if (inSource.getSystemId() == null) { + } else if (in.getSystemId() == null) { warning("P-065", null); - inSource.setSystemId(uri); + in.setSystemId(uri); } - parseInternal(inSource); + parseInternal(in); } // makes sure the parser is reset to "before a document" diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EndOfInputException.java b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EndOfInputException.java index aa7eeae0..a7cc5224 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EndOfInputException.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EndOfInputException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EntityDecl.java b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EntityDecl.java index 6c735929..9db54f68 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EntityDecl.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EntityDecl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/ExternalEntity.java b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/ExternalEntity.java index 4ab87249..aa396902 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/ExternalEntity.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/ExternalEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InputEntity.java b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InputEntity.java index c296f367..65a0b7bf 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InputEntity.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InputEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InternalEntity.java b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InternalEntity.java index 15096930..00e125a1 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InternalEntity.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InternalEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/MessageCatalog.java b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/MessageCatalog.java index 5f4e8238..7ad1e121 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/MessageCatalog.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/MessageCatalog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/Resolver.java b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/Resolver.java index 90b2ec3e..ed8cbfe0 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/Resolver.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/Resolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java index 1cf19397..bbe4e5fc 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlChars.java b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlChars.java index 90d400b8..848ad1dd 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlChars.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlChars.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlNames.java b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlNames.java index 2f13e882..5ba9f15b 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlNames.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlNames.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlReader.java b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlReader.java index 88bfeb2e..37b6ecfe 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlReader.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -86,7 +86,7 @@ final class XmlReader extends Reader { // /** - * Constructs the reader from an input stream, auto-detecting + * Constructs the reader from an input stream, autodetecting * the encoding to use according to the heuristic specified * in the XML 1.0 recommendation. * @@ -104,7 +104,7 @@ final class XmlReader extends Reader { * * @param in the input stream from which the reader is constructed * @param encoding the IETF standard name of the encoding to use; - * if null, auto-detection is used. + * if null, autodetection is used. * @throws IOException on error, including unrecognized encoding */ public static Reader createReader(InputStream in, String encoding) diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/package.html b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/package.html index 5a61d1d3..950d8da1 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/package.html +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/package.html @@ -1,5 +1,5 @@ <!-- - Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/resources/Messages.properties b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/resources/Messages.properties index fd76eeb8..11b7acc3 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/resources/Messages.properties +++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/resources/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java index 688ce33d..8cfe231f 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ package com.sun.xml.internal.stream.buffer; +@SuppressWarnings("PointlessBitwiseExpression") public abstract class AbstractCreatorProcessor { /** * Flag on a T_DOCUMENT to indicate if a fragment diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java index 2014d757..80253244 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java index 69f96cc4..288fed3d 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,19 +35,19 @@ import org.xml.sax.Attributes; */ @SuppressWarnings({"PointlessArithmeticExpression"}) public final class AttributesHolder implements Attributes { - protected static final int DEFAULT_CAPACITY = 8; - protected static final int ITEM_SIZE = 1 << 3; + private static final int DEFAULT_CAPACITY = 8; + private static final int ITEM_SIZE = 1 << 3; - protected static final int PREFIX = 0; - protected static final int URI = 1; - protected static final int LOCAL_NAME = 2; - protected static final int QNAME = 3; - protected static final int TYPE = 4; - protected static final int VALUE = 5; + private static final int PREFIX = 0; + private static final int URI = 1; + private static final int LOCAL_NAME = 2; + private static final int QNAME = 3; + private static final int TYPE = 4; + private static final int VALUE = 5; - protected int _attributeCount; + private int _attributeCount; - protected String[] _strings; + private String[] _strings; public AttributesHolder() { _strings = new String[DEFAULT_CAPACITY * ITEM_SIZE]; diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java index 001dfd35..62ee0926 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,10 +25,10 @@ package com.sun.xml.internal.stream.buffer; -class FragmentedArray<T> { - protected T _item; - protected FragmentedArray<T> _next; - protected FragmentedArray<T> _previous; +final class FragmentedArray<T> { + private T _item; + private FragmentedArray<T> _next; + private FragmentedArray<T> _previous; FragmentedArray(T item) { this(item, null); diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java index 37e1eb2e..24a2a991 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java index 64cfe554..c6c68344 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java index 3a75cc98..d877ba3d 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java index 5a48367f..497458ce 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java index 83e454fe..96870b26 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java index 9da6f4eb..4429b2f9 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java index 873473f2..66c81a8c 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Features.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Features.java index e4dc5d4d..3fec5ebd 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Features.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Features.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Properties.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Properties.java index 9a834155..43c5b117 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Properties.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Properties.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java index 1654bb45..626b6f1f 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java index afc5007b..e1111d55 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java index 6f9e6552..8769f051 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -215,7 +215,8 @@ public class StreamReaderBufferCreator extends StreamBufferCreator { CharSequence c = reader.getPCDATA(); if (c instanceof Base64Data) { storeStructure(T_TEXT_AS_OBJECT); - storeContentObject(((Base64Data)c).clone()); + //Instead of clone the Base64Data, the original Base64Data instance is used here to preserve the DataHandler + storeContentObject(c); } else { storeContentCharacters(T_TEXT_AS_CHAR_ARRAY, reader.getTextCharacters(), reader.getTextStart(), diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java index 0ca0560b..4071bd2a 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java index 3102fc67..a4c579d2 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XMLWriter.java b/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XMLWriter.java index f1f5acd2..ce706a86 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XMLWriter.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XMLWriter.java @@ -932,7 +932,7 @@ public class XMLWriter extends XMLFilterImpl implements LexicalHandler write("<![CDATA["); inCDATA = true; } catch (IOException e) { - new SAXException(e); + throw new SAXException(e); } } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Packet.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Packet.java index 02960dab..fc981a9e 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Packet.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Packet.java @@ -1423,6 +1423,9 @@ public final class Packet if (getMtomRequest() != null && getMtomRequest() && getState().equals(State.ServerResponse)) { return true; } + if (getMtomRequest() != null && getMtomRequest() && getState().equals(State.ClientRequest)) { + return true; + } } } return false; diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/StreamingSOAP.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/StreamingSOAP.java new file mode 100644 index 00000000..e84ae576 --- /dev/null +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/StreamingSOAP.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code 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 + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.sun.xml.internal.ws.api.message; + +import javax.xml.stream.XMLStreamReader; + +public interface StreamingSOAP { + public XMLStreamReader readEnvelope(); +} diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Container.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Container.java index b0ddc4ac..914bf920 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Container.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Container.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.xml.internal.ws.api.server; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; @@ -91,6 +90,7 @@ public abstract class Container implements ComponentRegistry, ComponentEx { } public <S> S getSPI(Class<S> spiType) { + if (components == null) return null; for (Component c : components) { S s = c.getSPI(spiType); if (s != null) diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java index cfd8d317..a2672938 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -46,7 +46,7 @@ import java.util.concurrent.Executor; * @since 2.2.7 */ public class ThreadLocalContainerResolver extends ContainerResolver { - private ThreadLocal<Container> containers = new ThreadLocal<Container>() { + private ThreadLocal<Container> containerThreadLocal = new ThreadLocal<Container>() { @Override protected Container initialValue() { return Container.NONE; @@ -54,7 +54,7 @@ public class ThreadLocalContainerResolver extends ContainerResolver { }; public Container getContainer() { - return containers.get(); + return containerThreadLocal.get(); } /** @@ -63,8 +63,8 @@ public class ThreadLocalContainerResolver extends ContainerResolver { * @return Previous container; must be remembered and passed to exitContainer */ public Container enterContainer(Container container) { - Container old = containers.get(); - containers.set(container); + Container old = containerThreadLocal.get(); + containerThreadLocal.set(container); return old; } @@ -73,7 +73,7 @@ public class ThreadLocalContainerResolver extends ContainerResolver { * @param old Container returned from enterContainer */ public void exitContainer(Container old) { - containers.set(old); + containerThreadLocal.set(old); } /** diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java index c8ffbdbb..db6cbc62 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java @@ -34,7 +34,12 @@ import org.xml.sax.InputSource; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringReader; +import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URL; @@ -42,6 +47,8 @@ import java.security.AccessController; import java.util.logging.Level; import java.util.logging.Logger; +import com.sun.xml.internal.ws.resources.StreamingMessages; + /** * Factory for {@link XMLStreamReader}. * @@ -61,6 +68,8 @@ public abstract class XMLStreamReaderFactory { */ private static volatile @NotNull XMLStreamReaderFactory theInstance; + private static final String CLASS_NAME_OF_WSTXINPUTFACTORY = "com.ctc.wstx.stax.WstxInputFactory"; + static { XMLInputFactory xif = getXMLInputFactory(); XMLStreamReaderFactory f=null; @@ -73,7 +82,7 @@ public abstract class XMLStreamReaderFactory { if(f==null) { // is this Woodstox? - if (xif.getClass().getName().equals("com.ctc.wstx.stax.WstxInputFactory")) { + if (xif.getClass().getName().equals(CLASS_NAME_OF_WSTXINPUTFACTORY)) { f = new Woodstox(xif); } } @@ -83,7 +92,9 @@ public abstract class XMLStreamReaderFactory { } theInstance = f; - LOGGER.log(Level.FINE, "XMLStreamReaderFactory instance is = {0}", theInstance); + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.log(Level.FINE, "XMLStreamReaderFactory instance is = {0}", theInstance); + } } private static XMLInputFactory getXMLInputFactory() { @@ -92,7 +103,9 @@ public abstract class XMLStreamReaderFactory { try { xif = (XMLInputFactory)Class.forName("com.ctc.wstx.stax.WstxInputFactory").newInstance(); } catch (Exception e) { - // Ignore and fallback to default XMLInputFactory + if (LOGGER.isLoggable(Level.WARNING)) { + LOGGER.log(Level.WARNING, StreamingMessages.WOODSTOX_CANT_LOAD(CLASS_NAME_OF_WSTXINPUTFACTORY), e); + } } } if (xif == null) { @@ -101,10 +114,10 @@ public abstract class XMLStreamReaderFactory { xif.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true); xif.setProperty(XMLInputFactory.SUPPORT_DTD, false); xif.setProperty(XMLInputFactory.IS_COALESCING, true); + return xif; } - /** * Overrides the singleton {@link XMLStreamReaderFactory} instance that * the JAX-WS RI uses. @@ -168,7 +181,7 @@ public abstract class XMLStreamReaderFactory { * it takes to recycle vs the possible performance gain by doing so. * * <p> - * This method may be invked by multiple threads concurrently. + * This method may be invoked by multiple threads concurrently. * * @param r * The {@link XMLStreamReader} instance that the caller finished using. @@ -282,11 +295,13 @@ public abstract class XMLStreamReaderFactory { return sr; } + @Override public void doRecycle(XMLStreamReader r) { if(zephyrClass.isInstance(r)) pool.set(r); } + @Override public XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs) { try { XMLStreamReader xsr = fetch(); @@ -307,6 +322,7 @@ public abstract class XMLStreamReaderFactory { } } + @Override public XMLStreamReader doCreate(String systemId, Reader in, boolean rejectDTDs) { try { XMLStreamReader xsr = fetch(); @@ -345,7 +361,7 @@ public abstract class XMLStreamReaderFactory { * {@link XMLInputFactory} is not required to be thread-safe, but * if the create method on this implementation is synchronized, * it may run into (see <a href="https://jax-ws.dev.java.net/issues/show_bug.cgi?id=555"> - * race condition</a>). Hence, using a XMLInputFactory per theread. + * race condition</a>). Hence, using a XMLInputFactory per thread. */ public static final class Default extends XMLStreamReaderFactory { @@ -356,6 +372,7 @@ public abstract class XMLStreamReaderFactory { } }; + @Override public XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs) { try { return xif.get().createXMLStreamReader(systemId,in); @@ -364,6 +381,7 @@ public abstract class XMLStreamReaderFactory { } } + @Override public XMLStreamReader doCreate(String systemId, Reader in, boolean rejectDTDs) { try { return xif.get().createXMLStreamReader(systemId,in); @@ -372,6 +390,7 @@ public abstract class XMLStreamReaderFactory { } } + @Override public void doRecycle(XMLStreamReader r) { // there's no way to recycle with the default StAX API. } @@ -391,6 +410,7 @@ public abstract class XMLStreamReaderFactory { this.xif = xif; } + @Override public XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs) { try { return xif.createXMLStreamReader(systemId,in); @@ -399,6 +419,7 @@ public abstract class XMLStreamReaderFactory { } } + @Override public XMLStreamReader doCreate(String systemId, Reader in, boolean rejectDTDs) { try { return xif.createXMLStreamReader(systemId,in); @@ -407,33 +428,182 @@ public abstract class XMLStreamReaderFactory { } } + @Override public void doRecycle(XMLStreamReader r) { // there's no way to recycle with the default StAX API. } } /** - * Handles Woodstox's XIF but set properties to do the string interning. + * Handles Woodstox's XIF, but sets properties to do the string interning, sets various limits, ... * Woodstox {@link XMLInputFactory} is thread safe. */ public static final class Woodstox extends NoLock { + + public final static String PROPERTY_MAX_ATTRIBUTES_PER_ELEMENT = "xml.ws.maximum.AttributesPerElement"; + public final static String PROPERTY_MAX_ATTRIBUTE_SIZE = "xml.ws.maximum.AttributeSize"; + public final static String PROPERTY_MAX_CHILDREN_PER_ELEMENT = "xml.ws.maximum.ChildrenPerElement"; + public final static String PROPERTY_MAX_ELEMENT_COUNT = "xml.ws.maximum.ElementCount"; + public final static String PROPERTY_MAX_ELEMENT_DEPTH = "xml.ws.maximum.ElementDepth"; + public final static String PROPERTY_MAX_CHARACTERS = "xml.ws.maximum.Characters"; + + private static final int DEFAULT_MAX_ATTRIBUTES_PER_ELEMENT = 500; + private static final int DEFAULT_MAX_ATTRIBUTE_SIZE = 65536 * 8; + private static final int DEFAULT_MAX_CHILDREN_PER_ELEMENT = Integer.MAX_VALUE; + private static final int DEFAULT_MAX_ELEMENT_DEPTH = 500; + private static final long DEFAULT_MAX_ELEMENT_COUNT = Integer.MAX_VALUE; + private static final long DEFAULT_MAX_CHARACTERS = Long.MAX_VALUE; + + /* Woodstox default setting: + int mMaxAttributesPerElement = 1000; + int mMaxAttributeSize = 65536 * 8; + int mMaxChildrenPerElement = Integer.MAX_VALUE; + int mMaxElementDepth = 1000; + long mMaxElementCount = Long.MAX_VALUE; + long mMaxCharacters = Long.MAX_VALUE; + */ + + private int maxAttributesPerElement = DEFAULT_MAX_ATTRIBUTES_PER_ELEMENT; + private int maxAttributeSize = DEFAULT_MAX_ATTRIBUTE_SIZE; + private int maxChildrenPerElement = DEFAULT_MAX_CHILDREN_PER_ELEMENT; + private int maxElementDepth = DEFAULT_MAX_ELEMENT_DEPTH; + private long maxElementCount = DEFAULT_MAX_ELEMENT_COUNT; + private long maxCharacters = DEFAULT_MAX_CHARACTERS; + + // Note: this is a copy from com.ctc.wstx.api.WstxInputProperties, to be removed in the future + private static final java.lang.String P_MAX_ATTRIBUTES_PER_ELEMENT = "com.ctc.wstx.maxAttributesPerElement"; + private static final java.lang.String P_MAX_ATTRIBUTE_SIZE = "com.ctc.wstx.maxAttributeSize"; + private static final java.lang.String P_MAX_CHILDREN_PER_ELEMENT = "com.ctc.wstx.maxChildrenPerElement"; + private static final java.lang.String P_MAX_ELEMENT_COUNT = "com.ctc.wstx.maxElementCount"; + private static final java.lang.String P_MAX_ELEMENT_DEPTH = "com.ctc.wstx.maxElementDepth"; + private static final java.lang.String P_MAX_CHARACTERS = "com.ctc.wstx.maxCharacters"; + private static final java.lang.String P_INTERN_NSURIS = "org.codehaus.stax2.internNsUris"; + public Woodstox(XMLInputFactory xif) { super(xif); - xif.setProperty("org.codehaus.stax2.internNsUris",true); + + if (xif.isPropertySupported(P_INTERN_NSURIS)) { + xif.setProperty(P_INTERN_NSURIS, true); + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.log(Level.FINE, P_INTERN_NSURIS + " is {0}", true); + } + } + + if (xif.isPropertySupported(P_MAX_ATTRIBUTES_PER_ELEMENT)) { + maxAttributesPerElement = Integer.valueOf(buildIntegerValue( + PROPERTY_MAX_ATTRIBUTES_PER_ELEMENT, DEFAULT_MAX_ATTRIBUTES_PER_ELEMENT) + ); + xif.setProperty(P_MAX_ATTRIBUTES_PER_ELEMENT, maxAttributesPerElement); + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.log(Level.FINE, P_MAX_ATTRIBUTES_PER_ELEMENT + " is {0}", maxAttributesPerElement); + } + } + + if (xif.isPropertySupported(P_MAX_ATTRIBUTE_SIZE)) { + maxAttributeSize = Integer.valueOf(buildIntegerValue( + PROPERTY_MAX_ATTRIBUTE_SIZE, DEFAULT_MAX_ATTRIBUTE_SIZE) + ); + xif.setProperty(P_MAX_ATTRIBUTE_SIZE, maxAttributeSize); + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.log(Level.FINE, P_MAX_ATTRIBUTE_SIZE + " is {0}", maxAttributeSize); + } + } + + if (xif.isPropertySupported(P_MAX_CHILDREN_PER_ELEMENT)) { + maxChildrenPerElement = Integer.valueOf(buildIntegerValue( + PROPERTY_MAX_CHILDREN_PER_ELEMENT, DEFAULT_MAX_CHILDREN_PER_ELEMENT) + ); + xif.setProperty(P_MAX_CHILDREN_PER_ELEMENT, maxChildrenPerElement); + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.log(Level.FINE, P_MAX_CHILDREN_PER_ELEMENT + " is {0}", maxChildrenPerElement); + } + } + + if (xif.isPropertySupported(P_MAX_ELEMENT_DEPTH)) { + maxElementDepth = Integer.valueOf(buildIntegerValue( + PROPERTY_MAX_ELEMENT_DEPTH, DEFAULT_MAX_ELEMENT_DEPTH) + ); + xif.setProperty(P_MAX_ELEMENT_DEPTH, maxElementDepth); + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.log(Level.FINE, P_MAX_ELEMENT_DEPTH + " is {0}", maxElementDepth); + } + } + + if (xif.isPropertySupported(P_MAX_ELEMENT_COUNT)) { + maxElementCount = Long.valueOf(buildLongValue( + PROPERTY_MAX_ELEMENT_COUNT, DEFAULT_MAX_ELEMENT_COUNT) + ); + xif.setProperty(P_MAX_ELEMENT_COUNT, maxElementCount); + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.log(Level.FINE, P_MAX_ELEMENT_COUNT + " is {0}", maxElementCount); + } + } + + if (xif.isPropertySupported(P_MAX_CHARACTERS)) { + maxCharacters = Long.valueOf(buildLongValue( + PROPERTY_MAX_CHARACTERS, DEFAULT_MAX_CHARACTERS) + ); + xif.setProperty(P_MAX_CHARACTERS, maxCharacters); + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.log(Level.FINE, P_MAX_CHARACTERS + " is {0}", maxCharacters); + } + } } + @Override public XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs) { return super.doCreate(systemId, in, rejectDTDs); } + @Override public XMLStreamReader doCreate(String systemId, Reader in, boolean rejectDTDs) { return super.doCreate(systemId, in, rejectDTDs); } } + private static int buildIntegerValue(String propertyName, int defaultValue) { + String propVal = System.getProperty(propertyName); + if (propVal != null && propVal.length() > 0) { + try { + Integer value = Integer.parseInt(propVal); + if (value > 0) { + // return with the value in System property + return value; + } + } catch (NumberFormatException nfe) { + if (LOGGER.isLoggable(Level.WARNING)) { + LOGGER.log(Level.WARNING, StreamingMessages.INVALID_PROPERTY_VALUE_INTEGER(propertyName, propVal, Integer.toString(defaultValue)), nfe); + } + } + } + // return with the default value + return defaultValue; + } + + private static long buildLongValue(String propertyName, long defaultValue) { + String propVal = System.getProperty(propertyName); + if (propVal != null && propVal.length() > 0) { + try { + long value = Long.parseLong(propVal); + if (value > 0L) { + // return with the value in System property + return value; + } + } catch (NumberFormatException nfe) { + // defult will be returned + if (LOGGER.isLoggable(Level.WARNING)) { + LOGGER.log(Level.WARNING, StreamingMessages.INVALID_PROPERTY_VALUE_LONG(propertyName, propVal, Long.toString(defaultValue)), nfe); + } + } + } + // return with the default value + return defaultValue; + } + private static Boolean getProperty(final String prop) { return AccessController.doPrivileged( new java.security.PrivilegedAction<Boolean>() { + @Override public Boolean run() { String value = System.getProperty(prop); return value != null ? Boolean.valueOf(value) : Boolean.FALSE; @@ -441,4 +611,5 @@ public abstract class XMLStreamReaderFactory { } ); } + } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java index 2558d9ff..3d1a560c 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,7 +42,7 @@ import com.sun.xml.internal.ws.api.server.WSEndpoint; * <p/> * The JAX-WS WSDLGenerator uses TXW to serialize the WSDL out to XML. * More information about TXW can be located at - * <a href="http://txw.dev.java.net">http://txw.dev.java.net</a>. + * <a href="http://txw.java.net">http://txw.java.net</a>. */ public abstract class WSDLGeneratorExtension { /** diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java index 376df497..31d1d713 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java @@ -81,10 +81,27 @@ public final class Converter { } return toString(packet.getMessage()); + } + + public static String toStringNoIndent(Packet packet) { + if (packet == null) { + return "[ Null packet ]"; + } else if (packet.getMessage() == null) { + return "[ Empty packet ]"; + } + return toStringNoIndent(packet.getMessage()); } public static String toString(Message message) { + return toString(message, true); + } + + public static String toStringNoIndent(Message message) { + return toString(message, false); + } + + private static String toString(Message message, boolean createIndenter) { if (message == null) { return "[ Null message ]"; } @@ -94,7 +111,9 @@ public final class Converter { XMLStreamWriter writer = null; try { writer = xmlOutputFactory.createXMLStreamWriter(stringOut); - writer = createIndenter(writer); + if (createIndenter) { + writer = createIndenter(writer); + } message.copy().writeTo(writer); } catch (Exception e) { // WSIT-1596 - Message Dumping should not affect other processing LOGGER.log(Level.WARNING, "Unexpected exception occured while dumping message", e); diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MtomCodec.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MtomCodec.java index e5c10497..0db9233e 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MtomCodec.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MtomCodec.java @@ -41,6 +41,7 @@ import com.sun.xml.internal.ws.developer.StreamingDataHandler; import com.sun.xml.internal.ws.message.MimeAttachmentSet; import com.sun.xml.internal.ws.streaming.XMLStreamWriterUtil; import com.sun.xml.internal.ws.util.ByteArrayDataSource; +import com.sun.xml.internal.ws.util.xml.NamespaceContextExAdaper; import com.sun.xml.internal.ws.util.xml.XMLStreamReaderFilter; import com.sun.xml.internal.ws.util.xml.XMLStreamWriterFilter; import com.sun.xml.internal.ws.streaming.MtomStreamWriter; @@ -374,8 +375,11 @@ public class MtomCodec extends MimeCodec { private void writeBinary(ByteArrayBuffer bab) { try { mtomAttachments.add(bab); - writer.setPrefix("xop", XOP_NAMESPACEURI); - writer.writeNamespace("xop", XOP_NAMESPACEURI); + String prefix = writer.getPrefix(XOP_NAMESPACEURI); + if (prefix == null || !prefix.equals("xop")) { + writer.setPrefix("xop", XOP_NAMESPACEURI); + writer.writeNamespace("xop", XOP_NAMESPACEURI); + } writer.writeStartElement(XOP_NAMESPACEURI, XOP_LOCALNAME); writer.writeAttribute("href", "cid:"+bab.contentId); writer.writeEndElement(); @@ -513,8 +517,7 @@ public class MtomCodec extends MimeCodec { @Override public NamespaceContextEx getNamespaceContext() { - NamespaceContext nsContext = reader.getNamespaceContext(); - return new MtomNamespaceContextEx(nsContext); + return new NamespaceContextExAdaper(reader.getNamespaceContext()); } @Override @@ -522,35 +525,6 @@ public class MtomCodec extends MimeCodec { throw new UnsupportedOperationException(); } - private static class MtomNamespaceContextEx implements NamespaceContextEx { - private final NamespaceContext nsContext; - - public MtomNamespaceContextEx(NamespaceContext nsContext) { - this.nsContext = nsContext; - } - - @Override - public Iterator<Binding> iterator() { - throw new UnsupportedOperationException(); - } - - @Override - public String getNamespaceURI(String prefix) { - return nsContext.getNamespaceURI(prefix); - } - - @Override - public String getPrefix(String namespaceURI) { - return nsContext.getPrefix(namespaceURI); - } - - @Override - public Iterator getPrefixes(String namespaceURI) { - return nsContext.getPrefixes(namespaceURI); - } - - } - @Override public int getTextLength() { if (xopReferencePresent) { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java index 69691001..d267cab3 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java @@ -44,12 +44,6 @@ import java.util.List; * @author Paul.Sandoz@Sun.Com */ final class StreamSOAP11Codec extends StreamSOAPCodec { - static final StreamHeaderDecoder SOAP11StreamHeaderDecoder = new StreamHeaderDecoder() { - @Override - public Header decodeHeader(XMLStreamReader reader, XMLStreamBuffer mark) { - return new StreamHeader11(reader, mark); - } - }; public static final String SOAP11_MIME_TYPE = "text/xml"; public static final String DEFAULT_SOAP11_CONTENT_TYPE = diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java index 096ef3e0..4e84fd74 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java @@ -47,12 +47,6 @@ import java.io.IOException; * @author Paul.Sandoz@Sun.Com */ final class StreamSOAP12Codec extends StreamSOAPCodec { - static final StreamHeaderDecoder SOAP12StreamHeaderDecoder = new StreamHeaderDecoder() { - @Override - public Header decodeHeader(XMLStreamReader reader, XMLStreamBuffer mark) { - return new StreamHeader12(reader, mark); - } - }; public static final String SOAP12_MIME_TYPE = "application/soap+xml"; public static final String DEFAULT_SOAP12_CONTENT_TYPE = diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java index be5c854b..4edafad8 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java @@ -194,9 +194,7 @@ public abstract class StreamSOAPCodec implements com.sun.xml.internal.ws.api.pip return decode(soapVersion, reader, attachmentSet); } - public static final Message decode(SOAPVersion soapVersion, XMLStreamReader reader, - @NotNull AttachmentSet attachmentSet) { - + public static final Message decode(SOAPVersion soapVersion, XMLStreamReader reader, @NotNull AttachmentSet attachmentSet) { // Move to soap:Envelope and verify if(reader.getEventType()!=XMLStreamConstants.START_ELEMENT) XMLStreamReaderUtil.nextElementContent(reader); @@ -205,61 +203,7 @@ public abstract class StreamSOAPCodec implements com.sun.xml.internal.ws.api.pip throw new VersionMismatchException(soapVersion, soapVersion.nsUri, reader.getNamespaceURI()); } XMLStreamReaderUtil.verifyTag(reader, soapVersion.nsUri, SOAP_ENVELOPE); - - TagInfoset envelopeTag = new TagInfoset(reader); - - // Collect namespaces on soap:Envelope - Map<String,String> namespaces = new HashMap<String,String>(); - for(int i=0; i< reader.getNamespaceCount();i++){ - namespaces.put(reader.getNamespacePrefix(i), reader.getNamespaceURI(i)); - } - - // Move to next element - XMLStreamReaderUtil.nextElementContent(reader); - XMLStreamReaderUtil.verifyReaderState(reader, - javax.xml.stream.XMLStreamConstants.START_ELEMENT); - - HeaderList headers = null; - TagInfoset headerTag = null; - - if (reader.getLocalName().equals(SOAP_HEADER) - && reader.getNamespaceURI().equals(soapVersion.nsUri)) { - headerTag = new TagInfoset(reader); - - // Collect namespaces on soap:Header - for(int i=0; i< reader.getNamespaceCount();i++){ - namespaces.put(reader.getNamespacePrefix(i), reader.getNamespaceURI(i)); - } - // skip <soap:Header> - XMLStreamReaderUtil.nextElementContent(reader); - - // If SOAP header blocks are present (i.e. not <soap:Header/>) - if (reader.getEventType() == XMLStreamConstants.START_ELEMENT) { - headers = new HeaderList(soapVersion); - - try { - // Cache SOAP header blocks - StreamHeaderDecoder headerDecoder = SOAPVersion.SOAP_11.equals(soapVersion) ? StreamSOAP11Codec.SOAP11StreamHeaderDecoder : StreamSOAP12Codec.SOAP12StreamHeaderDecoder; - cacheHeaders(reader, namespaces, headers, headerDecoder); - } catch (XMLStreamException e) { - // TODO need to throw more meaningful exception - throw new WebServiceException(e); - } - } - - // Move to soap:Body - XMLStreamReaderUtil.nextElementContent(reader); - } - - // Verify that <soap:Body> is present - XMLStreamReaderUtil.verifyTag(reader, soapVersion.nsUri, SOAP_BODY); - TagInfoset bodyTag = new TagInfoset(reader); - - String bodyPrologue = XMLStreamReaderUtil.nextWhiteSpaceContent(reader); - return new StreamMessage(envelopeTag,headerTag,attachmentSet,headers,bodyPrologue,bodyTag,null,reader,soapVersion); - // when there's no payload, - // it's tempting to use EmptyMessageImpl, but it doesn't preserve the infoset - // of <envelope>,<header>, and <body>, so we need to stick to StreamMessage. + return new StreamMessage(soapVersion, reader, attachmentSet); } public void decode(ReadableByteChannel in, String contentType, Packet packet ) { @@ -270,56 +214,6 @@ public abstract class StreamSOAPCodec implements com.sun.xml.internal.ws.api.pip return this; } - private static XMLStreamBuffer cacheHeaders(XMLStreamReader reader, - Map<String, String> namespaces, HeaderList headers, - StreamHeaderDecoder headerDecoder) throws XMLStreamException { - MutableXMLStreamBuffer buffer = createXMLStreamBuffer(); - StreamReaderBufferCreator creator = new StreamReaderBufferCreator(); - creator.setXMLStreamBuffer(buffer); - - // Reader is positioned at the first header block - while(reader.getEventType() == javax.xml.stream.XMLStreamConstants.START_ELEMENT) { - Map<String,String> headerBlockNamespaces = namespaces; - - // Collect namespaces on SOAP header block - if (reader.getNamespaceCount() > 0) { - headerBlockNamespaces = new HashMap<String,String>(namespaces); - for (int i = 0; i < reader.getNamespaceCount(); i++) { - headerBlockNamespaces.put(reader.getNamespacePrefix(i), reader.getNamespaceURI(i)); - } - } - - // Mark - XMLStreamBuffer mark = new XMLStreamBufferMark(headerBlockNamespaces, creator); - // Create Header - headers.add(headerDecoder.decodeHeader(reader, mark)); - - - // Cache the header block - // After caching Reader will be positioned at next header block or - // the end of the </soap:header> - creator.createElementFragment(reader, false); - if (reader.getEventType() != XMLStreamConstants.START_ELEMENT && - reader.getEventType() != XMLStreamConstants.END_ELEMENT) { - XMLStreamReaderUtil.nextElementContent(reader); - } - } - - return buffer; - } - - protected interface StreamHeaderDecoder { - public Header decodeHeader(XMLStreamReader reader, XMLStreamBuffer mark); - } - - private static MutableXMLStreamBuffer createXMLStreamBuffer() { - // TODO: Decode should own one MutableXMLStreamBuffer for reuse - // since it is more efficient. ISSUE: possible issue with - // lifetime of information in the buffer if accessed beyond - // the pipe line. - return new MutableXMLStreamBuffer(); - } - public void decode(InputStream in, String contentType, Packet packet, AttachmentSet att ) throws IOException { List<String> expectedContentTypes = getExpectedContentTypes(); if (contentType != null && !isContentTypeSupported(contentType,expectedContentTypes)) { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/TagInfoset.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/TagInfoset.java index f9565090..9eb66a30 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/TagInfoset.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/TagInfoset.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,8 @@ package com.sun.xml.internal.ws.encoding; +import java.util.List; + import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; @@ -221,4 +223,35 @@ public final class TagInfoset { private static final String[] EMPTY_ARRAY = new String[0]; private static final AttributesImpl EMPTY_ATTRIBUTES = new AttributesImpl(); + + public String getNamespaceURI(String prefix) { + int size = ns.length/2; + for(int i=0; i<size; i++){ + String p = ns[i*2 ]; + String n = ns[i*2+1]; + if (prefix.equals(p)) return n; + } + return null; + } + + public String getPrefix(String namespaceURI) { + int size = ns.length/2; + for(int i=0; i<size; i++){ + String p = ns[i*2 ]; + String n = ns[i*2+1]; + if (namespaceURI.equals(n)) return p; + } + return null; + } + //Who wants this? + public List<String> allPrefixes(String namespaceURI) { + int size = ns.length/2; + List<String> l = new java.util.ArrayList<String>(); + for(int i=0; i<size; i++){ + String p = ns[i*2 ]; + String n = ns[i*2+1]; + if (namespaceURI.equals(n)) l.add(p); + } + return l; + } } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java index 4ed1a77c..056b31b9 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java @@ -25,6 +25,7 @@ package com.sun.xml.internal.ws.message; +import com.sun.istack.internal.NotNull; import com.sun.xml.internal.bind.api.Bridge; import com.sun.xml.internal.ws.api.SOAPVersion; import com.sun.xml.internal.ws.api.message.Header; @@ -33,8 +34,11 @@ import com.sun.xml.internal.ws.api.message.MessageHeaders; import com.sun.xml.internal.ws.api.message.MessageWritable; import com.sun.xml.internal.ws.api.message.Packet; import com.sun.xml.internal.ws.api.message.saaj.SAAJFactory; +import com.sun.xml.internal.ws.encoding.TagInfoset; import com.sun.xml.internal.ws.message.saaj.SAAJMessage; import com.sun.xml.internal.ws.spi.db.XMLBridge; +import java.util.ArrayList; +import java.util.Collections; import org.xml.sax.ContentHandler; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; @@ -80,10 +84,34 @@ public abstract class AbstractMessageImpl extends Message { */ protected final SOAPVersion soapVersion; + protected @NotNull TagInfoset envelopeTag; + protected @NotNull TagInfoset headerTag; + protected @NotNull TagInfoset bodyTag; + + protected static final AttributesImpl EMPTY_ATTS; + protected static final LocatorImpl NULL_LOCATOR = new LocatorImpl(); + protected static final List<TagInfoset> DEFAULT_TAGS; + + static void create(SOAPVersion v, List c) { + int base = v.ordinal()*3; + c.add(base, new TagInfoset(v.nsUri, "Envelope", "S", EMPTY_ATTS,"S", v.nsUri)); + c.add(base+1, new TagInfoset(v.nsUri, "Header", "S", EMPTY_ATTS)); + c.add(base+2, new TagInfoset(v.nsUri, "Body", "S", EMPTY_ATTS)); + } + + static { + EMPTY_ATTS = new AttributesImpl(); + List<TagInfoset> tagList = new ArrayList<TagInfoset>(); + create(SOAPVersion.SOAP_11, tagList); + create(SOAPVersion.SOAP_12, tagList); + DEFAULT_TAGS = Collections.unmodifiableList(tagList); + } + protected AbstractMessageImpl(SOAPVersion soapVersion) { this.soapVersion = soapVersion; } + @Override public SOAPVersion getSOAPVersion() { return soapVersion; } @@ -94,10 +122,12 @@ public abstract class AbstractMessageImpl extends Message { this.soapVersion = that.soapVersion; } + @Override public Source readEnvelopeAsSource() { return new SAXSource(new XMLReaderImpl(this), XMLReaderImpl.THE_SOURCE); } + @Override public <T> T readPayloadAsJAXB(Unmarshaller unmarshaller) throws JAXBException { if(hasAttachments()) unmarshaller.setAttachmentUnmarshaller(new AttachmentUnmarshallerImpl(getAttachments())); @@ -108,11 +138,13 @@ public abstract class AbstractMessageImpl extends Message { } } /** @deprecated */ + @Override public <T> T readPayloadAsJAXB(Bridge<T> bridge) throws JAXBException { return bridge.unmarshal(readPayloadAsSource(), hasAttachments()? new AttachmentUnmarshallerImpl(getAttachments()) : null ); } + @Override public <T> T readPayloadAsJAXB(XMLBridge<T> bridge) throws JAXBException { return bridge.unmarshal(readPayloadAsSource(), hasAttachments()? new AttachmentUnmarshallerImpl(getAttachments()) : null ); @@ -121,6 +153,7 @@ public abstract class AbstractMessageImpl extends Message { /** * Default implementation that relies on {@link #writePayloadTo(XMLStreamWriter)} */ + @Override public void writeTo(XMLStreamWriter w) throws XMLStreamException { String soapNsUri = soapVersion.nsUri; w.writeStartDocument(); @@ -147,6 +180,7 @@ public abstract class AbstractMessageImpl extends Message { /** * Writes the whole envelope as SAX events. */ + @Override public void writeTo( ContentHandler contentHandler, ErrorHandler errorHandler ) throws SAXException { String soapNsUri = soapVersion.nsUri; @@ -191,13 +225,12 @@ public abstract class AbstractMessageImpl extends Message { /** * Default implementation that uses {@link #writeTo(ContentHandler, ErrorHandler)} */ + @Override public SOAPMessage readAsSOAPMessage() throws SOAPException { return SAAJFactory.read(soapVersion, this); } - /** - * - */ + @Override public SOAPMessage readAsSOAPMessage(Packet packet, boolean inbound) throws SOAPException { SOAPMessage msg = SAAJFactory.read(soapVersion, this, packet); transportHeaders(packet, inbound, msg); @@ -211,7 +244,4 @@ public abstract class AbstractMessageImpl extends Message { } if (msg.saveRequired()) msg.saveChanges(); } - - protected static final AttributesImpl EMPTY_ATTS = new AttributesImpl(); - protected static final LocatorImpl NULL_LOCATOR = new LocatorImpl(); } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java index 54df3e64..f0b947a4 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,6 +28,7 @@ package com.sun.xml.internal.ws.message.jaxb; import com.sun.istack.internal.NotNull; import com.sun.istack.internal.XMLStreamException2; import com.sun.xml.internal.bind.api.Bridge; +import com.sun.xml.internal.stream.buffer.MutableXMLStreamBuffer; import com.sun.xml.internal.stream.buffer.XMLStreamBuffer; import com.sun.xml.internal.stream.buffer.XMLStreamBufferResult; import com.sun.xml.internal.ws.api.message.Header; @@ -142,16 +143,12 @@ public final class JAXBHeader extends AbstractHeaderImpl { } public XMLStreamReader readHeader() throws XMLStreamException { - try { - if(infoset==null) { - XMLStreamBufferResult sbr = new XMLStreamBufferResult(); - bridge.marshal(jaxbObject,sbr); - infoset = sbr.getXMLStreamBuffer(); - } - return infoset.readAsXMLStreamReader(); - } catch (JAXBException e) { - throw new XMLStreamException2(e); + if(infoset==null) { + MutableXMLStreamBuffer buffer = new MutableXMLStreamBuffer(); + writeTo(buffer.createFromXMLStreamWriter()); + infoset = buffer; } + return infoset.readAsXMLStreamReader(); } public <T> T readAsJAXB(Unmarshaller unmarshaller) throws JAXBException { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java index f5011652..28047945 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java @@ -31,9 +31,11 @@ import com.sun.xml.internal.stream.buffer.XMLStreamBuffer; import com.sun.xml.internal.stream.buffer.XMLStreamBufferResult; import com.sun.xml.internal.ws.api.SOAPVersion; import com.sun.xml.internal.ws.api.message.AttachmentSet; +import com.sun.xml.internal.ws.api.message.Header; import com.sun.xml.internal.ws.api.message.HeaderList; import com.sun.xml.internal.ws.api.message.Message; import com.sun.xml.internal.ws.api.message.MessageHeaders; +import com.sun.xml.internal.ws.api.message.StreamingSOAP; import com.sun.xml.internal.ws.encoding.SOAPBindingCodec; import com.sun.xml.internal.ws.message.AbstractMessageImpl; import com.sun.xml.internal.ws.message.AttachmentSetImpl; @@ -45,6 +47,9 @@ import com.sun.xml.internal.ws.spi.db.XMLBridge; import com.sun.xml.internal.ws.streaming.XMLStreamWriterUtil; import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil; import com.sun.xml.internal.ws.streaming.MtomStreamWriter; +import com.sun.xml.internal.ws.util.xml.XMLReaderComposite; +import com.sun.xml.internal.ws.util.xml.XMLReaderComposite.ElemInfo; + import org.xml.sax.ContentHandler; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; @@ -65,13 +70,14 @@ import static javax.xml.stream.XMLStreamConstants.START_DOCUMENT; import javax.xml.transform.Source; import javax.xml.ws.WebServiceException; import java.io.OutputStream; +import java.util.List; /** * {@link Message} backed by a JAXB bean. * * @author Kohsuke Kawaguchi */ -public final class JAXBMessage extends AbstractMessageImpl { +public final class JAXBMessage extends AbstractMessageImpl implements StreamingSOAP { private MessageHeaders headers; /** @@ -319,14 +325,17 @@ public final class JAXBMessage extends AbstractMessageImpl { public XMLStreamReader readPayload() throws XMLStreamException { try { if(infoset==null) { - XMLStreamBufferResult sbr = new XMLStreamBufferResult(); if (rawContext != null) { + XMLStreamBufferResult sbr = new XMLStreamBufferResult(); Marshaller m = rawContext.createMarshaller(); m.setProperty("jaxb.fragment", Boolean.TRUE); m.marshal(jaxbObject, sbr); - } else - bridge.marshal(jaxbObject, sbr); - infoset = sbr.getXMLStreamBuffer(); + infoset = sbr.getXMLStreamBuffer(); + } else { + MutableXMLStreamBuffer buffer = new MutableXMLStreamBuffer(); + writePayloadTo(buffer.createFromXMLStreamWriter()); + infoset = buffer; + } } XMLStreamReader reader = infoset.readAsXMLStreamReader(); if(reader.getEventType()== START_DOCUMENT) @@ -376,21 +385,22 @@ public final class JAXBMessage extends AbstractMessageImpl { // Get output stream and use JAXB UTF-8 writer OutputStream os = bridge.supportOutputStream() ? XMLStreamWriterUtil.getOutputStream(sw) : null; - if (rawContext != null) { - Marshaller m = rawContext.createMarshaller(); - m.setProperty("jaxb.fragment", Boolean.TRUE); - m.setAttachmentMarshaller(am); - if (os != null) - m.marshal(jaxbObject, os); - else - m.marshal(jaxbObject, sw); - } else { - if (os != null && encoding != null && encoding.equalsIgnoreCase(SOAPBindingCodec.UTF8_ENCODING)) { - bridge.marshal(jaxbObject, os, sw.getNamespaceContext(), am); - } else { - bridge.marshal(jaxbObject, sw, am); - } - } + if (rawContext != null) { + Marshaller m = rawContext.createMarshaller(); + m.setProperty("jaxb.fragment", Boolean.TRUE); + m.setAttachmentMarshaller(am); + if (os != null) { + m.marshal(jaxbObject, os); + } else { + m.marshal(jaxbObject, sw); + } + } else { + if (os != null && encoding != null && encoding.equalsIgnoreCase(SOAPBindingCodec.UTF8_ENCODING)) { + bridge.marshal(jaxbObject, os, sw.getNamespaceContext(), am); + } else { + bridge.marshal(jaxbObject, sw, am); + } + } //cleanup() is not needed since JAXB doesn't keep ref to AttachmentMarshaller //am.cleanup(); } catch (JAXBException e) { @@ -404,4 +414,33 @@ public final class JAXBMessage extends AbstractMessageImpl { return new JAXBMessage(this); } + public XMLStreamReader readEnvelope() { + int base = soapVersion.ordinal()*3; + this.envelopeTag = DEFAULT_TAGS.get(base); + this.bodyTag = DEFAULT_TAGS.get(base+2); + List<XMLStreamReader> hReaders = new java.util.ArrayList<XMLStreamReader>(); + ElemInfo envElem = new ElemInfo(envelopeTag, null); + ElemInfo bdyElem = new ElemInfo(bodyTag, envElem); + for (Header h : getHeaders().asList()) { + try { + hReaders.add(h.readHeader()); + } catch (XMLStreamException e) { + throw new RuntimeException(e); + } + } + XMLStreamReader soapHeader = null; + if(hReaders.size()>0) { + headerTag = DEFAULT_TAGS.get(base+1); + ElemInfo hdrElem = new ElemInfo(headerTag, envElem); + soapHeader = new XMLReaderComposite(hdrElem, hReaders.toArray(new XMLStreamReader[hReaders.size()])); + } + try { + XMLStreamReader payload= readPayload(); + XMLStreamReader soapBody = new XMLReaderComposite(bdyElem, new XMLStreamReader[]{payload}); + XMLStreamReader[] soapContent = (soapHeader != null) ? new XMLStreamReader[]{soapHeader, soapBody} : new XMLStreamReader[]{soapBody}; + return new XMLReaderComposite(envElem, soapContent); + } catch (XMLStreamException e) { + throw new RuntimeException(e); + } + } } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java index 5a1e5739..72c054c8 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java @@ -175,7 +175,7 @@ public class SAAJMessage extends Message { */ @Override public @NotNull AttachmentSet getAttachments() { - parse(); + if (attachmentSet == null) attachmentSet = new SAAJAttachmentSet(sm); return attachmentSet; } @@ -185,23 +185,21 @@ public class SAAJMessage extends Message { */ @Override protected boolean hasAttachments() { - parse(); - return attachmentSet!=null; + return !getAttachments().isEmpty(); } public @Nullable String getPayloadLocalPart() { - access(); + soapBodyFirstChild(); return payloadLocalName; } public String getPayloadNamespaceURI() { - access(); + soapBodyFirstChild(); return payloadNamespace; } public boolean hasPayload() { - access(); - return payloadNamespace != null; + return soapBodyFirstChild() != null; } private void addAttributes(Element e, NamedNodeMap attrs) { @@ -327,15 +325,7 @@ public class SAAJMessage extends Message { } public XMLStreamReader readPayload() throws XMLStreamException { - access(); - if (payload != null) { - DOMStreamReader dss = new DOMStreamReader(); - dss.setCurrentNode(payload); - dss.nextTag(); - assert dss.getEventType() == XMLStreamReader.START_ELEMENT; - return dss; - } - return null; + return soapBodyFirstChildReader(); } public void writePayloadTo(XMLStreamWriter sw) throws XMLStreamException { @@ -522,7 +512,7 @@ public class SAAJMessage extends Message { private static final AttributesImpl EMPTY_ATTS = new AttributesImpl(); private static final LocatorImpl NULL_LOCATOR = new LocatorImpl(); - private static class SAAJAttachment implements AttachmentEx { + protected static class SAAJAttachment implements AttachmentEx { final AttachmentPart ap; @@ -651,7 +641,7 @@ public class SAAJMessage extends Message { * SAAJ wants '<' and '>' for the content ID, but {@link AttachmentSet} * doesn't. S this class also does the conversion between them. */ - private static class SAAJAttachmentSet implements AttachmentSet { + protected static class SAAJAttachmentSet implements AttachmentSet { private Map<String, Attachment> attMap; private Iterator attIter; @@ -715,4 +705,74 @@ public class SAAJMessage extends Message { public SOAPVersion getSOAPVersion() { return soapVersion; } + + private XMLStreamReader soapBodyFirstChildReader; + + /** + * This allow the subclass to retain the XMLStreamReader. + */ + protected XMLStreamReader getXMLStreamReader(SOAPElement soapElement) { + return null; + } + + protected XMLStreamReader createXMLStreamReader(SOAPElement soapElement) { + DOMStreamReader dss = new DOMStreamReader(); + dss.setCurrentNode(soapElement); + return dss; + } + + protected XMLStreamReader soapBodyFirstChildReader() { + if (soapBodyFirstChildReader != null) return soapBodyFirstChildReader; + soapBodyFirstChild(); + if (soapBodyFirstChild != null) { + soapBodyFirstChildReader = getXMLStreamReader(soapBodyFirstChild); + if (soapBodyFirstChildReader == null) soapBodyFirstChildReader = + createXMLStreamReader(soapBodyFirstChild); + if (soapBodyFirstChildReader.getEventType() == XMLStreamReader.START_DOCUMENT) { + try { + while(soapBodyFirstChildReader.getEventType() != XMLStreamReader.START_ELEMENT) + soapBodyFirstChildReader.next(); + } catch (XMLStreamException e) { + throw new RuntimeException(e); + } + } + return soapBodyFirstChildReader; + } else { + payloadLocalName = null; + payloadNamespace = null; + return null; + } + } + + private SOAPElement soapBodyFirstChild; + + SOAPElement soapBodyFirstChild() { + if (soapBodyFirstChild != null) return soapBodyFirstChild; + try { + boolean foundElement = false; + for (Node n = sm.getSOAPBody().getFirstChild(); n != null && !foundElement; n = n.getNextSibling()) { + if (n.getNodeType() == Node.ELEMENT_NODE) { + foundElement = true; + if (n instanceof SOAPElement) { + soapBodyFirstChild = (SOAPElement) n; + payloadLocalName = soapBodyFirstChild.getLocalName(); + payloadNamespace = soapBodyFirstChild.getNamespaceURI(); + return soapBodyFirstChild; + } + } + } + if(foundElement) for(Iterator i = sm.getSOAPBody().getChildElements(); i.hasNext();){ + Object o = i.next(); + if (o instanceof SOAPElement) { + soapBodyFirstChild = (SOAPElement)o; + payloadLocalName = soapBodyFirstChild.getLocalName(); + payloadNamespace = soapBodyFirstChild.getNamespaceURI(); + return soapBodyFirstChild; + } + } + } catch (SOAPException e) { + throw new RuntimeException(e); + } + return soapBodyFirstChild; + } } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java index 6821927b..244471d1 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java @@ -30,6 +30,8 @@ import com.sun.istack.internal.Nullable; import com.sun.istack.internal.XMLStreamReaderToContentHandler; import com.sun.xml.internal.bind.api.Bridge; import com.sun.xml.internal.stream.buffer.MutableXMLStreamBuffer; +import com.sun.xml.internal.stream.buffer.XMLStreamBuffer; +import com.sun.xml.internal.stream.buffer.XMLStreamBufferMark; import com.sun.xml.internal.stream.buffer.stax.StreamReaderBufferCreator; import com.sun.xml.internal.ws.api.SOAPVersion; import com.sun.xml.internal.ws.api.message.AttachmentSet; @@ -37,15 +39,20 @@ import com.sun.xml.internal.ws.api.message.Header; import com.sun.xml.internal.ws.api.message.HeaderList; import com.sun.xml.internal.ws.api.message.Message; import com.sun.xml.internal.ws.api.message.MessageHeaders; +import com.sun.xml.internal.ws.api.message.StreamingSOAP; import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory; import com.sun.xml.internal.ws.encoding.TagInfoset; import com.sun.xml.internal.ws.message.AbstractMessageImpl; import com.sun.xml.internal.ws.message.AttachmentUnmarshallerImpl; +import com.sun.xml.internal.ws.protocol.soap.VersionMismatchException; import com.sun.xml.internal.ws.spi.db.XMLBridge; import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil; import com.sun.xml.internal.ws.util.xml.DummyLocation; import com.sun.xml.internal.ws.util.xml.StAXSource; +import com.sun.xml.internal.ws.util.xml.XMLReaderComposite; import com.sun.xml.internal.ws.util.xml.XMLStreamReaderToXMLStreamWriter; +import com.sun.xml.internal.ws.util.xml.XMLReaderComposite.ElemInfo; + import org.xml.sax.ContentHandler; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; @@ -55,6 +62,7 @@ import org.xml.sax.helpers.NamespaceSupport; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import javax.xml.stream.*; + import static javax.xml.stream.XMLStreamConstants.START_DOCUMENT; import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; @@ -62,7 +70,9 @@ import javax.xml.transform.Source; import javax.xml.ws.WebServiceException; import java.util.ArrayList; import java.util.Enumeration; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * {@link Message} implementation backed by {@link XMLStreamReader}. @@ -70,7 +80,7 @@ import java.util.List; * TODO: we need another message class that keeps {@link XMLStreamReader} that points * at the start of the envelope element. */ -public class StreamMessage extends AbstractMessageImpl { +public class StreamMessage extends AbstractMessageImpl implements StreamingSOAP { /** * The reader will be positioned at * the first child of the SOAP body @@ -93,44 +103,51 @@ public class StreamMessage extends AbstractMessageImpl { */ private String bodyEpilogue = null; - private final String payloadLocalName; + private String payloadLocalName; - private final String payloadNamespaceURI; - - /** - * infoset about the SOAP envelope, header, and body. - * - * <p> - * If the creater of this object didn't care about those, - * we use stock values. - */ - private @NotNull TagInfoset envelopeTag; - private @NotNull TagInfoset headerTag; - private @NotNull TagInfoset bodyTag; + private String payloadNamespaceURI; /** * Used only for debugging. This records where the message was consumed. */ private Throwable consumedAt; - /** - * Default s:Envelope, s:Header, and s:Body tag infoset definitions. - * - * We need 3 for SOAP 1.1, 3 for SOAP 1.2. - */ - private static final TagInfoset[] DEFAULT_TAGS; - - static { - DEFAULT_TAGS = new TagInfoset[6]; - create(SOAPVersion.SOAP_11); - create(SOAPVersion.SOAP_12); - } + private XMLStreamReader envelopeReader; public StreamMessage(SOAPVersion v) { super(v); payloadLocalName = null; payloadNamespaceURI = null; } + + public StreamMessage(SOAPVersion v, @NotNull XMLStreamReader envelope, @NotNull AttachmentSet attachments) { + super(v); + envelopeReader = envelope; + attachmentSet = attachments; + } + + public XMLStreamReader readEnvelope() { + if (envelopeReader == null) { + List<XMLStreamReader> hReaders = new java.util.ArrayList<XMLStreamReader>(); + ElemInfo envElem = new ElemInfo(envelopeTag, null); + ElemInfo hdrElem = (headerTag != null) ? new ElemInfo(headerTag, envElem) : null; + ElemInfo bdyElem = new ElemInfo(bodyTag, envElem); + for (Header h : getHeaders().asList()) { + try { + hReaders.add(h.readHeader()); + } catch (XMLStreamException e) { + throw new RuntimeException(e); + } + } + XMLStreamReader soapHeader = (hdrElem != null) ? new XMLReaderComposite(hdrElem, hReaders.toArray(new XMLStreamReader[hReaders.size()])) : null; + XMLStreamReader[] payload = {readPayload()}; + XMLStreamReader soapBody = new XMLReaderComposite(bdyElem, payload); + XMLStreamReader[] soapContent = (soapHeader != null) ? new XMLStreamReader[]{soapHeader, soapBody} : new XMLStreamReader[]{soapBody}; + return new XMLReaderComposite(envElem, soapContent); + } + return envelopeReader; + } + /** * Creates a {@link StreamMessage} from a {@link XMLStreamReader} * that points at the start element of the payload, and headers. @@ -147,6 +164,10 @@ public class StreamMessage extends AbstractMessageImpl { */ public StreamMessage(@Nullable MessageHeaders headers, @NotNull AttachmentSet attachmentSet, @NotNull XMLStreamReader reader, @NotNull SOAPVersion soapVersion) { super(soapVersion); + init(headers, attachmentSet, reader, soapVersion); + } + + private void init(@Nullable MessageHeaders headers, @NotNull AttachmentSet attachmentSet, @NotNull XMLStreamReader reader, @NotNull SOAPVersion soapVersion) { this.headers = headers; this.attachmentSet = attachmentSet; this.reader = reader; @@ -175,9 +196,9 @@ public class StreamMessage extends AbstractMessageImpl { // use the default infoset representation for headers int base = soapVersion.ordinal()*3; - this.envelopeTag = DEFAULT_TAGS[base]; - this.headerTag = DEFAULT_TAGS[base+1]; - this.bodyTag = DEFAULT_TAGS[base+2]; + this.envelopeTag = DEFAULT_TAGS.get(base); + this.headerTag = DEFAULT_TAGS.get(base+1); + this.bodyTag = DEFAULT_TAGS.get(base+2); } /** @@ -197,7 +218,12 @@ public class StreamMessage extends AbstractMessageImpl { } public StreamMessage(@NotNull TagInfoset envelopeTag, @Nullable TagInfoset headerTag, @NotNull AttachmentSet attachmentSet, @Nullable MessageHeaders headers, @Nullable String bodyPrologue, @NotNull TagInfoset bodyTag, @Nullable String bodyEpilogue, @NotNull XMLStreamReader reader, @NotNull SOAPVersion soapVersion) { - this(headers,attachmentSet,reader,soapVersion); + super(soapVersion); + init(envelopeTag, headerTag, attachmentSet, headers, bodyPrologue, bodyTag, bodyEpilogue, reader, soapVersion); + } + + private void init(@NotNull TagInfoset envelopeTag, @Nullable TagInfoset headerTag, @NotNull AttachmentSet attachmentSet, @Nullable MessageHeaders headers, @Nullable String bodyPrologue, @NotNull TagInfoset bodyTag, @Nullable String bodyEpilogue, @NotNull XMLStreamReader reader, @NotNull SOAPVersion soapVersion) { + init(headers,attachmentSet,reader,soapVersion); if(envelopeTag == null ) { throw new IllegalArgumentException("EnvelopeTag TagInfoset cannot be null"); } @@ -212,10 +238,12 @@ public class StreamMessage extends AbstractMessageImpl { } public boolean hasHeaders() { + if ( envelopeReader != null ) readEnvelope(this); return headers!=null && headers.hasHeaders(); } public MessageHeaders getHeaders() { + if ( envelopeReader != null ) readEnvelope(this); if (headers == null) { headers = new HeaderList(getSOAPVersion()); } @@ -223,14 +251,17 @@ public class StreamMessage extends AbstractMessageImpl { } public String getPayloadLocalPart() { + if ( envelopeReader != null ) readEnvelope(this); return payloadLocalName; } public String getPayloadNamespaceURI() { + if ( envelopeReader != null ) readEnvelope(this); return payloadNamespaceURI; } public boolean hasPayload() { + if ( envelopeReader != null ) readEnvelope(this); return payloadLocalName!=null; } @@ -329,6 +360,7 @@ public class StreamMessage extends AbstractMessageImpl { } public void writePayloadTo(XMLStreamWriter writer)throws XMLStreamException { + if ( envelopeReader != null ) readEnvelope(this); assert unconsumed(); if(payloadLocalName==null) { @@ -379,6 +411,7 @@ public class StreamMessage extends AbstractMessageImpl { } public void writeTo(XMLStreamWriter sw) throws XMLStreamException{ + if ( envelopeReader != null ) readEnvelope(this); writeEnvelope(sw); } @@ -387,6 +420,7 @@ public class StreamMessage extends AbstractMessageImpl { * @param writer */ private void writeEnvelope(XMLStreamWriter writer) throws XMLStreamException { + if ( envelopeReader != null ) readEnvelope(this); writer.writeStartDocument(); envelopeTag.writeStart(writer); @@ -411,6 +445,7 @@ public class StreamMessage extends AbstractMessageImpl { } public void writePayloadTo(ContentHandler contentHandler, ErrorHandler errorHandler, boolean fragment) throws SAXException { + if ( envelopeReader != null ) readEnvelope(this); assert unconsumed(); try { @@ -465,8 +500,10 @@ public class StreamMessage extends AbstractMessageImpl { } } - // TODO: this method should be probably rewritten to respect spaces between eelements; is it used at all? + // TODO: this method should be probably rewritten to respect spaces between elements; is it used at all? + @Override public Message copy() { + if ( envelopeReader != null ) readEnvelope(this); try { assert unconsumed(); consumedAt = null; // but we don't want to mark it as consumed @@ -528,6 +565,7 @@ public class StreamMessage extends AbstractMessageImpl { } public void writeTo(ContentHandler contentHandler, ErrorHandler errorHandler ) throws SAXException { + if ( envelopeReader != null ) readEnvelope(this); contentHandler.setDocumentLocator(NULL_LOCATOR); contentHandler.startDocument(); envelopeTag.writeStart(contentHandler); @@ -570,23 +608,159 @@ public class StreamMessage extends AbstractMessageImpl { return true; } - private static void create(SOAPVersion v) { - int base = v.ordinal()*3; - DEFAULT_TAGS[base ] = new TagInfoset(v.nsUri,"Envelope","S",EMPTY_ATTS,"S",v.nsUri); - DEFAULT_TAGS[base+1] = new TagInfoset(v.nsUri,"Header","S",EMPTY_ATTS); - DEFAULT_TAGS[base+2] = new TagInfoset(v.nsUri,"Body","S",EMPTY_ATTS); - } - public String getBodyPrologue() { + if ( envelopeReader != null ) readEnvelope(this); return bodyPrologue; } public String getBodyEpilogue() { + if ( envelopeReader != null ) readEnvelope(this); return bodyEpilogue; } public XMLStreamReader getReader() { + if ( envelopeReader != null ) readEnvelope(this); assert unconsumed(); return reader; } + + + private static final String SOAP_ENVELOPE = "Envelope"; + private static final String SOAP_HEADER = "Header"; + private static final String SOAP_BODY = "Body"; + + protected interface StreamHeaderDecoder { + public Header decodeHeader(XMLStreamReader reader, XMLStreamBuffer mark); + } + + static final StreamHeaderDecoder SOAP12StreamHeaderDecoder = new StreamHeaderDecoder() { + @Override + public Header decodeHeader(XMLStreamReader reader, XMLStreamBuffer mark) { + return new StreamHeader12(reader, mark); + } + }; + + static final StreamHeaderDecoder SOAP11StreamHeaderDecoder = new StreamHeaderDecoder() { + @Override + public Header decodeHeader(XMLStreamReader reader, XMLStreamBuffer mark) { + return new StreamHeader11(reader, mark); + } + }; + + static private void readEnvelope(StreamMessage message) { + if ( message.envelopeReader == null ) return; + XMLStreamReader reader = message.envelopeReader; + message.envelopeReader = null; + SOAPVersion soapVersion = message.soapVersion; + // Move to soap:Envelope and verify + if(reader.getEventType()!=XMLStreamConstants.START_ELEMENT) + XMLStreamReaderUtil.nextElementContent(reader); + XMLStreamReaderUtil.verifyReaderState(reader,XMLStreamConstants.START_ELEMENT); + if (SOAP_ENVELOPE.equals(reader.getLocalName()) && !soapVersion.nsUri.equals(reader.getNamespaceURI())) { + throw new VersionMismatchException(soapVersion, soapVersion.nsUri, reader.getNamespaceURI()); + } + XMLStreamReaderUtil.verifyTag(reader, soapVersion.nsUri, SOAP_ENVELOPE); + + TagInfoset envelopeTag = new TagInfoset(reader); + + // Collect namespaces on soap:Envelope + Map<String,String> namespaces = new HashMap<String,String>(); + for(int i=0; i< reader.getNamespaceCount();i++){ + namespaces.put(reader.getNamespacePrefix(i), reader.getNamespaceURI(i)); + } + + // Move to next element + XMLStreamReaderUtil.nextElementContent(reader); + XMLStreamReaderUtil.verifyReaderState(reader, + javax.xml.stream.XMLStreamConstants.START_ELEMENT); + + HeaderList headers = null; + TagInfoset headerTag = null; + + if (reader.getLocalName().equals(SOAP_HEADER) + && reader.getNamespaceURI().equals(soapVersion.nsUri)) { + headerTag = new TagInfoset(reader); + + // Collect namespaces on soap:Header + for(int i=0; i< reader.getNamespaceCount();i++){ + namespaces.put(reader.getNamespacePrefix(i), reader.getNamespaceURI(i)); + } + // skip <soap:Header> + XMLStreamReaderUtil.nextElementContent(reader); + + // If SOAP header blocks are present (i.e. not <soap:Header/>) + if (reader.getEventType() == XMLStreamConstants.START_ELEMENT) { + headers = new HeaderList(soapVersion); + + try { + // Cache SOAP header blocks + StreamHeaderDecoder headerDecoder = SOAPVersion.SOAP_11.equals(soapVersion) ? SOAP11StreamHeaderDecoder : SOAP12StreamHeaderDecoder; + cacheHeaders(reader, namespaces, headers, headerDecoder); + } catch (XMLStreamException e) { + // TODO need to throw more meaningful exception + throw new WebServiceException(e); + } + } + + // Move to soap:Body + XMLStreamReaderUtil.nextElementContent(reader); + } + + // Verify that <soap:Body> is present + XMLStreamReaderUtil.verifyTag(reader, soapVersion.nsUri, SOAP_BODY); + TagInfoset bodyTag = new TagInfoset(reader); + + String bodyPrologue = XMLStreamReaderUtil.nextWhiteSpaceContent(reader); + message.init(envelopeTag,headerTag,message.attachmentSet,headers,bodyPrologue,bodyTag,null,reader,soapVersion); + // when there's no payload, + // it's tempting to use EmptyMessageImpl, but it doesn't preserve the infoset + // of <envelope>,<header>, and <body>, so we need to stick to StreamMessage. + } + + + private static XMLStreamBuffer cacheHeaders(XMLStreamReader reader, + Map<String, String> namespaces, HeaderList headers, + StreamHeaderDecoder headerDecoder) throws XMLStreamException { + MutableXMLStreamBuffer buffer = createXMLStreamBuffer(); + StreamReaderBufferCreator creator = new StreamReaderBufferCreator(); + creator.setXMLStreamBuffer(buffer); + + // Reader is positioned at the first header block + while(reader.getEventType() == javax.xml.stream.XMLStreamConstants.START_ELEMENT) { + Map<String,String> headerBlockNamespaces = namespaces; + + // Collect namespaces on SOAP header block + if (reader.getNamespaceCount() > 0) { + headerBlockNamespaces = new HashMap<String,String>(namespaces); + for (int i = 0; i < reader.getNamespaceCount(); i++) { + headerBlockNamespaces.put(reader.getNamespacePrefix(i), reader.getNamespaceURI(i)); + } + } + + // Mark + XMLStreamBuffer mark = new XMLStreamBufferMark(headerBlockNamespaces, creator); + // Create Header + headers.add(headerDecoder.decodeHeader(reader, mark)); + + + // Cache the header block + // After caching Reader will be positioned at next header block or + // the end of the </soap:header> + creator.createElementFragment(reader, false); + if (reader.getEventType() != XMLStreamConstants.START_ELEMENT && + reader.getEventType() != XMLStreamConstants.END_ELEMENT) { + XMLStreamReaderUtil.nextElementContent(reader); + } + } + + return buffer; + } + + private static MutableXMLStreamBuffer createXMLStreamBuffer() { + // TODO: Decode should own one MutableXMLStreamBuffer for reuse + // since it is more efficient. ISSUE: possible issue with + // lifetime of information in the buffer if accessed beyond + // the pipe line. + return new MutableXMLStreamBuffer(); + } } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/StreamingMessages.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/StreamingMessages.java index b0070e55..f139643a 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/StreamingMessages.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/StreamingMessages.java @@ -99,6 +99,18 @@ public final class StreamingMessages { return localizer.localize(localizableXMLREADER_UNEXPECTED_STATE(arg0, arg1)); } + public static Localizable localizableWOODSTOX_CANT_LOAD(Object arg0) { + return messageFactory.getMessage("woodstox.cant.load", arg0); + } + + /** + * Unable to load Woodstox class {0} + * + */ + public static String WOODSTOX_CANT_LOAD(Object arg0) { + return localizer.localize(localizableWOODSTOX_CANT_LOAD(arg0)); + } + public static Localizable localizableXMLREADER_IO_EXCEPTION(Object arg0) { return messageFactory.getMessage("xmlreader.ioException", arg0); } @@ -123,6 +135,18 @@ public final class StreamingMessages { return localizer.localize(localizableFASTINFOSET_NO_IMPLEMENTATION()); } + public static Localizable localizableINVALID_PROPERTY_VALUE_INTEGER(Object arg0, Object arg1, Object arg2) { + return messageFactory.getMessage("invalid.property.value.integer", arg0, arg1, arg2); + } + + /** + * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid integer. Using default value "{2}". + * + */ + public static String INVALID_PROPERTY_VALUE_INTEGER(Object arg0, Object arg1, Object arg2) { + return localizer.localize(localizableINVALID_PROPERTY_VALUE_INTEGER(arg0, arg1, arg2)); + } + public static Localizable localizableXMLWRITER_IO_EXCEPTION(Object arg0) { return messageFactory.getMessage("xmlwriter.ioException", arg0); } @@ -183,6 +207,18 @@ public final class StreamingMessages { return localizer.localize(localizableXMLREADER_NESTED_ERROR(arg0)); } + public static Localizable localizableINVALID_PROPERTY_VALUE_LONG(Object arg0, Object arg1, Object arg2) { + return messageFactory.getMessage("invalid.property.value.long", arg0, arg1, arg2); + } + + /** + * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid long. Using default value "{2}". + * + */ + public static String INVALID_PROPERTY_VALUE_LONG(Object arg0, Object arg1, Object arg2) { + return localizer.localize(localizableINVALID_PROPERTY_VALUE_LONG(arg0, arg1, arg2)); + } + public static Localizable localizableSTAXREADER_XMLSTREAMEXCEPTION(Object arg0) { return messageFactory.getMessage("staxreader.xmlstreamexception", arg0); } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming.properties b/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming.properties index 330a576d..172554cb 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming.properties +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -48,3 +48,8 @@ fastinfoset.decodingNotAccepted=Fast Infoset decoding is not accepted fastinfoset.noImplementation=Unable to locate compatible implementation of Fast Infoset in classpath sourcereader.invalidSource=Unable to create reader from source \"{0}\" + +woodstox.cant.load=Unable to load Woodstox class {0} + +invalid.property.value.integer=Ignoring system property \"{0}\" as value \"{1}\" is invalid, property value must be a valid integer. Using default value \"{2}\". +invalid.property.value.long=Ignoring system property \"{0}\" as value \"{1}\" is invalid, property value must be a valid long. Using default value \"{2}\". diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java index 46185418..b7417af2 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -66,7 +66,7 @@ public class SDDocumentImpl extends SDDocumentSource implements SDDocument { private static final QName SCHEMA_IMPORT_QNAME = new QName(NS_XSD, "import"); private static final QName SCHEMA_REDEFINE_QNAME = new QName(NS_XSD, "redefine"); private static final String VERSION_COMMENT = - " Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is "+RuntimeVersion.VERSION+". "; + " Published by JAX-WS RI (http://jax-ws.java.net). RI's version is "+RuntimeVersion.VERSION+". "; private final QName rootName; private final SDDocumentSource source; diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingContext.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingContext.java index a7ed881f..94fcc032 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingContext.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,13 +36,9 @@ import javax.xml.bind.SchemaOutputResolver; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAttachmentRef; import javax.xml.namespace.QName; -import javax.xml.transform.Result; import com.sun.istack.internal.NotNull; import com.sun.istack.internal.Nullable; -//import com.sun.xml.internal.bind.api.BridgeContext; -//import com.sun.xml.internal.bind.v2.model.annotation.RuntimeAnnotationReader; -//import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeInfoSet; /** * {@link JAXBContext} enhanced with JAXB RI specific functionalities. @@ -222,32 +218,6 @@ public interface BindingContext { public abstract @NotNull String getBuildId(); /** - * Generates the episode file that represents the binding known to this {@link JAXBContext}, - * so that XJC can later do separate compilation. - * - * <p> - * Episode file is really just a JAXB customization file, except that currently - * we use the RI-specific SCD to refer to schema components. - * - * @param output - * This receives the generated episode file. - * - * @since 2.1 - */ -// public abstract void generateEpisode(Result output); - - /** - * Allows you to access the runtime model information of the JAXB XML/Java binding. - * - * <p> - * This is useful for doing a deeper integration with the JAXB RI. - * For more information about the model, see https://jaxb2-reflection.dev.java.net/ - * - * @since 2.1.10 - */ -// public abstract RuntimeTypeInfoSet getRuntimeTypeInfoSet(); - - /** * The property that you can specify to {@link JAXBContext#newInstance} * to reassign the default namespace URI to something else at the runtime. * diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java index db51719d..e4b3ed2b 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -72,6 +72,8 @@ import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; +import static com.sun.xml.internal.ws.util.xml.XmlUtil.allowFileAccess; + /** * {@link Tube} that does the schema validation. * @@ -90,7 +92,7 @@ public abstract class AbstractSchemaValidationTube extends AbstractFilterTubeImp super(next); this.binding = binding; feature = binding.getFeature(SchemaValidationFeature.class); - sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); + sf = allowFileAccess(SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI), false); } protected AbstractSchemaValidationTube(AbstractSchemaValidationTube that, TubeCloner cloner) { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties index fd92f3f9..8bbfcd87 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties @@ -274,7 +274,7 @@ V-029 = Value "{0}" is not one of the enumerated values for this attribute V-030 = Attribute value "{0}" does not name a notation V-031 = Attribute value "{0}" does not name an unparsed entity V-032 = NMTOKENS attributes must have at least one value -# Empty content model is a special type of XML element. I?d leave the message in English as is (also libraries from outside of Oracle use this exact message) but the word EMPTY can be translated. +# Empty content model is a special type of XML element. I�d leave the message in English as is (also libraries from outside of Oracle use this exact message) but the word EMPTY can be translated. V-033 = Empty content models must have no content # Usage not found. TODO Remove #V-034 = Element "{0}" does not allow "{1}" -- {2} diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/version.properties b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/version.properties index 5d7ed24b..9862bdc6 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/version.properties +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/version.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ # questions. # -build-id=2.2.9-b14027 -build-version=JAX-WS RI 2.2.9-b14027 +build-id=2.2.9-b14140 +build-version=JAX-WS RI 2.2.9-b14140 major-version=2.2.9 -svn-revision=14027 +svn-revision=14140 diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NamespaceContextExAdaper.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NamespaceContextExAdaper.java new file mode 100644 index 00000000..b3c18f8e --- /dev/null +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NamespaceContextExAdaper.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code 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 + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.sun.xml.internal.ws.util.xml; + +import java.util.Iterator; + +import javax.xml.namespace.NamespaceContext; + +import com.sun.xml.internal.org.jvnet.staxex.NamespaceContextEx; + +public class NamespaceContextExAdaper implements NamespaceContextEx { + + private final NamespaceContext nsContext; + + public NamespaceContextExAdaper(NamespaceContext nsContext) { + this.nsContext = nsContext; + } + + @Override //Who wants this? + public Iterator<Binding> iterator() { + throw new UnsupportedOperationException(); + } + + @Override + public String getNamespaceURI(String prefix) { + return nsContext.getNamespaceURI(prefix); + } + + @Override + public String getPrefix(String namespaceURI) { + return nsContext.getPrefix(namespaceURI); + } + + @Override + public Iterator getPrefixes(String namespaceURI) { + return nsContext.getPrefixes(namespaceURI); + } +} diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLReaderComposite.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLReaderComposite.java new file mode 100644 index 00000000..8d5ef1d4 --- /dev/null +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLReaderComposite.java @@ -0,0 +1,662 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code 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 + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.sun.xml.internal.ws.util.xml; + +import java.util.Iterator; +import java.util.List; + +import javax.xml.namespace.NamespaceContext; +import javax.xml.namespace.QName; +import javax.xml.stream.Location; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; + +import com.sun.xml.internal.org.jvnet.staxex.NamespaceContextEx; +import com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx; + +import com.sun.xml.internal.ws.encoding.TagInfoset; + +/** + * XMLReaderComposite + * + * @author shih-chang.chen@oracle.com + */ +public class XMLReaderComposite implements XMLStreamReaderEx { + + static public enum State { StartTag, Payload, EndTag } + + protected State state = State.StartTag; + protected ElemInfo elemInfo; + protected TagInfoset tagInfo; + protected XMLStreamReader[] children; + protected int payloadIndex = -1; + protected XMLStreamReader payloadReader; + + static public class ElemInfo implements NamespaceContext { + ElemInfo ancestor; + TagInfoset tagInfo; + public ElemInfo(TagInfoset tag, ElemInfo parent) { tagInfo = tag; ancestor = parent; } + public String getNamespaceURI(String prefix) { + String n = tagInfo.getNamespaceURI(prefix); + return (n != null) ? n : (ancestor != null) ? ancestor.getNamespaceURI(prefix) : null; + } + public String getPrefix(String uri) { + String p = tagInfo.getPrefix(uri); + return (p != null) ? p : (ancestor != null) ? ancestor.getPrefix(uri) : null; + } + //Who wants this? + public List<String> allPrefixes(String namespaceURI) { + List<String> l = tagInfo.allPrefixes(namespaceURI); + if (ancestor != null) { + List<String> p = ancestor.allPrefixes(namespaceURI); + p.addAll(l); + return p; + } + return l; + } + public Iterator<String> getPrefixes(String namespaceURI) { + return allPrefixes(namespaceURI).iterator(); + } + } + + public XMLReaderComposite(final ElemInfo elem, XMLStreamReader[] wrapees) { + elemInfo = elem; + tagInfo = elem.tagInfo; + children = wrapees; + if (children != null && children.length > 0) { + payloadIndex = 0; + payloadReader = children[payloadIndex]; + } + } + + + @Override + public int next() throws XMLStreamException { + switch (state) { + case StartTag: + if (payloadReader != null) { + state = State.Payload; + return payloadReader.getEventType(); + } else { + state = State.EndTag; + return XMLStreamReader.END_ELEMENT; + } + case EndTag: return XMLStreamReader.END_DOCUMENT; + case Payload: + default: + int next = XMLStreamReader.END_DOCUMENT; + if (payloadReader != null && payloadReader.hasNext()) { + next = payloadReader.next(); + } + if (next != XMLStreamReader.END_DOCUMENT) return next; + else { + if (payloadIndex+1 < children.length ) { + payloadIndex++; + payloadReader = children[payloadIndex]; + return payloadReader.getEventType(); + } else { + state = State.EndTag; + return XMLStreamReader.END_ELEMENT; + } + } + } + } + + @Override + public boolean hasNext() throws XMLStreamException { + switch (state) { + case EndTag: return false; + case StartTag: + case Payload: + default: return true; + } + } + + @Override + public String getElementText() throws XMLStreamException { + switch (state) { + case StartTag: + if (payloadReader.isCharacters()) return payloadReader.getText(); + return ""; + case Payload: + default: + return payloadReader.getElementText(); + } + } + + @Override + public int nextTag() throws XMLStreamException { + int e = next(); + if (e == XMLStreamReader.END_DOCUMENT) return e; + while (e != XMLStreamReader.END_DOCUMENT) { + if (e == XMLStreamReader.START_ELEMENT) return e; + if (e == XMLStreamReader.END_ELEMENT) return e; + e = next(); + } + return e; + } + + @Override + public Object getProperty(String name) throws IllegalArgumentException { + return (payloadReader != null) ? payloadReader.getProperty(name) : null; + } + + @Override + public void require(int type, String namespaceURI, String localName) throws XMLStreamException { + if (payloadReader!=null) payloadReader.require(type, namespaceURI, localName); + } + + @Override + public void close() throws XMLStreamException { + if (payloadReader!=null) payloadReader.close(); + } + + @Override + public String getNamespaceURI(String prefix) { + switch (state) { + case StartTag: + case EndTag: + return elemInfo.getNamespaceURI(prefix); + case Payload: + default: + return payloadReader.getNamespaceURI(prefix); + } + } + + @Override + public boolean isStartElement() { + switch (state) { + case StartTag: return true; + case EndTag: return false; + case Payload: + default: + return payloadReader.isStartElement(); + } + } + + @Override + public boolean isEndElement() { + switch (state) { + case StartTag: return false; + case EndTag: return true; + case Payload: + default: + return payloadReader.isEndElement(); + } + } + + @Override + public boolean isCharacters() { + switch (state) { + case StartTag: + case EndTag: return false; + case Payload: + default: + return payloadReader.isCharacters(); + } + } + + @Override + public boolean isWhiteSpace() { + switch (state) { + case StartTag: + case EndTag: return false; + case Payload: + default: + return payloadReader.isWhiteSpace(); + } + } + + @Override + public String getAttributeValue(String uri, String localName) { + switch (state) { + case StartTag: + case EndTag: return tagInfo.atts.getValue(uri, localName); + case Payload: + default: + return payloadReader.getAttributeValue(uri, localName); + } + } + + @Override + public int getAttributeCount() { + switch (state) { + case StartTag: + case EndTag: return tagInfo.atts.getLength(); + case Payload: + default: + return payloadReader.getAttributeCount(); + } + } + + @Override + public QName getAttributeName(int i) { + switch (state) { + case StartTag: + case EndTag: return new QName(tagInfo.atts.getURI(i),tagInfo.atts.getLocalName(i),getPrfix(tagInfo.atts.getQName(i))); + case Payload: + default: + return payloadReader.getAttributeName(i); + } + } + + @Override + public String getAttributeNamespace(int index) { + switch (state) { + case StartTag: + case EndTag: return tagInfo.atts.getURI(index); + case Payload: + default: + return payloadReader.getAttributeNamespace(index); + } + } + + @Override + public String getAttributeLocalName(int index) { + switch (state) { + case StartTag: + case EndTag: return tagInfo.atts.getLocalName(index); + case Payload: + default: + return payloadReader.getAttributeLocalName(index); + } + } + + @Override + public String getAttributePrefix(int index) { + switch (state) { + case StartTag: + case EndTag: return getPrfix(tagInfo.atts.getQName(index)); + case Payload: + default: + return payloadReader.getAttributePrefix(index); + } + } + + static private String getPrfix(String qName) { + if (qName == null) return null; + int i = qName.indexOf(":"); + return (i > 0)? qName.substring(0, i) : ""; + } + + + @Override + public String getAttributeType(int index) { + switch (state) { + case StartTag: + case EndTag: return tagInfo.atts.getType(index); + case Payload: + default: + return payloadReader.getAttributeType(index); + } + } + + @Override + public String getAttributeValue(int index) { + switch (state) { + case StartTag: + case EndTag: return tagInfo.atts.getValue(index); + case Payload: + default: + return payloadReader.getAttributeValue(index); + } + } + + @Override + public boolean isAttributeSpecified(int index) { + switch (state) { + case StartTag: + case EndTag: return (index < tagInfo.atts.getLength()) ? tagInfo.atts.getLocalName(index) != null : false; + case Payload: + default: + return payloadReader.isAttributeSpecified(index); + } + } + + @Override + public int getNamespaceCount() { + switch (state) { + case StartTag: + case EndTag: return (tagInfo.ns.length/2); + case Payload: + default: + return payloadReader.getNamespaceCount(); + } + } + + @Override + public String getNamespacePrefix(int index) { + switch (state) { + case StartTag: + case EndTag: return tagInfo.ns[2*index]; + case Payload: + default: + return payloadReader.getNamespacePrefix(index); + } + } + + @Override + public String getNamespaceURI(int index) { + switch (state) { + case StartTag: + case EndTag: return tagInfo.ns[2*index+1]; + case Payload: + default: + return payloadReader.getNamespaceURI(index); + } + } + + @Override + public NamespaceContextEx getNamespaceContext() { + switch (state) { + case StartTag: + case EndTag: return new NamespaceContextExAdaper(elemInfo); + case Payload: + default: + return isPayloadReaderEx()? + payloadReaderEx().getNamespaceContext() : + new NamespaceContextExAdaper(payloadReader.getNamespaceContext()); + } + } + + private boolean isPayloadReaderEx() { return (payloadReader instanceof XMLStreamReaderEx); } + + private XMLStreamReaderEx payloadReaderEx() { return (XMLStreamReaderEx)payloadReader; } + + @Override + public int getEventType() { + switch (state) { + case StartTag: return XMLStreamReader.START_ELEMENT; + case EndTag: return XMLStreamReader.END_ELEMENT; + case Payload: + default: + return payloadReader.getEventType(); + } + } + + @Override + public String getText() { + switch (state) { + case StartTag: + case EndTag: return null; + case Payload: + default: + return payloadReader.getText(); + } + } + + @Override + public char[] getTextCharacters() { + switch (state) { + case StartTag: + case EndTag: return null; + case Payload: + default: + return payloadReader.getTextCharacters(); + } + } + + @Override + public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length) throws XMLStreamException { + switch (state) { + case StartTag: + case EndTag: return -1; + case Payload: + default: + return payloadReader.getTextCharacters(sourceStart, target, targetStart, length); + } + } + + @Override + public int getTextStart() { + switch (state) { + case StartTag: + case EndTag: return 0; + case Payload: + default: + return payloadReader.getTextStart(); + } + } + + @Override + public int getTextLength() { + switch (state) { + case StartTag: + case EndTag: return 0; + case Payload: + default: + return payloadReader.getTextLength(); + } + } + + @Override + public String getEncoding() { + switch (state) { + case StartTag: + case EndTag: return null; + case Payload: + default: + return payloadReader.getEncoding(); + } + } + + @Override + public boolean hasText() { + switch (state) { + case StartTag: + case EndTag: return false; + case Payload: + default: + return payloadReader.hasText(); + } + } + + @Override + public Location getLocation() { + switch (state) { + case StartTag: + case EndTag: return new Location() { + + @Override + public int getLineNumber() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public int getColumnNumber() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public int getCharacterOffset() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public String getPublicId() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getSystemId() { + // TODO Auto-generated method stub + return null; + } + + }; + case Payload: + default: + return payloadReader.getLocation(); + } + } + + @Override + public QName getName() { + switch (state) { + case StartTag: + case EndTag: return new QName(tagInfo.nsUri, tagInfo.localName, tagInfo.prefix); + case Payload: + default: + return payloadReader.getName(); + } + } + + @Override + public String getLocalName() { + switch (state) { + case StartTag: + case EndTag: return tagInfo.localName; + case Payload: + default: + return payloadReader.getLocalName(); + } + } + + @Override + public boolean hasName() { + switch (state) { + case StartTag: + case EndTag: return true; + case Payload: + default: + return payloadReader.hasName(); + } + } + + @Override + public String getNamespaceURI() { + switch (state) { + case StartTag: + case EndTag: return tagInfo.nsUri; + case Payload: + default: + return payloadReader.getNamespaceURI(); + } + } + + @Override + public String getPrefix() { + switch (state) { + case StartTag: + case EndTag: return tagInfo.prefix; + case Payload: + default: + return payloadReader.getPrefix(); + } + } + + @Override + public String getVersion() { + switch (state) { + case StartTag: + case EndTag: return null; + case Payload: + default: + return payloadReader.getVersion(); + } + } + + @Override + public boolean isStandalone() { + switch (state) { + case StartTag: + case EndTag: return true; + case Payload: + default: + return payloadReader.isStandalone(); + } + } + + @Override + public boolean standaloneSet() { + switch (state) { + case StartTag: + case EndTag: return true; + case Payload: + default: + return payloadReader.standaloneSet(); + } + } + + @Override + public String getCharacterEncodingScheme() { + switch (state) { + case StartTag: + case EndTag: return null; + case Payload: + default: + return payloadReader.getCharacterEncodingScheme(); + } + } + + @Override + public String getPITarget() { + switch (state) { + case StartTag: + case EndTag: return null; + case Payload: + default: + return payloadReader.getPITarget(); + } + } + + @Override + public String getPIData() { + switch (state) { + case StartTag: + case EndTag: return null; + case Payload: + default: + return payloadReader.getPIData(); + } + } + + @Override + public String getElementTextTrim() throws XMLStreamException { + switch (state) { + case StartTag: + case EndTag: return null; + case Payload: + default: + return isPayloadReaderEx()? payloadReaderEx().getElementTextTrim() : payloadReader.getElementText().trim(); + } + } + + @Override + public CharSequence getPCDATA() throws XMLStreamException { + switch (state) { + case StartTag: + case EndTag: return null; + case Payload: + default: + return isPayloadReaderEx()? payloadReaderEx().getPCDATA() : payloadReader.getElementText(); + } + } +} diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java index eb358b30..8ae256f6 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java @@ -54,6 +54,7 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.SchemaFactory; import javax.xml.ws.WebServiceException; import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactoryConfigurationException; @@ -74,6 +75,10 @@ import java.util.logging.Logger; * @author WS Development Team */ public class XmlUtil { + + // not in older JDK, so must be duplicated here, otherwise javax.xml.XMLConstants should be used + private static final String ACCESS_EXTERNAL_SCHEMA = "http://javax.xml.XMLConstants/property/accessExternalSchema"; + private final static String LEXICAL_HANDLER_PROPERTY = "http://xml.org/sax/properties/lexical-handler"; @@ -414,4 +419,21 @@ public class XmlUtil { return globalSecureXmlProcessingEnabled && localSecureXmlProcessingEnabled; } + public static SchemaFactory allowFileAccess(SchemaFactory sf, boolean disableSecureProcessing) { + + // if feature secure processing enabled, nothing to do, file is allowed, + // or user is able to control access by standard JAXP mechanisms + if (checkGlobalOverride(disableSecureProcessing)) { + return sf; + } + + try { + sf.setProperty(ACCESS_EXTERNAL_SCHEMA, "file"); + LOGGER.log(Level.FINE, "Property \"{}\" is supported and has been successfully set by used JAXP implementation.", new Object[]{ACCESS_EXTERNAL_SCHEMA}); + } catch (SAXException ignored) { + // depending on JDK/SAX implementation used + LOGGER.log(Level.CONFIG, "Property \"{}\" is not supported by used JAXP implementation.", new Object[]{ACCESS_EXTERNAL_SCHEMA}); + } + return sf; + } } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java b/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java index 8dc3a356..136c9808 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java @@ -329,7 +329,7 @@ public class WSDLGenerator { private static class CommentFilter implements XmlSerializer { final XmlSerializer serializer; private static final String VERSION_COMMENT = - " Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is " + RuntimeVersion.VERSION + ". "; + " Generated by JAX-WS RI (http://jax-ws.java.net). RI's version is " + RuntimeVersion.VERSION + ". "; CommentFilter(XmlSerializer serializer) { this.serializer = serializer; diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.java index f9f88c4d..662d5cf4 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -77,4 +77,10 @@ public class Messages public static final String ERR_SIMPLE_CONTENT_EXPECTED = "SimpleContentExpected"; // arg:2 + + public static final String JAXP_UNSUPPORTED_PROPERTY = + "JAXPUnsupportedProperty"; // arg:1 + + public static final String JAXP_SUPPORTED_PROPERTY = + "JAXPSupportedProperty"; // arg:1 } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties index 5e1b9d15..ed0a876f 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -71,3 +71,9 @@ EntityResolutionFailure = \ SimpleContentExpected = \ A complex type with a simple content or a simple type is expected but found ''{0}'':{1} + +JAXPUnsupportedProperty = \ + Property "{0}" is not supported by used JAXP implementation. + +JAXPSupportedProperty = \ + Property "{0}" is supported and has been successfuly set by used JAXP implementation. diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java index b0b42a3e..7f36e45d 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,6 +42,8 @@ import java.io.IOException; * {@link SAXParserFactory} implementation that ultimately * uses {@link XMLParser} to parse documents. * + * @deprecated + * * @author * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) */ @@ -58,7 +60,7 @@ public class SAXParserFactoryAdaptor extends SAXParserFactory { } public void setFeature(String name, boolean value) { - ; + throw new UnsupportedOperationException("XSOM parser does not support JAXP features."); } public boolean getFeature(String name) { diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java index 0fe643e5..63ba36b2 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java @@ -195,22 +195,22 @@ public class Schema extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 12: + case 49: { - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 11; + $_ngcc_current_state = 45; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; case 36: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))))))))))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 374, null); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import"))))))))))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 527, null); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -218,25 +218,102 @@ public class Schema extends NGCCHandler { } } break; - case 1: + case 0: + { + revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 16: + { + if(($ai = $runtime.getAttributeIndex("","default"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 12; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + } + break; + case 53: + { + if(($ai = $runtime.getAttributeIndex("","targetNamespace"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 49; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + } + break; + case 37: + { + if(($ai = $runtime.getAttributeIndex("","finalDefault"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 36; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + } + break; + case 12: + { + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 11; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + } + break; + case 45: + { + if(($ai = $runtime.getAttributeIndex("","elementFormDefault"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 41; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + } + break; + case 41: + { + if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 37; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + } + break; + case 2: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 351, anno,AnnotationContext.SCHEMA); + NGCCHandler h = new annotation(this, super._source, $runtime, 515, anno,AnnotationContext.SCHEMA); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))) { - NGCCHandler h = new includeDecl(this, super._source, $runtime, 352); + NGCCHandler h = new includeDecl(this, super._source, $runtime, 516); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import"))) { - NGCCHandler h = new importDecl(this, super._source, $runtime, 353); + NGCCHandler h = new importDecl(this, super._source, $runtime, 517); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) { - NGCCHandler h = new redefine(this, super._source, $runtime, 354); + NGCCHandler h = new redefine(this, super._source, $runtime, 518); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -247,12 +324,12 @@ public class Schema extends NGCCHandler { } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { - NGCCHandler h = new simpleType(this, super._source, $runtime, 356); + NGCCHandler h = new simpleType(this, super._source, $runtime, 520); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) { - NGCCHandler h = new complexType(this, super._source, $runtime, 357); + NGCCHandler h = new complexType(this, super._source, $runtime, 521); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -263,21 +340,22 @@ public class Schema extends NGCCHandler { } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) { - NGCCHandler h = new group(this, super._source, $runtime, 359); + NGCCHandler h = new group(this, super._source, $runtime, 523); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) { - NGCCHandler h = new notation(this, super._source, $runtime, 360); + NGCCHandler h = new notation(this, super._source, $runtime, 524); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) { - NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 361); + NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 525); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 1; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } } @@ -291,66 +369,59 @@ public class Schema extends NGCCHandler { } } break; - case 0: - { - revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; - case 53: + case 27: { - if(($ai = $runtime.getAttributeIndex("","targetNamespace"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if((($ai = $runtime.getAttributeIndex("","default"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","name"))>=0 || ($ai = $runtime.getAttributeIndex("","abstract"))>=0))))))) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 49; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; - case 41: + case 57: { - if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("schema"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + action15(); + $_ngcc_current_state = 53; } else { - $_ngcc_current_state = 37; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; - case 37: + case 11: { - if(($ai = $runtime.getAttributeIndex("","finalDefault"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if((($ai = $runtime.getAttributeIndex("","name"))>=0 || ($ai = $runtime.getAttributeIndex("","form"))>=0)) { + NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 421, locator,false,defaultValue,fixedValue); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 36; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; - case 2: + case 1: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 362, anno,AnnotationContext.SCHEMA); + NGCCHandler h = new annotation(this, super._source, $runtime, 504, anno,AnnotationContext.SCHEMA); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))) { - NGCCHandler h = new includeDecl(this, super._source, $runtime, 363); + NGCCHandler h = new includeDecl(this, super._source, $runtime, 505); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import"))) { - NGCCHandler h = new importDecl(this, super._source, $runtime, 364); + NGCCHandler h = new importDecl(this, super._source, $runtime, 506); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) { - NGCCHandler h = new redefine(this, super._source, $runtime, 365); + NGCCHandler h = new redefine(this, super._source, $runtime, 507); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -361,12 +432,12 @@ public class Schema extends NGCCHandler { } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { - NGCCHandler h = new simpleType(this, super._source, $runtime, 367); + NGCCHandler h = new simpleType(this, super._source, $runtime, 509); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) { - NGCCHandler h = new complexType(this, super._source, $runtime, 368); + NGCCHandler h = new complexType(this, super._source, $runtime, 510); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -377,22 +448,21 @@ public class Schema extends NGCCHandler { } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) { - NGCCHandler h = new group(this, super._source, $runtime, 370); + NGCCHandler h = new group(this, super._source, $runtime, 512); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) { - NGCCHandler h = new notation(this, super._source, $runtime, 371); + NGCCHandler h = new notation(this, super._source, $runtime, 513); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) { - NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 372); + NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 514); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 1; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } } @@ -406,76 +476,6 @@ public class Schema extends NGCCHandler { } } break; - case 45: - { - if(($ai = $runtime.getAttributeIndex("","elementFormDefault"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - else { - $_ngcc_current_state = 41; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - } - break; - case 57: - { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("schema"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action15(); - $_ngcc_current_state = 53; - } - else { - unexpectedEnterElement($__qname); - } - } - break; - case 27: - { - if((($ai = $runtime.getAttributeIndex("","name"))>=0 || (($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","default"))>=0 || ($ai = $runtime.getAttributeIndex("","abstract"))>=0))))))) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - unexpectedEnterElement($__qname); - } - } - break; - case 11: - { - if((($ai = $runtime.getAttributeIndex("","form"))>=0 || ($ai = $runtime.getAttributeIndex("","name"))>=0)) { - NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 268, locator,false,defaultValue,fixedValue); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - unexpectedEnterElement($__qname); - } - } - break; - case 49: - { - if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - else { - $_ngcc_current_state = 45; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - } - break; - case 16: - { - if(($ai = $runtime.getAttributeIndex("","default"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - else { - $_ngcc_current_state = 12; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - } - break; default: { unexpectedEnterElement($__qname); @@ -490,14 +490,14 @@ public class Schema extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 12: + case 49: { - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 11; + $_ngcc_current_state = 45; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } @@ -505,7 +505,7 @@ public class Schema extends NGCCHandler { case 36: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("schema"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 374, null); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 527, null); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -513,20 +513,32 @@ public class Schema extends NGCCHandler { } } break; - case 1: + case 0: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("schema"))) { + revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); + } + break; + case 10: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) { $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 0; + $_ngcc_current_state = 1; } else { unexpectedLeaveElement($__qname); } } break; - case 0: + case 16: { - revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); + if(($ai = $runtime.getAttributeIndex("","default"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + else { + $_ngcc_current_state = 12; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } } break; case 53: @@ -541,9 +553,9 @@ public class Schema extends NGCCHandler { } } break; - case 10: + case 26: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) { $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); $_ngcc_current_state = 1; } @@ -552,14 +564,26 @@ public class Schema extends NGCCHandler { } } break; - case 41: + case 37: { - if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) { + if(($ai = $runtime.getAttributeIndex("","finalDefault"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 37; + $_ngcc_current_state = 36; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + } + break; + case 12: + { + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + else { + $_ngcc_current_state = 11; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } @@ -576,14 +600,14 @@ public class Schema extends NGCCHandler { } } break; - case 37: + case 41: { - if(($ai = $runtime.getAttributeIndex("","finalDefault"))>=0) { + if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 36; + $_ngcc_current_state = 37; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } @@ -596,8 +620,8 @@ public class Schema extends NGCCHandler { break; case 27: { - if(((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))))))) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true); + if(((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))))))) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -607,8 +631,8 @@ public class Schema extends NGCCHandler { break; case 11: { - if(((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) || (($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) { - NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 268, locator,false,defaultValue,fixedValue); + if(((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) || (($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) { + NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 421, locator,false,defaultValue,fixedValue); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -616,41 +640,17 @@ public class Schema extends NGCCHandler { } } break; - case 26: + case 1: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("schema"))) { $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 1; + $_ngcc_current_state = 0; } else { unexpectedLeaveElement($__qname); } } break; - case 49: - { - if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - else { - $_ngcc_current_state = 45; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - } - break; - case 16: - { - if(($ai = $runtime.getAttributeIndex("","default"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - else { - $_ngcc_current_state = 12; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - } - break; default: { unexpectedLeaveElement($__qname); @@ -665,48 +665,49 @@ public class Schema extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 12: + case 49: { - if(($__uri.equals("") && $__local.equals("fixed"))) { - $_ngcc_current_state = 14; + if(($__uri.equals("") && $__local.equals("attributeFormDefault"))) { + $_ngcc_current_state = 51; } else { - $_ngcc_current_state = 11; + $_ngcc_current_state = 45; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; - case 0: - { - revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); - } - break; - case 27: + case 45: { - if((($__uri.equals("") && $__local.equals("name")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("default")) || ($__uri.equals("") && $__local.equals("abstract"))))))))) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true); - spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("elementFormDefault"))) { + $_ngcc_current_state = 47; } else { - unexpectedEnterAttribute($__qname); + $_ngcc_current_state = 41; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; - case 53: + case 41: { - if(($__uri.equals("") && $__local.equals("targetNamespace"))) { - $_ngcc_current_state = 55; + if(($__uri.equals("") && $__local.equals("blockDefault"))) { + $_ngcc_current_state = 43; } else { - $_ngcc_current_state = 49; + $_ngcc_current_state = 37; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; - case 11: + case 2: + { + $_ngcc_current_state = 1; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 27: { - if((($__uri.equals("") && $__local.equals("form")) || ($__uri.equals("") && $__local.equals("name")))) { - NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 268, locator,false,defaultValue,fixedValue); + if((($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("abstract"))))))))) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true); spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { @@ -714,63 +715,62 @@ public class Schema extends NGCCHandler { } } break; - case 41: + case 0: { - if(($__uri.equals("") && $__local.equals("blockDefault"))) { - $_ngcc_current_state = 43; + revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); + } + break; + case 16: + { + if(($__uri.equals("") && $__local.equals("default"))) { + $_ngcc_current_state = 18; } else { - $_ngcc_current_state = 37; + $_ngcc_current_state = 12; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; - case 49: + case 37: { - if(($__uri.equals("") && $__local.equals("attributeFormDefault"))) { - $_ngcc_current_state = 51; + if(($__uri.equals("") && $__local.equals("finalDefault"))) { + $_ngcc_current_state = 39; } else { - $_ngcc_current_state = 45; + $_ngcc_current_state = 36; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; - case 45: + case 53: { - if(($__uri.equals("") && $__local.equals("elementFormDefault"))) { - $_ngcc_current_state = 47; + if(($__uri.equals("") && $__local.equals("targetNamespace"))) { + $_ngcc_current_state = 55; } else { - $_ngcc_current_state = 41; + $_ngcc_current_state = 49; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 37: + case 11: { - if(($__uri.equals("") && $__local.equals("finalDefault"))) { - $_ngcc_current_state = 39; + if((($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("form")))) { + NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 421, locator,false,defaultValue,fixedValue); + spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 36; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + unexpectedEnterAttribute($__qname); } } break; - case 16: + case 12: { - if(($__uri.equals("") && $__local.equals("default"))) { - $_ngcc_current_state = 18; + if(($__uri.equals("") && $__local.equals("fixed"))) { + $_ngcc_current_state = 14; } else { - $_ngcc_current_state = 12; + $_ngcc_current_state = 11; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } @@ -789,38 +789,46 @@ public class Schema extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 12: + case 49: { - $_ngcc_current_state = 11; + $_ngcc_current_state = 45; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 0: + case 38: { - revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("finalDefault"))) { + $_ngcc_current_state = 36; + } + else { + unexpectedLeaveAttribute($__qname); + } } break; - case 53: + case 0: { - $_ngcc_current_state = 49; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; - case 41: + case 16: { - $_ngcc_current_state = 37; + $_ngcc_current_state = 12; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 45: + case 13: { - $_ngcc_current_state = 41; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("fixed"))) { + $_ngcc_current_state = 11; + } + else { + unexpectedLeaveAttribute($__qname); + } } break; - case 2: + case 53: { - $_ngcc_current_state = 1; + $_ngcc_current_state = 49; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; @@ -830,88 +838,80 @@ public class Schema extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 50: + case 17: { - if(($__uri.equals("") && $__local.equals("attributeFormDefault"))) { - $_ngcc_current_state = 45; + if(($__uri.equals("") && $__local.equals("default"))) { + $_ngcc_current_state = 12; } else { unexpectedLeaveAttribute($__qname); } } break; - case 46: + case 12: { - if(($__uri.equals("") && $__local.equals("elementFormDefault"))) { - $_ngcc_current_state = 41; - } - else { - unexpectedLeaveAttribute($__qname); - } + $_ngcc_current_state = 11; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 54: + case 50: { - if(($__uri.equals("") && $__local.equals("targetNamespace"))) { - $_ngcc_current_state = 49; + if(($__uri.equals("") && $__local.equals("attributeFormDefault"))) { + $_ngcc_current_state = 45; } else { unexpectedLeaveAttribute($__qname); } } break; - case 13: + case 42: { - if(($__uri.equals("") && $__local.equals("fixed"))) { - $_ngcc_current_state = 11; + if(($__uri.equals("") && $__local.equals("blockDefault"))) { + $_ngcc_current_state = 37; } else { unexpectedLeaveAttribute($__qname); } } break; - case 17: + case 45: { - if(($__uri.equals("") && $__local.equals("default"))) { - $_ngcc_current_state = 12; - } - else { - unexpectedLeaveAttribute($__qname); - } + $_ngcc_current_state = 41; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 42: + case 41: { - if(($__uri.equals("") && $__local.equals("blockDefault"))) { - $_ngcc_current_state = 37; + $_ngcc_current_state = 37; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 2: + { + $_ngcc_current_state = 1; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 54: + { + if(($__uri.equals("") && $__local.equals("targetNamespace"))) { + $_ngcc_current_state = 49; } else { unexpectedLeaveAttribute($__qname); } } break; - case 38: + case 46: { - if(($__uri.equals("") && $__local.equals("finalDefault"))) { - $_ngcc_current_state = 36; + if(($__uri.equals("") && $__local.equals("elementFormDefault"))) { + $_ngcc_current_state = 41; } else { unexpectedLeaveAttribute($__qname); } } break; - case 49: - { - $_ngcc_current_state = 45; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 16: - { - $_ngcc_current_state = 12; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveAttribute($__qname); @@ -923,14 +923,14 @@ public class Schema extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 12: + case 49: { - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 11; + $_ngcc_current_state = 45; $runtime.sendText(super._cookie, $value); } } @@ -940,54 +940,50 @@ public class Schema extends NGCCHandler { revertToParentFromText(this, super._cookie, $value); } break; - case 53: + case 47: { - if(($ai = $runtime.getAttributeIndex("","targetNamespace"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); + if($value.equals("unqualified")) { + NGCCHandler h = new qualification(this, super._source, $runtime, 539); + spawnChildFromText(h, $value); } else { - $_ngcc_current_state = 49; - $runtime.sendText(super._cookie, $value); + if($value.equals("qualified")) { + NGCCHandler h = new qualification(this, super._source, $runtime, 539); + spawnChildFromText(h, $value); + } } } break; case 43: { - NGCCHandler h = new ersSet(this, super._source, $runtime, 381); + NGCCHandler h = new ersSet(this, super._source, $runtime, 534); spawnChildFromText(h, $value); } break; - case 41: + case 16: { - if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) { + if(($ai = $runtime.getAttributeIndex("","default"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 37; + $_ngcc_current_state = 12; $runtime.sendText(super._cookie, $value); } } break; - case 45: + case 53: { - if(($ai = $runtime.getAttributeIndex("","elementFormDefault"))>=0) { + if(($ai = $runtime.getAttributeIndex("","targetNamespace"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 41; + $_ngcc_current_state = 49; $runtime.sendText(super._cookie, $value); } } break; - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendText(super._cookie, $value); - } - break; case 37: { if(($ai = $runtime.getAttributeIndex("","finalDefault"))>=0) { @@ -1000,9 +996,16 @@ public class Schema extends NGCCHandler { } } break; - case 55: + case 12: { - $_ngcc_current_state = 54; + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } + else { + $_ngcc_current_state = 11; + $runtime.sendText(super._cookie, $value); + } } break; case 14: @@ -1011,60 +1014,75 @@ public class Schema extends NGCCHandler { $_ngcc_current_state = 13; } break; - case 47: + case 45: { - if($value.equals("unqualified")) { - NGCCHandler h = new qualification(this, super._source, $runtime, 386); - spawnChildFromText(h, $value); + if(($ai = $runtime.getAttributeIndex("","elementFormDefault"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); } else { - if($value.equals("qualified")) { - NGCCHandler h = new qualification(this, super._source, $runtime, 386); - spawnChildFromText(h, $value); - } + $_ngcc_current_state = 41; + $runtime.sendText(super._cookie, $value); } } break; - case 39: + case 41: { - NGCCHandler h = new erSet(this, super._source, $runtime, 376); - spawnChildFromText(h, $value); + if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } + else { + $_ngcc_current_state = 37; + $runtime.sendText(super._cookie, $value); + } + } + break; + case 55: + { + $_ngcc_current_state = 54; + } + break; + case 2: + { + $_ngcc_current_state = 1; + $runtime.sendText(super._cookie, $value); } break; case 27: { if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true); + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","default"))>=0) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true); + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true); + if(($ai = $runtime.getAttributeIndex("","block"))>=0) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","block"))>=0) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true); + if(($ai = $runtime.getAttributeIndex("","final"))>=0) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true); spawnChildFromText(h, $value); } else { if(($ai = $runtime.getAttributeIndex("","form"))>=0) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true); + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","final"))>=0) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true); + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true); + if(($ai = $runtime.getAttributeIndex("","default"))>=0) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true); spawnChildFromText(h, $value); } } @@ -1075,61 +1093,43 @@ public class Schema extends NGCCHandler { } } break; - case 11: - { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 268, locator,false,defaultValue,fixedValue); - spawnChildFromText(h, $value); - } - else { - if(($ai = $runtime.getAttributeIndex("","form"))>=0) { - NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 268, locator,false,defaultValue,fixedValue); - spawnChildFromText(h, $value); - } - } - } - break; - case 18: + case 39: { - defaultValue = $value; - $_ngcc_current_state = 17; + NGCCHandler h = new erSet(this, super._source, $runtime, 529); + spawnChildFromText(h, $value); } break; case 51: { if($value.equals("unqualified")) { - NGCCHandler h = new qualification(this, super._source, $runtime, 391); + NGCCHandler h = new qualification(this, super._source, $runtime, 544); spawnChildFromText(h, $value); } else { if($value.equals("qualified")) { - NGCCHandler h = new qualification(this, super._source, $runtime, 391); + NGCCHandler h = new qualification(this, super._source, $runtime, 544); spawnChildFromText(h, $value); } } } break; - case 49: + case 18: { - if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } - else { - $_ngcc_current_state = 45; - $runtime.sendText(super._cookie, $value); - } + defaultValue = $value; + $_ngcc_current_state = 17; } break; - case 16: + case 11: { - if(($ai = $runtime.getAttributeIndex("","default"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); + if(($ai = $runtime.getAttributeIndex("","form"))>=0) { + NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 421, locator,false,defaultValue,fixedValue); + spawnChildFromText(h, $value); } else { - $_ngcc_current_state = 12; - $runtime.sendText(super._cookie, $value); + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 421, locator,false,defaultValue,fixedValue); + spawnChildFromText(h, $value); + } } } break; @@ -1138,163 +1138,163 @@ public class Schema extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 381: + case 527: + { + fa = ((ForeignAttributesImpl)$__result__); + action10(); + $_ngcc_current_state = 2; + } + break; + case 534: { blockDefault = ((Integer)$__result__); action12(); $_ngcc_current_state = 42; } break; - case 268: + case 439: { - ad = ((AttributeDeclImpl)$__result__); - action3(); - $_ngcc_current_state = 10; + e = ((ElementDecl)$__result__); + action7(); + $_ngcc_current_state = 26; } break; - case 391: + case 544: { afd = ((Boolean)$__result__).booleanValue(); action14(); $_ngcc_current_state = 50; } break; - case 386: + case 421: { - efd = ((Boolean)$__result__).booleanValue(); - action13(); - $_ngcc_current_state = 46; + ad = ((AttributeDeclImpl)$__result__); + action3(); + $_ngcc_current_state = 10; } break; - case 351: + case 504: { anno = ((AnnotationImpl)$__result__); action9(); $_ngcc_current_state = 1; } break; - case 352: + case 505: { $_ngcc_current_state = 1; } break; - case 353: + case 506: { $_ngcc_current_state = 1; } break; - case 354: + case 507: { $_ngcc_current_state = 1; } break; - case 356: + case 509: { st = ((SimpleTypeImpl)$__result__); action6(); $_ngcc_current_state = 1; } break; - case 357: + case 510: { ct = ((ComplexTypeImpl)$__result__); action5(); $_ngcc_current_state = 1; } break; - case 359: + case 512: { group = ((ModelGroupDeclImpl)$__result__); action2(); $_ngcc_current_state = 1; } break; - case 360: + case 513: { notation = ((XSNotation)$__result__); action1(); $_ngcc_current_state = 1; } break; - case 361: + case 514: { ag = ((AttGroupDeclImpl)$__result__); action0(); $_ngcc_current_state = 1; } break; - case 286: + case 539: { - e = ((ElementDecl)$__result__); - action7(); - $_ngcc_current_state = 26; - } - break; - case 374: - { - fa = ((ForeignAttributesImpl)$__result__); - action10(); - $_ngcc_current_state = 2; + efd = ((Boolean)$__result__).booleanValue(); + action13(); + $_ngcc_current_state = 46; } break; - case 362: + case 515: { anno = ((AnnotationImpl)$__result__); action9(); $_ngcc_current_state = 1; } break; - case 363: + case 516: { $_ngcc_current_state = 1; } break; - case 364: + case 517: { $_ngcc_current_state = 1; } break; - case 365: + case 518: { $_ngcc_current_state = 1; } break; - case 367: + case 520: { st = ((SimpleTypeImpl)$__result__); action6(); $_ngcc_current_state = 1; } break; - case 368: + case 521: { ct = ((ComplexTypeImpl)$__result__); action5(); $_ngcc_current_state = 1; } break; - case 370: + case 523: { group = ((ModelGroupDeclImpl)$__result__); action2(); $_ngcc_current_state = 1; } break; - case 371: + case 524: { notation = ((XSNotation)$__result__); action1(); $_ngcc_current_state = 1; } break; - case 372: + case 525: { ag = ((AttGroupDeclImpl)$__result__); action0(); $_ngcc_current_state = 1; } break; - case 376: + case 529: { finalDefault = ((Integer)$__result__); action11(); diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java index d35f23f0..50506cf4 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java @@ -99,10 +99,21 @@ class SimpleType_List extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 9: + { + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","itemType"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 266, fa); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + unexpectedEnterElement($__qname); + } + } + break; case 7: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 693, annotation,AnnotationContext.SIMPLETYPE_DECL); + NGCCHandler h = new annotation(this, super._source, $runtime, 264, annotation,AnnotationContext.SIMPLETYPE_DECL); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -111,9 +122,16 @@ class SimpleType_List extends NGCCHandler { } } break; - case 0: + case 10: { - revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + action2(); + $_ngcc_current_state = 9; + } + else { + unexpectedEnterElement($__qname); + } } break; case 2: @@ -124,7 +142,7 @@ class SimpleType_List extends NGCCHandler { } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { - NGCCHandler h = new simpleType(this, super._source, $runtime, 687); + NGCCHandler h = new simpleType(this, super._source, $runtime, 258); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -133,27 +151,9 @@ class SimpleType_List extends NGCCHandler { } } break; - case 9: - { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || (($ai = $runtime.getAttributeIndex("","itemType"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 695, fa); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - unexpectedEnterElement($__qname); - } - } - break; - case 10: + case 0: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action2(); - $_ngcc_current_state = 9; - } - else { - unexpectedEnterElement($__qname); - } + revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); } break; default: @@ -170,12 +170,11 @@ class SimpleType_List extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 1: + case 9: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 0; - action0(); + if((($ai = $runtime.getAttributeIndex("","itemType"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list")))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 266, fa); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); @@ -188,11 +187,6 @@ class SimpleType_List extends NGCCHandler { $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 0: - { - revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); - } - break; case 2: { if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) { @@ -204,11 +198,17 @@ class SimpleType_List extends NGCCHandler { } } break; - case 9: + case 0: { - if((($ai = $runtime.getAttributeIndex("","itemType"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list")))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 695, fa); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); + } + break; + case 1: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) { + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 0; + action0(); } else { unexpectedLeaveElement($__qname); @@ -229,15 +229,21 @@ class SimpleType_List extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 7: + case 9: { - $_ngcc_current_state = 2; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("itemType"))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 266, fa); + spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); + } + else { + unexpectedEnterAttribute($__qname); + } } break; - case 0: + case 7: { - revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 2; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; case 2: @@ -250,15 +256,9 @@ class SimpleType_List extends NGCCHandler { } } break; - case 9: + case 0: { - if(($__uri.equals("") && $__local.equals("itemType"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 695, fa); - spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); - } - else { - unexpectedEnterAttribute($__qname); - } + revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); } break; default: @@ -275,16 +275,6 @@ class SimpleType_List extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 4: - { - if(($__uri.equals("") && $__local.equals("itemType"))) { - $_ngcc_current_state = 1; - } - else { - unexpectedLeaveAttribute($__qname); - } - } - break; case 7: { $_ngcc_current_state = 2; @@ -296,6 +286,16 @@ class SimpleType_List extends NGCCHandler { revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); } break; + case 4: + { + if(($__uri.equals("") && $__local.equals("itemType"))) { + $_ngcc_current_state = 1; + } + else { + unexpectedLeaveAttribute($__qname); + } + } + break; default: { unexpectedLeaveAttribute($__qname); @@ -307,15 +307,18 @@ class SimpleType_List extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 7: + case 9: { - $_ngcc_current_state = 2; - $runtime.sendText(super._cookie, $value); + if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 266, fa); + spawnChildFromText(h, $value); + } } break; - case 0: + case 7: { - revertToParentFromText(result, super._cookie, $value); + $_ngcc_current_state = 2; + $runtime.sendText(super._cookie, $value); } break; case 2: @@ -326,17 +329,14 @@ class SimpleType_List extends NGCCHandler { } } break; - case 9: + case 0: { - if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 695, fa); - spawnChildFromText(h, $value); - } + revertToParentFromText(result, super._cookie, $value); } break; case 5: { - NGCCHandler h = new qname(this, super._source, $runtime, 689); + NGCCHandler h = new qname(this, super._source, $runtime, 260); spawnChildFromText(h, $value); } break; @@ -345,25 +345,25 @@ class SimpleType_List extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 693: + case 266: + { + fa = ((ForeignAttributesImpl)$__result__); + $_ngcc_current_state = 7; + } + break; + case 264: { annotation = ((AnnotationImpl)$__result__); $_ngcc_current_state = 2; } break; - case 687: + case 258: { itemType = ((SimpleTypeImpl)$__result__); $_ngcc_current_state = 1; } break; - case 695: - { - fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 7; - } - break; - case 689: + case 260: { itemTypeName = ((UName)$__result__); action1(); diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java index cb56d957..ddd1fd8b 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java @@ -105,15 +105,10 @@ class SimpleType_Restriction extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: - { - revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; case 12: { - if(((($ai = $runtime.getAttributeIndex("","base"))>=0 && (((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 445, fa); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","base"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || (((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 166, fa); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -121,18 +116,30 @@ class SimpleType_Restriction extends NGCCHandler { } } break; - case 13: + case 10: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action3(); - $_ngcc_current_state = 12; + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 164, annotation,AnnotationContext.SIMPLETYPE_DECL); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 5; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; + case 4: + { + action1(); + $_ngcc_current_state = 2; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 0: + { + revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; case 5: { if(($ai = $runtime.getAttributeIndex("","base"))>=0) { @@ -141,7 +148,7 @@ class SimpleType_Restriction extends NGCCHandler { } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { - NGCCHandler h = new simpleType(this, super._source, $runtime, 437); + NGCCHandler h = new simpleType(this, super._source, $runtime, 158); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -150,45 +157,38 @@ class SimpleType_Restriction extends NGCCHandler { } } break; - case 2: + case 1: { if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) { - NGCCHandler h = new facet(this, super._source, $runtime, 433); + NGCCHandler h = new facet(this, super._source, $runtime, 153); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 1; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; - case 1: + case 2: { if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) { - NGCCHandler h = new facet(this, super._source, $runtime, 432); + NGCCHandler h = new facet(this, super._source, $runtime, 154); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 1; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 4: - { - action1(); - $_ngcc_current_state = 2; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; - case 10: + case 13: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 443, annotation,AnnotationContext.SIMPLETYPE_DECL); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + action3(); + $_ngcc_current_state = 12; } else { - $_ngcc_current_state = 5; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; @@ -206,15 +206,10 @@ class SimpleType_Restriction extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: - { - revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); - } - break; case 12: { if((($ai = $runtime.getAttributeIndex("","base"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 445, fa); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 166, fa); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -222,6 +217,24 @@ class SimpleType_Restriction extends NGCCHandler { } } break; + case 10: + { + $_ngcc_current_state = 5; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; + case 4: + { + action1(); + $_ngcc_current_state = 2; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; + case 0: + { + revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); + } + break; case 5: { if(($ai = $runtime.getAttributeIndex("","base"))>=0) { @@ -233,12 +246,6 @@ class SimpleType_Restriction extends NGCCHandler { } } break; - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; case 1: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { @@ -250,16 +257,9 @@ class SimpleType_Restriction extends NGCCHandler { } } break; - case 4: - { - action1(); - $_ngcc_current_state = 2; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 10: + case 2: { - $_ngcc_current_state = 5; + $_ngcc_current_state = 1; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; @@ -277,15 +277,10 @@ class SimpleType_Restriction extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: - { - revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); - } - break; case 12: { if(($__uri.equals("") && $__local.equals("base"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 445, fa); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 166, fa); spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { @@ -293,6 +288,24 @@ class SimpleType_Restriction extends NGCCHandler { } } break; + case 10: + { + $_ngcc_current_state = 5; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 4: + { + action1(); + $_ngcc_current_state = 2; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 0: + { + revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); + } + break; case 5: { if(($__uri.equals("") && $__local.equals("base"))) { @@ -309,19 +322,6 @@ class SimpleType_Restriction extends NGCCHandler { $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 4: - { - action1(); - $_ngcc_current_state = 2; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 10: - { - $_ngcc_current_state = 5; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedEnterAttribute($__qname); @@ -346,14 +346,9 @@ class SimpleType_Restriction extends NGCCHandler { } } break; - case 0: - { - revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); - } - break; - case 2: + case 10: { - $_ngcc_current_state = 1; + $_ngcc_current_state = 5; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; @@ -364,9 +359,14 @@ class SimpleType_Restriction extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 10: + case 0: { - $_ngcc_current_state = 5; + revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); + } + break; + case 2: + { + $_ngcc_current_state = 1; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; @@ -381,23 +381,36 @@ class SimpleType_Restriction extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 0: + case 8: { - revertToParentFromText(result, super._cookie, $value); + NGCCHandler h = new qname(this, super._source, $runtime, 160); + spawnChildFromText(h, $value); } break; case 12: { if(($ai = $runtime.getAttributeIndex("","base"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 445, fa); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 166, fa); spawnChildFromText(h, $value); } } break; - case 8: + case 10: { - NGCCHandler h = new qname(this, super._source, $runtime, 439); - spawnChildFromText(h, $value); + $_ngcc_current_state = 5; + $runtime.sendText(super._cookie, $value); + } + break; + case 4: + { + action1(); + $_ngcc_current_state = 2; + $runtime.sendText(super._cookie, $value); + } + break; + case 0: + { + revertToParentFromText(result, super._cookie, $value); } break; case 5: @@ -414,57 +427,44 @@ class SimpleType_Restriction extends NGCCHandler { $runtime.sendText(super._cookie, $value); } break; - case 4: - { - action1(); - $_ngcc_current_state = 2; - $runtime.sendText(super._cookie, $value); - } - break; - case 10: - { - $_ngcc_current_state = 5; - $runtime.sendText(super._cookie, $value); - } - break; } } public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 439: + case 160: { baseTypeName = ((UName)$__result__); action2(); $_ngcc_current_state = 7; } break; - case 445: + case 164: { - fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 10; + annotation = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 5; } break; - case 437: + case 154: { - baseType = ((SimpleTypeImpl)$__result__); - $_ngcc_current_state = 4; + facet = ((XSFacet)$__result__); + action0(); + $_ngcc_current_state = 1; } break; - case 443: + case 166: { - annotation = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 5; + fa = ((ForeignAttributesImpl)$__result__); + $_ngcc_current_state = 10; } break; - case 433: + case 158: { - facet = ((XSFacet)$__result__); - action0(); - $_ngcc_current_state = 1; + baseType = ((SimpleTypeImpl)$__result__); + $_ngcc_current_state = 4; } break; - case 432: + case 153: { facet = ((XSFacet)$__result__); action0(); diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java index 5691e2e4..12adef59 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java @@ -111,14 +111,15 @@ class SimpleType_Union extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 6: + case 4: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 665, fa); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 183, annotation,AnnotationContext.SIMPLETYPE_DECL); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 2; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; @@ -127,22 +128,10 @@ class SimpleType_Union extends NGCCHandler { revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); } break; - case 12: - { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action4(); - $_ngcc_current_state = 7; - } - else { - unexpectedEnterElement($__qname); - } - } - break; case 1: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { - NGCCHandler h = new simpleType(this, super._source, $runtime, 659); + NGCCHandler h = new simpleType(this, super._source, $runtime, 179); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -162,22 +151,22 @@ class SimpleType_Union extends NGCCHandler { } } break; - case 4: + case 12: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 663, annotation,AnnotationContext.SIMPLETYPE_DECL); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + action4(); + $_ngcc_current_state = 7; } else { - $_ngcc_current_state = 2; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; case 2: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { - NGCCHandler h = new simpleType(this, super._source, $runtime, 660); + NGCCHandler h = new simpleType(this, super._source, $runtime, 180); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -186,6 +175,17 @@ class SimpleType_Union extends NGCCHandler { } } break; + case 6: + { + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 185, fa); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + unexpectedEnterElement($__qname); + } + } + break; default: { unexpectedEnterElement($__qname); @@ -200,15 +200,10 @@ class SimpleType_Union extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 6: + case 4: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 665, fa); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); - } - else { - unexpectedLeaveElement($__qname); - } + $_ngcc_current_state = 2; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; case 0: @@ -240,16 +235,21 @@ class SimpleType_Union extends NGCCHandler { } } break; - case 4: + case 2: { - $_ngcc_current_state = 2; + $_ngcc_current_state = 1; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 2: + case 6: { - $_ngcc_current_state = 1; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 185, fa); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + } + else { + unexpectedLeaveElement($__qname); + } } break; default: @@ -266,6 +266,12 @@ class SimpleType_Union extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 4: + { + $_ngcc_current_state = 2; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; case 0: { revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); @@ -282,12 +288,6 @@ class SimpleType_Union extends NGCCHandler { } } break; - case 4: - { - $_ngcc_current_state = 2; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; case 2: { $_ngcc_current_state = 1; @@ -308,19 +308,15 @@ class SimpleType_Union extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: + case 4: { - revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 2; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 8: + case 0: { - if(($__uri.equals("") && $__local.equals("memberTypes"))) { - $_ngcc_current_state = 6; - } - else { - unexpectedLeaveAttribute($__qname); - } + revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); } break; case 7: @@ -329,10 +325,14 @@ class SimpleType_Union extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 4: + case 8: { - $_ngcc_current_state = 2; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("memberTypes"))) { + $_ngcc_current_state = 6; + } + else { + unexpectedLeaveAttribute($__qname); + } } break; case 2: @@ -352,14 +352,15 @@ class SimpleType_Union extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 0: + case 4: { - revertToParentFromText(result, super._cookie, $value); + $_ngcc_current_state = 2; + $runtime.sendText(super._cookie, $value); } break; - case 8: + case 9: { - NGCCHandler h = new qname(this, super._source, $runtime, 668); + NGCCHandler h = new qname(this, super._source, $runtime, 187); spawnChildFromText(h, $value); } break; @@ -370,10 +371,9 @@ class SimpleType_Union extends NGCCHandler { action3(); } break; - case 9: + case 0: { - NGCCHandler h = new qname(this, super._source, $runtime, 667); - spawnChildFromText(h, $value); + revertToParentFromText(result, super._cookie, $value); } break; case 7: @@ -388,10 +388,10 @@ class SimpleType_Union extends NGCCHandler { } } break; - case 4: + case 8: { - $_ngcc_current_state = 2; - $runtime.sendText(super._cookie, $value); + NGCCHandler h = new qname(this, super._source, $runtime, 188); + spawnChildFromText(h, $value); } break; case 2: @@ -405,46 +405,46 @@ class SimpleType_Union extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 665: - { - fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 4; - } - break; - case 660: - { - anonymousMemberType = ((SimpleTypeImpl)$__result__); - action1(); - $_ngcc_current_state = 1; - } - break; - case 663: + case 183: { annotation = ((AnnotationImpl)$__result__); $_ngcc_current_state = 2; } break; - case 668: + case 187: { memberTypeName = ((UName)$__result__); action2(); $_ngcc_current_state = 8; } break; - case 659: + case 179: { anonymousMemberType = ((SimpleTypeImpl)$__result__); action1(); $_ngcc_current_state = 1; } break; - case 667: + case 188: { memberTypeName = ((UName)$__result__); action2(); $_ngcc_current_state = 8; } break; + case 185: + { + fa = ((ForeignAttributesImpl)$__result__); + $_ngcc_current_state = 4; + } + break; + case 180: + { + anonymousMemberType = ((SimpleTypeImpl)$__result__); + action1(); + $_ngcc_current_state = 1; + } + break; } } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java index dbd0a39d..6446644f 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java @@ -118,11 +118,6 @@ class annotation extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: - { - revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname); - } - break; case 1: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { @@ -134,6 +129,11 @@ class annotation extends NGCCHandler { } } break; + case 0: + { + revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname); + } + break; default: { unexpectedLeaveElement($__qname); diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java index 752b292b..fbd2d5e2 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java @@ -92,31 +92,30 @@ class attributeDeclBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 7: - { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 210, null,AnnotationContext.ATTRIBUTE_DECL); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - $_ngcc_current_state = 1; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - } - break; case 0: { revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs); } break; - case 13: + case 12: { - if(($ai = $runtime.getAttributeIndex("","form"))>=0) { + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 12; + unexpectedEnterElement($__qname); + } + } + break; + case 7: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 388, null,AnnotationContext.ATTRIBUTE_DECL); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 1; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } @@ -124,23 +123,24 @@ class attributeDeclBody extends NGCCHandler { case 9: { if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","type"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } } break; - case 12: + case 13: { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + if(($ai = $runtime.getAttributeIndex("","form"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 12; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; @@ -152,7 +152,7 @@ class attributeDeclBody extends NGCCHandler { } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { - NGCCHandler h = new simpleType(this, super._source, $runtime, 201); + NGCCHandler h = new simpleType(this, super._source, $runtime, 379); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -176,49 +176,49 @@ class attributeDeclBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 7: - { - $_ngcc_current_state = 1; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; case 0: { revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname); } break; - case 13: + case 12: { - if(($ai = $runtime.getAttributeIndex("","form"))>=0) { + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 12; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + unexpectedLeaveElement($__qname); } } break; + case 7: + { + $_ngcc_current_state = 1; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; case 9: { if(($ai = $runtime.getAttributeIndex("","type"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } } break; - case 12: + case 13: { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + if(($ai = $runtime.getAttributeIndex("","form"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - unexpectedLeaveElement($__qname); + $_ngcc_current_state = 12; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; @@ -248,47 +248,47 @@ class attributeDeclBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 7: - { - $_ngcc_current_state = 1; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; case 0: { revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); } break; - case 13: + case 12: { - if(($__uri.equals("") && $__local.equals("form"))) { - $_ngcc_current_state = 15; + if(($__uri.equals("") && $__local.equals("name"))) { + $_ngcc_current_state = 11; } else { - $_ngcc_current_state = 12; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + unexpectedEnterAttribute($__qname); } } break; + case 7: + { + $_ngcc_current_state = 1; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; case 9: { if(($__uri.equals("") && $__local.equals("type"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa); spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa); spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } } break; - case 12: + case 13: { - if(($__uri.equals("") && $__local.equals("name"))) { - $_ngcc_current_state = 11; + if(($__uri.equals("") && $__local.equals("form"))) { + $_ngcc_current_state = 15; } else { - unexpectedEnterAttribute($__qname); + $_ngcc_current_state = 12; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; @@ -317,10 +317,15 @@ class attributeDeclBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 10: + case 0: { - if(($__uri.equals("") && $__local.equals("name"))) { - $_ngcc_current_state = 9; + revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); + } + break; + case 14: + { + if(($__uri.equals("") && $__local.equals("form"))) { + $_ngcc_current_state = 12; } else { unexpectedLeaveAttribute($__qname); @@ -333,31 +338,32 @@ class attributeDeclBody extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 0: + case 10: { - revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("name"))) { + $_ngcc_current_state = 9; + } + else { + unexpectedLeaveAttribute($__qname); + } } break; - case 13: + case 9: { - $_ngcc_current_state = 12; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa); + spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname); } break; - case 9: + case 13: { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa); - spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname); + $_ngcc_current_state = 12; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 14: + case 1: { - if(($__uri.equals("") && $__local.equals("form"))) { - $_ngcc_current_state = 12; - } - else { - unexpectedLeaveAttribute($__qname); - } + $_ngcc_current_state = 0; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; case 4: @@ -370,12 +376,6 @@ class attributeDeclBody extends NGCCHandler { } } break; - case 1: - { - $_ngcc_current_state = 0; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveAttribute($__qname); @@ -387,58 +387,60 @@ class attributeDeclBody extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 7: - { - $_ngcc_current_state = 1; - $runtime.sendText(super._cookie, $value); - } - break; - case 5: - { - NGCCHandler h = new qname(this, super._source, $runtime, 203); - spawnChildFromText(h, $value); - } - break; case 0: { revertToParentFromText(makeResult(), super._cookie, $value); } break; - case 13: + case 12: { - if(($ai = $runtime.getAttributeIndex("","form"))>=0) { + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } - else { - $_ngcc_current_state = 12; - $runtime.sendText(super._cookie, $value); - } + } + break; + case 7: + { + $_ngcc_current_state = 1; + $runtime.sendText(super._cookie, $value); } break; case 9: { if(($ai = $runtime.getAttributeIndex("","type"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa); spawnChildFromText(h, $value); } else { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa); spawnChildFromText(h, $value); } } break; - case 11: + case 13: { - name = $value; - $_ngcc_current_state = 10; + if(($ai = $runtime.getAttributeIndex("","form"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } + else { + $_ngcc_current_state = 12; + $runtime.sendText(super._cookie, $value); + } } break; - case 12: + case 15: { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); + if($value.equals("unqualified")) { + NGCCHandler h = new qualification(this, super._source, $runtime, 395); + spawnChildFromText(h, $value); + } + else { + if($value.equals("qualified")) { + NGCCHandler h = new qualification(this, super._source, $runtime, 395); + spawnChildFromText(h, $value); + } } } break; @@ -454,18 +456,16 @@ class attributeDeclBody extends NGCCHandler { } } break; - case 15: + case 11: { - if($value.equals("unqualified")) { - NGCCHandler h = new qualification(this, super._source, $runtime, 217); - spawnChildFromText(h, $value); - } - else { - if($value.equals("qualified")) { - NGCCHandler h = new qualification(this, super._source, $runtime, 217); - spawnChildFromText(h, $value); - } - } + name = $value; + $_ngcc_current_state = 10; + } + break; + case 5: + { + NGCCHandler h = new qname(this, super._source, $runtime, 381); + spawnChildFromText(h, $value); } break; } @@ -473,43 +473,43 @@ class attributeDeclBody extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 210: + case 388: { annotation = ((AnnotationImpl)$__result__); $_ngcc_current_state = 1; } break; - case 217: + case 379: { - form = ((Boolean)$__result__).booleanValue(); - action1(); - $_ngcc_current_state = 14; + type = ((SimpleTypeImpl)$__result__); + $_ngcc_current_state = 0; } break; - case 203: + case 390: { - typeName = ((UName)$__result__); - action0(); - $_ngcc_current_state = 4; + fa = ((ForeignAttributesImpl)$__result__); + $_ngcc_current_state = 7; } break; - case 212: + case 395: { - fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 7; + form = ((Boolean)$__result__).booleanValue(); + action1(); + $_ngcc_current_state = 14; } break; - case 201: + case 381: { - type = ((SimpleTypeImpl)$__result__); - $_ngcc_current_state = 0; + typeName = ((UName)$__result__); + action0(); + $_ngcc_current_state = 4; } break; } } public boolean accepted() { - return((($_ngcc_current_state == 1) || (($_ngcc_current_state == 0) || ($_ngcc_current_state == 7)))); + return((($_ngcc_current_state == 0) || (($_ngcc_current_state == 1) || ($_ngcc_current_state == 7)))); } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java index 9bc6dad8..88dfb6bc 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java @@ -83,11 +83,15 @@ class attributeGroupDecl extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 3: + case 6: { - action0(); - $_ngcc_current_state = 2; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 246, fa); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + unexpectedEnterElement($__qname); + } } break; case 13: @@ -101,28 +105,9 @@ class attributeGroupDecl extends NGCCHandler { } } break; - case 4: - { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 525, null,AnnotationContext.ATTRIBUTE_GROUP); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - $_ngcc_current_state = 3; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - } - break; - case 14: + case 0: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action1(); - $_ngcc_current_state = 13; - } - else { - unexpectedEnterElement($__qname); - } + revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); } break; case 7: @@ -137,10 +122,17 @@ class attributeGroupDecl extends NGCCHandler { } } break; - case 6: + case 3: + { + action0(); + $_ngcc_current_state = 2; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 2: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 527, fa); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) { + NGCCHandler h = new attributeUses(this, super._source, $runtime, 241, result); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -148,20 +140,28 @@ class attributeGroupDecl extends NGCCHandler { } } break; - case 2: + case 14: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))) { - NGCCHandler h = new attributeUses(this, super._source, $runtime, 522, result); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + action1(); + $_ngcc_current_state = 13; } else { unexpectedEnterElement($__qname); } } break; - case 0: + case 4: { - revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 244, null,AnnotationContext.ATTRIBUTE_GROUP); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 3; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } } break; default: @@ -178,18 +178,11 @@ class attributeGroupDecl extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 3: - { - action0(); - $_ngcc_current_state = 2; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 13: + case 6: { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 246, fa); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); @@ -207,10 +200,20 @@ class attributeGroupDecl extends NGCCHandler { } } break; - case 4: + case 13: { - $_ngcc_current_state = 3; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + else { + unexpectedLeaveElement($__qname); + } + } + break; + case 0: + { + revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); } break; case 7: @@ -225,21 +228,17 @@ class attributeGroupDecl extends NGCCHandler { } } break; - case 6: + case 3: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 527, fa); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); - } - else { - unexpectedLeaveElement($__qname); - } + action0(); + $_ngcc_current_state = 2; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; case 2: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) { - NGCCHandler h = new attributeUses(this, super._source, $runtime, 522, result); + NGCCHandler h = new attributeUses(this, super._source, $runtime, 241, result); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -247,9 +246,10 @@ class attributeGroupDecl extends NGCCHandler { } } break; - case 0: + case 4: { - revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 3; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; default: @@ -266,13 +266,6 @@ class attributeGroupDecl extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 3: - { - action0(); - $_ngcc_current_state = 2; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; case 13: { if(($__uri.equals("") && $__local.equals("name"))) { @@ -283,10 +276,9 @@ class attributeGroupDecl extends NGCCHandler { } } break; - case 4: + case 0: { - $_ngcc_current_state = 3; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); } break; case 7: @@ -300,9 +292,17 @@ class attributeGroupDecl extends NGCCHandler { } } break; - case 0: + case 3: { - revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); + action0(); + $_ngcc_current_state = 2; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 4: + { + $_ngcc_current_state = 3; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; default: @@ -319,14 +319,15 @@ class attributeGroupDecl extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 8: + case 0: { - if(($__uri.equals("") && $__local.equals("id"))) { - $_ngcc_current_state = 6; - } - else { - unexpectedLeaveAttribute($__qname); - } + revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); + } + break; + case 7: + { + $_ngcc_current_state = 6; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; case 3: @@ -336,6 +337,16 @@ class attributeGroupDecl extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; + case 8: + { + if(($__uri.equals("") && $__local.equals("id"))) { + $_ngcc_current_state = 6; + } + else { + unexpectedLeaveAttribute($__qname); + } + } + break; case 11: { if(($__uri.equals("") && $__local.equals("name"))) { @@ -352,17 +363,6 @@ class attributeGroupDecl extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 7: - { - $_ngcc_current_state = 6; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 0: - { - revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveAttribute($__qname); @@ -374,13 +374,6 @@ class attributeGroupDecl extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 3: - { - action0(); - $_ngcc_current_state = 2; - $runtime.sendText(super._cookie, $value); - } - break; case 13: { if(($ai = $runtime.getAttributeIndex("","name"))>=0) { @@ -389,21 +382,9 @@ class attributeGroupDecl extends NGCCHandler { } } break; - case 12: - { - name = $value; - $_ngcc_current_state = 11; - } - break; - case 4: - { - $_ngcc_current_state = 3; - $runtime.sendText(super._cookie, $value); - } - break; - case 9: + case 0: { - $_ngcc_current_state = 8; + revertToParentFromText(result, super._cookie, $value); } break; case 7: @@ -418,9 +399,28 @@ class attributeGroupDecl extends NGCCHandler { } } break; - case 0: + case 12: { - revertToParentFromText(result, super._cookie, $value); + name = $value; + $_ngcc_current_state = 11; + } + break; + case 9: + { + $_ngcc_current_state = 8; + } + break; + case 3: + { + action0(); + $_ngcc_current_state = 2; + $runtime.sendText(super._cookie, $value); + } + break; + case 4: + { + $_ngcc_current_state = 3; + $runtime.sendText(super._cookie, $value); } break; } @@ -428,21 +428,21 @@ class attributeGroupDecl extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 525: + case 241: { - annotation = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 3; + $_ngcc_current_state = 1; } break; - case 527: + case 246: { fa = ((ForeignAttributesImpl)$__result__); $_ngcc_current_state = 4; } break; - case 522: + case 244: { - $_ngcc_current_state = 1; + annotation = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 3; } break; } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java index b7e747a8..9a9c41de 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java @@ -143,22 +143,44 @@ class attributeUses extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 29: + case 1: { - if(($ai = $runtime.getAttributeIndex("","default"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + action7(); + $_ngcc_current_state = 33; } else { - $_ngcc_current_state = 25; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + action3(); + $_ngcc_current_state = 13; + } + else { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + action1(); + $_ngcc_current_state = 3; + } + else { + $_ngcc_current_state = 0; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + } } } break; + case 8: + { + action2(); + $_ngcc_current_state = 7; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; case 3: { - if((($ai = $runtime.getAttributeIndex("","processContents"))>=0 || (($ai = $runtime.getAttributeIndex("","namespace"))>=0 || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))) { - NGCCHandler h = new wildcardBody(this, super._source, $runtime, 448, wloc); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($ai = $runtime.getAttributeIndex("","namespace"))>=0 || ($ai = $runtime.getAttributeIndex("","processContents"))>=0))) { + NGCCHandler h = new wildcardBody(this, super._source, $runtime, 290, wloc); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -166,25 +188,31 @@ class attributeUses extends NGCCHandler { } } break; - case 13: + case 17: { - if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if((($ai = $runtime.getAttributeIndex("","name"))>=0 || ($ai = $runtime.getAttributeIndex("","form"))>=0)) { + NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 315, locator,true,defaultValue,fixedValue); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + else { + unexpectedEnterElement($__qname); + } } } break; - case 9: + case 33: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 455, null,AnnotationContext.ATTRIBUTE_USE); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($ai = $runtime.getAttributeIndex("","use"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 8; + $_ngcc_current_state = 29; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } @@ -201,82 +229,38 @@ class attributeUses extends NGCCHandler { } } break; - case 5: - { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action7(); - $_ngcc_current_state = 33; - } - else { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action3(); - $_ngcc_current_state = 13; - } - else { - $_ngcc_current_state = 1; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - } - } - break; - case 33: + case 29: { - if(($ai = $runtime.getAttributeIndex("","use"))>=0) { + if(($ai = $runtime.getAttributeIndex("","default"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 29; + $_ngcc_current_state = 25; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 16: - { - action4(); - $_ngcc_current_state = 15; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; - case 19: + case 9: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 466, null,AnnotationContext.ATTRIBUTE_USE); + NGCCHandler h = new annotation(this, super._source, $runtime, 297, null,AnnotationContext.ATTRIBUTE_USE); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 18; + $_ngcc_current_state = 8; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 17: - { - if((($ai = $runtime.getAttributeIndex("","form"))>=0 || ($ai = $runtime.getAttributeIndex("","name"))>=0)) { - NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 473, locator,true,defaultValue,fixedValue); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - else { - unexpectedEnterElement($__qname); - } - } - } - break; - case 8: + case 16: { - action2(); - $_ngcc_current_state = 7; + action4(); + $_ngcc_current_state = 15; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } break; - case 1: + case 5: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) { $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); @@ -290,19 +274,35 @@ class attributeUses extends NGCCHandler { $_ngcc_current_state = 13; } else { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action1(); - $_ngcc_current_state = 3; - } - else { - $_ngcc_current_state = 0; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } + $_ngcc_current_state = 1; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } } break; + case 13: + { + if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + else { + unexpectedEnterElement($__qname); + } + } + break; + case 19: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 308, null,AnnotationContext.ATTRIBUTE_USE); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 18; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + } + break; case 0: { revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); @@ -322,22 +322,34 @@ class attributeUses extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 29: + case 1: { - if(($ai = $runtime.getAttributeIndex("","default"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 0; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; + case 2: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) { + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 0; } else { - $_ngcc_current_state = 25; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + unexpectedLeaveElement($__qname); } } break; + case 8: + { + action2(); + $_ngcc_current_state = 7; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; case 3: { - if(((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) || ((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))))) { - NGCCHandler h = new wildcardBody(this, super._source, $runtime, 448, wloc); + if(((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))))) { + NGCCHandler h = new wildcardBody(this, super._source, $runtime, 290, wloc); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -345,44 +357,38 @@ class attributeUses extends NGCCHandler { } } break; - case 13: + case 17: { - if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + if(((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) || (($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) { + NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 315, locator,true,defaultValue,fixedValue); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { - unexpectedLeaveElement($__qname); + if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + else { + unexpectedLeaveElement($__qname); + } } } break; - case 9: - { - $_ngcc_current_state = 8; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 25: + case 33: { - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + if(($ai = $runtime.getAttributeIndex("","use"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 17; + $_ngcc_current_state = 29; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 5: - { - $_ngcc_current_state = 1; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 7: + case 15: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) { $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); $_ngcc_current_state = 1; } @@ -391,29 +397,36 @@ class attributeUses extends NGCCHandler { } } break; - case 33: + case 25: { - if(($ai = $runtime.getAttributeIndex("","use"))>=0) { + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 29; + $_ngcc_current_state = 17; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 15: + case 29: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 1; + if(($ai = $runtime.getAttributeIndex("","default"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - unexpectedLeaveElement($__qname); + $_ngcc_current_state = 25; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; + case 9: + { + $_ngcc_current_state = 8; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; case 16: { action4(); @@ -421,53 +434,40 @@ class attributeUses extends NGCCHandler { $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 19: + case 5: { - $_ngcc_current_state = 18; + $_ngcc_current_state = 1; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 17: + case 13: { - if(((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) || (($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) { - NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 473, locator,true,defaultValue,fixedValue); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - else { - unexpectedLeaveElement($__qname); - } + unexpectedLeaveElement($__qname); } } break; - case 8: - { - action2(); - $_ngcc_current_state = 7; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 1: - { - $_ngcc_current_state = 0; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 2: + case 7: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) { $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 0; + $_ngcc_current_state = 1; } else { unexpectedLeaveElement($__qname); } } break; + case 19: + { + $_ngcc_current_state = 18; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; case 0: { revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); @@ -476,7 +476,7 @@ class attributeUses extends NGCCHandler { case 18: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 464, null); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 306, null); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -498,21 +498,23 @@ class attributeUses extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 29: + case 1: { - if(($__uri.equals("") && $__local.equals("default"))) { - $_ngcc_current_state = 31; - } - else { - $_ngcc_current_state = 25; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } + $_ngcc_current_state = 0; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 8: + { + action2(); + $_ngcc_current_state = 7; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; case 3: { - if((($__uri.equals("") && $__local.equals("processContents")) || ($__uri.equals("") && $__local.equals("namespace")))) { - NGCCHandler h = new wildcardBody(this, super._source, $runtime, 448, wloc); + if((($__uri.equals("") && $__local.equals("namespace")) || ($__uri.equals("") && $__local.equals("processContents")))) { + NGCCHandler h = new wildcardBody(this, super._source, $runtime, 290, wloc); spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { @@ -520,20 +522,31 @@ class attributeUses extends NGCCHandler { } } break; - case 13: + case 17: { - if(($__uri.equals("") && $__local.equals("ref"))) { - $_ngcc_current_state = 12; + if((($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("form")))) { + NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 315, locator,true,defaultValue,fixedValue); + spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { - unexpectedEnterAttribute($__qname); + if(($__uri.equals("") && $__local.equals("ref"))) { + $_ngcc_current_state = 22; + } + else { + unexpectedEnterAttribute($__qname); + } } } break; - case 9: + case 33: { - $_ngcc_current_state = 8; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("use"))) { + $_ngcc_current_state = 35; + } + else { + $_ngcc_current_state = 29; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } } break; case 25: @@ -547,23 +560,23 @@ class attributeUses extends NGCCHandler { } } break; - case 5: - { - $_ngcc_current_state = 1; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 33: + case 29: { - if(($__uri.equals("") && $__local.equals("use"))) { - $_ngcc_current_state = 35; + if(($__uri.equals("") && $__local.equals("default"))) { + $_ngcc_current_state = 31; } else { - $_ngcc_current_state = 29; + $_ngcc_current_state = 25; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; + case 9: + { + $_ngcc_current_state = 8; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; case 16: { action4(); @@ -571,38 +584,25 @@ class attributeUses extends NGCCHandler { $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 19: + case 5: { - $_ngcc_current_state = 18; + $_ngcc_current_state = 1; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 17: + case 13: { - if((($__uri.equals("") && $__local.equals("form")) || ($__uri.equals("") && $__local.equals("name")))) { - NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 473, locator,true,defaultValue,fixedValue); - spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("ref"))) { + $_ngcc_current_state = 12; } else { - if(($__uri.equals("") && $__local.equals("ref"))) { - $_ngcc_current_state = 22; - } - else { - unexpectedEnterAttribute($__qname); - } + unexpectedEnterAttribute($__qname); } } break; - case 8: - { - action2(); - $_ngcc_current_state = 7; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 1: + case 19: { - $_ngcc_current_state = 0; + $_ngcc_current_state = 18; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; @@ -625,9 +625,16 @@ class attributeUses extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 29: + case 1: { - $_ngcc_current_state = 25; + $_ngcc_current_state = 0; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 8: + { + action2(); + $_ngcc_current_state = 7; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; @@ -641,22 +648,14 @@ class attributeUses extends NGCCHandler { } } break; - case 9: - { - $_ngcc_current_state = 8; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 25: - { - $_ngcc_current_state = 17; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 5: + case 26: { - $_ngcc_current_state = 1; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("fixed"))) { + $_ngcc_current_state = 17; + } + else { + unexpectedLeaveAttribute($__qname); + } } break; case 11: @@ -675,65 +674,66 @@ class attributeUses extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 16: - { - action4(); - $_ngcc_current_state = 15; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 26: + case 21: { - if(($__uri.equals("") && $__local.equals("fixed"))) { - $_ngcc_current_state = 17; + if(($__uri.equals("") && $__local.equals("ref"))) { + $_ngcc_current_state = 19; } else { unexpectedLeaveAttribute($__qname); } } break; - case 19: + case 25: { - $_ngcc_current_state = 18; + $_ngcc_current_state = 17; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 21: + case 30: { - if(($__uri.equals("") && $__local.equals("ref"))) { - $_ngcc_current_state = 19; + if(($__uri.equals("") && $__local.equals("default"))) { + $_ngcc_current_state = 25; } else { unexpectedLeaveAttribute($__qname); } } break; - case 8: + case 29: { - action2(); - $_ngcc_current_state = 7; + $_ngcc_current_state = 25; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 1: + case 9: { - $_ngcc_current_state = 0; + $_ngcc_current_state = 8; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 0: + case 16: { - revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); + action4(); + $_ngcc_current_state = 15; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 30: + case 5: { - if(($__uri.equals("") && $__local.equals("default"))) { - $_ngcc_current_state = 25; - } - else { - unexpectedLeaveAttribute($__qname); - } + $_ngcc_current_state = 1; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 19: + { + $_ngcc_current_state = 18; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 0: + { + revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; default: @@ -747,62 +747,69 @@ class attributeUses extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 29: + case 31: { - if(($ai = $runtime.getAttributeIndex("","default"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } - else { - $_ngcc_current_state = 25; - $runtime.sendText(super._cookie, $value); - } + defaultValue = $value; + $_ngcc_current_state = 30; + } + break; + case 1: + { + $_ngcc_current_state = 0; + $runtime.sendText(super._cookie, $value); + } + break; + case 8: + { + action2(); + $_ngcc_current_state = 7; + $runtime.sendText(super._cookie, $value); } break; case 3: { - if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { - NGCCHandler h = new wildcardBody(this, super._source, $runtime, 448, wloc); + if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) { + NGCCHandler h = new wildcardBody(this, super._source, $runtime, 290, wloc); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) { - NGCCHandler h = new wildcardBody(this, super._source, $runtime, 448, wloc); + if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { + NGCCHandler h = new wildcardBody(this, super._source, $runtime, 290, wloc); spawnChildFromText(h, $value); } } } break; - case 27: - { - fixedValue = $value; - $_ngcc_current_state = 26; - } - break; - case 12: + case 17: { - NGCCHandler h = new qname(this, super._source, $runtime, 458); - spawnChildFromText(h, $value); + if(($ai = $runtime.getAttributeIndex("","form"))>=0) { + NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 315, locator,true,defaultValue,fixedValue); + spawnChildFromText(h, $value); + } + else { + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 315, locator,true,defaultValue,fixedValue); + spawnChildFromText(h, $value); + } + else { + if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } + } + } } break; - case 13: + case 33: { - if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { + if(($ai = $runtime.getAttributeIndex("","use"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } - } - break; - case 31: - { - defaultValue = $value; - $_ngcc_current_state = 30; - } - break; - case 9: - { - $_ngcc_current_state = 8; - $runtime.sendText(super._cookie, $value); + else { + $_ngcc_current_state = 29; + $runtime.sendText(super._cookie, $value); + } } break; case 25: @@ -817,80 +824,73 @@ class attributeUses extends NGCCHandler { } } break; - case 5: + case 22: { - $_ngcc_current_state = 1; - $runtime.sendText(super._cookie, $value); + NGCCHandler h = new qname(this, super._source, $runtime, 311); + spawnChildFromText(h, $value); } break; - case 33: + case 29: { - if(($ai = $runtime.getAttributeIndex("","use"))>=0) { + if(($ai = $runtime.getAttributeIndex("","default"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 29; + $_ngcc_current_state = 25; $runtime.sendText(super._cookie, $value); } } break; - case 16: + case 12: { - action4(); - $_ngcc_current_state = 15; - $runtime.sendText(super._cookie, $value); + NGCCHandler h = new qname(this, super._source, $runtime, 300); + spawnChildFromText(h, $value); } break; - case 19: + case 35: { - $_ngcc_current_state = 18; - $runtime.sendText(super._cookie, $value); + use = $value; + $_ngcc_current_state = 34; } break; - case 17: + case 27: { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 473, locator,true,defaultValue,fixedValue); - spawnChildFromText(h, $value); - } - else { - if(($ai = $runtime.getAttributeIndex("","form"))>=0) { - NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 473, locator,true,defaultValue,fixedValue); - spawnChildFromText(h, $value); - } - else { - if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } - } - } + fixedValue = $value; + $_ngcc_current_state = 26; } break; - case 8: + case 9: { - action2(); - $_ngcc_current_state = 7; + $_ngcc_current_state = 8; $runtime.sendText(super._cookie, $value); } break; - case 1: + case 16: { - $_ngcc_current_state = 0; + action4(); + $_ngcc_current_state = 15; $runtime.sendText(super._cookie, $value); } break; - case 22: + case 5: { - NGCCHandler h = new qname(this, super._source, $runtime, 469); - spawnChildFromText(h, $value); + $_ngcc_current_state = 1; + $runtime.sendText(super._cookie, $value); } break; - case 35: + case 13: { - use = $value; - $_ngcc_current_state = 34; + if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } + } + break; + case 19: + { + $_ngcc_current_state = 18; + $runtime.sendText(super._cookie, $value); } break; case 0: @@ -903,50 +903,50 @@ class attributeUses extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 448: + case 300: { - wildcard = ((WildcardImpl)$__result__); - action0(); - $_ngcc_current_state = 2; - } - break; - case 466: - { - annotation = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 18; + groupName = ((UName)$__result__); + $_ngcc_current_state = 11; } break; - case 473: + case 297: { - anonymousDecl = ((AttributeDeclImpl)$__result__); - action6(); - $_ngcc_current_state = 16; + $_ngcc_current_state = 8; } break; - case 464: + case 306: { fa = ((ForeignAttributesImpl)$__result__); $_ngcc_current_state = 16; } break; - case 458: + case 290: { - groupName = ((UName)$__result__); - $_ngcc_current_state = 11; + wildcard = ((WildcardImpl)$__result__); + action0(); + $_ngcc_current_state = 2; } break; - case 455: + case 315: { - $_ngcc_current_state = 8; + anonymousDecl = ((AttributeDeclImpl)$__result__); + action6(); + $_ngcc_current_state = 16; } break; - case 469: + case 311: { attDeclName = ((UName)$__result__); action5(); $_ngcc_current_state = 21; } break; + case 308: + { + annotation = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 18; + } + break; } } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java index ec0ee2ff..c9eae4e6 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java @@ -189,26 +189,14 @@ class complexType extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 65: + case 54: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 81, null,AnnotationContext.COMPLEXTYPE_DECL); + NGCCHandler h = new annotation(this, super._source, $runtime, 617, annotation,AnnotationContext.COMPLEXTYPE_DECL); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 2; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - } - break; - case 29: - { - if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - else { - $_ngcc_current_state = 28; + $_ngcc_current_state = 52; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } @@ -225,76 +213,64 @@ class complexType extends NGCCHandler { } } break; - case 88: + case 49: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action16(); - $_ngcc_current_state = 84; + if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) { + NGCCHandler h = new facet(this, super._source, $runtime, 610); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 48; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 2: + case 7: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent"))) { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - $_ngcc_current_state = 63; + action7(); + $_ngcc_current_state = 24; } else { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent"))) { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) { $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - $_ngcc_current_state = 29; + action4(); + $_ngcc_current_state = 15; } else { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))))))) { - action1(); - NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 4, result); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - unexpectedEnterElement($__qname); - } + unexpectedEnterElement($__qname); } } } break; - case 47: + case 61: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))) { - NGCCHandler h = new attributeUses(this, super._source, $runtime, 53, result); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 626, annotation,AnnotationContext.COMPLEXTYPE_DECL); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 35; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 38: - { - action8(); - $_ngcc_current_state = 37; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; - case 49: + case 18: { - if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) { - NGCCHandler h = new facet(this, super._source, $runtime, 57); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))))))) { + NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 571, result); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 48; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; - case 18: + case 12: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))))))) { - NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 18, result); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")))))))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 564, fa); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -302,87 +278,83 @@ class complexType extends NGCCHandler { } } break; - case 51: - { - action13(); - $_ngcc_current_state = 49; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; - case 54: + case 26: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 64, annotation,AnnotationContext.COMPLEXTYPE_DECL); + NGCCHandler h = new annotation(this, super._source, $runtime, 582, annotation,AnnotationContext.COMPLEXTYPE_DECL); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 52; + $_ngcc_current_state = 7; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 68: + case 38: { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - else { - $_ngcc_current_state = 67; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } + action8(); + $_ngcc_current_state = 37; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } break; - case 56: + case 44: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern"))))))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 66, fa); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($ai = $runtime.getAttributeIndex("","base"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { unexpectedEnterElement($__qname); } } break; - case 84: + case 68: { - if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 80; + $_ngcc_current_state = 67; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 52: + case 35: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { - NGCCHandler h = new simpleType(this, super._source, $runtime, 61); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + action15(); + $_ngcc_current_state = 59; } else { - $_ngcc_current_state = 51; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + action10(); + $_ngcc_current_state = 44; + } + else { + unexpectedEnterElement($__qname); + } } } break; - case 12: + case 80: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")))))))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 11, fa); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($ai = $runtime.getAttributeIndex("","block"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 76; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 41: + case 63: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 46, fa); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 628, fa); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -390,39 +362,34 @@ class complexType extends NGCCHandler { } } break; - case 10: + case 88: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 9, annotation,AnnotationContext.COMPLEXTYPE_DECL); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + action16(); + $_ngcc_current_state = 84; } else { - $_ngcc_current_state = 9; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; - case 0: - { - revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; - case 80: + case 84: { - if(($ai = $runtime.getAttributeIndex("","block"))>=0) { + if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 76; + $_ngcc_current_state = 80; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 28: + case 37: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 31, fa); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) { + NGCCHandler h = new attributeUses(this, super._source, $runtime, 594, result); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -430,30 +397,30 @@ class complexType extends NGCCHandler { } } break; - case 72: + case 9: { - if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))))))) { + NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 560, result); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 68; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; - case 63: + case 19: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 75, fa); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 573, annotation,AnnotationContext.COMPLEXTYPE_DECL); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 18; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 59: + case 15: { if(($ai = $runtime.getAttributeIndex("","base"))>=0) { $runtime.consumeAttribute($ai); @@ -464,31 +431,31 @@ class complexType extends NGCCHandler { } } break; - case 19: + case 48: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 20, annotation,AnnotationContext.COMPLEXTYPE_DECL); + if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) { + NGCCHandler h = new facet(this, super._source, $runtime, 609); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 18; + action11(); + $_ngcc_current_state = 47; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 39: + case 47: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 44, annotation,AnnotationContext.COMPLEXTYPE_DECL); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) { + NGCCHandler h = new attributeUses(this, super._source, $runtime, 606, result); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 38; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; - case 44: + case 24: { if(($ai = $runtime.getAttributeIndex("","base"))>=0) { $runtime.consumeAttribute($ai); @@ -499,10 +466,10 @@ class complexType extends NGCCHandler { } } break; - case 21: + case 28: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")))))))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 22, fa); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 584, fa); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -510,47 +477,45 @@ class complexType extends NGCCHandler { } } break; - case 48: + case 29: { - if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) { - NGCCHandler h = new facet(this, super._source, $runtime, 56); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - action11(); - $_ngcc_current_state = 47; + $_ngcc_current_state = 28; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 61: + case 67: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 73, annotation,AnnotationContext.COMPLEXTYPE_DECL); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")))))))))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 636, fa); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 35; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; - case 26: + case 10: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 29, annotation,AnnotationContext.COMPLEXTYPE_DECL); + NGCCHandler h = new annotation(this, super._source, $runtime, 562, annotation,AnnotationContext.COMPLEXTYPE_DECL); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 7; + $_ngcc_current_state = 9; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 37: + case 41: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))) { - NGCCHandler h = new attributeUses(this, super._source, $runtime, 41, result); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 599, fa); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -558,10 +523,34 @@ class complexType extends NGCCHandler { } } break; - case 67: + case 2: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent")))))))))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 83, fa); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + $_ngcc_current_state = 63; + } + else { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + $_ngcc_current_state = 29; + } + else { + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))))))) { + action1(); + NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 557, result); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + unexpectedEnterElement($__qname); + } + } + } + } + break; + case 21: + { + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")))))))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 575, fa); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -569,29 +558,22 @@ class complexType extends NGCCHandler { } } break; - case 7: + case 72: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action7(); - $_ngcc_current_state = 24; + if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action4(); - $_ngcc_current_state = 15; - } - else { - unexpectedEnterElement($__qname); - } + $_ngcc_current_state = 68; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 9: + case 56: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))))))) { - NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 7, result); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || ((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")))))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 619, fa); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -599,26 +581,19 @@ class complexType extends NGCCHandler { } } break; - case 35: + case 39: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action15(); - $_ngcc_current_state = 59; + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 597, annotation,AnnotationContext.COMPLEXTYPE_DECL); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action10(); - $_ngcc_current_state = 44; - } - else { - unexpectedEnterElement($__qname); - } + $_ngcc_current_state = 38; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 24: + case 59: { if(($ai = $runtime.getAttributeIndex("","base"))>=0) { $runtime.consumeAttribute($ai); @@ -629,14 +604,39 @@ class complexType extends NGCCHandler { } } break; - case 15: + case 52: { - if(($ai = $runtime.getAttributeIndex("","base"))>=0) { - $runtime.consumeAttribute($ai); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { + NGCCHandler h = new simpleType(this, super._source, $runtime, 614); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 51; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } + } + break; + case 0: + { + revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 51: + { + action13(); + $_ngcc_current_state = 49; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 65: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 634, null,AnnotationContext.COMPLEXTYPE_DECL); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 2; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; @@ -654,27 +654,33 @@ class complexType extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 65: + case 54: { - $_ngcc_current_state = 2; + $_ngcc_current_state = 52; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 29: + case 76: { - if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) { + if(($ai = $runtime.getAttributeIndex("","final"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 28; + $_ngcc_current_state = 72; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 34: + case 49: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent"))) { + $_ngcc_current_state = 48; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; + case 6: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent"))) { $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); $_ngcc_current_state = 1; } @@ -683,33 +689,26 @@ class complexType extends NGCCHandler { } } break; - case 76: + case 61: { - if(($ai = $runtime.getAttributeIndex("","final"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - else { - $_ngcc_current_state = 72; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } + $_ngcc_current_state = 35; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 2: + case 46: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) { - action1(); - NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 4, result); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 34; } else { unexpectedLeaveElement($__qname); } } break; - case 46: + case 36: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) { $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); $_ngcc_current_state = 34; } @@ -718,10 +717,10 @@ class complexType extends NGCCHandler { } } break; - case 47: + case 18: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { - NGCCHandler h = new attributeUses(this, super._source, $runtime, 53, result); + NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 571, result); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -729,41 +728,50 @@ class complexType extends NGCCHandler { } } break; - case 38: + case 12: { - action8(); - $_ngcc_current_state = 37; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 564, fa); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + } + else { + unexpectedLeaveElement($__qname); + } } break; - case 49: + case 26: { - $_ngcc_current_state = 48; + $_ngcc_current_state = 7; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 18: + case 34: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { - NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 18, result); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent"))) { + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 1; } else { unexpectedLeaveElement($__qname); } } break; - case 51: + case 38: { - action13(); - $_ngcc_current_state = 49; + action8(); + $_ngcc_current_state = 37; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 54: + case 44: { - $_ngcc_current_state = 52; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + if(($ai = $runtime.getAttributeIndex("","base"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + else { + unexpectedLeaveElement($__qname); + } } break; case 68: @@ -778,39 +786,33 @@ class complexType extends NGCCHandler { } } break; - case 56: + case 1: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 66, fa); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) { + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 0; } else { unexpectedLeaveElement($__qname); } } break; - case 84: + case 80: { - if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { + if(($ai = $runtime.getAttributeIndex("","block"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 80; + $_ngcc_current_state = 76; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 52: - { - $_ngcc_current_state = 51; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 12: + case 37: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 11, fa); + NGCCHandler h = new attributeUses(this, super._source, $runtime, 594, result); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -818,123 +820,102 @@ class complexType extends NGCCHandler { } } break; - case 41: + case 84: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 46, fa); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - unexpectedLeaveElement($__qname); + $_ngcc_current_state = 80; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 36: + case 9: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 34; + NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 560, result); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); } } break; - case 10: + case 19: { - $_ngcc_current_state = 9; + $_ngcc_current_state = 18; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 0: - { - revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); - } - break; - case 80: + case 15: { - if(($ai = $runtime.getAttributeIndex("","block"))>=0) { + if(($ai = $runtime.getAttributeIndex("","base"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 76; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + unexpectedLeaveElement($__qname); } } break; - case 72: + case 48: { - if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - else { - $_ngcc_current_state = 68; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } + action11(); + $_ngcc_current_state = 47; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 59: + case 47: { - if(($ai = $runtime.getAttributeIndex("","base"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { + NGCCHandler h = new attributeUses(this, super._source, $runtime, 606, result); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); } } break; - case 6: + case 8: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent"))) { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) { $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 1; + $_ngcc_current_state = 6; } else { unexpectedLeaveElement($__qname); } } break; - case 1: + case 24: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 0; + if(($ai = $runtime.getAttributeIndex("","base"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); } } break; - case 19: - { - $_ngcc_current_state = 18; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 39: - { - $_ngcc_current_state = 38; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 44: + case 29: { - if(($ai = $runtime.getAttributeIndex("","base"))>=0) { + if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - unexpectedLeaveElement($__qname); + $_ngcc_current_state = 28; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 21: + case 67: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 22, fa); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 636, fa); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -942,29 +923,16 @@ class complexType extends NGCCHandler { } } break; - case 48: - { - action11(); - $_ngcc_current_state = 47; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 61: - { - $_ngcc_current_state = 35; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 26: + case 10: { - $_ngcc_current_state = 7; + $_ngcc_current_state = 9; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 37: + case 41: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) { - NGCCHandler h = new attributeUses(this, super._source, $runtime, 41, result); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 599, fa); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -972,10 +940,11 @@ class complexType extends NGCCHandler { } } break; - case 67: + case 2: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 83, fa); + action1(); + NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 557, result); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -983,32 +952,33 @@ class complexType extends NGCCHandler { } } break; - case 17: + case 21: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 6; + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 575, fa); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); } } break; - case 8: + case 72: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 6; + if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - unexpectedLeaveElement($__qname); + $_ngcc_current_state = 68; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 9: + case 56: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) { - NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 7, result); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 619, fa); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -1016,7 +986,13 @@ class complexType extends NGCCHandler { } } break; - case 24: + case 39: + { + $_ngcc_current_state = 38; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; + case 59: { if(($ai = $runtime.getAttributeIndex("","base"))>=0) { $runtime.consumeAttribute($ai); @@ -1027,17 +1003,41 @@ class complexType extends NGCCHandler { } } break; - case 15: + case 52: { - if(($ai = $runtime.getAttributeIndex("","base"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 51; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; + case 17: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 6; } else { unexpectedLeaveElement($__qname); } } break; + case 0: + { + revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); + } + break; + case 51: + { + action13(); + $_ngcc_current_state = 49; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; + case 65: + { + $_ngcc_current_state = 2; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; default: { unexpectedLeaveElement($__qname); @@ -1052,23 +1052,6 @@ class complexType extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 65: - { - $_ngcc_current_state = 2; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 72: - { - if(($__uri.equals("") && $__local.equals("mixed"))) { - $_ngcc_current_state = 74; - } - else { - $_ngcc_current_state = 68; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - } - break; case 29: { if(($__uri.equals("") && $__local.equals("mixed"))) { @@ -1080,6 +1063,18 @@ class complexType extends NGCCHandler { } } break; + case 54: + { + $_ngcc_current_state = 52; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 10: + { + $_ngcc_current_state = 9; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; case 76: { if(($__uri.equals("") && $__local.equals("final"))) { @@ -1091,33 +1086,27 @@ class complexType extends NGCCHandler { } } break; - case 59: - { - if(($__uri.equals("") && $__local.equals("base"))) { - $_ngcc_current_state = 58; - } - else { - unexpectedEnterAttribute($__qname); - } - } - break; - case 19: + case 49: { - $_ngcc_current_state = 18; + $_ngcc_current_state = 48; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 49: + case 61: { - $_ngcc_current_state = 48; + $_ngcc_current_state = 35; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 38: + case 72: { - action8(); - $_ngcc_current_state = 37; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("mixed"))) { + $_ngcc_current_state = 74; + } + else { + $_ngcc_current_state = 68; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } } break; case 39: @@ -1126,66 +1115,46 @@ class complexType extends NGCCHandler { $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 44: + case 59: { if(($__uri.equals("") && $__local.equals("base"))) { - $_ngcc_current_state = 43; + $_ngcc_current_state = 58; } else { unexpectedEnterAttribute($__qname); } } break; - case 48: - { - action11(); - $_ngcc_current_state = 47; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 61: - { - $_ngcc_current_state = 35; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 51: - { - action13(); - $_ngcc_current_state = 49; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; case 26: { $_ngcc_current_state = 7; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 54: + case 38: { - $_ngcc_current_state = 52; + action8(); + $_ngcc_current_state = 37; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 68: + case 44: { - if(($__uri.equals("") && $__local.equals("name"))) { - $_ngcc_current_state = 70; + if(($__uri.equals("") && $__local.equals("base"))) { + $_ngcc_current_state = 43; } else { - $_ngcc_current_state = 67; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + unexpectedEnterAttribute($__qname); } } break; - case 84: + case 68: { - if(($__uri.equals("") && $__local.equals("abstract"))) { - $_ngcc_current_state = 86; + if(($__uri.equals("") && $__local.equals("name"))) { + $_ngcc_current_state = 70; } else { - $_ngcc_current_state = 80; + $_ngcc_current_state = 67; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } @@ -1196,15 +1165,16 @@ class complexType extends NGCCHandler { $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 10: + case 0: { - $_ngcc_current_state = 9; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); } break; - case 0: + case 51: { - revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); + action13(); + $_ngcc_current_state = 49; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; case 80: @@ -1218,16 +1188,23 @@ class complexType extends NGCCHandler { } } break; - case 24: + case 84: { - if(($__uri.equals("") && $__local.equals("base"))) { - $_ngcc_current_state = 23; + if(($__uri.equals("") && $__local.equals("abstract"))) { + $_ngcc_current_state = 86; } else { - unexpectedEnterAttribute($__qname); + $_ngcc_current_state = 80; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; + case 19: + { + $_ngcc_current_state = 18; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; case 15: { if(($__uri.equals("") && $__local.equals("base"))) { @@ -1238,6 +1215,29 @@ class complexType extends NGCCHandler { } } break; + case 65: + { + $_ngcc_current_state = 2; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 48: + { + action11(); + $_ngcc_current_state = 47; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 24: + { + if(($__uri.equals("") && $__local.equals("base"))) { + $_ngcc_current_state = 23; + } + else { + unexpectedEnterAttribute($__qname); + } + } + break; default: { unexpectedEnterAttribute($__qname); @@ -1252,25 +1252,9 @@ class complexType extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 22: - { - if(($__uri.equals("") && $__local.equals("base"))) { - $_ngcc_current_state = 21; - } - else { - unexpectedLeaveAttribute($__qname); - } - } - break; - case 65: - { - $_ngcc_current_state = 2; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 29: + case 54: { - $_ngcc_current_state = 28; + $_ngcc_current_state = 52; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; @@ -1280,49 +1264,48 @@ class complexType extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 38: - { - action8(); - $_ngcc_current_state = 37; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; case 49: { $_ngcc_current_state = 48; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 85: + case 30: { - if(($__uri.equals("") && $__local.equals("abstract"))) { - $_ngcc_current_state = 80; + if(($__uri.equals("") && $__local.equals("mixed"))) { + $_ngcc_current_state = 28; } else { unexpectedLeaveAttribute($__qname); } } break; - case 13: + case 73: { - if(($__uri.equals("") && $__local.equals("base"))) { - $_ngcc_current_state = 12; + if(($__uri.equals("") && $__local.equals("mixed"))) { + $_ngcc_current_state = 68; } else { unexpectedLeaveAttribute($__qname); } } break; - case 51: + case 61: { - action13(); - $_ngcc_current_state = 49; + $_ngcc_current_state = 35; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 54: + case 26: { - $_ngcc_current_state = 52; + $_ngcc_current_state = 7; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 38: + { + action8(); + $_ngcc_current_state = 37; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; @@ -1332,59 +1315,67 @@ class complexType extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 84: + case 13: { - $_ngcc_current_state = 80; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("base"))) { + $_ngcc_current_state = 12; + } + else { + unexpectedLeaveAttribute($__qname); + } } break; - case 30: + case 85: { - if(($__uri.equals("") && $__local.equals("mixed"))) { - $_ngcc_current_state = 28; + if(($__uri.equals("") && $__local.equals("abstract"))) { + $_ngcc_current_state = 80; } else { unexpectedLeaveAttribute($__qname); } } break; - case 52: + case 80: { - $_ngcc_current_state = 51; + $_ngcc_current_state = 76; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 10: + case 84: { - $_ngcc_current_state = 9; + $_ngcc_current_state = 80; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 0: + case 19: { - revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 18; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 80: + case 48: { - $_ngcc_current_state = 76; + action11(); + $_ngcc_current_state = 47; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 57: + case 29: { - if(($__uri.equals("") && $__local.equals("base"))) { - $_ngcc_current_state = 56; - } - else { - unexpectedLeaveAttribute($__qname); - } + $_ngcc_current_state = 28; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 81: + case 10: { - if(($__uri.equals("") && $__local.equals("block"))) { - $_ngcc_current_state = 76; + $_ngcc_current_state = 9; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 77: + { + if(($__uri.equals("") && $__local.equals("final"))) { + $_ngcc_current_state = 72; } else { unexpectedLeaveAttribute($__qname); @@ -1397,10 +1388,14 @@ class complexType extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 19: + case 69: { - $_ngcc_current_state = 18; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("name"))) { + $_ngcc_current_state = 67; + } + else { + unexpectedLeaveAttribute($__qname); + } } break; case 39: @@ -1409,63 +1404,68 @@ class complexType extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 42: + case 22: { if(($__uri.equals("") && $__local.equals("base"))) { - $_ngcc_current_state = 41; + $_ngcc_current_state = 21; } else { unexpectedLeaveAttribute($__qname); } } break; - case 77: + case 81: { - if(($__uri.equals("") && $__local.equals("final"))) { - $_ngcc_current_state = 72; + if(($__uri.equals("") && $__local.equals("block"))) { + $_ngcc_current_state = 76; } else { unexpectedLeaveAttribute($__qname); } } break; - case 48: + case 42: { - action11(); - $_ngcc_current_state = 47; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("base"))) { + $_ngcc_current_state = 41; + } + else { + unexpectedLeaveAttribute($__qname); + } } break; - case 61: + case 52: { - $_ngcc_current_state = 35; + $_ngcc_current_state = 51; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 26: + case 0: { - $_ngcc_current_state = 7; + revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); + } + break; + case 51: + { + action13(); + $_ngcc_current_state = 49; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 69: + case 57: { - if(($__uri.equals("") && $__local.equals("name"))) { - $_ngcc_current_state = 67; + if(($__uri.equals("") && $__local.equals("base"))) { + $_ngcc_current_state = 56; } else { unexpectedLeaveAttribute($__qname); } } break; - case 73: + case 65: { - if(($__uri.equals("") && $__local.equals("mixed"))) { - $_ngcc_current_state = 68; - } - else { - unexpectedLeaveAttribute($__qname); - } + $_ngcc_current_state = 2; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; default: @@ -1479,22 +1479,22 @@ class complexType extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 65: + case 58: { - $_ngcc_current_state = 2; + NGCCHandler h = new qname(this, super._source, $runtime, 621); + spawnChildFromText(h, $value); + } + break; + case 54: + { + $_ngcc_current_state = 52; $runtime.sendText(super._cookie, $value); } break; - case 29: + case 31: { - if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } - else { - $_ngcc_current_state = 28; - $runtime.sendText(super._cookie, $value); - } + mixedValue = $value; + $_ngcc_current_state = 30; } break; case 76: @@ -1509,42 +1509,37 @@ class complexType extends NGCCHandler { } } break; - case 23: - { - NGCCHandler h = new qname(this, super._source, $runtime, 24); - spawnChildFromText(h, $value); - } - break; - case 38: + case 49: { - action8(); - $_ngcc_current_state = 37; + $_ngcc_current_state = 48; $runtime.sendText(super._cookie, $value); } break; - case 49: + case 61: { - $_ngcc_current_state = 48; + $_ngcc_current_state = 35; $runtime.sendText(super._cookie, $value); } break; - case 43: + case 26: { - NGCCHandler h = new qname(this, super._source, $runtime, 48); - spawnChildFromText(h, $value); + $_ngcc_current_state = 7; + $runtime.sendText(super._cookie, $value); } break; - case 51: + case 38: { - action13(); - $_ngcc_current_state = 49; + action8(); + $_ngcc_current_state = 37; $runtime.sendText(super._cookie, $value); } break; - case 54: + case 44: { - $_ngcc_current_state = 52; - $runtime.sendText(super._cookie, $value); + if(($ai = $runtime.getAttributeIndex("","base"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } } break; case 68: @@ -1559,95 +1554,99 @@ class complexType extends NGCCHandler { } } break; - case 84: + case 80: { - if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { + if(($ai = $runtime.getAttributeIndex("","block"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 80; + $_ngcc_current_state = 76; $runtime.sendText(super._cookie, $value); } } break; - case 52: + case 84: { - $_ngcc_current_state = 51; - $runtime.sendText(super._cookie, $value); + if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } + else { + $_ngcc_current_state = 80; + $runtime.sendText(super._cookie, $value); + } } break; - case 10: + case 19: { - $_ngcc_current_state = 9; + $_ngcc_current_state = 18; $runtime.sendText(super._cookie, $value); } break; - case 0: - { - revertToParentFromText(result, super._cookie, $value); - } - break; - case 80: + case 15: { - if(($ai = $runtime.getAttributeIndex("","block"))>=0) { + if(($ai = $runtime.getAttributeIndex("","base"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } - else { - $_ngcc_current_state = 76; - $runtime.sendText(super._cookie, $value); - } } break; - case 58: + case 86: { - NGCCHandler h = new qname(this, super._source, $runtime, 68); - spawnChildFromText(h, $value); + abstractValue = $value; + $_ngcc_current_state = 85; } break; - case 31: + case 48: { - mixedValue = $value; - $_ngcc_current_state = 30; + action11(); + $_ngcc_current_state = 47; + $runtime.sendText(super._cookie, $value); } break; - case 72: + case 24: + { + if(($ai = $runtime.getAttributeIndex("","base"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } + } + break; + case 29: { if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 68; + $_ngcc_current_state = 28; $runtime.sendText(super._cookie, $value); } } break; - case 70: - { - name = $value; - $_ngcc_current_state = 69; - } - break; - case 86: + case 10: { - abstractValue = $value; - $_ngcc_current_state = 85; + $_ngcc_current_state = 9; + $runtime.sendText(super._cookie, $value); } break; - case 59: + case 72: { - if(($ai = $runtime.getAttributeIndex("","base"))>=0) { + if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } + else { + $_ngcc_current_state = 68; + $runtime.sendText(super._cookie, $value); + } } break; - case 19: + case 43: { - $_ngcc_current_state = 18; - $runtime.sendText(super._cookie, $value); + NGCCHandler h = new qname(this, super._source, $runtime, 601); + spawnChildFromText(h, $value); } break; case 39: @@ -1656,7 +1655,7 @@ class complexType extends NGCCHandler { $runtime.sendText(super._cookie, $value); } break; - case 44: + case 59: { if(($ai = $runtime.getAttributeIndex("","base"))>=0) { $runtime.consumeAttribute($ai); @@ -1664,49 +1663,52 @@ class complexType extends NGCCHandler { } } break; - case 14: + case 23: { - NGCCHandler h = new qname(this, super._source, $runtime, 13); + NGCCHandler h = new qname(this, super._source, $runtime, 577); spawnChildFromText(h, $value); } break; - case 48: + case 52: { - action11(); - $_ngcc_current_state = 47; + $_ngcc_current_state = 51; $runtime.sendText(super._cookie, $value); } break; - case 61: + case 78: { - $_ngcc_current_state = 35; - $runtime.sendText(super._cookie, $value); + NGCCHandler h = new erSet(this, super._source, $runtime, 648); + spawnChildFromText(h, $value); } break; - case 26: + case 70: { - $_ngcc_current_state = 7; - $runtime.sendText(super._cookie, $value); + name = $value; + $_ngcc_current_state = 69; } break; case 82: { - NGCCHandler h = new erSet(this, super._source, $runtime, 100); + NGCCHandler h = new erSet(this, super._source, $runtime, 653); spawnChildFromText(h, $value); } break; - case 78: + case 0: { - NGCCHandler h = new erSet(this, super._source, $runtime, 95); - spawnChildFromText(h, $value); + revertToParentFromText(result, super._cookie, $value); } break; - case 24: + case 51: { - if(($ai = $runtime.getAttributeIndex("","base"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } + action13(); + $_ngcc_current_state = 49; + $runtime.sendText(super._cookie, $value); + } + break; + case 65: + { + $_ngcc_current_state = 2; + $runtime.sendText(super._cookie, $value); } break; case 74: @@ -1715,12 +1717,10 @@ class complexType extends NGCCHandler { $_ngcc_current_state = 73; } break; - case 15: + case 14: { - if(($ai = $runtime.getAttributeIndex("","base"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } + NGCCHandler h = new qname(this, super._source, $runtime, 566); + spawnChildFromText(h, $value); } break; } @@ -1728,179 +1728,179 @@ class complexType extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 53: + case 573: { - $_ngcc_current_state = 46; + annotation = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 18; } break; - case 18: + case 636: { - explicitContent = ((ContentTypeImpl)$__result__); - action5(); - $_ngcc_current_state = 17; + fa = ((ForeignAttributesImpl)$__result__); + $_ngcc_current_state = 65; } break; - case 61: + case 562: { - baseContentType = ((SimpleTypeImpl)$__result__); - $_ngcc_current_state = 51; + annotation = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 9; } break; - case 11: + case 577: { - fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 10; + baseTypeName = ((UName)$__result__); + action6(); + $_ngcc_current_state = 22; } break; - case 9: + case 648: { - annotation = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 9; + finalValue = ((Integer)$__result__); + $_ngcc_current_state = 77; } break; - case 44: + case 614: { - annotation = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 38; + baseContentType = ((SimpleTypeImpl)$__result__); + $_ngcc_current_state = 51; } break; - case 13: + case 653: + { + blockValue = ((Integer)$__result__); + $_ngcc_current_state = 81; + } + break; + case 566: { baseTypeName = ((UName)$__result__); action3(); $_ngcc_current_state = 13; } break; - case 56: + case 621: { - facet = ((XSFacet)$__result__); - action12(); - $_ngcc_current_state = 48; + baseTypeName = ((UName)$__result__); + action14(); + $_ngcc_current_state = 57; } break; - case 29: + case 617: { annotation = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 7; + $_ngcc_current_state = 52; } break; - case 95: + case 610: { - finalValue = ((Integer)$__result__); - $_ngcc_current_state = 77; + facet = ((XSFacet)$__result__); + action12(); + $_ngcc_current_state = 48; } break; - case 83: + case 626: { - fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 65; + annotation = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 35; } break; - case 7: + case 571: { explicitContent = ((ContentTypeImpl)$__result__); - action2(); - $_ngcc_current_state = 8; + action5(); + $_ngcc_current_state = 17; } break; - case 81: + case 564: { - annotation = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 2; + fa = ((ForeignAttributesImpl)$__result__); + $_ngcc_current_state = 10; } break; - case 24: + case 582: { - baseTypeName = ((UName)$__result__); - action6(); - $_ngcc_current_state = 22; + annotation = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 7; } break; - case 4: + case 628: { - explicitContent = ((ContentTypeImpl)$__result__); - action0(); - $_ngcc_current_state = 1; + fa = ((ForeignAttributesImpl)$__result__); + $_ngcc_current_state = 61; } break; - case 57: + case 594: { - facet = ((XSFacet)$__result__); - action12(); - $_ngcc_current_state = 48; + $_ngcc_current_state = 36; } break; - case 48: + case 560: { - baseTypeName = ((UName)$__result__); - action9(); - $_ngcc_current_state = 42; + explicitContent = ((ContentTypeImpl)$__result__); + action2(); + $_ngcc_current_state = 8; } break; - case 64: + case 606: { - annotation = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 52; + $_ngcc_current_state = 46; } break; - case 66: + case 609: { - fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 54; + facet = ((XSFacet)$__result__); + action12(); + $_ngcc_current_state = 48; } break; - case 46: + case 584: { fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 39; + $_ngcc_current_state = 26; } break; - case 68: + case 599: { - baseTypeName = ((UName)$__result__); - action14(); - $_ngcc_current_state = 57; + fa = ((ForeignAttributesImpl)$__result__); + $_ngcc_current_state = 39; } break; - case 31: + case 557: { - fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 26; + explicitContent = ((ContentTypeImpl)$__result__); + action0(); + $_ngcc_current_state = 1; } break; - case 75: + case 575: { fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 61; + $_ngcc_current_state = 19; } break; - case 20: + case 601: { - annotation = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 18; + baseTypeName = ((UName)$__result__); + action9(); + $_ngcc_current_state = 42; } break; - case 22: + case 619: { fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 19; + $_ngcc_current_state = 54; } break; - case 73: + case 597: { annotation = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 35; - } - break; - case 100: - { - blockValue = ((Integer)$__result__); - $_ngcc_current_state = 81; + $_ngcc_current_state = 38; } break; - case 41: + case 634: { - $_ngcc_current_state = 36; + annotation = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 2; } break; } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java index e7e2e3da..80fe03be 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java @@ -76,27 +76,27 @@ class complexType_complexContent_body extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: - { - revertToParentFromEnterElement(particle, super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; case 1: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))) { - NGCCHandler h = new attributeUses(this, super._source, $runtime, 674, owner); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) { + NGCCHandler h = new attributeUses(this, super._source, $runtime, 1, owner); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - NGCCHandler h = new attributeUses(this, super._source, $runtime, 674, owner); + NGCCHandler h = new attributeUses(this, super._source, $runtime, 1, owner); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } } break; + case 0: + { + revertToParentFromEnterElement(particle, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; case 2: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))) { - NGCCHandler h = new particle(this, super._source, $runtime, 676); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")))))) { + NGCCHandler h = new particle(this, super._source, $runtime, 3); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -119,15 +119,15 @@ class complexType_complexContent_body extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: + case 1: { - revertToParentFromLeaveElement(particle, super._cookie, $__uri, $__local, $__qname); + NGCCHandler h = new attributeUses(this, super._source, $runtime, 1, owner); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } break; - case 1: + case 0: { - NGCCHandler h = new attributeUses(this, super._source, $runtime, 674, owner); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + revertToParentFromLeaveElement(particle, super._cookie, $__uri, $__local, $__qname); } break; case 2: @@ -150,15 +150,15 @@ class complexType_complexContent_body extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: + case 1: { - revertToParentFromEnterAttribute(particle, super._cookie, $__uri, $__local, $__qname); + NGCCHandler h = new attributeUses(this, super._source, $runtime, 1, owner); + spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } break; - case 1: + case 0: { - NGCCHandler h = new attributeUses(this, super._source, $runtime, 674, owner); - spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); + revertToParentFromEnterAttribute(particle, super._cookie, $__uri, $__local, $__qname); } break; case 2: @@ -181,15 +181,15 @@ class complexType_complexContent_body extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: + case 1: { - revertToParentFromLeaveAttribute(particle, super._cookie, $__uri, $__local, $__qname); + NGCCHandler h = new attributeUses(this, super._source, $runtime, 1, owner); + spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname); } break; - case 1: + case 0: { - NGCCHandler h = new attributeUses(this, super._source, $runtime, 674, owner); - spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname); + revertToParentFromLeaveAttribute(particle, super._cookie, $__uri, $__local, $__qname); } break; case 2: @@ -209,15 +209,15 @@ class complexType_complexContent_body extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 0: + case 1: { - revertToParentFromText(particle, super._cookie, $value); + NGCCHandler h = new attributeUses(this, super._source, $runtime, 1, owner); + spawnChildFromText(h, $value); } break; - case 1: + case 0: { - NGCCHandler h = new attributeUses(this, super._source, $runtime, 674, owner); - spawnChildFromText(h, $value); + revertToParentFromText(particle, super._cookie, $value); } break; case 2: @@ -231,13 +231,13 @@ class complexType_complexContent_body extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 674: + case 1: { action0(); $_ngcc_current_state = 0; } break; - case 676: + case 3: { particle = ((ParticleImpl)$__result__); $_ngcc_current_state = 1; diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java index bad2200c..b8f30114 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java @@ -107,51 +107,38 @@ class elementDeclBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 40: + case 17: { - if(($ai = $runtime.getAttributeIndex("","block"))>=0) { + if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 36; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - } - break; - case 1: - { - if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) { - NGCCHandler h = new identityConstraint(this, super._source, $runtime, 112); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - $_ngcc_current_state = 0; + $_ngcc_current_state = 13; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 36: + case 28: { - if(($ai = $runtime.getAttributeIndex("","final"))>=0) { + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 32; + $_ngcc_current_state = 24; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 44: + case 0: { - if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) { + NGCCHandler h = new identityConstraint(this, super._source, $runtime, 6); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 40; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs); } } break; @@ -167,119 +154,132 @@ class elementDeclBody extends NGCCHandler { } } break; - case 23: + case 24: { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + if(($ai = $runtime.getAttributeIndex("","form"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 23; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 3: + case 11: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { - NGCCHandler h = new simpleType(this, super._source, $runtime, 124); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 24, null,AnnotationContext.ELEMENT_DECL); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) { - NGCCHandler h = new complexType(this, super._source, $runtime, 125); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - if(($ai = $runtime.getAttributeIndex("","type"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - else { - $_ngcc_current_state = 1; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - } + $_ngcc_current_state = 3; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 0: + case 23: { - if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) { - NGCCHandler h = new identityConstraint(this, super._source, $runtime, 111); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; - case 13: + case 44: { - if(($ai = $runtime.getAttributeIndex("","substitutionGroup"))>=0) { + if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 11; + $_ngcc_current_state = 40; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 24: + case 40: { - if(($ai = $runtime.getAttributeIndex("","form"))>=0) { + if(($ai = $runtime.getAttributeIndex("","block"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 23; + $_ngcc_current_state = 36; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 17: + case 48: { - if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if(((($ai = $runtime.getAttributeIndex("","default"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))))))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 13; + unexpectedEnterElement($__qname); + } + } + break; + case 1: + { + if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) { + NGCCHandler h = new identityConstraint(this, super._source, $runtime, 7); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 0; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 48: + case 3: { - if(((($ai = $runtime.getAttributeIndex("","final"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($ai = $runtime.getAttributeIndex("","default"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))))))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { + NGCCHandler h = new simpleType(this, super._source, $runtime, 19); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) { + NGCCHandler h = new complexType(this, super._source, $runtime, 20); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + if(($ai = $runtime.getAttributeIndex("","type"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 1; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + } } } break; - case 28: + case 13: { - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + if(($ai = $runtime.getAttributeIndex("","substitutionGroup"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 24; + $_ngcc_current_state = 11; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 11: + case 36: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 129, null,AnnotationContext.ELEMENT_DECL); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($ai = $runtime.getAttributeIndex("","final"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 3; + $_ngcc_current_state = 32; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } @@ -298,60 +298,65 @@ class elementDeclBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 40: + case 17: { - if(($ai = $runtime.getAttributeIndex("","block"))>=0) { + if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 36; + $_ngcc_current_state = 13; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 1: - { - $_ngcc_current_state = 0; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 36: + case 28: { - if(($ai = $runtime.getAttributeIndex("","final"))>=0) { + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 32; + $_ngcc_current_state = 24; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 44: + case 0: { - if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { + revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname); + } + break; + case 32: + { + if(($ai = $runtime.getAttributeIndex("","default"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 40; + $_ngcc_current_state = 28; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 32: + case 24: { - if(($ai = $runtime.getAttributeIndex("","default"))>=0) { + if(($ai = $runtime.getAttributeIndex("","form"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 28; + $_ngcc_current_state = 23; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; + case 11: + { + $_ngcc_current_state = 3; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; case 23: { if(($ai = $runtime.getAttributeIndex("","name"))>=0) { @@ -363,88 +368,83 @@ class elementDeclBody extends NGCCHandler { } } break; - case 3: + case 44: { - if(($ai = $runtime.getAttributeIndex("","type"))>=0) { + if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 40; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 0: - { - revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname); - } - break; - case 13: + case 40: { - if(($ai = $runtime.getAttributeIndex("","substitutionGroup"))>=0) { + if(($ai = $runtime.getAttributeIndex("","block"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 11; + $_ngcc_current_state = 36; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 24: + case 48: { - if(($ai = $runtime.getAttributeIndex("","form"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + if((($ai = $runtime.getAttributeIndex("","default"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","name"))>=0 || ($ai = $runtime.getAttributeIndex("","abstract"))>=0))))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 23; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + unexpectedLeaveElement($__qname); } } break; - case 17: + case 1: { - if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) { + $_ngcc_current_state = 0; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; + case 3: + { + if(($ai = $runtime.getAttributeIndex("","type"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 13; + $_ngcc_current_state = 1; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 48: + case 13: { - if((($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","name"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 || ($ai = $runtime.getAttributeIndex("","default"))>=0))))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + if(($ai = $runtime.getAttributeIndex("","substitutionGroup"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - unexpectedLeaveElement($__qname); + $_ngcc_current_state = 11; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 28: + case 36: { - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + if(($ai = $runtime.getAttributeIndex("","final"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 24; + $_ngcc_current_state = 32; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 11: - { - $_ngcc_current_state = 3; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveElement($__qname); @@ -459,43 +459,31 @@ class elementDeclBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 40: + case 17: { - if(($__uri.equals("") && $__local.equals("block"))) { - $_ngcc_current_state = 42; + if(($__uri.equals("") && $__local.equals("nillable"))) { + $_ngcc_current_state = 19; } else { - $_ngcc_current_state = 36; + $_ngcc_current_state = 13; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; - case 1: - { - $_ngcc_current_state = 0; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 36: + case 28: { - if(($__uri.equals("") && $__local.equals("final"))) { - $_ngcc_current_state = 38; + if(($__uri.equals("") && $__local.equals("fixed"))) { + $_ngcc_current_state = 30; } else { - $_ngcc_current_state = 32; + $_ngcc_current_state = 24; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; - case 44: + case 0: { - if(($__uri.equals("") && $__local.equals("abstract"))) { - $_ngcc_current_state = 46; - } - else { - $_ngcc_current_state = 40; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } + revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); } break; case 32: @@ -509,6 +497,23 @@ class elementDeclBody extends NGCCHandler { } } break; + case 24: + { + if(($__uri.equals("") && $__local.equals("form"))) { + $_ngcc_current_state = 26; + } + else { + $_ngcc_current_state = 23; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + } + break; + case 11: + { + $_ngcc_current_state = 3; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; case 23: { if(($__uri.equals("") && $__local.equals("name"))) { @@ -519,83 +524,78 @@ class elementDeclBody extends NGCCHandler { } } break; - case 3: + case 44: { - if(($__uri.equals("") && $__local.equals("type"))) { - $_ngcc_current_state = 6; + if(($__uri.equals("") && $__local.equals("abstract"))) { + $_ngcc_current_state = 46; } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 40; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; - case 0: - { - revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); - } - break; - case 13: + case 40: { - if(($__uri.equals("") && $__local.equals("substitutionGroup"))) { - $_ngcc_current_state = 15; + if(($__uri.equals("") && $__local.equals("block"))) { + $_ngcc_current_state = 42; } else { - $_ngcc_current_state = 11; + $_ngcc_current_state = 36; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; - case 24: + case 48: { - if(($__uri.equals("") && $__local.equals("form"))) { - $_ngcc_current_state = 26; + if((($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("abstract"))))))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa); + spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 23; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + unexpectedEnterAttribute($__qname); } } break; - case 17: + case 1: { - if(($__uri.equals("") && $__local.equals("nillable"))) { - $_ngcc_current_state = 19; + $_ngcc_current_state = 0; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 3: + { + if(($__uri.equals("") && $__local.equals("type"))) { + $_ngcc_current_state = 6; } else { - $_ngcc_current_state = 13; + $_ngcc_current_state = 1; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; - case 48: + case 13: { - if((($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("name")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("abstract")) || ($__uri.equals("") && $__local.equals("default"))))))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa); - spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("substitutionGroup"))) { + $_ngcc_current_state = 15; } else { - unexpectedEnterAttribute($__qname); + $_ngcc_current_state = 11; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; - case 28: + case 36: { - if(($__uri.equals("") && $__local.equals("fixed"))) { - $_ngcc_current_state = 30; + if(($__uri.equals("") && $__local.equals("final"))) { + $_ngcc_current_state = 38; } else { - $_ngcc_current_state = 24; + $_ngcc_current_state = 32; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; - case 11: - { - $_ngcc_current_state = 3; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedEnterAttribute($__qname); @@ -610,172 +610,172 @@ class elementDeclBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 40: - { - $_ngcc_current_state = 36; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 14: + case 21: { - if(($__uri.equals("") && $__local.equals("substitutionGroup"))) { - $_ngcc_current_state = 11; + if(($__uri.equals("") && $__local.equals("name"))) { + $_ngcc_current_state = 17; } else { unexpectedLeaveAttribute($__qname); } } break; - case 37: + case 17: { - if(($__uri.equals("") && $__local.equals("final"))) { - $_ngcc_current_state = 32; + $_ngcc_current_state = 13; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 18: + { + if(($__uri.equals("") && $__local.equals("nillable"))) { + $_ngcc_current_state = 13; } else { unexpectedLeaveAttribute($__qname); } } break; - case 1: - { - $_ngcc_current_state = 0; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 33: + case 25: { - if(($__uri.equals("") && $__local.equals("default"))) { - $_ngcc_current_state = 28; + if(($__uri.equals("") && $__local.equals("form"))) { + $_ngcc_current_state = 23; } else { unexpectedLeaveAttribute($__qname); } } break; - case 21: + case 41: { - if(($__uri.equals("") && $__local.equals("name"))) { - $_ngcc_current_state = 17; + if(($__uri.equals("") && $__local.equals("block"))) { + $_ngcc_current_state = 36; } else { unexpectedLeaveAttribute($__qname); } } break; - case 36: + case 28: { - $_ngcc_current_state = 32; + $_ngcc_current_state = 24; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 44: + case 32: { - $_ngcc_current_state = 40; + $_ngcc_current_state = 28; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 41: + case 0: { - if(($__uri.equals("") && $__local.equals("block"))) { - $_ngcc_current_state = 36; - } - else { - unexpectedLeaveAttribute($__qname); - } + revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); } break; - case 3: + case 24: { - $_ngcc_current_state = 1; + $_ngcc_current_state = 23; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 32: + case 11: { - $_ngcc_current_state = 28; + $_ngcc_current_state = 3; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 29: + case 33: { - if(($__uri.equals("") && $__local.equals("fixed"))) { - $_ngcc_current_state = 24; + if(($__uri.equals("") && $__local.equals("default"))) { + $_ngcc_current_state = 28; } else { unexpectedLeaveAttribute($__qname); } } break; - case 18: + case 37: { - if(($__uri.equals("") && $__local.equals("nillable"))) { - $_ngcc_current_state = 13; + if(($__uri.equals("") && $__local.equals("final"))) { + $_ngcc_current_state = 32; } else { unexpectedLeaveAttribute($__qname); } } break; - case 0: + case 44: { - revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 40; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 5: + case 14: { - if(($__uri.equals("") && $__local.equals("type"))) { - $_ngcc_current_state = 1; - action1(); + if(($__uri.equals("") && $__local.equals("substitutionGroup"))) { + $_ngcc_current_state = 11; } else { unexpectedLeaveAttribute($__qname); } } break; - case 13: + case 40: { - $_ngcc_current_state = 11; + $_ngcc_current_state = 36; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 25: + case 45: { - if(($__uri.equals("") && $__local.equals("form"))) { - $_ngcc_current_state = 23; + if(($__uri.equals("") && $__local.equals("abstract"))) { + $_ngcc_current_state = 40; } else { unexpectedLeaveAttribute($__qname); } } break; - case 24: + case 1: { - $_ngcc_current_state = 23; + $_ngcc_current_state = 0; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 28: + case 3: { - $_ngcc_current_state = 24; + $_ngcc_current_state = 1; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 17: + case 13: { - $_ngcc_current_state = 13; + $_ngcc_current_state = 11; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 11: + case 36: { - $_ngcc_current_state = 3; + $_ngcc_current_state = 32; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 45: + case 5: { - if(($__uri.equals("") && $__local.equals("abstract"))) { - $_ngcc_current_state = 40; + if(($__uri.equals("") && $__local.equals("type"))) { + $_ngcc_current_state = 1; + action1(); + } + else { + unexpectedLeaveAttribute($__qname); + } + } + break; + case 29: + { + if(($__uri.equals("") && $__local.equals("fixed"))) { + $_ngcc_current_state = 24; } else { unexpectedLeaveAttribute($__qname); @@ -793,82 +793,38 @@ class elementDeclBody extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 40: + case 17: { - if(($ai = $runtime.getAttributeIndex("","block"))>=0) { + if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 36; + $_ngcc_current_state = 13; $runtime.sendText(super._cookie, $value); } } break; - case 22: - { - name = $value; - $_ngcc_current_state = 21; - } - break; - case 1: - { - $_ngcc_current_state = 0; - $runtime.sendText(super._cookie, $value); - } - break; - case 30: - { - fixedValue = $value; - $_ngcc_current_state = 29; - } - break; - case 46: - { - abstractValue = $value; - $_ngcc_current_state = 45; - } - break; - case 36: + case 34: { - if(($ai = $runtime.getAttributeIndex("","final"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } - else { - $_ngcc_current_state = 32; - $runtime.sendText(super._cookie, $value); - } + defaultValue = $value; + $_ngcc_current_state = 33; } break; - case 44: + case 22: { - if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } - else { - $_ngcc_current_state = 40; - $runtime.sendText(super._cookie, $value); - } + name = $value; + $_ngcc_current_state = 21; } break; - case 3: + case 28: { - if(($ai = $runtime.getAttributeIndex("","type"))>=0) { + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 1; - $runtime.sendText(super._cookie, $value); - } - } - break; - case 23: - { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - $runtime.consumeAttribute($ai); + $_ngcc_current_state = 24; $runtime.sendText(super._cookie, $value); } } @@ -885,125 +841,113 @@ class elementDeclBody extends NGCCHandler { } } break; - case 42: + case 0: { - NGCCHandler h = new ersSet(this, super._source, $runtime, 165); - spawnChildFromText(h, $value); + revertToParentFromText(makeResult(), super._cookie, $value); } break; case 6: { - NGCCHandler h = new qname(this, super._source, $runtime, 115); + NGCCHandler h = new qname(this, super._source, $runtime, 10); spawnChildFromText(h, $value); } break; - case 19: - { - nillable = $value; - $_ngcc_current_state = 18; - } - break; - case 0: - { - revertToParentFromText(makeResult(), super._cookie, $value); - } - break; - case 13: + case 24: { - if(($ai = $runtime.getAttributeIndex("","substitutionGroup"))>=0) { + if(($ai = $runtime.getAttributeIndex("","form"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 11; + $_ngcc_current_state = 23; $runtime.sendText(super._cookie, $value); } } break; - case 26: + case 11: { - if($value.equals("unqualified")) { - NGCCHandler h = new qualification(this, super._source, $runtime, 145); - spawnChildFromText(h, $value); - } - else { - if($value.equals("qualified")) { - NGCCHandler h = new qualification(this, super._source, $runtime, 145); - spawnChildFromText(h, $value); - } - } + $_ngcc_current_state = 3; + $runtime.sendText(super._cookie, $value); } break; - case 24: + case 23: { - if(($ai = $runtime.getAttributeIndex("","form"))>=0) { + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } - else { - $_ngcc_current_state = 23; - $runtime.sendText(super._cookie, $value); - } } break; - case 28: + case 44: { - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 24; + $_ngcc_current_state = 40; $runtime.sendText(super._cookie, $value); } } break; - case 17: + case 46: { - if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) { + abstractValue = $value; + $_ngcc_current_state = 45; + } + break; + case 19: + { + nillable = $value; + $_ngcc_current_state = 18; + } + break; + case 40: + { + if(($ai = $runtime.getAttributeIndex("","block"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 13; + $_ngcc_current_state = 36; $runtime.sendText(super._cookie, $value); } } break; case 48: { - if(($ai = $runtime.getAttributeIndex("","default"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa); + if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa); + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa); + if(($ai = $runtime.getAttributeIndex("","final"))>=0) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa); spawnChildFromText(h, $value); } else { if(($ai = $runtime.getAttributeIndex("","block"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa); spawnChildFromText(h, $value); } else { if(($ai = $runtime.getAttributeIndex("","form"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa); + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","final"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa); + if(($ai = $runtime.getAttributeIndex("","default"))>=0) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa); spawnChildFromText(h, $value); } } @@ -1014,110 +958,166 @@ class elementDeclBody extends NGCCHandler { } } break; - case 15: + case 30: { - NGCCHandler h = new qname(this, super._source, $runtime, 132); - spawnChildFromText(h, $value); + fixedValue = $value; + $_ngcc_current_state = 29; } break; - case 11: + case 1: { - $_ngcc_current_state = 3; + $_ngcc_current_state = 0; $runtime.sendText(super._cookie, $value); } break; + case 3: + { + if(($ai = $runtime.getAttributeIndex("","type"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } + else { + $_ngcc_current_state = 1; + $runtime.sendText(super._cookie, $value); + } + } + break; + case 13: + { + if(($ai = $runtime.getAttributeIndex("","substitutionGroup"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } + else { + $_ngcc_current_state = 11; + $runtime.sendText(super._cookie, $value); + } + } + break; case 38: { - NGCCHandler h = new erSet(this, super._source, $runtime, 160); + NGCCHandler h = new erSet(this, super._source, $runtime, 55); spawnChildFromText(h, $value); } break; - case 34: + case 15: { - defaultValue = $value; - $_ngcc_current_state = 33; + NGCCHandler h = new qname(this, super._source, $runtime, 27); + spawnChildFromText(h, $value); } break; - } - } - - public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { - switch($__cookie__) { - case 145: + case 26: { - form = ((Boolean)$__result__).booleanValue(); - action3(); - $_ngcc_current_state = 25; + if($value.equals("unqualified")) { + NGCCHandler h = new qualification(this, super._source, $runtime, 40); + spawnChildFromText(h, $value); + } + else { + if($value.equals("qualified")) { + NGCCHandler h = new qualification(this, super._source, $runtime, 40); + spawnChildFromText(h, $value); + } + } } break; - case 174: + case 36: { - fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 44; + if(($ai = $runtime.getAttributeIndex("","final"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } + else { + $_ngcc_current_state = 32; + $runtime.sendText(super._cookie, $value); + } + } + break; + case 42: + { + NGCCHandler h = new ersSet(this, super._source, $runtime, 60); + spawnChildFromText(h, $value); } break; - case 129: + } + } + + public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { + switch($__cookie__) { + case 24: { annotation = ((AnnotationImpl)$__result__); $_ngcc_current_state = 3; } break; - case 115: + case 27: + { + substRef = ((UName)$__result__); + action2(); + $_ngcc_current_state = 14; + } + break; + case 10: { typeName = ((UName)$__result__); $_ngcc_current_state = 5; } break; - case 165: + case 60: { blockValue = ((Integer)$__result__); $_ngcc_current_state = 41; } break; - case 111: + case 69: { - idc = ((IdentityConstraintImpl)$__result__); - action0(); - $_ngcc_current_state = 0; - } - break; - case 132: - { - substRef = ((UName)$__result__); - action2(); - $_ngcc_current_state = 14; + fa = ((ForeignAttributesImpl)$__result__); + $_ngcc_current_state = 44; } break; - case 124: + case 19: { type = ((SimpleTypeImpl)$__result__); $_ngcc_current_state = 1; } break; - case 125: + case 20: { type = ((ComplexTypeImpl)$__result__); $_ngcc_current_state = 1; } break; - case 160: + case 40: { - finalValue = ((Integer)$__result__); - $_ngcc_current_state = 37; + form = ((Boolean)$__result__).booleanValue(); + action3(); + $_ngcc_current_state = 25; + } + break; + case 6: + { + idc = ((IdentityConstraintImpl)$__result__); + action0(); + $_ngcc_current_state = 0; } break; - case 112: + case 7: { idc = ((IdentityConstraintImpl)$__result__); action0(); $_ngcc_current_state = 0; } break; + case 55: + { + finalValue = ((Integer)$__result__); + $_ngcc_current_state = 37; + } + break; } } public boolean accepted() { - return((($_ngcc_current_state == 1) || (($_ngcc_current_state == 3) || (($_ngcc_current_state == 0) || (($_ngcc_current_state == 11) || (($_ngcc_current_state == 17) || ($_ngcc_current_state == 13))))))); + return((($_ngcc_current_state == 1) || (($_ngcc_current_state == 0) || (($_ngcc_current_state == 3) || (($_ngcc_current_state == 17) || (($_ngcc_current_state == 13) || ($_ngcc_current_state == 11))))))); } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java index 09c64f1b..cb7e8e0b 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java @@ -143,15 +143,15 @@ class erSet extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 1: + case 0: { - v = $value; - $_ngcc_current_state = 0; + revertToParentFromText(makeResult(), super._cookie, $value); } break; - case 0: + case 1: { - revertToParentFromText(makeResult(), super._cookie, $value); + v = $value; + $_ngcc_current_state = 0; } break; } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java index e62beff9..7a4efcf2 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java @@ -143,15 +143,15 @@ class ersSet extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 1: + case 0: { - v = $value; - $_ngcc_current_state = 0; + revertToParentFromText(makeResult(), super._cookie, $value); } break; - case 0: + case 1: { - revertToParentFromText(makeResult(), super._cookie, $value); + v = $value; + $_ngcc_current_state = 0; } break; } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java index ed843a95..81fc9b06 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java @@ -85,18 +85,6 @@ class facet extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: - { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 418, null,AnnotationContext.SIMPLETYPE_DECL); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - $_ngcc_current_state = 1; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - } - break; case 12: { if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) { @@ -109,41 +97,53 @@ class facet extends NGCCHandler { } } break; - case 0: + case 4: { - revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 230, fa); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + unexpectedEnterElement($__qname); + } } break; - case 11: + case 5: { - if(($ai = $runtime.getAttributeIndex("","value"))>=0) { + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 4; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 4: + case 11: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 420, fa); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($ai = $runtime.getAttributeIndex("","value"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { unexpectedEnterElement($__qname); } } break; - case 5: + case 0: { - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 2: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 228, null,AnnotationContext.SIMPLETYPE_DECL); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 4; + $_ngcc_current_state = 1; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } @@ -162,63 +162,63 @@ class facet extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 1: + case 4: { if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 0; - action0(); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 230, fa); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); } } break; - case 0: - { - revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); - } - break; - case 11: + case 5: { - if(($ai = $runtime.getAttributeIndex("","value"))>=0) { + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - unexpectedLeaveElement($__qname); + $_ngcc_current_state = 4; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 4: + case 1: { if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 420, fa); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 0; + action0(); } else { unexpectedLeaveElement($__qname); } } break; - case 5: + case 11: { - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + if(($ai = $runtime.getAttributeIndex("","value"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 4; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + unexpectedLeaveElement($__qname); } } break; + case 0: + { + revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); + } + break; + case 2: + { + $_ngcc_current_state = 1; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; default: { unexpectedLeaveElement($__qname); @@ -233,15 +233,15 @@ class facet extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 0: + case 5: { - revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("fixed"))) { + $_ngcc_current_state = 7; + } + else { + $_ngcc_current_state = 4; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } } break; case 11: @@ -254,15 +254,15 @@ class facet extends NGCCHandler { } } break; - case 5: + case 0: { - if(($__uri.equals("") && $__local.equals("fixed"))) { - $_ngcc_current_state = 7; - } - else { - $_ngcc_current_state = 4; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } + revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); + } + break; + case 2: + { + $_ngcc_current_state = 1; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; default: @@ -279,16 +279,16 @@ class facet extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: + case 5: { - $_ngcc_current_state = 1; + $_ngcc_current_state = 4; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 6: + case 9: { - if(($__uri.equals("") && $__local.equals("fixed"))) { - $_ngcc_current_state = 4; + if(($__uri.equals("") && $__local.equals("value"))) { + $_ngcc_current_state = 5; } else { unexpectedLeaveAttribute($__qname); @@ -300,19 +300,19 @@ class facet extends NGCCHandler { revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); } break; - case 9: + case 6: { - if(($__uri.equals("") && $__local.equals("value"))) { - $_ngcc_current_state = 5; + if(($__uri.equals("") && $__local.equals("fixed"))) { + $_ngcc_current_state = 4; } else { unexpectedLeaveAttribute($__qname); } } break; - case 5: + case 2: { - $_ngcc_current_state = 4; + $_ngcc_current_state = 1; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; @@ -327,15 +327,16 @@ class facet extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendText(super._cookie, $value); - } - break; - case 0: + case 5: { - revertToParentFromText(result, super._cookie, $value); + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } + else { + $_ngcc_current_state = 4; + $runtime.sendText(super._cookie, $value); + } } break; case 7: @@ -358,16 +359,15 @@ class facet extends NGCCHandler { $_ngcc_current_state = 9; } break; - case 5: + case 0: { - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } - else { - $_ngcc_current_state = 4; - $runtime.sendText(super._cookie, $value); - } + revertToParentFromText(result, super._cookie, $value); + } + break; + case 2: + { + $_ngcc_current_state = 1; + $runtime.sendText(super._cookie, $value); } break; } @@ -375,16 +375,16 @@ class facet extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 418: + case 230: { - annotation = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 1; + fa = ((ForeignAttributesImpl)$__result__); + $_ngcc_current_state = 2; } break; - case 420: + case 228: { - fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 2; + annotation = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 1; } break; } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java index 72ce3273..3afa0b9a 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java @@ -95,34 +95,22 @@ class group extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 15: - { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action2(); - $_ngcc_current_state = 11; - } - else { - unexpectedEnterElement($__qname); - } - } - break; - case 3: + case 10: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))) { - NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 593, mloc,compositorName); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { unexpectedEnterElement($__qname); } } break; - case 4: + case 5: { if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - $_ngcc_current_state = 3; + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 357, null); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { unexpectedEnterElement($__qname); @@ -141,43 +129,55 @@ class group extends NGCCHandler { } } break; - case 5: + case 6: { - if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 595, null); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 359, null,AnnotationContext.MODELGROUP_DECL); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 5; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 10: + case 0: { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 4: + { + if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + $_ngcc_current_state = 3; } else { unexpectedEnterElement($__qname); } } break; - case 6: + case 15: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 597, null,AnnotationContext.MODELGROUP_DECL); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + action2(); + $_ngcc_current_state = 11; } else { - $_ngcc_current_state = 5; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; - case 0: + case 3: { - revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))))))) { + NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 355, mloc,compositorName); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + unexpectedEnterElement($__qname); + } } break; default: @@ -194,22 +194,11 @@ class group extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 3: - { - if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) { - NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 593, mloc,compositorName); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); - } - else { - unexpectedLeaveElement($__qname); - } - } - break; - case 2: + case 10: { - if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 1; + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); @@ -240,17 +229,6 @@ class group extends NGCCHandler { } } break; - case 10: - { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - else { - unexpectedLeaveElement($__qname); - } - } - break; case 6: { $_ngcc_current_state = 5; @@ -262,6 +240,28 @@ class group extends NGCCHandler { revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); } break; + case 2: + { + if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) { + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 1; + } + else { + unexpectedLeaveElement($__qname); + } + } + break; + case 3: + { + if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) { + NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 355, mloc,compositorName); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + } + else { + unexpectedLeaveElement($__qname); + } + } + break; default: { unexpectedLeaveElement($__qname); @@ -276,24 +276,24 @@ class group extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 11: + case 10: { - if(($__uri.equals("") && $__local.equals("ID"))) { - $_ngcc_current_state = 13; + if(($__uri.equals("") && $__local.equals("name"))) { + $_ngcc_current_state = 9; } else { - $_ngcc_current_state = 10; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + unexpectedEnterAttribute($__qname); } } break; - case 10: + case 11: { - if(($__uri.equals("") && $__local.equals("name"))) { - $_ngcc_current_state = 9; + if(($__uri.equals("") && $__local.equals("ID"))) { + $_ngcc_current_state = 13; } else { - unexpectedEnterAttribute($__qname); + $_ngcc_current_state = 10; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } break; @@ -322,6 +322,23 @@ class group extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 11: + { + $_ngcc_current_state = 10; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 6: + { + $_ngcc_current_state = 5; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 0: + { + revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); + } + break; case 12: { if(($__uri.equals("") && $__local.equals("ID"))) { @@ -332,12 +349,6 @@ class group extends NGCCHandler { } } break; - case 11: - { - $_ngcc_current_state = 10; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; case 8: { if(($__uri.equals("") && $__local.equals("name"))) { @@ -348,17 +359,6 @@ class group extends NGCCHandler { } } break; - case 6: - { - $_ngcc_current_state = 5; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 0: - { - revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveAttribute($__qname); @@ -370,15 +370,12 @@ class group extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 13: - { - $_ngcc_current_state = 12; - } - break; - case 9: + case 10: { - name = $value; - $_ngcc_current_state = 8; + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } } break; case 11: @@ -393,14 +390,6 @@ class group extends NGCCHandler { } } break; - case 10: - { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } - } - break; case 6: { $_ngcc_current_state = 5; @@ -412,30 +401,41 @@ class group extends NGCCHandler { revertToParentFromText(result, super._cookie, $value); } break; + case 9: + { + name = $value; + $_ngcc_current_state = 8; + } + break; + case 13: + { + $_ngcc_current_state = 12; + } + break; } } public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 593: - { - term = ((ModelGroupImpl)$__result__); - $_ngcc_current_state = 2; - } - break; - case 595: + case 357: { fa = ((ForeignAttributesImpl)$__result__); action1(); $_ngcc_current_state = 4; } break; - case 597: + case 359: { annotation = ((AnnotationImpl)$__result__); $_ngcc_current_state = 5; } break; + case 355: + { + term = ((ModelGroupImpl)$__result__); + $_ngcc_current_state = 2; + } + break; } } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java index db03c281..4acbf50c 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java @@ -96,6 +96,17 @@ class identityConstraint extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 16: + { + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + else { + unexpectedEnterElement($__qname); + } + } + break; case 1: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) { @@ -107,10 +118,15 @@ class identityConstraint extends NGCCHandler { } } break; + case 0: + { + revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; case 17: { - if((($ai = $runtime.getAttributeIndex("","name"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector"))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 254, null); + if((($ai = $runtime.getAttributeIndex("","name"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 287, null); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -118,22 +134,23 @@ class identityConstraint extends NGCCHandler { } } break; - case 6: + case 7: { - if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) { - NGCCHandler h = new xpath(this, super._source, $runtime, 241); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + $_ngcc_current_state = 6; } else { unexpectedEnterElement($__qname); } } break; - case 16: + case 18: { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + action2(); + $_ngcc_current_state = 17; } else { unexpectedEnterElement($__qname); @@ -143,7 +160,7 @@ class identityConstraint extends NGCCHandler { case 3: { if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) { - NGCCHandler h = new xpath(this, super._source, $runtime, 237); + NGCCHandler h = new xpath(this, super._source, $runtime, 270); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -151,38 +168,21 @@ class identityConstraint extends NGCCHandler { } } break; - case 7: + case 4: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector"))) { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) { $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - $_ngcc_current_state = 6; + $_ngcc_current_state = 3; } else { unexpectedEnterElement($__qname); } } break; - case 10: - { - if(($ai = $runtime.getAttributeIndex("","refer"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - else { - $_ngcc_current_state = 8; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - } - break; - case 0: - { - revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; case 8: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 244, null,AnnotationContext.IDENTITY_CONSTRAINT); + NGCCHandler h = new annotation(this, super._source, $runtime, 277, null,AnnotationContext.IDENTITY_CONSTRAINT); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -191,23 +191,23 @@ class identityConstraint extends NGCCHandler { } } break; - case 18: + case 10: { - if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action2(); - $_ngcc_current_state = 17; + if(($ai = $runtime.getAttributeIndex("","refer"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 8; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 4: + case 6: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - $_ngcc_current_state = 3; + if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) { + NGCCHandler h = new xpath(this, super._source, $runtime, 274); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { unexpectedEnterElement($__qname); @@ -228,44 +228,60 @@ class identityConstraint extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 1: + case 5: { - if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector"))) { $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 0; + $_ngcc_current_state = 4; } else { unexpectedLeaveElement($__qname); } } break; - case 17: + case 16: { if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 254, null); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); } } break; - case 6: + case 1: { - if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector")))) { - NGCCHandler h = new xpath(this, super._source, $runtime, 241); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) { + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 0; } else { unexpectedLeaveElement($__qname); } } break; - case 16: + case 2: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) { + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 1; + } + else { + unexpectedLeaveElement($__qname); + } + } + break; + case 0: + { + revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname); + } + break; + case 17: { if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 287, null); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); @@ -275,7 +291,7 @@ class identityConstraint extends NGCCHandler { case 3: { if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field")))) { - NGCCHandler h = new xpath(this, super._source, $runtime, 237); + NGCCHandler h = new xpath(this, super._source, $runtime, 270); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -283,6 +299,12 @@ class identityConstraint extends NGCCHandler { } } break; + case 8: + { + $_ngcc_current_state = 7; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; case 10: { if(($ai = $runtime.getAttributeIndex("","refer"))>=0) { @@ -295,39 +317,17 @@ class identityConstraint extends NGCCHandler { } } break; - case 5: - { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector"))) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 4; - } - else { - unexpectedLeaveElement($__qname); - } - } - break; - case 0: - { - revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname); - } - break; - case 2: + case 6: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 1; + if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector")))) { + NGCCHandler h = new xpath(this, super._source, $runtime, 274); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); } } break; - case 8: - { - $_ngcc_current_state = 7; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveElement($__qname); @@ -342,32 +342,26 @@ class identityConstraint extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 17: + case 16: { if(($__uri.equals("") && $__local.equals("name"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 254, null); - spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); + $_ngcc_current_state = 15; } else { unexpectedEnterAttribute($__qname); } } break; - case 6: + case 0: { - if(($__uri.equals("") && $__local.equals("xpath"))) { - NGCCHandler h = new xpath(this, super._source, $runtime, 241); - spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); - } - else { - unexpectedEnterAttribute($__qname); - } + revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); } break; - case 16: + case 17: { if(($__uri.equals("") && $__local.equals("name"))) { - $_ngcc_current_state = 15; + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 287, null); + spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { unexpectedEnterAttribute($__qname); @@ -377,7 +371,7 @@ class identityConstraint extends NGCCHandler { case 3: { if(($__uri.equals("") && $__local.equals("xpath"))) { - NGCCHandler h = new xpath(this, super._source, $runtime, 237); + NGCCHandler h = new xpath(this, super._source, $runtime, 270); spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { @@ -385,6 +379,12 @@ class identityConstraint extends NGCCHandler { } } break; + case 8: + { + $_ngcc_current_state = 7; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; case 10: { if(($__uri.equals("") && $__local.equals("refer"))) { @@ -396,15 +396,15 @@ class identityConstraint extends NGCCHandler { } } break; - case 0: - { - revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); - } - break; - case 8: + case 6: { - $_ngcc_current_state = 7; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("xpath"))) { + NGCCHandler h = new xpath(this, super._source, $runtime, 274); + spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); + } + else { + unexpectedEnterAttribute($__qname); + } } break; default: @@ -421,6 +421,11 @@ class identityConstraint extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 0: + { + revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); + } + break; case 14: { if(($__uri.equals("") && $__local.equals("name"))) { @@ -431,14 +436,10 @@ class identityConstraint extends NGCCHandler { } } break; - case 11: + case 8: { - if(($__uri.equals("") && $__local.equals("refer"))) { - $_ngcc_current_state = 8; - } - else { - unexpectedLeaveAttribute($__qname); - } + $_ngcc_current_state = 7; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; case 10: @@ -447,15 +448,14 @@ class identityConstraint extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 0: - { - revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); - } - break; - case 8: + case 11: { - $_ngcc_current_state = 7; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("refer"))) { + $_ngcc_current_state = 8; + } + else { + unexpectedLeaveAttribute($__qname); + } } break; default: @@ -469,42 +469,51 @@ class identityConstraint extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 17: + case 15: + { + name = $value; + $_ngcc_current_state = 14; + } + break; + case 16: { if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 254, null); - spawnChildFromText(h, $value); + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); } } break; - case 6: + case 0: { - if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) { - NGCCHandler h = new xpath(this, super._source, $runtime, 241); - spawnChildFromText(h, $value); - } + revertToParentFromText(makeResult(), super._cookie, $value); } break; - case 16: + case 12: + { + NGCCHandler h = new qname(this, super._source, $runtime, 280); + spawnChildFromText(h, $value); + } + break; + case 17: { if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 287, null); + spawnChildFromText(h, $value); } } break; case 3: { if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) { - NGCCHandler h = new xpath(this, super._source, $runtime, 237); + NGCCHandler h = new xpath(this, super._source, $runtime, 270); spawnChildFromText(h, $value); } } break; - case 15: + case 8: { - name = $value; - $_ngcc_current_state = 14; + $_ngcc_current_state = 7; + $runtime.sendText(super._cookie, $value); } break; case 10: @@ -519,21 +528,12 @@ class identityConstraint extends NGCCHandler { } } break; - case 0: - { - revertToParentFromText(makeResult(), super._cookie, $value); - } - break; - case 12: - { - NGCCHandler h = new qname(this, super._source, $runtime, 247); - spawnChildFromText(h, $value); - } - break; - case 8: + case 6: { - $_ngcc_current_state = 7; - $runtime.sendText(super._cookie, $value); + if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) { + NGCCHandler h = new xpath(this, super._source, $runtime, 274); + spawnChildFromText(h, $value); + } } break; } @@ -541,36 +541,36 @@ class identityConstraint extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 241: - { - selector = ((XPathImpl)$__result__); - $_ngcc_current_state = 5; - } - break; - case 237: + case 270: { field = ((XPathImpl)$__result__); action0(); $_ngcc_current_state = 2; } break; - case 244: + case 287: { - ann = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 7; + fa = ((ForeignAttributesImpl)$__result__); + $_ngcc_current_state = 16; } break; - case 247: + case 280: { ref = ((UName)$__result__); action1(); $_ngcc_current_state = 11; } break; - case 254: + case 277: { - fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 16; + ann = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 7; + } + break; + case 274: + { + selector = ((XPathImpl)$__result__); + $_ngcc_current_state = 5; } break; } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java index b671ceb8..6695620e 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java @@ -78,9 +78,16 @@ class importDecl extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: + case 4: { - revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); + if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 2; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } } break; case 8: @@ -109,7 +116,7 @@ class importDecl extends NGCCHandler { case 2: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 498, null,AnnotationContext.SCHEMA); + NGCCHandler h = new annotation(this, super._source, $runtime, 340, null,AnnotationContext.SCHEMA); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -118,16 +125,9 @@ class importDecl extends NGCCHandler { } } break; - case 4: + case 0: { - if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - else { - $_ngcc_current_state = 2; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } + revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); } break; default: @@ -144,9 +144,16 @@ class importDecl extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: + case 4: { - revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); + if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + else { + $_ngcc_current_state = 2; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } } break; case 8: @@ -161,6 +168,12 @@ class importDecl extends NGCCHandler { } } break; + case 2: + { + $_ngcc_current_state = 1; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; case 1: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import"))) { @@ -173,22 +186,9 @@ class importDecl extends NGCCHandler { } } break; - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 4: + case 0: { - if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - else { - $_ngcc_current_state = 2; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } + revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); } break; default: @@ -205,9 +205,15 @@ class importDecl extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: + case 4: { - revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("schemaLocation"))) { + $_ngcc_current_state = 6; + } + else { + $_ngcc_current_state = 2; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } } break; case 8: @@ -227,15 +233,9 @@ class importDecl extends NGCCHandler { $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 4: + case 0: { - if(($__uri.equals("") && $__local.equals("schemaLocation"))) { - $_ngcc_current_state = 6; - } - else { - $_ngcc_current_state = 2; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } + revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; default: @@ -262,9 +262,10 @@ class importDecl extends NGCCHandler { } } break; - case 0: + case 4: { - revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 2; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; case 8: @@ -273,12 +274,6 @@ class importDecl extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; case 5: { if(($__uri.equals("") && $__local.equals("schemaLocation"))) { @@ -289,12 +284,17 @@ class importDecl extends NGCCHandler { } } break; - case 4: + case 2: { - $_ngcc_current_state = 2; + $_ngcc_current_state = 1; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; + case 0: + { + revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); + } + break; default: { unexpectedLeaveAttribute($__qname); @@ -306,9 +306,16 @@ class importDecl extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 0: + case 4: { - revertToParentFromText(this, super._cookie, $value); + if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } + else { + $_ngcc_current_state = 2; + $runtime.sendText(super._cookie, $value); + } } break; case 8: @@ -323,10 +330,10 @@ class importDecl extends NGCCHandler { } } break; - case 6: + case 10: { - schemaLocation = $value; - $_ngcc_current_state = 5; + ns = $value; + $_ngcc_current_state = 9; } break; case 2: @@ -335,22 +342,15 @@ class importDecl extends NGCCHandler { $runtime.sendText(super._cookie, $value); } break; - case 4: + case 0: { - if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } - else { - $_ngcc_current_state = 2; - $runtime.sendText(super._cookie, $value); - } + revertToParentFromText(this, super._cookie, $value); } break; - case 10: + case 6: { - ns = $value; - $_ngcc_current_state = 9; + schemaLocation = $value; + $_ngcc_current_state = 5; } break; } @@ -358,7 +358,7 @@ class importDecl extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 498: + case 340: { $_ngcc_current_state = 1; } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java index b44f4929..1052ef2f 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java @@ -74,21 +74,10 @@ class includeDecl extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 6: - { - if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - else { - unexpectedEnterElement($__qname); - } - } - break; case 2: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 610, null,AnnotationContext.SCHEMA); + NGCCHandler h = new annotation(this, super._source, $runtime, 372, null,AnnotationContext.SCHEMA); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -97,6 +86,11 @@ class includeDecl extends NGCCHandler { } } break; + case 0: + { + revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; case 7: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))) { @@ -108,9 +102,15 @@ class includeDecl extends NGCCHandler { } } break; - case 0: + case 6: { - revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); + if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + else { + unexpectedEnterElement($__qname); + } } break; default: @@ -127,17 +127,6 @@ class includeDecl extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 6: - { - if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - else { - unexpectedLeaveElement($__qname); - } - } - break; case 1: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))) { @@ -161,6 +150,17 @@ class includeDecl extends NGCCHandler { revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); } break; + case 6: + { + if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + else { + unexpectedLeaveElement($__qname); + } + } + break; default: { unexpectedLeaveElement($__qname); @@ -175,16 +175,6 @@ class includeDecl extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 6: - { - if(($__uri.equals("") && $__local.equals("schemaLocation"))) { - $_ngcc_current_state = 5; - } - else { - unexpectedEnterAttribute($__qname); - } - } - break; case 2: { $_ngcc_current_state = 1; @@ -196,6 +186,16 @@ class includeDecl extends NGCCHandler { revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; + case 6: + { + if(($__uri.equals("") && $__local.equals("schemaLocation"))) { + $_ngcc_current_state = 5; + } + else { + unexpectedEnterAttribute($__qname); + } + } + break; default: { unexpectedEnterAttribute($__qname); @@ -210,16 +210,6 @@ class includeDecl extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 4: - { - if(($__uri.equals("") && $__local.equals("schemaLocation"))) { - $_ngcc_current_state = 2; - } - else { - unexpectedLeaveAttribute($__qname); - } - } - break; case 2: { $_ngcc_current_state = 1; @@ -231,6 +221,16 @@ class includeDecl extends NGCCHandler { revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; + case 4: + { + if(($__uri.equals("") && $__local.equals("schemaLocation"))) { + $_ngcc_current_state = 2; + } + else { + unexpectedLeaveAttribute($__qname); + } + } + break; default: { unexpectedLeaveAttribute($__qname); @@ -242,6 +242,17 @@ class includeDecl extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { + case 2: + { + $_ngcc_current_state = 1; + $runtime.sendText(super._cookie, $value); + } + break; + case 0: + { + revertToParentFromText(this, super._cookie, $value); + } + break; case 5: { schemaLocation = $value; @@ -256,23 +267,12 @@ class includeDecl extends NGCCHandler { } } break; - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendText(super._cookie, $value); - } - break; - case 0: - { - revertToParentFromText(this, super._cookie, $value); - } - break; } } public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 610: + case 372: { $_ngcc_current_state = 1; } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java index 3e70de95..54f0ee6e 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java @@ -97,56 +97,56 @@ class modelGroupBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: + case 0: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))) { - NGCCHandler h = new particle(this, super._source, $runtime, 515); + revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 4: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 174, null,AnnotationContext.MODELGROUP); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 2; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 6: + case 2: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 520, null); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")))))) { + NGCCHandler h = new particle(this, super._source, $runtime, 171); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 520, null); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + $_ngcc_current_state = 1; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 1: + case 6: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))) { - NGCCHandler h = new particle(this, super._source, $runtime, 514); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 176, null); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - action0(); - $_ngcc_current_state = 0; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 176, null); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } } break; - case 0: - { - revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; - case 4: + case 1: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 518, null,AnnotationContext.MODELGROUP); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")))))) { + NGCCHandler h = new particle(this, super._source, $runtime, 170); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 2; + action0(); + $_ngcc_current_state = 0; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } @@ -165,6 +165,17 @@ class modelGroupBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 0: + { + revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); + } + break; + case 4: + { + $_ngcc_current_state = 2; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; case 2: { $_ngcc_current_state = 1; @@ -173,7 +184,7 @@ class modelGroupBody extends NGCCHandler { break; case 6: { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 520, null); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 176, null); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } break; @@ -184,17 +195,6 @@ class modelGroupBody extends NGCCHandler { $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 0: - { - revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); - } - break; - case 4: - { - $_ngcc_current_state = 2; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveElement($__qname); @@ -209,6 +209,17 @@ class modelGroupBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 0: + { + revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); + } + break; + case 4: + { + $_ngcc_current_state = 2; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; case 2: { $_ngcc_current_state = 1; @@ -217,7 +228,7 @@ class modelGroupBody extends NGCCHandler { break; case 6: { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 520, null); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 176, null); spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } break; @@ -228,17 +239,6 @@ class modelGroupBody extends NGCCHandler { $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 0: - { - revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); - } - break; - case 4: - { - $_ngcc_current_state = 2; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedEnterAttribute($__qname); @@ -253,6 +253,17 @@ class modelGroupBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 0: + { + revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); + } + break; + case 4: + { + $_ngcc_current_state = 2; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; case 2: { $_ngcc_current_state = 1; @@ -261,7 +272,7 @@ class modelGroupBody extends NGCCHandler { break; case 6: { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 520, null); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 176, null); spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname); } break; @@ -272,17 +283,6 @@ class modelGroupBody extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 0: - { - revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); - } - break; - case 4: - { - $_ngcc_current_state = 2; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveAttribute($__qname); @@ -294,6 +294,17 @@ class modelGroupBody extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { + case 0: + { + revertToParentFromText(result, super._cookie, $value); + } + break; + case 4: + { + $_ngcc_current_state = 2; + $runtime.sendText(super._cookie, $value); + } + break; case 2: { $_ngcc_current_state = 1; @@ -302,7 +313,7 @@ class modelGroupBody extends NGCCHandler { break; case 6: { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 520, null); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 176, null); spawnChildFromText(h, $value); } break; @@ -313,53 +324,42 @@ class modelGroupBody extends NGCCHandler { $runtime.sendText(super._cookie, $value); } break; - case 0: - { - revertToParentFromText(result, super._cookie, $value); - } - break; - case 4: - { - $_ngcc_current_state = 2; - $runtime.sendText(super._cookie, $value); - } - break; } } public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 520: + case 174: + { + annotation = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 2; + } + break; + case 176: { fa = ((ForeignAttributesImpl)$__result__); $_ngcc_current_state = 4; } break; - case 515: + case 171: { childParticle = ((ParticleImpl)$__result__); action1(); $_ngcc_current_state = 1; } break; - case 514: + case 170: { childParticle = ((ParticleImpl)$__result__); action1(); $_ngcc_current_state = 1; } break; - case 518: - { - annotation = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 2; - } - break; } } public boolean accepted() { - return((($_ngcc_current_state == 0) || (($_ngcc_current_state == 4) || (($_ngcc_current_state == 1) || ($_ngcc_current_state == 2))))); + return((($_ngcc_current_state == 1) || (($_ngcc_current_state == 2) || (($_ngcc_current_state == 4) || ($_ngcc_current_state == 0))))); } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java index b0531a84..6bcb4e8c 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java @@ -78,54 +78,61 @@ class notation extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: + case 2: { - revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 209, null,AnnotationContext.NOTATION); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 1; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } } break; - case 15: + case 16: { - if((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + action0(); + $_ngcc_current_state = 15; } else { unexpectedEnterElement($__qname); } } break; - case 2: + case 14: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 539, null,AnnotationContext.NOTATION); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 1; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; - case 4: + case 15: { - if(($ai = $runtime.getAttributeIndex("","system"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 224, null); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 2; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; - case 14: + case 4: { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + if(($ai = $runtime.getAttributeIndex("","system"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 2; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; @@ -141,16 +148,9 @@ class notation extends NGCCHandler { } } break; - case 16: + case 0: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - action0(); - $_ngcc_current_state = 15; - } - else { - unexpectedEnterElement($__qname); - } + revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs); } break; default: @@ -167,16 +167,17 @@ class notation extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: + case 2: { - revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 1; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 1: + case 14: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 0; + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); @@ -186,7 +187,7 @@ class notation extends NGCCHandler { case 15: { if((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation")))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 224, null); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -194,12 +195,6 @@ class notation extends NGCCHandler { } } break; - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; case 4: { if(($ai = $runtime.getAttributeIndex("","system"))>=0) { @@ -212,11 +207,11 @@ class notation extends NGCCHandler { } } break; - case 14: + case 1: { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) { + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 0; } else { unexpectedLeaveElement($__qname); @@ -235,6 +230,11 @@ class notation extends NGCCHandler { } } break; + case 0: + { + revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname); + } + break; default: { unexpectedLeaveElement($__qname); @@ -249,26 +249,31 @@ class notation extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: + case 2: { - revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 1; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 15: + case 14: { if(($__uri.equals("") && $__local.equals("name"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null); - spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); + $_ngcc_current_state = 13; } else { unexpectedEnterAttribute($__qname); } } break; - case 2: + case 15: { - $_ngcc_current_state = 1; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("name"))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 224, null); + spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); + } + else { + unexpectedEnterAttribute($__qname); + } } break; case 4: @@ -282,16 +287,6 @@ class notation extends NGCCHandler { } } break; - case 14: - { - if(($__uri.equals("") && $__local.equals("name"))) { - $_ngcc_current_state = 13; - } - else { - unexpectedEnterAttribute($__qname); - } - } - break; case 8: { if(($__uri.equals("") && $__local.equals("public"))) { @@ -303,6 +298,11 @@ class notation extends NGCCHandler { } } break; + case 0: + { + revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); + } + break; default: { unexpectedEnterAttribute($__qname); @@ -317,21 +317,30 @@ class notation extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 0: - { - revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); - } - break; case 2: { $_ngcc_current_state = 1; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 4: + case 9: { - $_ngcc_current_state = 2; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("public"))) { + $_ngcc_current_state = 4; + } + else { + unexpectedLeaveAttribute($__qname); + } + } + break; + case 12: + { + if(($__uri.equals("") && $__local.equals("name"))) { + $_ngcc_current_state = 8; + } + else { + unexpectedLeaveAttribute($__qname); + } } break; case 5: @@ -344,30 +353,21 @@ class notation extends NGCCHandler { } } break; - case 8: + case 4: { - $_ngcc_current_state = 4; + $_ngcc_current_state = 2; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 9: + case 8: { - if(($__uri.equals("") && $__local.equals("public"))) { - $_ngcc_current_state = 4; - } - else { - unexpectedLeaveAttribute($__qname); - } + $_ngcc_current_state = 4; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 12: + case 0: { - if(($__uri.equals("") && $__local.equals("name"))) { - $_ngcc_current_state = 8; - } - else { - unexpectedLeaveAttribute($__qname); - } + revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); } break; default: @@ -381,9 +381,10 @@ class notation extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 0: + case 2: { - revertToParentFromText(makeResult(), super._cookie, $value); + $_ngcc_current_state = 1; + $runtime.sendText(super._cookie, $value); } break; case 10: @@ -392,24 +393,20 @@ class notation extends NGCCHandler { $_ngcc_current_state = 9; } break; - case 15: + case 14: { if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null); - spawnChildFromText(h, $value); + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); } } break; - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendText(super._cookie, $value); - } - break; - case 13: + case 15: { - name = $value; - $_ngcc_current_state = 12; + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 224, null); + spawnChildFromText(h, $value); + } } break; case 4: @@ -424,20 +421,6 @@ class notation extends NGCCHandler { } } break; - case 6: - { - sys = $value; - $_ngcc_current_state = 5; - } - break; - case 14: - { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } - } - break; case 8: { if(($ai = $runtime.getAttributeIndex("","public"))>=0) { @@ -450,21 +433,38 @@ class notation extends NGCCHandler { } } break; + case 13: + { + name = $value; + $_ngcc_current_state = 12; + } + break; + case 6: + { + sys = $value; + $_ngcc_current_state = 5; + } + break; + case 0: + { + revertToParentFromText(makeResult(), super._cookie, $value); + } + break; } } public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 554: + case 209: { - fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 14; + ann = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 1; } break; - case 539: + case 224: { - ann = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 1; + fa = ((ForeignAttributesImpl)$__result__); + $_ngcc_current_state = 14; } break; } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java index 3f8233cd..8b384318 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java @@ -83,35 +83,35 @@ class occurs extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 5: + case 1: { - if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { + if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 0; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 1: + case 0: { - if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { + revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 5: + { + if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 0; + $_ngcc_current_state = 1; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 0: - { - revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; default: { unexpectedEnterElement($__qname); @@ -126,35 +126,35 @@ class occurs extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 5: + case 1: { - if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { + if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 0; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 1: + case 0: { - if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { + revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); + } + break; + case 5: + { + if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 0; + $_ngcc_current_state = 1; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 0: - { - revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveElement($__qname); @@ -169,17 +169,6 @@ class occurs extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 5: - { - if(($__uri.equals("") && $__local.equals("maxOccurs"))) { - $_ngcc_current_state = 7; - } - else { - $_ngcc_current_state = 1; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - } - break; case 1: { if(($__uri.equals("") && $__local.equals("minOccurs"))) { @@ -196,6 +185,17 @@ class occurs extends NGCCHandler { revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; + case 5: + { + if(($__uri.equals("") && $__local.equals("maxOccurs"))) { + $_ngcc_current_state = 7; + } + else { + $_ngcc_current_state = 1; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + } + break; default: { unexpectedEnterAttribute($__qname); @@ -210,26 +210,15 @@ class occurs extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 5: - { - $_ngcc_current_state = 1; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; case 1: { $_ngcc_current_state = 0; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 6: + case 0: { - if(($__uri.equals("") && $__local.equals("maxOccurs"))) { - $_ngcc_current_state = 1; - } - else { - unexpectedLeaveAttribute($__qname); - } + revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; case 2: @@ -242,9 +231,20 @@ class occurs extends NGCCHandler { } } break; - case 0: + case 5: { - revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 1; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 6: + { + if(($__uri.equals("") && $__local.equals("maxOccurs"))) { + $_ngcc_current_state = 1; + } + else { + unexpectedLeaveAttribute($__qname); + } } break; default: @@ -258,35 +258,42 @@ class occurs extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 5: + case 1: { - if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { + if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 0; $runtime.sendText(super._cookie, $value); } } break; - case 1: + case 0: { - if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { + revertToParentFromText(this, super._cookie, $value); + } + break; + case 3: + { + v = $value; + $_ngcc_current_state = 2; + action0(); + } + break; + case 5: + { + if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 0; + $_ngcc_current_state = 1; $runtime.sendText(super._cookie, $value); } } break; - case 0: - { - revertToParentFromText(this, super._cookie, $value); - } - break; case 7: { if($value.equals("unbounded")) { @@ -300,13 +307,6 @@ class occurs extends NGCCHandler { } } break; - case 3: - { - v = $value; - $_ngcc_current_state = 2; - action0(); - } - break; } } @@ -316,7 +316,7 @@ class occurs extends NGCCHandler { } public boolean accepted() { - return((($_ngcc_current_state == 0) || (($_ngcc_current_state == 1) || ($_ngcc_current_state == 5)))); + return((($_ngcc_current_state == 5) || (($_ngcc_current_state == 0) || ($_ngcc_current_state == 1)))); } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java index 3e1da144..63bbafa8 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java @@ -131,21 +131,10 @@ class particle extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 4: - { - if(((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))))) { - NGCCHandler h = new occurs(this, super._source, $runtime, 618); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - unexpectedEnterElement($__qname); - } - } - break; - case 3: + case 29: { - if((($ai = $runtime.getAttributeIndex("","processContents"))>=0 || (($ai = $runtime.getAttributeIndex("","namespace"))>=0 || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))) { - NGCCHandler h = new wildcardBody(this, super._source, $runtime, 617, wloc); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))))))) { + NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 136, loc,compositorName); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -153,10 +142,10 @@ class particle extends NGCCHandler { } } break; - case 30: + case 4: { - if(((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))))) { - NGCCHandler h = new occurs(this, super._source, $runtime, 648); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || (($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))))) { + NGCCHandler h = new occurs(this, super._source, $runtime, 107); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -166,8 +155,8 @@ class particle extends NGCCHandler { break; case 26: { - if(((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || (($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))) { - NGCCHandler h = new occurs(this, super._source, $runtime, 643); + if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || (($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))) { + NGCCHandler h = new occurs(this, super._source, $runtime, 132); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -175,25 +164,6 @@ class particle extends NGCCHandler { } } break; - case 11: - { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 626, null,AnnotationContext.PARTICLE); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - $_ngcc_current_state = 10; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - } - break; - case 10: - { - action3(); - $_ngcc_current_state = 7; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; case 1: { if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) { @@ -227,14 +197,44 @@ class particle extends NGCCHandler { } } break; - case 29: + case 0: + { + revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 20: + { + action5(); + $_ngcc_current_state = 19; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 8: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))) { - NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 647, loc,compositorName); + if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + else { + if((($ai = $runtime.getAttributeIndex("","default"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","name"))>=0 || ($ai = $runtime.getAttributeIndex("","abstract"))>=0))))))) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + unexpectedEnterElement($__qname); + } + } + } + break; + case 11: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 115, null,AnnotationContext.PARTICLE); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 10; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; @@ -249,22 +249,28 @@ class particle extends NGCCHandler { } } break; - case 21: + case 10: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 638, null,AnnotationContext.PARTICLE); + action3(); + $_ngcc_current_state = 7; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 3: + { + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($ai = $runtime.getAttributeIndex("","namespace"))>=0 || ($ai = $runtime.getAttributeIndex("","processContents"))>=0))) { + NGCCHandler h = new wildcardBody(this, super._source, $runtime, 106, wloc); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 20; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } break; case 16: { - if(((($ai = $runtime.getAttributeIndex("","name"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($ai = $runtime.getAttributeIndex("","ref"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))))))))))) { - NGCCHandler h = new occurs(this, super._source, $runtime, 632); + if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","ref"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))))))))))) { + NGCCHandler h = new occurs(this, super._source, $runtime, 121); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -272,33 +278,27 @@ class particle extends NGCCHandler { } } break; - case 8: + case 21: { - if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 127, null,AnnotationContext.PARTICLE); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - if((($ai = $runtime.getAttributeIndex("","name"))>=0 || (($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","default"))>=0 || ($ai = $runtime.getAttributeIndex("","abstract"))>=0))))))) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - unexpectedEnterElement($__qname); - } + $_ngcc_current_state = 20; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 20: - { - action5(); - $_ngcc_current_state = 19; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; - case 0: + case 30: { - revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))))))))) { + NGCCHandler h = new occurs(this, super._source, $runtime, 137); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + unexpectedEnterElement($__qname); + } } break; default: @@ -315,10 +315,10 @@ class particle extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 4: + case 29: { - if(((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))))))) { - NGCCHandler h = new occurs(this, super._source, $runtime, 618); + if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) { + NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 136, loc,compositorName); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -326,10 +326,10 @@ class particle extends NGCCHandler { } } break; - case 3: + case 4: { - if(((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))))) { - NGCCHandler h = new wildcardBody(this, super._source, $runtime, 617, wloc); + if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))))))) { + NGCCHandler h = new occurs(this, super._source, $runtime, 107); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -337,55 +337,77 @@ class particle extends NGCCHandler { } } break; - case 19: + case 26: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 0; + if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || ((($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || (($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")))))) { + NGCCHandler h = new occurs(this, super._source, $runtime, 132); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); } } break; - case 30: + case 2: { - if(((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))))))) { - NGCCHandler h = new occurs(this, super._source, $runtime, 648); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) { + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 0; } else { unexpectedLeaveElement($__qname); } } break; - case 26: + case 0: { - if(((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || (($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")))))) { - NGCCHandler h = new occurs(this, super._source, $runtime, 643); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); + } + break; + case 8: + { + if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - unexpectedLeaveElement($__qname); + if(((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))))))) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + } + else { + unexpectedLeaveElement($__qname); + } } } break; + case 20: + { + action5(); + $_ngcc_current_state = 19; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; case 11: { $_ngcc_current_state = 10; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 10: + case 25: { - action3(); - $_ngcc_current_state = 7; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + else { + unexpectedLeaveElement($__qname); + } } break; - case 2: + case 19: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) { $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); $_ngcc_current_state = 0; } @@ -394,6 +416,13 @@ class particle extends NGCCHandler { } } break; + case 10: + { + action3(); + $_ngcc_current_state = 7; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; case 7: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) { @@ -405,10 +434,10 @@ class particle extends NGCCHandler { } } break; - case 29: + case 3: { - if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) { - NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 647, loc,compositorName); + if(((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))))) { + NGCCHandler h = new wildcardBody(this, super._source, $runtime, 106, wloc); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -416,11 +445,11 @@ class particle extends NGCCHandler { } } break; - case 25: + case 16: { - if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))))))))) { + NGCCHandler h = new occurs(this, super._source, $runtime, 121); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); @@ -433,10 +462,10 @@ class particle extends NGCCHandler { $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 16: + case 30: { - if(((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))))))))) { - NGCCHandler h = new occurs(this, super._source, $runtime, 632); + if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))))) { + NGCCHandler h = new occurs(this, super._source, $runtime, 137); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { @@ -444,23 +473,6 @@ class particle extends NGCCHandler { } } break; - case 8: - { - if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - else { - if(((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))))))) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); - } - else { - unexpectedLeaveElement($__qname); - } - } - } - break; case 28: { if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) { @@ -472,18 +484,6 @@ class particle extends NGCCHandler { } } break; - case 20: - { - action5(); - $_ngcc_current_state = 19; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; - case 0: - { - revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveElement($__qname); @@ -498,38 +498,54 @@ class particle extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 4: + case 0: { - if((($__uri.equals("") && $__local.equals("minOccurs")) || (($__uri.equals("") && $__local.equals("processContents")) || (($__uri.equals("") && $__local.equals("maxOccurs")) || ($__uri.equals("") && $__local.equals("namespace")))))) { - NGCCHandler h = new occurs(this, super._source, $runtime, 618); - spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); + revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); + } + break; + case 8: + { + if(($__uri.equals("") && $__local.equals("ref"))) { + $_ngcc_current_state = 14; } else { - unexpectedEnterAttribute($__qname); + if((($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("abstract"))))))))) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false); + spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); + } + else { + unexpectedEnterAttribute($__qname); + } } } break; - case 21: + case 20: { - $_ngcc_current_state = 20; + action5(); + $_ngcc_current_state = 19; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 3: + case 11: { - if((($__uri.equals("") && $__local.equals("processContents")) || ($__uri.equals("") && $__local.equals("namespace")))) { - NGCCHandler h = new wildcardBody(this, super._source, $runtime, 617, wloc); - spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); + $_ngcc_current_state = 10; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 25: + { + if(($__uri.equals("") && $__local.equals("ref"))) { + $_ngcc_current_state = 24; } else { unexpectedEnterAttribute($__qname); } } break; - case 16: + case 4: { - if((($__uri.equals("") && $__local.equals("name")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("minOccurs")) || (($__uri.equals("") && $__local.equals("maxOccurs")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("abstract")) || ($__uri.equals("") && $__local.equals("ref")))))))))))) { - NGCCHandler h = new occurs(this, super._source, $runtime, 632); + if((($__uri.equals("") && $__local.equals("maxOccurs")) || (($__uri.equals("") && $__local.equals("minOccurs")) || (($__uri.equals("") && $__local.equals("namespace")) || ($__uri.equals("") && $__local.equals("processContents")))))) { + NGCCHandler h = new occurs(this, super._source, $runtime, 107); spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { @@ -537,26 +553,17 @@ class particle extends NGCCHandler { } } break; - case 8: + case 10: { - if(($__uri.equals("") && $__local.equals("ref"))) { - $_ngcc_current_state = 14; - } - else { - if((($__uri.equals("") && $__local.equals("name")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("default")) || ($__uri.equals("") && $__local.equals("abstract"))))))))) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false); - spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); - } - else { - unexpectedEnterAttribute($__qname); - } - } + action3(); + $_ngcc_current_state = 7; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 30: + case 26: { - if((($__uri.equals("") && $__local.equals("minOccurs")) || ($__uri.equals("") && $__local.equals("maxOccurs")))) { - NGCCHandler h = new occurs(this, super._source, $runtime, 648); + if((($__uri.equals("") && $__local.equals("maxOccurs")) || (($__uri.equals("") && $__local.equals("ref")) || ($__uri.equals("") && $__local.equals("minOccurs"))))) { + NGCCHandler h = new occurs(this, super._source, $runtime, 132); spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { @@ -564,16 +571,10 @@ class particle extends NGCCHandler { } } break; - case 11: - { - $_ngcc_current_state = 10; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 26: + case 3: { - if((($__uri.equals("") && $__local.equals("minOccurs")) || (($__uri.equals("") && $__local.equals("maxOccurs")) || ($__uri.equals("") && $__local.equals("ref"))))) { - NGCCHandler h = new occurs(this, super._source, $runtime, 643); + if((($__uri.equals("") && $__local.equals("namespace")) || ($__uri.equals("") && $__local.equals("processContents")))) { + NGCCHandler h = new wildcardBody(this, super._source, $runtime, 106, wloc); spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { @@ -581,29 +582,28 @@ class particle extends NGCCHandler { } } break; - case 10: + case 16: { - action3(); - $_ngcc_current_state = 7; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + if((($__uri.equals("") && $__local.equals("maxOccurs")) || (($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("ref")) || (($__uri.equals("") && $__local.equals("minOccurs")) || (($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("abstract")))))))))))) { + NGCCHandler h = new occurs(this, super._source, $runtime, 121); + spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); + } + else { + unexpectedEnterAttribute($__qname); + } } break; - case 20: + case 21: { - action5(); - $_ngcc_current_state = 19; + $_ngcc_current_state = 20; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 0: - { - revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); - } - break; - case 25: + case 30: { - if(($__uri.equals("") && $__local.equals("ref"))) { - $_ngcc_current_state = 24; + if((($__uri.equals("") && $__local.equals("maxOccurs")) || ($__uri.equals("") && $__local.equals("minOccurs")))) { + NGCCHandler h = new occurs(this, super._source, $runtime, 137); + spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { unexpectedEnterAttribute($__qname); @@ -624,22 +624,28 @@ class particle extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 21: - { - $_ngcc_current_state = 20; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; - case 13: + case 23: { if(($__uri.equals("") && $__local.equals("ref"))) { - $_ngcc_current_state = 11; + $_ngcc_current_state = 21; } else { unexpectedLeaveAttribute($__qname); } } break; + case 0: + { + revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); + } + break; + case 20: + { + action5(); + $_ngcc_current_state = 19; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; case 11: { $_ngcc_current_state = 10; @@ -653,28 +659,22 @@ class particle extends NGCCHandler { $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 20: + case 21: { - action5(); - $_ngcc_current_state = 19; + $_ngcc_current_state = 20; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 23: + case 13: { if(($__uri.equals("") && $__local.equals("ref"))) { - $_ngcc_current_state = 21; + $_ngcc_current_state = 11; } else { unexpectedLeaveAttribute($__qname); } } break; - case 0: - { - revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveAttribute($__qname); @@ -688,23 +688,23 @@ class particle extends NGCCHandler { switch($_ngcc_current_state) { case 4: { - if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 618); + if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 107); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 618); + if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 107); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 618); + if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 107); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 618); + if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 107); spawnChildFromText(h, $value); } } @@ -712,140 +712,91 @@ class particle extends NGCCHandler { } } break; - case 3: - { - if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { - NGCCHandler h = new wildcardBody(this, super._source, $runtime, 617, wloc); - spawnChildFromText(h, $value); - } - else { - if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) { - NGCCHandler h = new wildcardBody(this, super._source, $runtime, 617, wloc); - spawnChildFromText(h, $value); - } - } - } - break; - case 30: - { - if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 648); - spawnChildFromText(h, $value); - } - else { - if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 648); - spawnChildFromText(h, $value); - } - } - } - break; case 26: { - if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 643); + if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 132); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 643); + if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 132); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 643); + if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 132); spawnChildFromText(h, $value); } } } } break; - case 11: - { - $_ngcc_current_state = 10; - $runtime.sendText(super._cookie, $value); - } - break; - case 10: + case 14: { - action3(); - $_ngcc_current_state = 7; - $runtime.sendText(super._cookie, $value); + NGCCHandler h = new qname(this, super._source, $runtime, 118); + spawnChildFromText(h, $value); } break; - case 14: + case 24: { - NGCCHandler h = new qname(this, super._source, $runtime, 629); + NGCCHandler h = new qname(this, super._source, $runtime, 130); spawnChildFromText(h, $value); } break; - case 25: + case 0: { - if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } + revertToParentFromText(result, super._cookie, $value); } break; - case 21: + case 20: { - $_ngcc_current_state = 20; + action5(); + $_ngcc_current_state = 19; $runtime.sendText(super._cookie, $value); } break; - case 16: + case 8: { if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 632); - spawnChildFromText(h, $value); + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); } else { if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 632); + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","default"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 632); + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 632); + if(($ai = $runtime.getAttributeIndex("","block"))>=0) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","block"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 632); + if(($ai = $runtime.getAttributeIndex("","final"))>=0) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false); spawnChildFromText(h, $value); } else { if(($ai = $runtime.getAttributeIndex("","form"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 632); + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 632); + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 632); + if(($ai = $runtime.getAttributeIndex("","default"))>=0) { + NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false); spawnChildFromText(h, $value); } - else { - if(($ai = $runtime.getAttributeIndex("","final"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 632); - spawnChildFromText(h, $value); - } - else { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - NGCCHandler h = new occurs(this, super._source, $runtime, 632); - spawnChildFromText(h, $value); - } - } - } } } } @@ -855,47 +806,94 @@ class particle extends NGCCHandler { } } break; - case 8: + case 11: + { + $_ngcc_current_state = 10; + $runtime.sendText(super._cookie, $value); + } + break; + case 25: { if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } + } + break; + case 10: + { + action3(); + $_ngcc_current_state = 7; + $runtime.sendText(super._cookie, $value); + } + break; + case 3: + { + if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) { + NGCCHandler h = new wildcardBody(this, super._source, $runtime, 106, wloc); + spawnChildFromText(h, $value); + } else { - if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false); + if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { + NGCCHandler h = new wildcardBody(this, super._source, $runtime, 106, wloc); + spawnChildFromText(h, $value); + } + } + } + break; + case 16: + { + if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 121); + spawnChildFromText(h, $value); + } + else { + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 121); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","default"))>=0) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false); + if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 121); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false); + if(($ai = $runtime.getAttributeIndex("","ref"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 121); spawnChildFromText(h, $value); } else { if(($ai = $runtime.getAttributeIndex("","block"))>=0) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false); + NGCCHandler h = new occurs(this, super._source, $runtime, 121); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","form"))>=0) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false); + if(($ai = $runtime.getAttributeIndex("","final"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 121); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","final"))>=0) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false); + if(($ai = $runtime.getAttributeIndex("","form"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 121); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { - NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false); + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 121); spawnChildFromText(h, $value); } + else { + if(($ai = $runtime.getAttributeIndex("","default"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 121); + spawnChildFromText(h, $value); + } + else { + if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 121); + spawnChildFromText(h, $value); + } + } + } } } } @@ -905,22 +903,24 @@ class particle extends NGCCHandler { } } break; - case 24: - { - NGCCHandler h = new qname(this, super._source, $runtime, 641); - spawnChildFromText(h, $value); - } - break; - case 20: + case 21: { - action5(); - $_ngcc_current_state = 19; + $_ngcc_current_state = 20; $runtime.sendText(super._cookie, $value); } break; - case 0: + case 30: { - revertToParentFromText(result, super._cookie, $value); + if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 137); + spawnChildFromText(h, $value); + } + else { + if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { + NGCCHandler h = new occurs(this, super._source, $runtime, 137); + spawnChildFromText(h, $value); + } + } } break; } @@ -928,73 +928,73 @@ class particle extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 617: - { - wcBody = ((WildcardImpl)$__result__); - action0(); - $_ngcc_current_state = 2; - } - break; - case 647: + case 136: { term = ((ModelGroupImpl)$__result__); action7(); $_ngcc_current_state = 28; } break; - case 632: + case 107: { occurs = ((occurs)$__result__); - $_ngcc_current_state = 8; + $_ngcc_current_state = 3; } break; - case 618: + case 106: { - occurs = ((occurs)$__result__); - $_ngcc_current_state = 3; + wcBody = ((WildcardImpl)$__result__); + action0(); + $_ngcc_current_state = 2; } break; - case 648: + case 121: { occurs = ((occurs)$__result__); - $_ngcc_current_state = 29; + $_ngcc_current_state = 8; + } + break; + case 127: + { + annotation = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 20; } break; - case 643: + case 137: { occurs = ((occurs)$__result__); - $_ngcc_current_state = 25; + $_ngcc_current_state = 29; } break; - case 626: + case 132: { - annotation = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 10; + occurs = ((occurs)$__result__); + $_ngcc_current_state = 25; } break; - case 629: + case 118: { elementTypeName = ((UName)$__result__); $_ngcc_current_state = 13; } break; - case 638: + case 130: { - annotation = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 20; + groupName = ((UName)$__result__); + $_ngcc_current_state = 23; } break; - case 623: + case 112: { anonymousElementDecl = ((ElementDecl)$__result__); action2(); $_ngcc_current_state = 7; } break; - case 641: + case 115: { - groupName = ((UName)$__result__); - $_ngcc_current_state = 23; + annotation = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 10; } break; } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java index ce1cc179..160d0640 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java @@ -143,15 +143,15 @@ class qname extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 1: + case 0: { - qvalue = $value; - $_ngcc_current_state = 0; + revertToParentFromText($runtime.parseUName(qvalue), super._cookie, $value); } break; - case 0: + case 1: { - revertToParentFromText($runtime.parseUName(qvalue), super._cookie, $value); + qvalue = $value; + $_ngcc_current_state = 0; } break; } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java index 9480556f..4f443201 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java @@ -118,35 +118,39 @@ class redefine extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: + case 0: + { + revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 1: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 581, null,AnnotationContext.SCHEMA); + NGCCHandler h = new annotation(this, super._source, $runtime, 684, null,AnnotationContext.SCHEMA); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { - NGCCHandler h = new simpleType(this, super._source, $runtime, 582); + NGCCHandler h = new simpleType(this, super._source, $runtime, 685); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) { - NGCCHandler h = new complexType(this, super._source, $runtime, 583); + NGCCHandler h = new complexType(this, super._source, $runtime, 686); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) { - NGCCHandler h = new group(this, super._source, $runtime, 584); + NGCCHandler h = new group(this, super._source, $runtime, 687); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) { - NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 585); + NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 688); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 1; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + unexpectedEnterElement($__qname); } } } @@ -154,22 +158,6 @@ class redefine extends NGCCHandler { } } break; - case 15: - { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) { - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); - $_ngcc_current_state = 14; - } - else { - unexpectedEnterElement($__qname); - } - } - break; - case 0: - { - revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; case 14: { if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { @@ -181,34 +169,35 @@ class redefine extends NGCCHandler { } } break; - case 1: + case 2: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 576, null,AnnotationContext.SCHEMA); + NGCCHandler h = new annotation(this, super._source, $runtime, 689, null,AnnotationContext.SCHEMA); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { - NGCCHandler h = new simpleType(this, super._source, $runtime, 577); + NGCCHandler h = new simpleType(this, super._source, $runtime, 690); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) { - NGCCHandler h = new complexType(this, super._source, $runtime, 578); + NGCCHandler h = new complexType(this, super._source, $runtime, 691); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) { - NGCCHandler h = new group(this, super._source, $runtime, 579); + NGCCHandler h = new group(this, super._source, $runtime, 692); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) { - NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 580); + NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 693); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - unexpectedEnterElement($__qname); + $_ngcc_current_state = 1; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } } @@ -216,6 +205,17 @@ class redefine extends NGCCHandler { } } break; + case 15: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) { + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); + $_ngcc_current_state = 14; + } + else { + unexpectedEnterElement($__qname); + } + } + break; default: { unexpectedEnterElement($__qname); @@ -230,15 +230,20 @@ class redefine extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: + case 0: { - $_ngcc_current_state = 1; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); } break; - case 0: + case 1: { - revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) { + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 0; + } + else { + unexpectedLeaveElement($__qname); + } } break; case 14: @@ -252,15 +257,10 @@ class redefine extends NGCCHandler { } } break; - case 1: + case 2: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 0; - } - else { - unexpectedLeaveElement($__qname); - } + $_ngcc_current_state = 1; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; default: @@ -277,12 +277,6 @@ class redefine extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; case 0: { revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); @@ -298,6 +292,12 @@ class redefine extends NGCCHandler { } } break; + case 2: + { + $_ngcc_current_state = 1; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; default: { unexpectedEnterAttribute($__qname); @@ -312,10 +312,9 @@ class redefine extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: + case 0: { - $_ngcc_current_state = 1; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; case 12: @@ -328,9 +327,10 @@ class redefine extends NGCCHandler { } } break; - case 0: + case 2: { - revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 1; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; default: @@ -344,19 +344,6 @@ class redefine extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendText(super._cookie, $value); - } - break; - case 13: - { - schemaLocation = $value; - $_ngcc_current_state = 12; - action4(); - } - break; case 0: { revertToParentFromText(this, super._cookie, $value); @@ -370,71 +357,84 @@ class redefine extends NGCCHandler { } } break; + case 2: + { + $_ngcc_current_state = 1; + $runtime.sendText(super._cookie, $value); + } + break; + case 13: + { + schemaLocation = $value; + $_ngcc_current_state = 12; + action4(); + } + break; } } public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 581: + case 689: { $_ngcc_current_state = 1; } break; - case 582: + case 690: { newSt = ((SimpleTypeImpl)$__result__); action3(); $_ngcc_current_state = 1; } break; - case 583: + case 691: { newCt = ((ComplexTypeImpl)$__result__); action2(); $_ngcc_current_state = 1; } break; - case 584: + case 692: { newGrp = ((ModelGroupDeclImpl)$__result__); action1(); $_ngcc_current_state = 1; } break; - case 585: + case 693: { newAg = ((AttGroupDeclImpl)$__result__); action0(); $_ngcc_current_state = 1; } break; - case 576: + case 684: { $_ngcc_current_state = 1; } break; - case 577: + case 685: { newSt = ((SimpleTypeImpl)$__result__); action3(); $_ngcc_current_state = 1; } break; - case 578: + case 686: { newCt = ((ComplexTypeImpl)$__result__); action2(); $_ngcc_current_state = 1; } break; - case 579: + case 687: { newGrp = ((ModelGroupDeclImpl)$__result__); action1(); $_ngcc_current_state = 1; } break; - case 580: + case 688: { newAg = ((AttGroupDeclImpl)$__result__); action0(); diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java index 34b292ef..3f966ca5 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java @@ -81,36 +81,6 @@ class simpleType extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: - { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { - NGCCHandler h = new SimpleType_Restriction(this, super._source, $runtime, 182, annotation,locator,fa,name,finalSet); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) { - NGCCHandler h = new SimpleType_List(this, super._source, $runtime, 183, annotation,locator,fa,name,finalSet); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) { - NGCCHandler h = new SimpleType_Union(this, super._source, $runtime, 177, annotation,locator,fa,name,finalSet); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - unexpectedEnterElement($__qname); - } - } - } - } - break; - case 7: - { - action0(); - $_ngcc_current_state = 2; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; case 15: { if(($ai = $runtime.getAttributeIndex("","final"))>=0) { @@ -123,11 +93,6 @@ class simpleType extends NGCCHandler { } } break; - case 0: - { - revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; case 11: { if(($ai = $runtime.getAttributeIndex("","name"))>=0) { @@ -152,10 +117,22 @@ class simpleType extends NGCCHandler { } } break; + case 8: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { + NGCCHandler h = new annotation(this, super._source, $runtime, 89, null,AnnotationContext.SIMPLETYPE_DECL); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 7; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + } + break; case 10: { - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list")))))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 188, fa); + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list")))))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 91, fa); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -163,15 +140,38 @@ class simpleType extends NGCCHandler { } } break; - case 8: + case 7: { - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 186, null,AnnotationContext.SIMPLETYPE_DECL); + action0(); + $_ngcc_current_state = 2; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 0: + { + revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 2: + { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) { + NGCCHandler h = new SimpleType_Restriction(this, super._source, $runtime, 85, annotation,locator,fa,name,finalSet); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 7; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) { + NGCCHandler h = new SimpleType_List(this, super._source, $runtime, 86, annotation,locator,fa,name,finalSet); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) { + NGCCHandler h = new SimpleType_Union(this, super._source, $runtime, 80, annotation,locator,fa,name,finalSet); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + unexpectedEnterElement($__qname); + } + } } } break; @@ -189,13 +189,6 @@ class simpleType extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 7: - { - action0(); - $_ngcc_current_state = 2; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - break; case 15: { if(($ai = $runtime.getAttributeIndex("","final"))>=0) { @@ -208,11 +201,6 @@ class simpleType extends NGCCHandler { } } break; - case 0: - { - revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); - } - break; case 11: { if(($ai = $runtime.getAttributeIndex("","name"))>=0) { @@ -231,6 +219,13 @@ class simpleType extends NGCCHandler { $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; + case 7: + { + action0(); + $_ngcc_current_state = 2; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; case 1: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { @@ -242,6 +237,11 @@ class simpleType extends NGCCHandler { } } break; + case 0: + { + revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); + } + break; default: { unexpectedLeaveElement($__qname); @@ -256,13 +256,6 @@ class simpleType extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 7: - { - action0(); - $_ngcc_current_state = 2; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; case 15: { if(($__uri.equals("") && $__local.equals("final"))) { @@ -274,11 +267,6 @@ class simpleType extends NGCCHandler { } } break; - case 0: - { - revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); - } - break; case 11: { if(($__uri.equals("") && $__local.equals("name"))) { @@ -296,6 +284,18 @@ class simpleType extends NGCCHandler { $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; + case 7: + { + action0(); + $_ngcc_current_state = 2; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 0: + { + revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); + } + break; default: { unexpectedEnterAttribute($__qname); @@ -310,27 +310,29 @@ class simpleType extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 7: + case 15: { - action0(); - $_ngcc_current_state = 2; + $_ngcc_current_state = 11; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 15: + case 11: { - $_ngcc_current_state = 11; + $_ngcc_current_state = 10; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 16: + case 8: { - if(($__uri.equals("") && $__local.equals("final"))) { - $_ngcc_current_state = 11; - } - else { - unexpectedLeaveAttribute($__qname); - } + $_ngcc_current_state = 7; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 7: + { + action0(); + $_ngcc_current_state = 2; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; case 12: @@ -343,21 +345,19 @@ class simpleType extends NGCCHandler { } } break; - case 0: - { - revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); - } - break; - case 11: + case 16: { - $_ngcc_current_state = 10; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + if(($__uri.equals("") && $__local.equals("final"))) { + $_ngcc_current_state = 11; + } + else { + unexpectedLeaveAttribute($__qname); + } } break; - case 8: + case 0: { - $_ngcc_current_state = 7; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); } break; default: @@ -371,11 +371,10 @@ class simpleType extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 7: + case 13: { - action0(); - $_ngcc_current_state = 2; - $runtime.sendText(super._cookie, $value); + name = $value; + $_ngcc_current_state = 12; } break; case 15: @@ -390,17 +389,6 @@ class simpleType extends NGCCHandler { } } break; - case 13: - { - name = $value; - $_ngcc_current_state = 12; - } - break; - case 0: - { - revertToParentFromText(result, super._cookie, $value); - } - break; case 11: { if(($ai = $runtime.getAttributeIndex("","name"))>=0) { @@ -413,16 +401,28 @@ class simpleType extends NGCCHandler { } } break; + case 8: + { + $_ngcc_current_state = 7; + $runtime.sendText(super._cookie, $value); + } + break; + case 7: + { + action0(); + $_ngcc_current_state = 2; + $runtime.sendText(super._cookie, $value); + } + break; case 17: { finalValue = $value; $_ngcc_current_state = 16; } break; - case 8: + case 0: { - $_ngcc_current_state = 7; - $runtime.sendText(super._cookie, $value); + revertToParentFromText(result, super._cookie, $value); } break; } @@ -430,31 +430,31 @@ class simpleType extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 186: + case 89: { annotation = ((AnnotationImpl)$__result__); $_ngcc_current_state = 7; } break; - case 188: + case 91: { fa = ((ForeignAttributesImpl)$__result__); $_ngcc_current_state = 8; } break; - case 182: + case 85: { result = ((RestrictionSimpleTypeImpl)$__result__); $_ngcc_current_state = 1; } break; - case 183: + case 86: { result = ((ListSimpleTypeImpl)$__result__); $_ngcc_current_state = 1; } break; - case 177: + case 80: { result = ((UnionSimpleTypeImpl)$__result__); $_ngcc_current_state = 1; diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java index 0524ac7b..b4ee9c06 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java @@ -77,6 +77,18 @@ class wildcardBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 1: + { + if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + else { + $_ngcc_current_state = 0; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + } + break; case 5: { if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) { @@ -91,12 +103,12 @@ class wildcardBody extends NGCCHandler { break; case 9: { - if((($ai = $runtime.getAttributeIndex("","processContents"))>=0 || ($ai = $runtime.getAttributeIndex("","namespace"))>=0)) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null); + if((($ai = $runtime.getAttributeIndex("","namespace"))>=0 || ($ai = $runtime.getAttributeIndex("","processContents"))>=0)) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } } @@ -104,7 +116,7 @@ class wildcardBody extends NGCCHandler { case 10: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 414, null,AnnotationContext.WILDCARD); + NGCCHandler h = new annotation(this, super._source, $runtime, 411, null,AnnotationContext.WILDCARD); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -113,18 +125,6 @@ class wildcardBody extends NGCCHandler { } } break; - case 1: - { - if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - else { - $_ngcc_current_state = 0; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - } - break; case 0: { revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs); @@ -144,6 +144,18 @@ class wildcardBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 1: + { + if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + else { + $_ngcc_current_state = 0; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + } + break; case 5: { if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) { @@ -158,12 +170,12 @@ class wildcardBody extends NGCCHandler { break; case 9: { - if((($ai = $runtime.getAttributeIndex("","processContents"))>=0 || ($ai = $runtime.getAttributeIndex("","namespace"))>=0)) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null); + if((($ai = $runtime.getAttributeIndex("","namespace"))>=0 || ($ai = $runtime.getAttributeIndex("","processContents"))>=0)) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null); spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } } @@ -174,18 +186,6 @@ class wildcardBody extends NGCCHandler { $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } break; - case 1: - { - if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - else { - $_ngcc_current_state = 0; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - } - break; case 0: { revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname); @@ -205,6 +205,17 @@ class wildcardBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 1: + { + if(($__uri.equals("") && $__local.equals("namespace"))) { + $_ngcc_current_state = 3; + } + else { + $_ngcc_current_state = 0; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + } + break; case 5: { if(($__uri.equals("") && $__local.equals("processContents"))) { @@ -218,12 +229,12 @@ class wildcardBody extends NGCCHandler { break; case 9: { - if((($__uri.equals("") && $__local.equals("processContents")) || ($__uri.equals("") && $__local.equals("namespace")))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null); + if((($__uri.equals("") && $__local.equals("namespace")) || ($__uri.equals("") && $__local.equals("processContents")))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null); spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null); spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } } @@ -234,17 +245,6 @@ class wildcardBody extends NGCCHandler { $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 1: - { - if(($__uri.equals("") && $__local.equals("namespace"))) { - $_ngcc_current_state = 3; - } - else { - $_ngcc_current_state = 0; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - } - break; case 0: { revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); @@ -264,55 +264,55 @@ class wildcardBody extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 5: + case 1: { - $_ngcc_current_state = 1; + $_ngcc_current_state = 0; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 9: + case 5: { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null); - spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname); + $_ngcc_current_state = 1; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 2: + case 6: { - if(($__uri.equals("") && $__local.equals("namespace"))) { - $_ngcc_current_state = 0; + if(($__uri.equals("") && $__local.equals("processContents"))) { + $_ngcc_current_state = 1; } else { unexpectedLeaveAttribute($__qname); } } break; + case 9: + { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null); + spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname); + } + break; case 10: { $_ngcc_current_state = 9; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 1: + case 0: { - $_ngcc_current_state = 0; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); } break; - case 6: + case 2: { - if(($__uri.equals("") && $__local.equals("processContents"))) { - $_ngcc_current_state = 1; + if(($__uri.equals("") && $__local.equals("namespace"))) { + $_ngcc_current_state = 0; } else { unexpectedLeaveAttribute($__qname); } } break; - case 0: - { - revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveAttribute($__qname); @@ -324,69 +324,69 @@ class wildcardBody extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 5: + case 1: { - if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) { + if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 0; $runtime.sendText(super._cookie, $value); } } break; - case 7: + case 3: { - modeValue = $value; - $_ngcc_current_state = 6; + ns = $value; + $_ngcc_current_state = 2; + } + break; + case 5: + { + if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } + else { + $_ngcc_current_state = 1; + $runtime.sendText(super._cookie, $value); + } } break; case 9: { - if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null); + if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null); spawnChildFromText(h, $value); } else { - if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null); + if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null); spawnChildFromText(h, $value); } else { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null); spawnChildFromText(h, $value); } } } break; - case 3: - { - ns = $value; - $_ngcc_current_state = 2; - } - break; case 10: { $_ngcc_current_state = 9; $runtime.sendText(super._cookie, $value); } break; - case 1: + case 0: { - if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } - else { - $_ngcc_current_state = 0; - $runtime.sendText(super._cookie, $value); - } + revertToParentFromText(makeResult(), super._cookie, $value); } break; - case 0: + case 7: { - revertToParentFromText(makeResult(), super._cookie, $value); + modeValue = $value; + $_ngcc_current_state = 6; } break; } @@ -394,13 +394,13 @@ class wildcardBody extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 412: + case 409: { fa = ((ForeignAttributesImpl)$__result__); $_ngcc_current_state = 5; } break; - case 414: + case 411: { annotation = ((AnnotationImpl)$__result__); $_ngcc_current_state = 9; @@ -410,7 +410,7 @@ class wildcardBody extends NGCCHandler { } public boolean accepted() { - return((($_ngcc_current_state == 0) || (($_ngcc_current_state == 1) || ($_ngcc_current_state == 5)))); + return((($_ngcc_current_state == 0) || (($_ngcc_current_state == 5) || ($_ngcc_current_state == 1)))); } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java index 014d421d..5b245596 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java @@ -72,10 +72,26 @@ class xpath extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 0: + { + revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 6: + { + if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) { + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 77, null); + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); + } + else { + unexpectedEnterElement($__qname); + } + } + break; case 1: { if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { - NGCCHandler h = new annotation(this, super._source, $runtime, 679, null,AnnotationContext.XPATH); + NGCCHandler h = new annotation(this, super._source, $runtime, 72, null,AnnotationContext.XPATH); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -95,22 +111,6 @@ class xpath extends NGCCHandler { } } break; - case 6: - { - if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 684, null); - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); - } - else { - unexpectedEnterElement($__qname); - } - } - break; - case 0: - { - revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; default: { unexpectedEnterElement($__qname); @@ -125,39 +125,39 @@ class xpath extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 1: + case 0: { - $_ngcc_current_state = 0; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname); } break; - case 5: + case 6: { if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 77, null); + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); } } break; - case 6: + case 1: + { + $_ngcc_current_state = 0; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + break; + case 5: { if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 684, null); - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { unexpectedLeaveElement($__qname); } } break; - case 0: - { - revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveElement($__qname); @@ -172,38 +172,38 @@ class xpath extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 1: + case 0: { - $_ngcc_current_state = 0; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); } break; - case 5: + case 6: { if(($__uri.equals("") && $__local.equals("xpath"))) { - $_ngcc_current_state = 4; + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 77, null); + spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); } else { unexpectedEnterAttribute($__qname); } } break; - case 6: + case 1: + { + $_ngcc_current_state = 0; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 5: { if(($__uri.equals("") && $__local.equals("xpath"))) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 684, null); - spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); + $_ngcc_current_state = 4; } else { unexpectedEnterAttribute($__qname); } } break; - case 0: - { - revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedEnterAttribute($__qname); @@ -218,15 +218,15 @@ class xpath extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 1: + case 0: { - $_ngcc_current_state = 0; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); } break; - case 0: + case 1: { - revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 0; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; case 3: @@ -250,37 +250,37 @@ class xpath extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 1: + case 4: { - $_ngcc_current_state = 0; - $runtime.sendText(super._cookie, $value); + xpath = $value; + $_ngcc_current_state = 3; } break; - case 5: + case 0: { - if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } + revertToParentFromText(makeResult(), super._cookie, $value); } break; case 6: { if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) { - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 684, null); + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 77, null); spawnChildFromText(h, $value); } } break; - case 0: + case 1: { - revertToParentFromText(makeResult(), super._cookie, $value); + $_ngcc_current_state = 0; + $runtime.sendText(super._cookie, $value); } break; - case 4: + case 5: { - xpath = $value; - $_ngcc_current_state = 3; + if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } } break; } @@ -288,23 +288,23 @@ class xpath extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 679: + case 77: { - ann = ((AnnotationImpl)$__result__); - $_ngcc_current_state = 0; + fa = ((ForeignAttributesImpl)$__result__); + $_ngcc_current_state = 5; } break; - case 684: + case 72: { - fa = ((ForeignAttributesImpl)$__result__); - $_ngcc_current_state = 5; + ann = ((AnnotationImpl)$__result__); + $_ngcc_current_state = 0; } break; } } public boolean accepted() { - return((($_ngcc_current_state == 0) || ($_ngcc_current_state == 1))); + return((($_ngcc_current_state == 1) || ($_ngcc_current_state == 0))); } diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/JAXPParser.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/JAXPParser.java index ecd0330d..13401ba9 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/JAXPParser.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/JAXPParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,18 +27,14 @@ package com.sun.xml.internal.xsom.parser; import java.io.IOException; import java.net.URL; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.xml.sax.ContentHandler; -import org.xml.sax.EntityResolver; -import org.xml.sax.ErrorHandler; -import org.xml.sax.InputSource; -import org.xml.sax.Locator; -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import org.xml.sax.XMLReader; +import org.xml.sax.*; import org.xml.sax.helpers.XMLFilterImpl; import com.sun.xml.internal.xsom.impl.parser.Messages; @@ -51,6 +47,11 @@ import com.sun.xml.internal.xsom.impl.parser.Messages; */ public class JAXPParser implements XMLParser { + // not in older JDK, so must be duplicated here, otherwise javax.xml.XMLConstants should be used + private static final String ACCESS_EXTERNAL_SCHEMA = "http://javax.xml.XMLConstants/property/accessExternalSchema"; + + private static final Logger LOGGER = Logger.getLogger(JAXPParser.class.getName()); + private final SAXParserFactory factory; public JAXPParser( SAXParserFactory factory ) { @@ -58,6 +59,11 @@ public class JAXPParser implements XMLParser { this.factory = factory; } + /** + * @deprecated Unsafe, use JAXPParser(factory) instead with + * security features initialized by setting + * XMLConstants.FEATURE_SECURE_PROCESSING feature. + */ public JAXPParser() { this( SAXParserFactory.newInstance()); } @@ -68,8 +74,8 @@ public class JAXPParser implements XMLParser { throws SAXException, IOException { try { - XMLReader reader = factory.newSAXParser().getXMLReader(); - reader = new XMLReaderEx(reader); + SAXParser saxParser = allowFileAccess(factory.newSAXParser(), false); + XMLReader reader = new XMLReaderEx(saxParser.getXMLReader()); reader.setContentHandler(handler); if(errorHandler!=null) @@ -85,6 +91,24 @@ public class JAXPParser implements XMLParser { } } + private static SAXParser allowFileAccess(SAXParser saxParser, boolean disableSecureProcessing) throws SAXException { + + // if feature secure processing enabled, nothing to do, file is allowed, + // or user is able to control access by standard JAXP mechanisms + if (disableSecureProcessing) { + return saxParser; + } + + try { + saxParser.setProperty(ACCESS_EXTERNAL_SCHEMA, "file"); + LOGGER.log(Level.FINE, Messages.format(Messages.JAXP_SUPPORTED_PROPERTY, ACCESS_EXTERNAL_SCHEMA)); + } catch (SAXException ignored) { + // nothing to do; support depends on version JDK or SAX implementation + LOGGER.log(Level.CONFIG, Messages.format(Messages.JAXP_UNSUPPORTED_PROPERTY, ACCESS_EXTERNAL_SCHEMA), ignored); + } + return saxParser; + } + /** * XMLReader with improved error message for entity resolution failure. * diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/XSOMParser.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/XSOMParser.java index 6bb8d379..a877f002 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/XSOMParser.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/XSOMParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -64,6 +64,9 @@ public final class XSOMParser { /** * Creates a new XSOMParser by using a SAX parser from JAXP. + * @deprecated Unsafe, use XSOMParser(factory) instead with + * security features initialized by setting + * XMLConstants.FEATURE_SECURE_PROCESSING feature. */ public XSOMParser() { this(new JAXPParser()); diff --git a/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java b/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java index 672c1a84..93fbd0fc 100644 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,6 +29,7 @@ import com.sun.xml.internal.xsom.XSAnnotation; import com.sun.xml.internal.xsom.parser.AnnotationContext; import com.sun.xml.internal.xsom.parser.AnnotationParser; import com.sun.xml.internal.xsom.parser.AnnotationParserFactory; +import javax.xml.XMLConstants; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -56,10 +57,15 @@ import javax.xml.transform.sax.TransformerHandler; * @author Kohsuke Kawaguchi */ public class DomAnnotationParserFactory implements AnnotationParserFactory { + public AnnotationParser create() { return new AnnotationParserImpl(); } + public AnnotationParser create(boolean disableSecureProcessing) { + return new AnnotationParserImpl(); + } + private static final SAXTransformerFactory stf = (SAXTransformerFactory) SAXTransformerFactory.newInstance(); private static class AnnotationParserImpl extends AnnotationParser { @@ -71,8 +77,13 @@ public class DomAnnotationParserFactory implements AnnotationParserFactory { private DOMResult result; AnnotationParserImpl() { + this(false); + } + + AnnotationParserImpl(boolean disableSecureProcessing) { try { transformer = stf.newTransformerHandler(); + stf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, disableSecureProcessing); } catch (TransformerConfigurationException e) { throw new Error(e); // impossible } diff --git a/src/share/jaxws_classes/javax/xml/bind/Binder.java b/src/share/jaxws_classes/javax/xml/bind/Binder.java index c72736fb..a243aaaa 100644 --- a/src/share/jaxws_classes/javax/xml/bind/Binder.java +++ b/src/share/jaxws_classes/javax/xml/bind/Binder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/ContextFinder.java b/src/share/jaxws_classes/javax/xml/bind/ContextFinder.java index 046329d4..78dd65de 100644 --- a/src/share/jaxws_classes/javax/xml/bind/ContextFinder.java +++ b/src/share/jaxws_classes/javax/xml/bind/ContextFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -310,17 +310,16 @@ class ContextFinder { } } - if (getContextClassLoader() == classLoader) { - Class factory = lookupUsingOSGiServiceLoader("javax.xml.bind.JAXBContext"); - if (factory != null) { - logger.fine("OSGi environment detected"); - return newInstance(contextPath, factory, classLoader, properties); - } + // OSGi search + Class jaxbContext = lookupJaxbContextUsingOsgiServiceLoader(); + if (jaxbContext != null) { + logger.fine("OSGi environment detected"); + return newInstance(contextPath, jaxbContext, classLoader, properties); } logger.fine("Searching META-INF/services"); // search META-INF services next - BufferedReader r; + BufferedReader r = null; try { final StringBuilder resource = new StringBuilder().append("META-INF/services/").append(jaxbContextFQCN); final InputStream resourceStream = @@ -328,7 +327,10 @@ class ContextFinder { if (resourceStream != null) { r = new BufferedReader(new InputStreamReader(resourceStream, "UTF-8")); - factoryClassName = r.readLine().trim(); + factoryClassName = r.readLine(); + if (factoryClassName != null) { + factoryClassName = factoryClassName.trim(); + } r.close(); return newInstance(contextPath, factoryClassName, classLoader, properties); } else { @@ -339,6 +341,14 @@ class ContextFinder { throw new JAXBException(e); } catch (IOException e) { throw new JAXBException(e); + } finally { + try { + if (r != null) { + r.close(); + } + } catch (IOException ex) { + Logger.getLogger(ContextFinder.class.getName()).log(Level.SEVERE, null, ex); + } } // else no provider found @@ -402,15 +412,16 @@ class ContextFinder { } } - Class factory = lookupUsingOSGiServiceLoader("javax.xml.bind.JAXBContext"); - if (factory != null) { + // OSGi search + Class jaxbContext = lookupJaxbContextUsingOsgiServiceLoader(); + if (jaxbContext != null) { logger.fine("OSGi environment detected"); - return newInstance(classes, properties, factory); + return newInstance(classes, properties, jaxbContext); } // search META-INF services next logger.fine("Checking META-INF/services"); - BufferedReader r; + BufferedReader r = null; try { final String resource = new StringBuilder("META-INF/services/").append(jaxbContextFQCN).toString(); ClassLoader classLoader = getContextClassLoader(); @@ -423,7 +434,10 @@ class ContextFinder { if (resourceURL != null) { logger.log(Level.FINE, "Reading {0}", resourceURL); r = new BufferedReader(new InputStreamReader(resourceURL.openStream(), "UTF-8")); - factoryClassName = r.readLine().trim(); + factoryClassName = r.readLine(); + if (factoryClassName != null) { + factoryClassName = factoryClassName.trim(); + } return newInstance(classes, properties, factoryClassName); } else { logger.log(Level.FINE, "Unable to find: {0}", resource); @@ -433,6 +447,14 @@ class ContextFinder { throw new JAXBException(e); } catch (IOException e) { throw new JAXBException(e); + } finally { + if (r != null) { + try { + r.close(); + } catch (IOException ex) { + logger.log(Level.FINE, "Unable to close stream", ex); + } + } } // else no provider found @@ -440,16 +462,15 @@ class ContextFinder { return newInstance(classes, properties, PLATFORM_DEFAULT_FACTORY_CLASS); } - private static Class lookupUsingOSGiServiceLoader(String factoryId) { + private static Class lookupJaxbContextUsingOsgiServiceLoader() { try { - // Use reflection to avoid having any dependendcy on ServiceLoader class - Class serviceClass = Class.forName(factoryId); + // Use reflection to avoid having any dependency on ServiceLoader class Class target = Class.forName("com.sun.org.glassfish.hk2.osgiresourcelocator.ServiceLoader"); Method m = target.getMethod("lookupProviderClasses", Class.class); - Iterator iter = ((Iterable) m.invoke(null, serviceClass)).iterator(); + Iterator iter = ((Iterable) m.invoke(null, JAXBContext.class)).iterator(); return iter.hasNext() ? (Class)iter.next() : null; } catch(Exception e) { - logger.log(Level.FINE, "Unable to find from OSGi: {0}", factoryId); + logger.log(Level.FINE, "Unable to find from OSGi: javax.xml.bind.JAXBContext"); return null; } } diff --git a/src/share/jaxws_classes/javax/xml/bind/DataBindingException.java b/src/share/jaxws_classes/javax/xml/bind/DataBindingException.java index cb9a77bb..2d0461ef 100644 --- a/src/share/jaxws_classes/javax/xml/bind/DataBindingException.java +++ b/src/share/jaxws_classes/javax/xml/bind/DataBindingException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/DatatypeConverter.java b/src/share/jaxws_classes/javax/xml/bind/DatatypeConverter.java index d25b79f5..c7cc5094 100644 --- a/src/share/jaxws_classes/javax/xml/bind/DatatypeConverter.java +++ b/src/share/jaxws_classes/javax/xml/bind/DatatypeConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -94,7 +94,7 @@ import javax.xml.namespace.NamespaceContext; final public class DatatypeConverter { // delegate to this instance of DatatypeConverter - private static DatatypeConverterInterface theConverter = null; + private static volatile DatatypeConverterInterface theConverter = null; private final static JAXBPermission SET_DATATYPE_CONVERTER_PERMISSION = new JAXBPermission("setDatatypeConverter"); diff --git a/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java b/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java index 49c41af6..a2358500 100644 --- a/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java +++ b/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterInterface.java b/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterInterface.java index c6de51b3..228673bc 100644 --- a/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterInterface.java +++ b/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterInterface.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/Element.java b/src/share/jaxws_classes/javax/xml/bind/Element.java index f924ccb4..6e576d05 100644 --- a/src/share/jaxws_classes/javax/xml/bind/Element.java +++ b/src/share/jaxws_classes/javax/xml/bind/Element.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/GetPropertyAction.java b/src/share/jaxws_classes/javax/xml/bind/GetPropertyAction.java index 65c16bbf..45867c17 100644 --- a/src/share/jaxws_classes/javax/xml/bind/GetPropertyAction.java +++ b/src/share/jaxws_classes/javax/xml/bind/GetPropertyAction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/JAXB.java b/src/share/jaxws_classes/javax/xml/bind/JAXB.java index 053922c5..3c164546 100644 --- a/src/share/jaxws_classes/javax/xml/bind/JAXB.java +++ b/src/share/jaxws_classes/javax/xml/bind/JAXB.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/JAXBContext.java b/src/share/jaxws_classes/javax/xml/bind/JAXBContext.java index 07940c62..2d3c1255 100644 --- a/src/share/jaxws_classes/javax/xml/bind/JAXBContext.java +++ b/src/share/jaxws_classes/javax/xml/bind/JAXBContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/JAXBElement.java b/src/share/jaxws_classes/javax/xml/bind/JAXBElement.java index 611d0ade..fa240af7 100644 --- a/src/share/jaxws_classes/javax/xml/bind/JAXBElement.java +++ b/src/share/jaxws_classes/javax/xml/bind/JAXBElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/JAXBException.java b/src/share/jaxws_classes/javax/xml/bind/JAXBException.java index f3de84d5..ff79b118 100644 --- a/src/share/jaxws_classes/javax/xml/bind/JAXBException.java +++ b/src/share/jaxws_classes/javax/xml/bind/JAXBException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/JAXBIntrospector.java b/src/share/jaxws_classes/javax/xml/bind/JAXBIntrospector.java index b7c09aa0..18a70ff6 100644 --- a/src/share/jaxws_classes/javax/xml/bind/JAXBIntrospector.java +++ b/src/share/jaxws_classes/javax/xml/bind/JAXBIntrospector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/JAXBPermission.java b/src/share/jaxws_classes/javax/xml/bind/JAXBPermission.java index ca200be7..05b83450 100644 --- a/src/share/jaxws_classes/javax/xml/bind/JAXBPermission.java +++ b/src/share/jaxws_classes/javax/xml/bind/JAXBPermission.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/MarshalException.java b/src/share/jaxws_classes/javax/xml/bind/MarshalException.java index 47e689d4..f944d1d0 100644 --- a/src/share/jaxws_classes/javax/xml/bind/MarshalException.java +++ b/src/share/jaxws_classes/javax/xml/bind/MarshalException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/Messages.java b/src/share/jaxws_classes/javax/xml/bind/Messages.java index 25c3865a..a1ebb81f 100644 --- a/src/share/jaxws_classes/javax/xml/bind/Messages.java +++ b/src/share/jaxws_classes/javax/xml/bind/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/Messages.properties b/src/share/jaxws_classes/javax/xml/bind/Messages.properties index b773c80c..e6a930d6 100644 --- a/src/share/jaxws_classes/javax/xml/bind/Messages.properties +++ b/src/share/jaxws_classes/javax/xml/bind/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/NotIdentifiableEvent.java b/src/share/jaxws_classes/javax/xml/bind/NotIdentifiableEvent.java index b4d101c8..f4820c96 100644 --- a/src/share/jaxws_classes/javax/xml/bind/NotIdentifiableEvent.java +++ b/src/share/jaxws_classes/javax/xml/bind/NotIdentifiableEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/ParseConversionEvent.java b/src/share/jaxws_classes/javax/xml/bind/ParseConversionEvent.java index 32c7407a..b6ee5e69 100644 --- a/src/share/jaxws_classes/javax/xml/bind/ParseConversionEvent.java +++ b/src/share/jaxws_classes/javax/xml/bind/ParseConversionEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/PrintConversionEvent.java b/src/share/jaxws_classes/javax/xml/bind/PrintConversionEvent.java index 9014aacc..c630cf62 100644 --- a/src/share/jaxws_classes/javax/xml/bind/PrintConversionEvent.java +++ b/src/share/jaxws_classes/javax/xml/bind/PrintConversionEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/PropertyException.java b/src/share/jaxws_classes/javax/xml/bind/PropertyException.java index 0969ad4e..65613b84 100644 --- a/src/share/jaxws_classes/javax/xml/bind/PropertyException.java +++ b/src/share/jaxws_classes/javax/xml/bind/PropertyException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/SchemaOutputResolver.java b/src/share/jaxws_classes/javax/xml/bind/SchemaOutputResolver.java index 3892612e..f911107b 100644 --- a/src/share/jaxws_classes/javax/xml/bind/SchemaOutputResolver.java +++ b/src/share/jaxws_classes/javax/xml/bind/SchemaOutputResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/TypeConstraintException.java b/src/share/jaxws_classes/javax/xml/bind/TypeConstraintException.java index 1a04ca50..a1118b1a 100644 --- a/src/share/jaxws_classes/javax/xml/bind/TypeConstraintException.java +++ b/src/share/jaxws_classes/javax/xml/bind/TypeConstraintException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/UnmarshalException.java b/src/share/jaxws_classes/javax/xml/bind/UnmarshalException.java index 6a0d8f4a..88746597 100644 --- a/src/share/jaxws_classes/javax/xml/bind/UnmarshalException.java +++ b/src/share/jaxws_classes/javax/xml/bind/UnmarshalException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/Unmarshaller.java b/src/share/jaxws_classes/javax/xml/bind/Unmarshaller.java index 0e5420b7..eb3090ab 100644 --- a/src/share/jaxws_classes/javax/xml/bind/Unmarshaller.java +++ b/src/share/jaxws_classes/javax/xml/bind/Unmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/UnmarshallerHandler.java b/src/share/jaxws_classes/javax/xml/bind/UnmarshallerHandler.java index 94721a1e..0f2c7954 100644 --- a/src/share/jaxws_classes/javax/xml/bind/UnmarshallerHandler.java +++ b/src/share/jaxws_classes/javax/xml/bind/UnmarshallerHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/ValidationEvent.java b/src/share/jaxws_classes/javax/xml/bind/ValidationEvent.java index e2756099..5395904c 100644 --- a/src/share/jaxws_classes/javax/xml/bind/ValidationEvent.java +++ b/src/share/jaxws_classes/javax/xml/bind/ValidationEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/ValidationEventHandler.java b/src/share/jaxws_classes/javax/xml/bind/ValidationEventHandler.java index 951631c3..76ed5842 100644 --- a/src/share/jaxws_classes/javax/xml/bind/ValidationEventHandler.java +++ b/src/share/jaxws_classes/javax/xml/bind/ValidationEventHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/ValidationEventLocator.java b/src/share/jaxws_classes/javax/xml/bind/ValidationEventLocator.java index 822cc2ed..c45327ea 100644 --- a/src/share/jaxws_classes/javax/xml/bind/ValidationEventLocator.java +++ b/src/share/jaxws_classes/javax/xml/bind/ValidationEventLocator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/ValidationException.java b/src/share/jaxws_classes/javax/xml/bind/ValidationException.java index e461c05f..32f2223b 100644 --- a/src/share/jaxws_classes/javax/xml/bind/ValidationException.java +++ b/src/share/jaxws_classes/javax/xml/bind/ValidationException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/Validator.java b/src/share/jaxws_classes/javax/xml/bind/Validator.java index 7e72d0b5..830c30ae 100644 --- a/src/share/jaxws_classes/javax/xml/bind/Validator.java +++ b/src/share/jaxws_classes/javax/xml/bind/Validator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/WhiteSpaceProcessor.java b/src/share/jaxws_classes/javax/xml/bind/WhiteSpaceProcessor.java index 734c3736..9bf23293 100644 --- a/src/share/jaxws_classes/javax/xml/bind/WhiteSpaceProcessor.java +++ b/src/share/jaxws_classes/javax/xml/bind/WhiteSpaceProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/DomHandler.java b/src/share/jaxws_classes/javax/xml/bind/annotation/DomHandler.java index e143bf1c..e9ab3311 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/DomHandler.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/DomHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/W3CDomHandler.java b/src/share/jaxws_classes/javax/xml/bind/annotation/W3CDomHandler.java index 15e795c2..113780e2 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/W3CDomHandler.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/W3CDomHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessOrder.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessOrder.java index 0993c734..2235678a 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessOrder.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessOrder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessType.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessType.java index 83cafb69..c53213a4 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessType.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorOrder.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorOrder.java index 0ab06ff9..a72a9d2a 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorOrder.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorOrder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorType.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorType.java index 83a9aeaa..e8f044f9 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorType.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyAttribute.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyAttribute.java index 80094746..bf1a6ad2 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyAttribute.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyAttribute.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyElement.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyElement.java index 17ba3b1c..9613547c 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyElement.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttachmentRef.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttachmentRef.java index d565d316..d15dc369 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttachmentRef.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttachmentRef.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttribute.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttribute.java index f852a17e..13f52547 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttribute.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttribute.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElement.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElement.java index 1b29edf3..6f2c7e5a 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElement.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementDecl.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementDecl.java index ea637bd4..d5c558de 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementDecl.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementDecl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRef.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRef.java index d3d39560..0f5c7219 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRef.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRef.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRefs.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRefs.java index 159688b5..bb3633ed 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRefs.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRefs.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementWrapper.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementWrapper.java index 2e11c15f..c6bebb27 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementWrapper.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElements.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElements.java index 8366c57c..2e538460 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElements.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElements.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnum.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnum.java index 1b718536..544a21e1 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnum.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnum.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java index 429405b5..ea656abd 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlID.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlID.java index e64ebdee..13ce41d5 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlID.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlID.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlIDREF.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlIDREF.java index c6e69a87..ef9e2c6b 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlIDREF.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlIDREF.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlList.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlList.java index d744bfa8..ef11b5b1 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlList.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlList.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMixed.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMixed.java index 9ffd0ca9..7b0462e6 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMixed.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMixed.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNs.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNs.java index 58b68c66..dc92cc55 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNs.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNs.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNsForm.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNsForm.java index 5b554b1f..68670a9c 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNsForm.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNsForm.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRegistry.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRegistry.java index cf12b406..1218061c 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRegistry.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRootElement.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRootElement.java index d28407c1..4216d4a8 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRootElement.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRootElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchema.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchema.java index aed9067c..80756f38 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchema.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchema.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaType.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaType.java index 82e08eda..7484cc1c 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaType.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaTypes.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaTypes.java index 26b18abc..d32a6218 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaTypes.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaTypes.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSeeAlso.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSeeAlso.java index 54e3cfd6..41bf41e3 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSeeAlso.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSeeAlso.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlTransient.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlTransient.java index 79ffe298..730dea19 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlTransient.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlTransient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlType.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlType.java index 7bcfaa8a..3802f978 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlType.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlValue.java b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlValue.java index 016b3268..dc18c2fc 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/XmlValue.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/XmlValue.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java b/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java index 4945e984..b9c1b7d3 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -64,7 +64,7 @@ public class CollapsedStringAdapter extends XmlAdapter<String,String> { // we now know that the input contains spaces. // let's sit down and do the collapsing normally. - StringBuffer result = new StringBuffer(len /*allocate enough size to avoid re-allocation*/ ); + StringBuilder result = new StringBuilder(len /*allocate enough size to avoid re-allocation*/ ); if(s!=0) { for( int i=0; i<s; i++ ) diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java b/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java index 203c38f5..84704a68 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java b/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java index d18dabf0..1ec0b11c 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java b/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java index 87160449..ab0cf949 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java b/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java index 3a48f0d1..c29493b4 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/package.html b/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/package.html index 3b9a50f6..91749443 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/package.html +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/package.html @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <!-- - Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/annotation/package.html b/src/share/jaxws_classes/javax/xml/bind/annotation/package.html index a89b8cc9..5e6a2a3d 100644 --- a/src/share/jaxws_classes/javax/xml/bind/annotation/package.html +++ b/src/share/jaxws_classes/javax/xml/bind/annotation/package.html @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <!-- - Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentMarshaller.java b/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentMarshaller.java index 2ef4a477..8d4892b6 100644 --- a/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentMarshaller.java +++ b/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java b/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java index f97fcd74..23d87215 100644 --- a/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java +++ b/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/attachment/package.html b/src/share/jaxws_classes/javax/xml/bind/attachment/package.html index 3fda0a82..5dca81db 100644 --- a/src/share/jaxws_classes/javax/xml/bind/attachment/package.html +++ b/src/share/jaxws_classes/javax/xml/bind/attachment/package.html @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <!-- - Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java b/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java index 8c6b6d80..c2506d23 100644 --- a/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java +++ b/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java b/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java index 44f5e4c3..37e04088 100644 --- a/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java +++ b/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java b/src/share/jaxws_classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java index 0bbfdf27..7fe68ef8 100644 --- a/src/share/jaxws_classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java +++ b/src/share/jaxws_classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.java b/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.java index e3be356b..bebce5ab 100644 --- a/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.java +++ b/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.properties b/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.properties index ea4332ec..f08d677a 100644 --- a/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.properties +++ b/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java b/src/share/jaxws_classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java index f1a0c758..e34c7889 100644 --- a/src/share/jaxws_classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java +++ b/src/share/jaxws_classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/helpers/ParseConversionEventImpl.java b/src/share/jaxws_classes/javax/xml/bind/helpers/ParseConversionEventImpl.java index 6cecc13e..92b50484 100644 --- a/src/share/jaxws_classes/javax/xml/bind/helpers/ParseConversionEventImpl.java +++ b/src/share/jaxws_classes/javax/xml/bind/helpers/ParseConversionEventImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/helpers/PrintConversionEventImpl.java b/src/share/jaxws_classes/javax/xml/bind/helpers/PrintConversionEventImpl.java index e2d5a307..00de3b15 100644 --- a/src/share/jaxws_classes/javax/xml/bind/helpers/PrintConversionEventImpl.java +++ b/src/share/jaxws_classes/javax/xml/bind/helpers/PrintConversionEventImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventImpl.java b/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventImpl.java index 5c0607a7..c3570006 100644 --- a/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventImpl.java +++ b/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java b/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java index 814a0035..36da7265 100644 --- a/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java +++ b/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/helpers/package.html b/src/share/jaxws_classes/javax/xml/bind/helpers/package.html index 7f612a52..31a91a6d 100644 --- a/src/share/jaxws_classes/javax/xml/bind/helpers/package.html +++ b/src/share/jaxws_classes/javax/xml/bind/helpers/package.html @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <!-- - Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/package.html b/src/share/jaxws_classes/javax/xml/bind/package.html index d964ab5f..524ae643 100644 --- a/src/share/jaxws_classes/javax/xml/bind/package.html +++ b/src/share/jaxws_classes/javax/xml/bind/package.html @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <!-- - Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/util/JAXBResult.java b/src/share/jaxws_classes/javax/xml/bind/util/JAXBResult.java index a3fd75e2..fbf7caac 100644 --- a/src/share/jaxws_classes/javax/xml/bind/util/JAXBResult.java +++ b/src/share/jaxws_classes/javax/xml/bind/util/JAXBResult.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/util/JAXBSource.java b/src/share/jaxws_classes/javax/xml/bind/util/JAXBSource.java index b9cdf880..51589461 100644 --- a/src/share/jaxws_classes/javax/xml/bind/util/JAXBSource.java +++ b/src/share/jaxws_classes/javax/xml/bind/util/JAXBSource.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,6 +41,7 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import javax.xml.transform.sax.SAXSource; +import org.xml.sax.XMLFilter; /** * JAXP {@link javax.xml.transform.Source} implementation @@ -210,7 +211,7 @@ public class JAXBSource extends SAXSource { // SAX allows ContentHandler to be changed during the parsing, // but JAXB doesn't. So this repeater will sit between those // two components. - private XMLFilterImpl repeater = new XMLFilterImpl(); + private XMLFilter repeater = new XMLFilterImpl(); public void setContentHandler(ContentHandler handler) { repeater.setContentHandler(handler); @@ -240,7 +241,7 @@ public class JAXBSource extends SAXSource { // SAX events will be sent to the repeater, and the repeater // will further forward it to an appropriate component. try { - marshaller.marshal( contentObject, repeater ); + marshaller.marshal( contentObject, (XMLFilterImpl)repeater ); } catch( JAXBException e ) { // wrap it to a SAXException SAXParseException se = diff --git a/src/share/jaxws_classes/javax/xml/bind/util/Messages.java b/src/share/jaxws_classes/javax/xml/bind/util/Messages.java index 95eba8cc..4a61d882 100644 --- a/src/share/jaxws_classes/javax/xml/bind/util/Messages.java +++ b/src/share/jaxws_classes/javax/xml/bind/util/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/util/Messages.properties b/src/share/jaxws_classes/javax/xml/bind/util/Messages.properties index a05f4992..6f140af5 100644 --- a/src/share/jaxws_classes/javax/xml/bind/util/Messages.properties +++ b/src/share/jaxws_classes/javax/xml/bind/util/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/util/ValidationEventCollector.java b/src/share/jaxws_classes/javax/xml/bind/util/ValidationEventCollector.java index e33ef237..9cfd2abb 100644 --- a/src/share/jaxws_classes/javax/xml/bind/util/ValidationEventCollector.java +++ b/src/share/jaxws_classes/javax/xml/bind/util/ValidationEventCollector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/src/share/jaxws_classes/javax/xml/bind/util/package.html b/src/share/jaxws_classes/javax/xml/bind/util/package.html index d2353b70..551f4f1f 100644 --- a/src/share/jaxws_classes/javax/xml/bind/util/package.html +++ b/src/share/jaxws_classes/javax/xml/bind/util/package.html @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <!-- - Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. This code is free software; you can redistribute it and/or modify it |