8022885: Update JAX-WS RI integration to 2.2.9-b14140

8013016: Rebase 8009009 against the latest jdk8/jaxws

Reviewed-by: alanb, chegar
This commit is contained in:
Miroslav Kos 2013-08-23 09:57:21 +01:00
parent 41525a23dc
commit e8f5679bc5
364 changed files with 7408 additions and 6257 deletions

View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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); throw new ClassNotFoundException("Loaded outside a jar "+url);
url = url.substring(4); // cut off jar: url = url.substring(4); // cut off jar:
url = url.substring(0,url.lastIndexOf('!')); // cut off everything after '!' url = url.substring(0,url.lastIndexOf('!')); // cut off everything after '!'
url = url.replaceAll(" ", "%20"); // support white spaces in path
return new URL(url); return new URL(url);
} }
} }

View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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 boolean self() default false;
public String providerName() default ""; public String providerName() default "";
public String moduleName() default ""; public String moduleName() default "";
public boolean stateful() default false;
public String profileNames() default "";
public boolean statefulReturn() default false;
public boolean statefulException() default false;
} }

View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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; package com.sun.org.glassfish.external.statistics.impl;
import java.util.concurrent.atomic.AtomicLong;
import java.util.Map; import java.util.Map;
import java.lang.reflect.*; import java.lang.reflect.*;
import com.sun.org.glassfish.external.statistics.AverageRangeStatistic; import com.sun.org.glassfish.external.statistics.AverageRangeStatistic;
@ -139,6 +138,8 @@ public final class AverageRangeStatisticImpl extends StatisticImpl implements
// todo: equals implementation // todo: equals implementation
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
checkMethod(method);
Object result; Object result;
try { try {
result = method.invoke(this, args); result = method.invoke(this, args);
@ -147,7 +148,6 @@ public final class AverageRangeStatisticImpl extends StatisticImpl implements
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " + throw new RuntimeException("unexpected invocation exception: " +
e.getMessage()); e.getMessage());
} finally {
} }
return result; return result;
} }

View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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; package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.BoundaryStatistic; import com.sun.org.glassfish.external.statistics.BoundaryStatistic;
import java.util.concurrent.atomic.AtomicLong;
import java.util.Map; import java.util.Map;
import java.lang.reflect.*; import java.lang.reflect.*;
@ -81,6 +80,8 @@ public final class BoundaryStatisticImpl extends StatisticImpl
// todo: equals implementation // todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
checkMethod(m);
Object result; Object result;
try { try {
result = m.invoke(this, args); result = m.invoke(this, args);
@ -89,7 +90,6 @@ public final class BoundaryStatisticImpl extends StatisticImpl
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " + throw new RuntimeException("unexpected invocation exception: " +
e.getMessage()); e.getMessage());
} finally {
} }
return result; return result;
} }

View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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; package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.BoundedRangeStatistic; import com.sun.org.glassfish.external.statistics.BoundedRangeStatistic;
import java.util.concurrent.atomic.AtomicLong;
import java.util.Map; import java.util.Map;
import java.lang.reflect.*; import java.lang.reflect.*;
@ -145,6 +145,8 @@ public final class BoundedRangeStatisticImpl extends StatisticImpl
// todo: equals implementation // todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
checkMethod(m);
Object result; Object result;
try { try {
result = m.invoke(this, args); result = m.invoke(this, args);
@ -153,7 +155,6 @@ public final class BoundedRangeStatisticImpl extends StatisticImpl
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " + throw new RuntimeException("unexpected invocation exception: " +
e.getMessage()); e.getMessage());
} finally {
} }
return result; return result;
} }

View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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; package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.CountStatistic; import com.sun.org.glassfish.external.statistics.CountStatistic;
import java.util.concurrent.atomic.AtomicLong;
import java.util.Map; import java.util.Map;
import java.lang.reflect.*; import java.lang.reflect.*;
@ -103,6 +102,8 @@ public final class CountStatisticImpl extends StatisticImpl
// todo: equals implementation // todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
checkMethod(m);
Object result; Object result;
try { try {
result = m.invoke(this, args); result = m.invoke(this, args);
@ -111,7 +112,6 @@ public final class CountStatisticImpl extends StatisticImpl
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " + throw new RuntimeException("unexpected invocation exception: " +
e.getMessage()); e.getMessage());
} finally {
} }
return result; return result;
} }

View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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; package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.RangeStatistic; import com.sun.org.glassfish.external.statistics.RangeStatistic;
import java.util.concurrent.atomic.AtomicLong;
import java.util.Map; import java.util.Map;
import java.lang.reflect.*; import java.lang.reflect.*;
@ -125,6 +124,8 @@ public final class RangeStatisticImpl extends StatisticImpl
// todo: equals implementation // todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
checkMethod(m);
Object result; Object result;
try { try {
result = m.invoke(this, args); result = m.invoke(this, args);
@ -133,7 +134,6 @@ public final class RangeStatisticImpl extends StatisticImpl
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " + throw new RuntimeException("unexpected invocation exception: " +
e.getMessage()); e.getMessage());
} finally {
} }
return result; return result;
} }

View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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; package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.Statistic; import com.sun.org.glassfish.external.statistics.Statistic;
import java.io.Serializable; import java.lang.reflect.Method;
import java.util.concurrent.atomic.AtomicLong; import java.lang.reflect.Modifier;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -133,4 +133,13 @@ public abstract class StatisticImpl implements Statistic {
protected static boolean isValidString(String str) { protected static boolean isValidString(String str) {
return (str!=null && str.length()>0); 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");
}
}
} }

View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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 // todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
checkMethod(m);
Object result; Object result;
try { try {
result = m.invoke(this, args); result = m.invoke(this, args);
@ -98,7 +100,6 @@ public final class StringStatisticImpl extends StatisticImpl
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " + throw new RuntimeException("unexpected invocation exception: " +
e.getMessage()); e.getMessage());
} finally {
} }
return result; return result;
} }

View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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; package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.TimeStatistic; import com.sun.org.glassfish.external.statistics.TimeStatistic;
import java.util.concurrent.atomic.AtomicLong;
import java.util.Map; import java.util.Map;
import java.lang.reflect.*; import java.lang.reflect.*;
@ -145,6 +144,8 @@ public final class TimeStatisticImpl extends StatisticImpl
// todo: equals implementation // todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
checkMethod(m);
Object result; Object result;
try { try {
result = m.invoke(this, args); result = m.invoke(this, args);
@ -153,7 +154,6 @@ public final class TimeStatisticImpl extends StatisticImpl
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " + throw new RuntimeException("unexpected invocation exception: " +
e.getMessage()); e.getMessage());
} finally {
} }
return result; return result;
} }

View file

@ -30,10 +30,10 @@ BASEDIR_DOESNT_EXIST = \
Non-existent directory: {0} Non-existent directory: {0}
VERSION = \ VERSION = \
schemagen 2.2.8-b01 schemagen 2.2.8-b20130806.1801
FULLVERSION = \ FULLVERSION = \
schemagen full version "2.2.8-b01" schemagen full version "2.2.8-b20130806.1801"
USAGE = \ USAGE = \
Usage: schemagen [-options ...] <java files> \n\ Usage: schemagen [-options ...] <java files> \n\

View file

@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = Nicht erkanntes {0} in Zeile {1} Spalte {2}
BASEDIR_DOESNT_EXIST = Nicht vorhandenes Verzeichnis: {0} 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 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

View file

@ -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} 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 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

View file

@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = Un \u00E9l\u00E9ment {0} inattendu appara\u00EEt \u00E0
BASEDIR_DOESNT_EXIST = R\u00E9pertoire {0} inexistant 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 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

View file

@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = {0} imprevisto visualizzato sulla riga {1} colonna {2}
BASEDIR_DOESNT_EXIST = Directory non esistente: {0} 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 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

View file

@ -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} 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 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

View file

@ -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} 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. 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.

View file

@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = {0} inesperado aparece na linha {1} coluna {2}
BASEDIR_DOESNT_EXIST = Diret\u00F3rio n\u00E3o existente: {0} 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 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

View file

@ -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} 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 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

View file

@ -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} 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 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

View file

@ -64,6 +64,9 @@ import org.xml.sax.Attributes;
* AttributeList} interface, it also includes a much more efficient * AttributeList} interface, it also includes a much more efficient
* implementation using a single array rather than a set of Vectors.</p> * 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 * @since SAX 2.0
* @author David Megginson, * @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a> * <a href="mailto:sax@megginson.com">sax@megginson.com</a>

View file

@ -33,7 +33,11 @@ import com.sun.tools.internal.jxc.NGCCRuntimeEx;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public class Classes extends NGCCHandler { public class Classes extends NGCCHandler {
private String __text; private String __text;
private String exclude_content; private String exclude_content;
@ -78,17 +82,11 @@ public class Classes extends NGCCHandler {
$localName = $__local; $localName = $__local;
$qname = $__qname; $qname = $__qname;
switch($_ngcc_current_state) { switch($_ngcc_current_state) {
case 4: case 12:
{ {
$_ngcc_current_state = 3; if(($__uri.equals("") && $__local.equals("classes"))) {
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
case 11:
{
if(($__uri.equals("") && $__local.equals("includes"))) {
$runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
$_ngcc_current_state = 10; $_ngcc_current_state = 11;
} }
else { else {
unexpectedEnterElement($__qname); unexpectedEnterElement($__qname);
@ -107,22 +105,28 @@ public class Classes extends NGCCHandler {
} }
} }
break; 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; break;
case 12: case 11:
{ {
if(($__uri.equals("") && $__local.equals("classes"))) { if(($__uri.equals("") && $__local.equals("includes"))) {
$runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs); $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
$_ngcc_current_state = 11; $_ngcc_current_state = 10;
} }
else { else {
unexpectedEnterElement($__qname); unexpectedEnterElement($__qname);
} }
} }
break; break;
case 0:
{
revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
default: default:
{ {
unexpectedEnterElement($__qname); unexpectedEnterElement($__qname);
@ -137,23 +141,18 @@ public class Classes extends NGCCHandler {
$localName = $__local; $localName = $__local;
$qname = $__qname; $qname = $__qname;
switch($_ngcc_current_state) { switch($_ngcc_current_state) {
case 2:
{
$_ngcc_current_state = 1;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
case 4: case 4:
{ {
$_ngcc_current_state = 3; $_ngcc_current_state = 3;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
} }
break; break;
case 3:
{
if(($__uri.equals("") && $__local.equals("excludes"))) {
$runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
$_ngcc_current_state = 1;
}
else {
unexpectedLeaveElement($__qname);
}
}
break;
case 1: case 1:
{ {
if(($__uri.equals("") && $__local.equals("classes"))) { if(($__uri.equals("") && $__local.equals("classes"))) {
@ -165,6 +164,22 @@ public class Classes extends NGCCHandler {
} }
} }
break; break;
case 3:
{
if(($__uri.equals("") && $__local.equals("excludes"))) {
$runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
$_ngcc_current_state = 1;
}
else {
unexpectedLeaveElement($__qname);
}
}
break;
case 0:
{
revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
}
break;
case 8: case 8:
{ {
if(($__uri.equals("") && $__local.equals("includes"))) { if(($__uri.equals("") && $__local.equals("includes"))) {
@ -176,17 +191,6 @@ public class Classes extends NGCCHandler {
} }
} }
break; 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: default:
{ {
unexpectedLeaveElement($__qname); unexpectedLeaveElement($__qname);
@ -201,18 +205,18 @@ public class Classes extends NGCCHandler {
$localName = $__local; $localName = $__local;
$qname = $__qname; $qname = $__qname;
switch($_ngcc_current_state) { switch($_ngcc_current_state) {
case 4:
{
$_ngcc_current_state = 3;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
case 2: case 2:
{ {
$_ngcc_current_state = 1; $_ngcc_current_state = 1;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
} }
break; break;
case 4:
{
$_ngcc_current_state = 3;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
case 0: case 0:
{ {
revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
@ -232,18 +236,18 @@ public class Classes extends NGCCHandler {
$localName = $__local; $localName = $__local;
$qname = $__qname; $qname = $__qname;
switch($_ngcc_current_state) { switch($_ngcc_current_state) {
case 4:
{
$_ngcc_current_state = 3;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
case 2: case 2:
{ {
$_ngcc_current_state = 1; $_ngcc_current_state = 1;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
} }
break; break;
case 4:
{
$_ngcc_current_state = 3;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
case 0: case 0:
{ {
revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
@ -260,6 +264,12 @@ public class Classes extends NGCCHandler {
public void text(String $value) throws SAXException { public void text(String $value) throws SAXException {
int $ai; int $ai;
switch($_ngcc_current_state) { switch($_ngcc_current_state) {
case 2:
{
$_ngcc_current_state = 1;
$runtime.sendText(super._cookie, $value);
}
break;
case 4: case 4:
{ {
exclude_content = $value; exclude_content = $value;
@ -267,20 +277,6 @@ public class Classes extends NGCCHandler {
action0(); action0();
} }
break; break;
case 3:
{
exclude_content = $value;
$_ngcc_current_state = 3;
action0();
}
break;
case 9:
{
include_content = $value;
$_ngcc_current_state = 8;
action2();
}
break;
case 10: case 10:
{ {
__text = $value; __text = $value;
@ -288,6 +284,13 @@ public class Classes extends NGCCHandler {
action3(); action3();
} }
break; break;
case 3:
{
exclude_content = $value;
$_ngcc_current_state = 3;
action0();
}
break;
case 6: case 6:
{ {
__text = $value; __text = $value;
@ -295,22 +298,23 @@ public class Classes extends NGCCHandler {
action1(); action1();
} }
break; break;
case 8: case 0:
{
revertToParentFromText(this, super._cookie, $value);
}
break;
case 9:
{ {
include_content = $value; include_content = $value;
$_ngcc_current_state = 8; $_ngcc_current_state = 8;
action2(); action2();
} }
break; break;
case 2: case 8:
{ {
$_ngcc_current_state = 1; include_content = $value;
$runtime.sendText(super._cookie, $value); $_ngcc_current_state = 8;
} action2();
break;
case 0:
{
revertToParentFromText(this, super._cookie, $value);
} }
break; break;
} }

View file

@ -36,7 +36,11 @@ import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.io.File; import java.io.File;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public class Config extends NGCCHandler { public class Config extends NGCCHandler {
private String bd; private String bd;
private Schema _schema; private Schema _schema;
@ -74,15 +78,19 @@ public class Config extends NGCCHandler {
$localName = $__local; $localName = $__local;
$qname = $__qname; $qname = $__qname;
switch($_ngcc_current_state) { 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"))) { 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); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
} }
else { else {
$_ngcc_current_state = 1; unexpectedEnterElement($__qname);
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
} }
} }
break; break;
@ -100,7 +108,7 @@ public class Config extends NGCCHandler {
case 4: case 4:
{ {
if(($__uri.equals("") && $__local.equals("classes"))) { 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); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
} }
else { else {
@ -108,19 +116,15 @@ public class Config extends NGCCHandler {
} }
} }
break; break;
case 0: case 2:
{
revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
case 1:
{ {
if(($__uri.equals("") && $__local.equals("schema"))) { 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); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
} }
else { else {
unexpectedEnterElement($__qname); $_ngcc_current_state = 1;
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
} }
} }
break; break;
@ -149,12 +153,6 @@ public class Config extends NGCCHandler {
$localName = $__local; $localName = $__local;
$qname = $__qname; $qname = $__qname;
switch($_ngcc_current_state) { switch($_ngcc_current_state) {
case 2:
{
$_ngcc_current_state = 1;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
case 0: case 0:
{ {
revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
@ -171,6 +169,12 @@ public class Config extends NGCCHandler {
} }
} }
break; break;
case 2:
{
$_ngcc_current_state = 1;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
case 7: case 7:
{ {
if(($ai = $runtime.getAttributeIndex("","baseDir"))>=0) { if(($ai = $runtime.getAttributeIndex("","baseDir"))>=0) {
@ -196,17 +200,17 @@ public class Config extends NGCCHandler {
$localName = $__local; $localName = $__local;
$qname = $__qname; $qname = $__qname;
switch($_ngcc_current_state) { switch($_ngcc_current_state) {
case 0:
{
revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
case 2: case 2:
{ {
$_ngcc_current_state = 1; $_ngcc_current_state = 1;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
} }
break; break;
case 0:
{
revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
case 7: case 7:
{ {
if(($__uri.equals("") && $__local.equals("baseDir"))) { if(($__uri.equals("") && $__local.equals("baseDir"))) {
@ -231,10 +235,9 @@ public class Config extends NGCCHandler {
$localName = $__local; $localName = $__local;
$qname = $__qname; $qname = $__qname;
switch($_ngcc_current_state) { switch($_ngcc_current_state) {
case 2: case 0:
{ {
$_ngcc_current_state = 1; revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
} }
break; break;
case 5: case 5:
@ -247,9 +250,10 @@ public class Config extends NGCCHandler {
} }
} }
break; break;
case 0: case 2:
{ {
revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); $_ngcc_current_state = 1;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
} }
break; break;
default: default:
@ -263,10 +267,9 @@ public class Config extends NGCCHandler {
public void text(String $value) throws SAXException { public void text(String $value) throws SAXException {
int $ai; int $ai;
switch($_ngcc_current_state) { switch($_ngcc_current_state) {
case 2: case 0:
{ {
$_ngcc_current_state = 1; revertToParentFromText(this, super._cookie, $value);
$runtime.sendText(super._cookie, $value);
} }
break; break;
case 6: case 6:
@ -276,9 +279,10 @@ public class Config extends NGCCHandler {
action1(); action1();
} }
break; break;
case 0: case 2:
{ {
revertToParentFromText(this, super._cookie, $value); $_ngcc_current_state = 1;
$runtime.sendText(super._cookie, $value);
} }
break; break;
case 7: case 7:
@ -294,20 +298,20 @@ public class Config extends NGCCHandler {
public void onChildCompleted(Object result, int cookie, boolean needAttCheck)throws SAXException { public void onChildCompleted(Object result, int cookie, boolean needAttCheck)throws SAXException {
switch(cookie) { switch(cookie) {
case 16: case 19:
{ {
this._schema = ((Schema)result); this._schema = ((Schema)result);
action0(); action0();
$_ngcc_current_state = 1; $_ngcc_current_state = 1;
} }
break; break;
case 18: case 22:
{ {
this.classes = ((Classes)result); this.classes = ((Classes)result);
$_ngcc_current_state = 2; $_ngcc_current_state = 2;
} }
break; break;
case 15: case 20:
{ {
this._schema = ((Schema)result); this._schema = ((Schema)result);
action0(); action0();

View file

@ -29,7 +29,9 @@ import org.xml.sax.Attributes;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
/** /**
* * <p><b>
* Auto-generated, do not edit.
* </b></p>
* *
* @author Kohsuke Kawaguchi (kk@kohsuke.org) * @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/ */

View file

@ -29,7 +29,9 @@ import org.xml.sax.Attributes;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
/** /**
* * <p><b>
* Auto-generated, do not edit.
* </b></p>
* *
* @author Kohsuke Kawaguchi (kk@kohsuke.org) * @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/ */

View file

@ -29,7 +29,9 @@ import org.xml.sax.Attributes;
import org.xml.sax.SAXException; 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 $ * @version $Id: NGCCHandler.java,v 1.9 2002/09/29 02:55:48 okajima Exp $
* @author Kohsuke Kawaguchi (kk@kohsuke.org) * @author Kohsuke Kawaguchi (kk@kohsuke.org)

View file

@ -32,6 +32,9 @@ import org.xml.sax.SAXException;
* Dispatches incoming events into sub handlers appropriately * Dispatches incoming events into sub handlers appropriately
* so that the interleaving semantics will be correctly realized. * so that the interleaving semantics will be correctly realized.
* *
* <p><b>
* Auto-generated, do not edit.
* </b></p>
* @author Kohsuke Kawaguchi (kk@kohsuke.org) * @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/ */
public abstract class NGCCInterleaveFilter implements NGCCEventSource, NGCCEventReceiver { public abstract class NGCCInterleaveFilter implements NGCCEventSource, NGCCEventReceiver {

View file

@ -50,7 +50,9 @@ import org.xml.sax.SAXParseException;
* <li>manage mapping between namespace URIs and prefixes. * <li>manage mapping between namespace URIs and prefixes.
* *
* <li>TODO: provide support for interleaving. * <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 $ * @version $Id: NGCCRuntime.java,v 1.15 2002/09/29 02:55:48 okajima Exp $
* @author Kohsuke Kawaguchi (kk@kohsuke.org) * @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/ */

View file

@ -32,7 +32,11 @@ import com.sun.tools.internal.jxc.NGCCRuntimeEx;
import java.io.File; import java.io.File;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public class Schema extends NGCCHandler { public class Schema extends NGCCHandler {
private File baseDir; private File baseDir;
private String loc; private String loc;
@ -72,18 +76,6 @@ public class Schema extends NGCCHandler {
revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
} }
break; break;
case 6:
{
if(($ai = $runtime.getAttributeIndex("","namespace"))>=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 2: case 2:
{ {
if(($ai = $runtime.getAttributeIndex("","location"))>=0) { if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
@ -96,6 +88,18 @@ public class Schema extends NGCCHandler {
} }
} }
break; break;
case 6:
{
if(($ai = $runtime.getAttributeIndex("","namespace"))>=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 10: case 10:
{ {
if(($__uri.equals("") && $__local.equals("schema"))) { if(($__uri.equals("") && $__local.equals("schema"))) {
@ -121,23 +125,22 @@ public class Schema extends NGCCHandler {
$localName = $__local; $localName = $__local;
$qname = $__qname; $qname = $__qname;
switch($_ngcc_current_state) { switch($_ngcc_current_state) {
case 1:
{
if(($__uri.equals("") && $__local.equals("schema"))) {
$runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
$_ngcc_current_state = 0;
}
else {
unexpectedLeaveElement($__qname);
}
}
break;
case 0: case 0:
{ {
revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
} }
break; break;
case 6:
{
if(($ai = $runtime.getAttributeIndex("","namespace"))>=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 2: case 2:
{ {
if(($ai = $runtime.getAttributeIndex("","location"))>=0) { if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
@ -150,14 +153,15 @@ public class Schema extends NGCCHandler {
} }
} }
break; break;
case 1: case 6:
{ {
if(($__uri.equals("") && $__local.equals("schema"))) { if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
$runtime.onLeaveElementConsumed($__uri, $__local, $__qname); $runtime.consumeAttribute($ai);
$_ngcc_current_state = 0; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
} }
else { else {
unexpectedLeaveElement($__qname); $_ngcc_current_state = 2;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
} }
} }
break; break;
@ -180,17 +184,6 @@ public class Schema extends NGCCHandler {
revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
} }
break; break;
case 6:
{
if(($__uri.equals("") && $__local.equals("namespace"))) {
$_ngcc_current_state = 8;
}
else {
$_ngcc_current_state = 2;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
}
break;
case 2: case 2:
{ {
if(($__uri.equals("") && $__local.equals("location"))) { if(($__uri.equals("") && $__local.equals("location"))) {
@ -202,6 +195,17 @@ public class Schema extends NGCCHandler {
} }
} }
break; break;
case 6:
{
if(($__uri.equals("") && $__local.equals("namespace"))) {
$_ngcc_current_state = 8;
}
else {
$_ngcc_current_state = 2;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
}
break;
default: default:
{ {
unexpectedEnterAttribute($__qname); unexpectedEnterAttribute($__qname);
@ -221,22 +225,6 @@ public class Schema extends NGCCHandler {
revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
} }
break; break;
case 7:
{
if(($__uri.equals("") && $__local.equals("namespace"))) {
$_ngcc_current_state = 2;
}
else {
unexpectedLeaveAttribute($__qname);
}
}
break;
case 6:
{
$_ngcc_current_state = 2;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
case 3: case 3:
{ {
if(($__uri.equals("") && $__local.equals("location"))) { if(($__uri.equals("") && $__local.equals("location"))) {
@ -247,12 +235,28 @@ public class Schema extends NGCCHandler {
} }
} }
break; break;
case 7:
{
if(($__uri.equals("") && $__local.equals("namespace"))) {
$_ngcc_current_state = 2;
}
else {
unexpectedLeaveAttribute($__qname);
}
}
break;
case 2: case 2:
{ {
$_ngcc_current_state = 1; $_ngcc_current_state = 1;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
} }
break; break;
case 6:
{
$_ngcc_current_state = 2;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
default: default:
{ {
unexpectedLeaveAttribute($__qname); unexpectedLeaveAttribute($__qname);
@ -270,23 +274,6 @@ public class Schema extends NGCCHandler {
$_ngcc_current_state = 7; $_ngcc_current_state = 7;
} }
break; break;
case 0:
{
revertToParentFromText(this, super._cookie, $value);
}
break;
case 6:
{
if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendText(super._cookie, $value);
}
else {
$_ngcc_current_state = 2;
$runtime.sendText(super._cookie, $value);
}
}
break;
case 4: case 4:
{ {
loc = $value; loc = $value;
@ -294,6 +281,11 @@ public class Schema extends NGCCHandler {
action0(); action0();
} }
break; break;
case 0:
{
revertToParentFromText(this, super._cookie, $value);
}
break;
case 2: case 2:
{ {
if(($ai = $runtime.getAttributeIndex("","location"))>=0) { if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
@ -306,6 +298,18 @@ public class Schema extends NGCCHandler {
} }
} }
break; break;
case 6:
{
if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendText(super._cookie, $value);
}
else {
$_ngcc_current_state = 2;
$runtime.sendText(super._cookie, $value);
}
}
break;
} }
} }

View file

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
# questions. # questions.
# #
build-id=2.2.9-b14027 build-id=2.2.9-b14140
build-version=JAX-WS RI 2.2.9-b14027 build-version=JAX-WS RI 2.2.9-b14140
major-version=2.2.9 major-version=2.2.9
svn-revision=14027 svn-revision=14140

View file

@ -171,23 +171,23 @@ Driver.CompilingSchema = \
Driver.FailedToGenerateCode = \ Driver.FailedToGenerateCode = \
Failed to produce code. 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 = \ 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\ 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\ Any modifications to this file will be lost upon recompilation of the source schema. \n\
Generated on: {0} \n Generated on: {0} \n
Driver.Version = \ Driver.Version = \
xjc 2.2.8-b01 xjc 2.2.8-b20130806.1801
Driver.FullVersion = \ 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 # 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 # 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. # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.

View file

@ -96,17 +96,17 @@ Driver.CompilingSchema = Ein Schema wird kompiliert ...
Driver.FailedToGenerateCode = Code konnte nicht erzeugt werden. Driver.FailedToGenerateCode = Code konnte nicht erzeugt werden.
# 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 = 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 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 # 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 # 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. # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.

View file

@ -96,17 +96,17 @@ Driver.CompilingSchema = Compilando un esquema...
Driver.FailedToGenerateCode = Fallo al producir c\u00f3digo. Driver.FailedToGenerateCode = Fallo al producir c\u00f3digo.
# 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 = 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 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 # 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 # 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. # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.

View file

@ -96,17 +96,17 @@ Driver.CompilingSchema = compilation d'un sch\u00e9ma...
Driver.FailedToGenerateCode = Echec de la production du code. 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> # 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-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 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 # 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 # 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. # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.

View file

@ -96,17 +96,17 @@ Driver.CompilingSchema = compilazione di uno schema in corso...
Driver.FailedToGenerateCode = Produzione del codice non riuscita. Driver.FailedToGenerateCode = Produzione del codice non riuscita.
# 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 = 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 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 # 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 # 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. # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.

View file

@ -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 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> # 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-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 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 # 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 # 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. # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.

View file

@ -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. 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> # 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-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 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 # 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 # 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. # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.

View file

@ -96,17 +96,17 @@ Driver.CompilingSchema = compilando um esquema...
Driver.FailedToGenerateCode = Falha ao produzir o c\u00f3digo. 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> # 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-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 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 # 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 # 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. # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.

View file

@ -96,17 +96,17 @@ Driver.CompilingSchema = \u6b63\u5728\u7f16\u8bd1\u6a21\u5f0f...
Driver.FailedToGenerateCode = \u65e0\u6cd5\u751f\u6210\u4ee3\u7801\u3002 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> # 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-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 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 # 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 # 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. # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.

View file

@ -96,17 +96,17 @@ Driver.CompilingSchema = \u6b63\u5728\u7de8\u8b6f\u7db1\u8981...
Driver.FailedToGenerateCode = \u7121\u6cd5\u7522\u751f\u7a0b\u5f0f\u78bc. 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> # 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-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 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 # 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 # 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. # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.

View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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 javax.xml.XMLConstants;
import org.xml.sax.SAXException; 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. * Wraps a JAXP {@link Schema} object and lazily instantiate it.
* *
@ -59,7 +61,7 @@ public final class SchemaCache {
try { try {
// do not disable secure processing - these are well-known schemas // do not disable secure processing - these are well-known schemas
SchemaFactory sf = XmlFactory.createSchemaFactory(XMLConstants.W3C_XML_SCHEMA_NS_URI, false); SchemaFactory sf = XmlFactory.createSchemaFactory(XMLConstants.W3C_XML_SCHEMA_NS_URI, false);
schema = sf.newSchema(source); schema = allowFileAccess(sf, false).newSchema(source);
} catch (SAXException e) { } catch (SAXException e) {
// we make sure that the schema is correct before we ship. // we make sure that the schema is correct before we ship.
throw new AssertionError(e); throw new AssertionError(e);

View file

@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlAccessOrder;
import javax.xml.bind.annotation.XmlAccessorOrder; import javax.xml.bind.annotation.XmlAccessorOrder;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlAccessorOrderWriter public interface XmlAccessorOrderWriter
extends JAnnotationWriter<XmlAccessorOrder> extends JAnnotationWriter<XmlAccessorOrder>
{ {

View file

@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlAccessorTypeWriter public interface XmlAccessorTypeWriter
extends JAnnotationWriter<XmlAccessorType> extends JAnnotationWriter<XmlAccessorType>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlAnyAttribute; import javax.xml.bind.annotation.XmlAnyAttribute;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlAnyAttributeWriter public interface XmlAnyAttributeWriter
extends JAnnotationWriter<XmlAnyAttribute> extends JAnnotationWriter<XmlAnyAttribute>
{ {

View file

@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlAnyElement;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType; import com.sun.codemodel.internal.JType;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlAnyElementWriter public interface XmlAnyElementWriter
extends JAnnotationWriter<XmlAnyElement> extends JAnnotationWriter<XmlAnyElement>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlAttachmentRef; import javax.xml.bind.annotation.XmlAttachmentRef;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlAttachmentRefWriter public interface XmlAttachmentRefWriter
extends JAnnotationWriter<XmlAttachmentRef> extends JAnnotationWriter<XmlAttachmentRef>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlAttributeWriter public interface XmlAttributeWriter
extends JAnnotationWriter<XmlAttribute> extends JAnnotationWriter<XmlAttribute>
{ {

View file

@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlElementDecl;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType; import com.sun.codemodel.internal.JType;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlElementDeclWriter public interface XmlElementDeclWriter
extends JAnnotationWriter<XmlElementDecl> extends JAnnotationWriter<XmlElementDecl>
{ {

View file

@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlElementRef;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType; import com.sun.codemodel.internal.JType;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlElementRefWriter public interface XmlElementRefWriter
extends JAnnotationWriter<XmlElementRef> extends JAnnotationWriter<XmlElementRef>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlElementRefs; import javax.xml.bind.annotation.XmlElementRefs;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlElementRefsWriter public interface XmlElementRefsWriter
extends JAnnotationWriter<XmlElementRefs> extends JAnnotationWriter<XmlElementRefs>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlElementWrapper;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlElementWrapperWriter public interface XmlElementWrapperWriter
extends JAnnotationWriter<XmlElementWrapper> extends JAnnotationWriter<XmlElementWrapper>
{ {

View file

@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlElement;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType; import com.sun.codemodel.internal.JType;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlElementWriter public interface XmlElementWriter
extends JAnnotationWriter<XmlElement> extends JAnnotationWriter<XmlElement>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlElements;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlElementsWriter public interface XmlElementsWriter
extends JAnnotationWriter<XmlElements> extends JAnnotationWriter<XmlElements>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlEnumValue;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlEnumValueWriter public interface XmlEnumValueWriter
extends JAnnotationWriter<XmlEnumValue> extends JAnnotationWriter<XmlEnumValue>
{ {

View file

@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlEnum;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType; import com.sun.codemodel.internal.JType;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlEnumWriter public interface XmlEnumWriter
extends JAnnotationWriter<XmlEnum> extends JAnnotationWriter<XmlEnum>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlIDREF; import javax.xml.bind.annotation.XmlIDREF;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlIDREFWriter public interface XmlIDREFWriter
extends JAnnotationWriter<XmlIDREF> extends JAnnotationWriter<XmlIDREF>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlID; import javax.xml.bind.annotation.XmlID;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlIDWriter public interface XmlIDWriter
extends JAnnotationWriter<XmlID> extends JAnnotationWriter<XmlID>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlInlineBinaryData; import javax.xml.bind.annotation.XmlInlineBinaryData;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlInlineBinaryDataWriter public interface XmlInlineBinaryDataWriter
extends JAnnotationWriter<XmlInlineBinaryData> extends JAnnotationWriter<XmlInlineBinaryData>
{ {

View file

@ -29,6 +29,11 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType; import com.sun.codemodel.internal.JType;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlJavaTypeAdapterWriter public interface XmlJavaTypeAdapterWriter
extends JAnnotationWriter<XmlJavaTypeAdapter> extends JAnnotationWriter<XmlJavaTypeAdapter>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlList; import javax.xml.bind.annotation.XmlList;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlListWriter public interface XmlListWriter
extends JAnnotationWriter<XmlList> extends JAnnotationWriter<XmlList>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlMimeType; import javax.xml.bind.annotation.XmlMimeType;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlMimeTypeWriter public interface XmlMimeTypeWriter
extends JAnnotationWriter<XmlMimeType> extends JAnnotationWriter<XmlMimeType>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlMixed; import javax.xml.bind.annotation.XmlMixed;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlMixedWriter public interface XmlMixedWriter
extends JAnnotationWriter<XmlMixed> extends JAnnotationWriter<XmlMixed>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlNs; import javax.xml.bind.annotation.XmlNs;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlNsWriter public interface XmlNsWriter
extends JAnnotationWriter<XmlNs> extends JAnnotationWriter<XmlNs>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlRegistry; import javax.xml.bind.annotation.XmlRegistry;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlRegistryWriter public interface XmlRegistryWriter
extends JAnnotationWriter<XmlRegistry> extends JAnnotationWriter<XmlRegistry>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlRootElementWriter public interface XmlRootElementWriter
extends JAnnotationWriter<XmlRootElement> extends JAnnotationWriter<XmlRootElement>
{ {

View file

@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlSchemaType;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType; import com.sun.codemodel.internal.JType;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlSchemaTypeWriter public interface XmlSchemaTypeWriter
extends JAnnotationWriter<XmlSchemaType> extends JAnnotationWriter<XmlSchemaType>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlSchemaTypes; import javax.xml.bind.annotation.XmlSchemaTypes;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlSchemaTypesWriter public interface XmlSchemaTypesWriter
extends JAnnotationWriter<XmlSchemaTypes> extends JAnnotationWriter<XmlSchemaTypes>
{ {

View file

@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlSchema; import javax.xml.bind.annotation.XmlSchema;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlSchemaWriter public interface XmlSchemaWriter
extends JAnnotationWriter<XmlSchema> extends JAnnotationWriter<XmlSchema>
{ {

View file

@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType; import com.sun.codemodel.internal.JType;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlSeeAlsoWriter public interface XmlSeeAlsoWriter
extends JAnnotationWriter<XmlSeeAlso> extends JAnnotationWriter<XmlSeeAlso>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlTransient;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlTransientWriter public interface XmlTransientWriter
extends JAnnotationWriter<XmlTransient> extends JAnnotationWriter<XmlTransient>
{ {

View file

@ -29,6 +29,11 @@ import javax.xml.bind.annotation.XmlType;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType; import com.sun.codemodel.internal.JType;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlTypeWriter public interface XmlTypeWriter
extends JAnnotationWriter<XmlType> extends JAnnotationWriter<XmlType>
{ {

View file

@ -28,6 +28,11 @@ package com.sun.tools.internal.xjc.generator.annotation.spec;
import javax.xml.bind.annotation.XmlValue; import javax.xml.bind.annotation.XmlValue;
import com.sun.codemodel.internal.JAnnotationWriter; import com.sun.codemodel.internal.JAnnotationWriter;
/**
* <p><b>
* Auto-generated, do not edit.
* </b></p>
*/
public interface XmlValueWriter public interface XmlValueWriter
extends JAnnotationWriter<XmlValue> extends JAnnotationWriter<XmlValue>
{ {

View file

@ -26,7 +26,7 @@
METHOD_COLLISION = \ METHOD_COLLISION = \
The "{0}" method is defined on both "{1}" and "{2}" and is causing a 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<EFBFBD>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 = \ ERR_UNUSABLE_NAME = \
Cannot derive a valid Java identifier from "{0}". Specify a customization to change the name. Cannot derive a valid Java identifier from "{0}". Specify a customization to change the name.

View file

@ -29,6 +29,7 @@ import java.lang.annotation.Annotation;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import javax.xml.XMLConstants;
import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName; 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 // this is anonymous type. can't have @XmlSchemaType
return false; 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 // if we put application-defined type name, it will be undefined
// by the time we generate a schema. // by the time we generate a schema.
return false; return false;

View file

@ -25,6 +25,7 @@
package com.sun.tools.internal.xjc.model; package com.sun.tools.internal.xjc.model;
import javax.xml.XMLConstants;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName; 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.PropertyInfo;
import com.sun.xml.internal.bind.v2.model.core.TypeRef; import com.sun.xml.internal.bind.v2.model.core.TypeRef;
import com.sun.xml.internal.bind.v2.runtime.RuntimeUtil; 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.XmlString;
import com.sun.xml.internal.xsom.XSElementDecl; import com.sun.xml.internal.xsom.XSElementDecl;
import com.sun.istack.internal.Nullable; import com.sun.istack.internal.Nullable;
@ -74,11 +76,34 @@ public final class CTypeRef implements TypeRef<NType,NClass> {
} }
public static QName getSimpleTypeName(XSElementDecl decl) { public static QName getSimpleTypeName(XSElementDecl decl) {
if(decl==null) return null; if(decl==null || !decl.getType().isSimpleType())
QName typeName = null; return null; // null if not simple type
if(decl.getType().isSimpleType()) return resolveSimpleTypeName(decl.getType());
typeName = BGMBuilder.getName(decl.getType()); }
return typeName;
/**
* 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) { public CTypeRef(CNonElement type, QName elementName, QName typeName, boolean nillable, XmlString defaultValue) {

View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -55,7 +55,3 @@
* </dl> * </dl>
*/ */
package com.sun.tools.internal.xjc.model; package com.sun.tools.internal.xjc.model;
import com.sun.xml.internal.xsom.XSComponent;
import org.xml.sax.Locator;

View file

@ -25,29 +25,27 @@
package com.sun.tools.internal.xjc.reader.internalizer; 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 com.sun.istack.internal.SAXParseException2;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;
import org.xml.sax.Locator; import org.xml.sax.Locator;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException; import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.XMLFilterImpl; 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 * XMLFilter that finds references to other schema files from
* SAX events. * SAX events.
* * <p/>
* This implementation is a base implementation for typical case * This implementation is a base implementation for typical case
* where we just need to look for a particular attribute which * where we just need to look for a particular attribute which
* contains an URL to another schema file. * contains an URL to another schema file.
* *
* @author * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
* Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
*/ */
public abstract class AbstractReferenceFinderImpl extends XMLFilterImpl { 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, * IF the given element contains a reference to an external resource,
* return its URL. * return its URL.
* *
* @param nsURI * @param nsURI Namespace URI of the current element
* Namespace URI of the current element * @param localName Local name of the current element
* @param localName * @return It's OK to return a relative URL.
* 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); protected abstract String findExternalResource(String nsURI, String localName, Attributes atts);
@ -83,16 +78,21 @@ public abstract class AbstractReferenceFinderImpl extends XMLFilterImpl {
// absolutize URL. // absolutize URL.
String lsi = locator.getSystemId(); String lsi = locator.getSystemId();
String ref; String ref;
if (lsi.startsWith("jar:")) { URI relRefURI = new URI(relativeRef);
int bangIdx = lsi.indexOf('!'); if (relRefURI.isAbsolute())
if (bangIdx > 0) { ref = relativeRef;
ref = lsi.substring(0, bangIdx + 1) else {
+ new URI(lsi.substring(bangIdx + 1)).resolve(new URI(relativeRef)).toString(); 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 { } 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, // then parse this schema as well,
@ -121,6 +121,7 @@ public abstract class AbstractReferenceFinderImpl extends XMLFilterImpl {
throw spe; throw spe;
} }
} }
private Locator locator; private Locator locator;
@Override @Override
@ -128,4 +129,4 @@ public abstract class AbstractReferenceFinderImpl extends XMLFilterImpl {
super.setDocumentLocator(locator); super.setDocumentLocator(locator);
this.locator = locator; this.locator = locator;
} }
}; }

View file

@ -25,18 +25,21 @@
package com.sun.tools.internal.xjc.reader.internalizer; package com.sun.tools.internal.xjc.reader.internalizer;
import java.io.IOException; import com.sun.istack.internal.NotNull;
import java.io.OutputStream; import com.sun.istack.internal.XMLStreamReaderToContentHandler;
import java.io.OutputStreamWriter; import com.sun.tools.internal.xjc.ErrorReceiver;
import java.util.ArrayList; import com.sun.tools.internal.xjc.Options;
import java.util.Collections; import com.sun.tools.internal.xjc.reader.Const;
import java.util.HashMap; import com.sun.tools.internal.xjc.util.ErrorReceiverFilter;
import java.util.HashSet; import com.sun.xml.internal.bind.marshaller.DataWriter;
import java.util.List; import com.sun.xml.internal.bind.v2.util.XmlFactory;
import java.util.Map; import com.sun.xml.internal.xsom.parser.JAXPParser;
import java.util.Set; 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.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException; 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.SAXResult;
import javax.xml.transform.sax.SAXSource; import javax.xml.transform.sax.SAXSource;
import javax.xml.validation.SchemaFactory; 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 static com.sun.xml.internal.bind.v2.util.XmlFactory.allowFileAccess;
import com.sun.istack.internal.XMLStreamReaderToContentHandler; import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
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;
/** /**
@ -471,7 +460,7 @@ public final class DOMForest {
} }
try { try {
sf.newSchema(sources.toArray(new SAXSource[0])); allowFileAccess(sf, options.disableXmlSecurity).newSchema(sources.toArray(new SAXSource[0]));
} catch (SAXException e) { } catch (SAXException e) {
// error should have been reported. // error should have been reported.
} catch (RuntimeException re) { } catch (RuntimeException re) {

View file

@ -30,7 +30,7 @@ import java.util.logging.Logger;
/** /**
* @author Kohsuke Kawaguchi * @author Kohsuke Kawaguchi
*/ */
public abstract class Util { public final class Util {
private Util() {} // no instanciation private Util() {} // no instanciation
/** /**

View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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 NO_DEFAULT_CONSTRUCTOR_IN_INNER_CLASS, // 1 arg
INVALID_TYPE_IN_MAP, // 0args INVALID_TYPE_IN_MAP, // 0args
INVALID_JAXP_IMPLEMENTATION, // 1 arg 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()); private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName());

View file

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -50,3 +50,9 @@ INVALID_TYPE_IN_MAP = \
INVALID_JAXP_IMPLEMENTATION = \ 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. 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.

View file

@ -25,7 +25,10 @@
package com.sun.xml.internal.bind.v2.model.annotation; package com.sun.xml.internal.bind.v2.model.annotation;
/**
* <p><b>Auto-generated, do not edit.</b></p>
*
*/
class Init { class Init {

View file

@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
/**
* <p><b>Auto-generated, do not edit.</b></p>
*
*/
final class XmlAttributeQuick final class XmlAttributeQuick
extends Quick extends Quick
implements XmlAttribute implements XmlAttribute

View file

@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.bind.annotation.XmlElementDecl;
/**
* <p><b>Auto-generated, do not edit.</b></p>
*
*/
final class XmlElementDeclQuick final class XmlElementDeclQuick
extends Quick extends Quick
implements XmlElementDecl implements XmlElementDecl

View file

@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
/**
* <p><b>Auto-generated, do not edit.</b></p>
*
*/
final class XmlElementQuick final class XmlElementQuick
extends Quick extends Quick
implements XmlElement implements XmlElement

View file

@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlElementRef;
/**
* <p><b>Auto-generated, do not edit.</b></p>
*
*/
final class XmlElementRefQuick final class XmlElementRefQuick
extends Quick extends Quick
implements XmlElementRef implements XmlElementRef

View file

@ -29,6 +29,11 @@ import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs; import javax.xml.bind.annotation.XmlElementRefs;
/**
* <p><b>Auto-generated, do not edit.</b></p>
*
*/
final class XmlElementRefsQuick final class XmlElementRefsQuick
extends Quick extends Quick
implements XmlElementRefs implements XmlElementRefs

View file

@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnum;
/**
* <p><b>Auto-generated, do not edit.</b></p>
*
*/
final class XmlEnumQuick final class XmlEnumQuick
extends Quick extends Quick
implements XmlEnum implements XmlEnum

View file

@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
/**
* <p><b>Auto-generated, do not edit.</b></p>
*
*/
final class XmlRootElementQuick final class XmlRootElementQuick
extends Quick extends Quick
implements XmlRootElement implements XmlRootElement

View file

@ -30,6 +30,11 @@ import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm; import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlSchema; import javax.xml.bind.annotation.XmlSchema;
/**
* <p><b>Auto-generated, do not edit.</b></p>
*
*/
final class XmlSchemaQuick final class XmlSchemaQuick
extends Quick extends Quick
implements XmlSchema implements XmlSchema

View file

@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlSchemaType;
/**
* <p><b>Auto-generated, do not edit.</b></p>
*
*/
final class XmlSchemaTypeQuick final class XmlSchemaTypeQuick
extends Quick extends Quick
implements XmlSchemaType implements XmlSchemaType

View file

@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlTransient;
/**
* <p><b>Auto-generated, do not edit.</b></p>
*
*/
final class XmlTransientQuick final class XmlTransientQuick
extends Quick extends Quick
implements XmlTransient implements XmlTransient

View file

@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
/**
* <p><b>Auto-generated, do not edit.</b></p>
*
*/
final class XmlTypeQuick final class XmlTypeQuick
extends Quick extends Quick
implements XmlType implements XmlType

View file

@ -28,6 +28,11 @@ package com.sun.xml.internal.bind.v2.model.annotation;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlValue; import javax.xml.bind.annotation.XmlValue;
/**
* <p><b>Auto-generated, do not edit.</b></p>
*
*/
final class XmlValueQuick final class XmlValueQuick
extends Quick extends Quick
implements XmlValue implements XmlValue

View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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) @XmlSchema(namespace="http://jaxb.dev.java.net/xjc/model",elementFormDefault=QUALIFIED)
package com.sun.xml.internal.bind.v2.model.core; 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 javax.xml.bind.annotation.XmlSchema;
import static javax.xml.bind.annotation.XmlNsForm.QUALIFIED; import static javax.xml.bind.annotation.XmlNsForm.QUALIFIED;

View file

@ -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.runtime.unmarshaller.UnmarshallingContext;
import com.sun.xml.internal.bind.v2.util.ByteArrayOutputStreamEx; import com.sun.xml.internal.bind.v2.util.ByteArrayOutputStreamEx;
import com.sun.xml.internal.bind.v2.util.DataSourceSource; 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; import org.xml.sax.SAXException;
@ -105,6 +108,8 @@ import org.xml.sax.SAXException;
public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<Type,Class> public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<Type,Class>
implements RuntimeBuiltinLeafInfo, Transducer<T> { implements RuntimeBuiltinLeafInfo, Transducer<T> {
private static final Logger logger = Util.getClassLogger();
private RuntimeBuiltinLeafInfoImpl(Class type, QName... typeNames) { private RuntimeBuiltinLeafInfoImpl(Class type, QName... typeNames) {
super(type, typeNames); super(type, typeNames);
LEAVES.put(type,this); LEAVES.put(type,this);
@ -196,6 +201,7 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<
public static final List<RuntimeBuiltinLeafInfoImpl<?>> builtinBeanInfos; public static final List<RuntimeBuiltinLeafInfoImpl<?>> builtinBeanInfos;
public static final String MAP_ANYURI_TO_URI = "mapAnyUriToUri"; public static final String MAP_ANYURI_TO_URI = "mapAnyUriToUri";
public static final String USE_OLD_GMONTH_MAPPING = "jaxb.ri.useOldGmonthMapping";
static { 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.DATETIME, "%Y-%M-%DT%h:%m:%s"+ "%z");
m.put(DatatypeConstants.DATE, "%Y-%M-%D" +"%z"); m.put(DatatypeConstants.DATE, "%Y-%M-%D" +"%z");
m.put(DatatypeConstants.TIME, "%h:%m:%s"+ "%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.GDAY, "---%D" + "%z");
m.put(DatatypeConstants.GYEAR, "%Y" + "%z"); m.put(DatatypeConstants.GYEAR, "%Y" + "%z");
m.put(DatatypeConstants.GYEARMONTH, "%Y-%M" + "%z"); m.put(DatatypeConstants.GYEARMONTH, "%Y-%M" + "%z");

View file

@ -180,7 +180,3 @@
* @ArchitectureDocument * @ArchitectureDocument
*/ */
package com.sun.xml.internal.bind.v2; package com.sun.xml.internal.bind.v2;
import javax.xml.bind.JAXBContext;
import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;

View file

@ -88,13 +88,11 @@ final class BridgeAdapter<OnWire,InMemory> extends InternalBridge<InMemory> {
private OnWire adaptM(Marshaller m,InMemory v) throws JAXBException { private OnWire adaptM(Marshaller m,InMemory v) throws JAXBException {
XMLSerializer serializer = ((MarshallerImpl)m).serializer; XMLSerializer serializer = ((MarshallerImpl)m).serializer;
serializer.setThreadAffinity();
serializer.pushCoordinator(); serializer.pushCoordinator();
try { try {
return _adaptM(serializer, v); return _adaptM(serializer, v);
} finally { } finally {
serializer.popCoordinator(); 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 { private @NotNull InMemory adaptU(Unmarshaller _u, OnWire v) throws JAXBException {
UnmarshallerImpl u = (UnmarshallerImpl) _u; UnmarshallerImpl u = (UnmarshallerImpl) _u;
XmlAdapter<OnWire,InMemory> a = u.coordinator.getAdapter(adapter); XmlAdapter<OnWire,InMemory> a = u.coordinator.getAdapter(adapter);
u.coordinator.setThreadAffinity();
u.coordinator.pushCoordinator(); u.coordinator.pushCoordinator();
try { try {
return a.unmarshal(v); return a.unmarshal(v);
@ -140,7 +137,6 @@ final class BridgeAdapter<OnWire,InMemory> extends InternalBridge<InMemory> {
throw new UnmarshalException(e); throw new UnmarshalException(e);
} finally { } finally {
u.coordinator.popCoordinator(); u.coordinator.popCoordinator();
u.coordinator.resetThreadAffinity();
} }
} }

View file

@ -94,75 +94,37 @@ public abstract class Coordinator implements ErrorHandler, ValidationEventHandle
return adapters.containsKey(type); return adapters.containsKey(type);
} }
// this much is necessary to avoid calling get and set twice when we push.
private static final ThreadLocal<Coordinator> activeTable = new ThreadLocal<Coordinator>();
/** /**
* The {@link Coordinator} in charge before this {@link Coordinator}. * The {@link Coordinator} in charge before this {@link Coordinator}.
*/ */
private Object old; private Coordinator 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;
}
/**
* Dis-associate this {@link Coordinator} with the current thread.
* Sohuld be called at the end of the episode to avoid memory leak.
*/
protected final void resetThreadAffinity() {
if (activeTable != null) {
activeTable.remove();
}
if(debugTableNPE)
guyWhoSetTheTableToNull = new Exception(); // remember that we set it to null
table = null;
}
/** /**
* Called whenever an execution flow enters the realm of this {@link Coordinator}. * Called whenever an execution flow enters the realm of this {@link Coordinator}.
*/ */
protected final void pushCoordinator() { protected final void pushCoordinator() {
old = table[0]; old = activeTable.get();
table[0] = this; activeTable.set(this);
} }
/** /**
* Called whenever an execution flow exits the realm of this {@link Coordinator}. * Called whenever an execution flow exits the realm of this {@link Coordinator}.
*/ */
protected final void popCoordinator() { protected final void popCoordinator() {
assert table[0]==this; if (old != null)
table[0] = old; activeTable.set(old);
else
activeTable.remove();
old = null; // avoid memory leak old = null; // avoid memory leak
} }
public static Coordinator _getInstance() { 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 // ErrorHandler implementation
@ -207,13 +169,4 @@ public abstract class Coordinator implements ErrorHandler, ValidationEventHandle
throw saxException; throw saxException;
} }
} }
public static boolean debugTableNPE;
static {
try {
debugTableNPE = Boolean.getBoolean(Coordinator.class.getName()+".debugTableNPE");
} catch (SecurityException t) {
}
}
} }

View file

@ -812,7 +812,6 @@ public final class XMLSerializer extends Coordinator {
* Similar to 'schemaLocation' but this one works for xsi:noNamespaceSchemaLocation * 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 { public void startDocument(XmlOutput out,boolean fragment,String schemaLocation,String noNsSchemaLocation) throws IOException, SAXException, XMLStreamException {
setThreadAffinity();
pushCoordinator(); pushCoordinator();
nsContext.reset(); nsContext.reset();
nse = nsContext.getCurrent(); nse = nsContext.getCurrent();
@ -841,7 +840,6 @@ public final class XMLSerializer extends Coordinator {
out = null; out = null;
clearCurrentProperty(); clearCurrentProperty();
popCoordinator(); popCoordinator();
resetThreadAffinity();
} }
/** /**

Some files were not shown because too many files have changed in this diff Show more