# HG changeset patch
# User mkos
# Date 1377248241 -3600
# Node ID b99d7e355d4b09c9a165db4c84ffe1ec57299e13
# Parent 6cdc6ed987801c175a1217d0d3e53c3bd69ba52e
8022885: Update JAX-WS RI integration to 2.2.9-b14140
8013016: Rebase 8009009 against the latest jdk8/jaxws
Reviewed-by: alanb, chegar
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java
--- a/src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -211,6 +211,7 @@
throw new ClassNotFoundException("Loaded outside a jar "+url);
url = url.substring(4); // cut off jar:
url = url.substring(0,url.lastIndexOf('!')); // cut off everything after '!'
+ url = url.replaceAll(" ", "%20"); // support white spaces in path
return new URL(url);
}
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,5 +47,8 @@
public boolean self() default false;
public String providerName() default "";
public String moduleName() default "";
-
+ public boolean stateful() default false;
+ public String profileNames() default "";
+ public boolean statefulReturn() default false;
+ public boolean statefulException() default false;
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
package com.sun.org.glassfish.external.statistics.impl;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.Map;
import java.lang.reflect.*;
import com.sun.org.glassfish.external.statistics.AverageRangeStatistic;
@@ -139,6 +138,8 @@
// todo: equals implementation
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ checkMethod(method);
+
Object result;
try {
result = method.invoke(this, args);
@@ -147,7 +148,6 @@
} catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " +
e.getMessage());
- } finally {
}
return result;
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.BoundaryStatistic;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.Map;
import java.lang.reflect.*;
@@ -81,6 +80,8 @@
// todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
+ checkMethod(m);
+
Object result;
try {
result = m.invoke(this, args);
@@ -89,7 +90,6 @@
} catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " +
e.getMessage());
- } finally {
}
return result;
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,8 @@
package com.sun.org.glassfish.external.statistics.impl;
+
import com.sun.org.glassfish.external.statistics.BoundedRangeStatistic;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.Map;
import java.lang.reflect.*;
@@ -145,6 +145,8 @@
// todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
+ checkMethod(m);
+
Object result;
try {
result = m.invoke(this, args);
@@ -153,7 +155,6 @@
} catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " +
e.getMessage());
- } finally {
}
return result;
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.CountStatistic;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.Map;
import java.lang.reflect.*;
@@ -103,6 +102,8 @@
// todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
+ checkMethod(m);
+
Object result;
try {
result = m.invoke(this, args);
@@ -111,7 +112,6 @@
} catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " +
e.getMessage());
- } finally {
}
return result;
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.RangeStatistic;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.Map;
import java.lang.reflect.*;
@@ -125,6 +124,8 @@
// todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
+ checkMethod(m);
+
Object result;
try {
result = m.invoke(this, args);
@@ -133,7 +134,6 @@
} catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " +
e.getMessage());
- } finally {
}
return result;
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,8 @@
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.Statistic;
-import java.io.Serializable;
-import java.util.concurrent.atomic.AtomicLong;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -133,4 +133,13 @@
protected static boolean isValidString(String str) {
return (str!=null && str.length()>0);
}
+
+ protected void checkMethod(Method method) {
+ if (method == null || method.getDeclaringClass() == null
+ || !Statistic.class.isAssignableFrom(method.getDeclaringClass())
+ || Modifier.isStatic(method.getModifiers())) {
+ throw new RuntimeException("Invalid method on invoke");
+ }
+ }
+
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -90,6 +90,8 @@
// todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
+ checkMethod(m);
+
Object result;
try {
result = m.invoke(this, args);
@@ -98,7 +100,6 @@
} catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " +
e.getMessage());
- } finally {
}
return result;
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.TimeStatistic;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.Map;
import java.lang.reflect.*;
@@ -145,6 +144,8 @@
// todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
+ checkMethod(m);
+
Object result;
try {
result = m.invoke(this, args);
@@ -153,7 +154,6 @@
} catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " +
e.getMessage());
- } finally {
}
return result;
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties Fri Aug 23 09:57:21 2013 +0100
@@ -30,10 +30,10 @@
Non-existent directory: {0}
VERSION = \
- schemagen 2.2.8-b01
+ schemagen 2.2.8-b20130806.1801
FULLVERSION = \
- schemagen full version "2.2.8-b01"
+ schemagen full version "2.2.8-b20130806.1801"
USAGE = \
Usage: schemagen [-options ...] \n\
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_de.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_de.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_de.properties Fri Aug 23 09:57:21 2013 +0100
@@ -27,8 +27,8 @@
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 ...] \nOptionen: \n\\ \\ \\ \\ -d : Gibt an, wo die von Prozessor und javac generierten Klassendateien gespeichert werden sollen\n\\ \\ \\ \\ -cp : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -classpath : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -encoding : Gibt die Codierung f\u00FCr die Annotationsverarbeitung/den javac-Aufruf an \n\\ \\ \\ \\ -episode : Generiert Episodendatei f\u00FCr separate Kompilierung\n\\ \\ \\ \\ -version : Zeigt Versionsinformation an\n\\ \\ \\ \\ -fullversion : Zeigt vollst\u00E4ndige Versionsinformationen an\n\\ \\ \\ \\ -help : Zeigt diese Verwendungsmeldung an
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_es.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_es.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_es.properties Fri Aug 23 09:57:21 2013 +0100
@@ -27,8 +27,8 @@
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 ...] \nOpciones: \n\\ \\ \\ \\ -d : especifique d\u00F3nde se colocan los archivos de clase generados por javac y el procesador\n\\ \\ \\ \\ -cp : especifique d\u00F3nde se encuentran los archivos especificados por el usuario\n\\ \\ \\ \\ -encoding : especifique la codificaci\u00F3n que se va a utilizar para el procesamiento de anotaciones/llamada de javac\n\\ \\ \\ \\ -episode : genera un archivo de episodio para una compilaci\u00F3n diferente\n\\ \\ \\ \\ -version : muestra la informaci\u00F3n de la versi\u00F3n\n\\ \\ \\ \\ -fullversion : muestra la informaci\u00F3n completa de la versi\u00F3n\n\\ \\ \\ \\ -help : muestra este mensaje de sintaxis
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties Fri Aug 23 09:57:21 2013 +0100
@@ -27,8 +27,8 @@
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 ...] \nOptions : \n\ \ \ \ -d : indiquez o\u00F9 placer les fichiers de classe g\u00E9n\u00E9r\u00E9s par le processeur et le compilateur javac\n\ \ \ \ -cp : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -classpath : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -encoding : indiquez l'encodage \u00E0 utiliser pour l'appel de javac/traitement de l'annotation \n\ \ \ \ -episode : g\u00E9n\u00E9rez un fichier d'\u00E9pisode pour la compilation s\u00E9par\u00E9e\n\ \ \ \ -version : affichez les informations de version\n\ \ \ \ -fullversion : affichez les informations compl\u00E8tes de version\n\ \ \ \ -help : affichez ce message de syntaxe
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_it.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_it.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_it.properties Fri Aug 23 09:57:21 2013 +0100
@@ -27,8 +27,8 @@
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 ...] \nOpzioni: \n\ \ \ \ -d : specifica dove posizionare il processore e i file della classe generata javac\n\ \ \ \ -cp : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -classpath : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -encoding : specifica la codifica da usare per l'elaborazione dell'annotazione/richiamo javac \n\ \ \ \ -episode : genera il file di episodio per la compilazione separata\n\ \ \ \ -version : visualizza le informazioni sulla versione\n\ \ \ \ -fullversion : visualizza le informazioni sulla versione completa\n\ \ \ \ -help : visualizza questo messaggio sull'uso
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties Fri Aug 23 09:57:21 2013 +0100
@@ -27,8 +27,8 @@
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 ...] \n\u30AA\u30D7\u30B7\u30E7\u30F3: \n\ \ \ \ -d : \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 : \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 : \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 : \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 : \u30B3\u30F3\u30D1\u30A4\u30EB\u3054\u3068\u306B\u30A8\u30D4\u30BD\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3057\u307E\u3059\n\ \ \ \ -version : \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -fullversion : \u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -help : \u3053\u306E\u4F7F\u7528\u4F8B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties Fri Aug 23 09:57:21 2013 +0100
@@ -27,8 +27,8 @@
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 ...] \n\uC635\uC158: \n\ \ \ \ -d : \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 : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -classpath : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -encoding : \uC8FC\uC11D \uCC98\uB9AC/javac \uD638\uCD9C\uC5D0 \uC0AC\uC6A9\uD560 \uC778\uCF54\uB529\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4. \n\ \ \ \ -episode : \uBCC4\uB3C4 \uCEF4\uD30C\uC77C\uC744 \uC704\uD574 episode \uD30C\uC77C\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n\ \ \ \ -version : \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -fullversion : \uC815\uC2DD \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -help : \uC774 \uC0AC\uC6A9\uBC95 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties Fri Aug 23 09:57:21 2013 +0100
@@ -27,8 +27,8 @@
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 ...] \nOp\u00E7\u00F5es: \n\\ \\ \\ \\ -d : especificar onde colocar o processador e os arquivos da classe gerados por javac\n\\ \\ \\ \\ -cp : especificar onde localizar arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -classpath : especificar onde localizar os arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -encoding : especificar codifica\u00E7\u00E3o a ser usada para processamento de anota\u00E7\u00E3o/chamada javac \n\\ \\ \\ \\ -episode : gerar arquivo do epis\u00F3dio para compila\u00E7\u00E3o separada\n\\ \\ \\ \\ -version : exibir informa\u00E7\u00F5es da vers\u00E3o\n\\ \\ \\ \\ -fullversion : exibir informa\u00E7\u00F5es da vers\u00E3o completa\n\\ \\ \\ \\ -help : exibir esta mensagem de uso
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties Fri Aug 23 09:57:21 2013 +0100
@@ -27,8 +27,8 @@
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 ...] \n\u9009\u9879: \n\ \ \ \ -d : \u6307\u5B9A\u653E\u7F6E\u5904\u7406\u7A0B\u5E8F\u548C javac \u751F\u6210\u7684\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -cp : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -classpath : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -encoding : \u6307\u5B9A\u7528\u4E8E\u6CE8\u91CA\u5904\u7406/javac \u8C03\u7528\u7684\u7F16\u7801\n\ \ \ \ -episode : \u751F\u6210\u7247\u6BB5\u6587\u4EF6\u4EE5\u4F9B\u5355\u72EC\u7F16\u8BD1\n\ \ \ \ -version : \u663E\u793A\u7248\u672C\u4FE1\u606F\n\ \ \ \ -fullversion : \u663E\u793A\u5B8C\u6574\u7684\u7248\u672C\u4FE1\u606F\n\ \ \ \ -help : \u663E\u793A\u6B64\u7528\u6CD5\u6D88\u606F
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties Fri Aug 23 09:57:21 2013 +0100
@@ -27,8 +27,8 @@
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 ...] \n\u9078\u9805: \n\\ \\ \\ \\ -d : \u6307\u5B9A\u8655\u7406\u5668\u4EE5\u53CA javac \u7522\u751F\u7684\u985E\u5225\u6A94\u6848\u653E\u7F6E\u4F4D\u7F6E\n\\ \\ \\ \\ -cp : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -classpath : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -encoding : \u6307\u5B9A\u8981\u7528\u65BC\u8A3B\u89E3\u8655\u7406/javac \u547C\u53EB\u7684\u7DE8\u78BC \n\\ \\ \\ \\ -episode : \u7522\u751F\u7368\u7ACB\u7DE8\u8B6F\u7684\u4E8B\u4EF6 (episode) \u6A94\u6848\n\\ \\ \\ \\ -version : \u986F\u793A\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -fullversion : \u986F\u793A\u5B8C\u6574\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -help : \u986F\u793A\u6B64\u7528\u6CD5\u8A0A\u606F
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java Fri Aug 23 09:57:21 2013 +0100
@@ -64,6 +64,9 @@
* AttributeList} interface, it also includes a much more efficient
* implementation using a single array rather than a set of Vectors.
*
+ *
+ * Auto-generated, do not edit.
+ *
* @since SAX 2.0
* @author David Megginson,
* sax@megginson.com
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java Fri Aug 23 09:57:21 2013 +0100
@@ -33,7 +33,11 @@
import java.util.List;
import java.util.ArrayList;
-
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public class Classes extends NGCCHandler {
private String __text;
private String exclude_content;
@@ -78,17 +82,11 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 4:
+ case 12:
{
- $_ngcc_current_state = 3;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 11:
- {
- if(($__uri.equals("") && $__local.equals("includes"))) {
+ if(($__uri.equals("") && $__local.equals("classes"))) {
$runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- $_ngcc_current_state = 10;
+ $_ngcc_current_state = 11;
}
else {
unexpectedEnterElement($__qname);
@@ -107,22 +105,28 @@
}
}
break;
- case 0:
+ case 4:
{
- revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ $_ngcc_current_state = 3;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
- case 12:
+ case 11:
{
- if(($__uri.equals("") && $__local.equals("classes"))) {
+ if(($__uri.equals("") && $__local.equals("includes"))) {
$runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- $_ngcc_current_state = 11;
+ $_ngcc_current_state = 10;
}
else {
unexpectedEnterElement($__qname);
}
}
break;
+ case 0:
+ {
+ revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
default:
{
unexpectedEnterElement($__qname);
@@ -137,12 +141,29 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 4:
{
$_ngcc_current_state = 3;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 1:
+ {
+ if(($__uri.equals("") && $__local.equals("classes"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 0;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
case 3:
{
if(($__uri.equals("") && $__local.equals("excludes"))) {
@@ -154,15 +175,9 @@
}
}
break;
- case 1:
+ case 0:
{
- if(($__uri.equals("") && $__local.equals("classes"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 0;
- }
- else {
- unexpectedLeaveElement($__qname);
- }
+ revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
}
break;
case 8:
@@ -176,17 +191,6 @@
}
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 0:
- {
- revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveElement($__qname);
@@ -201,18 +205,18 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 4:
{
$_ngcc_current_state = 3;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 0:
{
revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
@@ -232,18 +236,18 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 4:
{
$_ngcc_current_state = 3;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 0:
{
revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
@@ -260,6 +264,12 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
case 4:
{
exclude_content = $value;
@@ -267,6 +277,13 @@
action0();
}
break;
+ case 10:
+ {
+ __text = $value;
+ $_ngcc_current_state = 9;
+ action3();
+ }
+ break;
case 3:
{
exclude_content = $value;
@@ -274,6 +291,18 @@
action0();
}
break;
+ case 6:
+ {
+ __text = $value;
+ $_ngcc_current_state = 4;
+ action1();
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromText(this, super._cookie, $value);
+ }
+ break;
case 9:
{
include_content = $value;
@@ -281,20 +310,6 @@
action2();
}
break;
- case 10:
- {
- __text = $value;
- $_ngcc_current_state = 9;
- action3();
- }
- break;
- case 6:
- {
- __text = $value;
- $_ngcc_current_state = 4;
- action1();
- }
- break;
case 8:
{
include_content = $value;
@@ -302,17 +317,6 @@
action2();
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 0:
- {
- revertToParentFromText(this, super._cookie, $value);
- }
- break;
}
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java Fri Aug 23 09:57:21 2013 +0100
@@ -36,7 +36,11 @@
import java.util.ArrayList;
import java.io.File;
-
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public class Config extends NGCCHandler {
private String bd;
private Schema _schema;
@@ -74,15 +78,19 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
+ case 0:
+ {
+ revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 1:
{
if(($__uri.equals("") && $__local.equals("schema"))) {
- NGCCHandler h = new Schema(this, super._source, $runtime, 16, baseDir);
+ NGCCHandler h = new Schema(this, super._source, $runtime, 19, baseDir);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ unexpectedEnterElement($__qname);
}
}
break;
@@ -100,7 +108,7 @@
case 4:
{
if(($__uri.equals("") && $__local.equals("classes"))) {
- NGCCHandler h = new Classes(this, super._source, $runtime, 18);
+ NGCCHandler h = new Classes(this, super._source, $runtime, 22);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -108,19 +116,15 @@
}
}
break;
- case 0:
- {
- revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 1:
+ case 2:
{
if(($__uri.equals("") && $__local.equals("schema"))) {
- NGCCHandler h = new Schema(this, super._source, $runtime, 15, baseDir);
+ NGCCHandler h = new Schema(this, super._source, $runtime, 20, baseDir);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- unexpectedEnterElement($__qname);
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
}
break;
@@ -149,12 +153,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 0:
{
revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
@@ -171,6 +169,12 @@
}
}
break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 7:
{
if(($ai = $runtime.getAttributeIndex("","baseDir"))>=0) {
@@ -196,17 +200,17 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 2:
{
$_ngcc_current_state = 1;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
- {
- revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 7:
{
if(($__uri.equals("") && $__local.equals("baseDir"))) {
@@ -231,10 +235,9 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
+ case 0:
{
- $_ngcc_current_state = 1;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
case 5:
@@ -247,9 +250,10 @@
}
}
break;
- case 0:
+ case 2:
{
- revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
default:
@@ -263,10 +267,9 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 2:
+ case 0:
{
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
+ revertToParentFromText(this, super._cookie, $value);
}
break;
case 6:
@@ -276,9 +279,10 @@
action1();
}
break;
- case 0:
+ case 2:
{
- revertToParentFromText(this, super._cookie, $value);
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
}
break;
case 7:
@@ -294,20 +298,20 @@
public void onChildCompleted(Object result, int cookie, boolean needAttCheck)throws SAXException {
switch(cookie) {
- case 16:
+ case 19:
{
this._schema = ((Schema)result);
action0();
$_ngcc_current_state = 1;
}
break;
- case 18:
+ case 22:
{
this.classes = ((Classes)result);
$_ngcc_current_state = 2;
}
break;
- case 15:
+ case 20:
{
this._schema = ((Schema)result);
action0();
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,7 +29,9 @@
import org.xml.sax.SAXException;
/**
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
* @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,7 +29,9 @@
import org.xml.sax.SAXException;
/**
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
* @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,7 +29,9 @@
import org.xml.sax.SAXException;
/**
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
* @version $Id: NGCCHandler.java,v 1.9 2002/09/29 02:55:48 okajima Exp $
* @author Kohsuke Kawaguchi (kk@kohsuke.org)
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java Fri Aug 23 09:57:21 2013 +0100
@@ -32,6 +32,9 @@
* Dispatches incoming events into sub handlers appropriately
* so that the interleaving semantics will be correctly realized.
*
+ *
+ * Auto-generated, do not edit.
+ *
* @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/
public abstract class NGCCInterleaveFilter implements NGCCEventSource, NGCCEventReceiver {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java Fri Aug 23 09:57:21 2013 +0100
@@ -50,7 +50,9 @@
* manage mapping between namespace URIs and prefixes.
*
* TODO: provide support for interleaving.
- *
+ *
+ * Auto-generated, do not edit.
+ *
* @version $Id: NGCCRuntime.java,v 1.15 2002/09/29 02:55:48 okajima Exp $
* @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java Fri Aug 23 09:57:21 2013 +0100
@@ -32,7 +32,11 @@
import java.io.File;
-
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public class Schema extends NGCCHandler {
private File baseDir;
private String loc;
@@ -72,6 +76,18 @@
revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
+ case 2:
+ {
+ if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
case 6:
{
if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
@@ -84,18 +100,6 @@
}
}
break;
- case 2:
- {
- if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
case 10:
{
if(($__uri.equals("") && $__local.equals("schema"))) {
@@ -121,23 +125,22 @@
$localName = $__local;
$qname = $__qname;
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:
{
revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
}
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:
{
if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
@@ -150,14 +153,15 @@
}
}
break;
- case 1:
+ case 6:
{
- if(($__uri.equals("") && $__local.equals("schema"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 0;
+ if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
else {
- unexpectedLeaveElement($__qname);
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
}
break;
@@ -180,6 +184,17 @@
revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 2:
+ {
+ if(($__uri.equals("") && $__local.equals("location"))) {
+ $_ngcc_current_state = 4;
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
case 6:
{
if(($__uri.equals("") && $__local.equals("namespace"))) {
@@ -191,17 +206,6 @@
}
}
break;
- case 2:
- {
- if(($__uri.equals("") && $__local.equals("location"))) {
- $_ngcc_current_state = 4;
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
default:
{
unexpectedEnterAttribute($__qname);
@@ -221,6 +225,16 @@
revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 3:
+ {
+ if(($__uri.equals("") && $__local.equals("location"))) {
+ $_ngcc_current_state = 1;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
case 7:
{
if(($__uri.equals("") && $__local.equals("namespace"))) {
@@ -231,25 +245,15 @@
}
}
break;
- case 6:
+ case 2:
{
- $_ngcc_current_state = 2;
+ $_ngcc_current_state = 1;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 3:
+ case 6:
{
- if(($__uri.equals("") && $__local.equals("location"))) {
- $_ngcc_current_state = 1;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 2:
- {
- $_ngcc_current_state = 1;
+ $_ngcc_current_state = 2;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
@@ -270,11 +274,30 @@
$_ngcc_current_state = 7;
}
break;
+ case 4:
+ {
+ loc = $value;
+ $_ngcc_current_state = 3;
+ action0();
+ }
+ break;
case 0:
{
revertToParentFromText(this, super._cookie, $value);
}
break;
+ case 2:
+ {
+ if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
case 6:
{
if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
@@ -287,25 +310,6 @@
}
}
break;
- case 4:
- {
- loc = $value;
- $_ngcc_current_state = 3;
- action0();
- }
- break;
- case 2:
- {
- if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
}
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/ws/version.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/version.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/version.properties Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
# questions.
#
-build-id=2.2.9-b14027
-build-version=JAX-WS RI 2.2.9-b14027
+build-id=2.2.9-b14140
+build-version=JAX-WS RI 2.2.9-b14140
major-version=2.2.9
-svn-revision=14027
+svn-revision=14140
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle.properties Fri Aug 23 09:57:21 2013 +0100
@@ -171,23 +171,23 @@
Driver.FailedToGenerateCode = \
Failed to produce code.
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant
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 http://java.sun.com/xml/jaxb \n\
Any modifications to this file will be lost upon recompilation of the source schema. \n\
Generated on: {0} \n
Driver.Version = \
- xjc 2.2.8-b01
+ xjc 2.2.8-b20130806.1801
Driver.FullVersion = \
- xjc full version "2.2.8-b01-b28"
+ xjc full version "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_de.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_de.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_de.properties Fri Aug 23 09:57:21 2013 +0100
@@ -96,17 +96,17 @@
Driver.FailedToGenerateCode = Code konnte nicht erzeugt werden.
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant
-Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b01 generiert \nSiehe http://java.sun.com/xml/jaxb \n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. \nGeneriert: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant
+Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b20130806.1801 generiert \nSiehe http://java.sun.com/xml/jaxb \n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. \nGeneriert: {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = xjc vollst\u00e4ndige Version "2.2.8-b01-b28"
+Driver.FullVersion = xjc vollst\u00E4ndige Version "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_es.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_es.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_es.properties Fri Aug 23 09:57:21 2013 +0100
@@ -96,17 +96,17 @@
Driver.FailedToGenerateCode = Fallo al producir c\u00f3digo.
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant
-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 http://java.sun.com/xml/jaxb \nTodas las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a compilar el esquema de origen. \nGenerado el: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant
+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 http://java.sun.com/xml/jaxb \nTodas las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a compilar el esquema de origen. \nGenerado el: {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = versi\u00f3n completa de xjc "2.2.8-b01-b28"
+Driver.FullVersion = versi\u00F3n completa de xjc "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties Fri Aug 23 09:57:21 2013 +0100
@@ -96,17 +96,17 @@
Driver.FailedToGenerateCode = Echec de la production du code.
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant
-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 http://java.sun.com/xml/jaxb \nToute modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant
+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 http://java.sun.com/xml/jaxb \nToute modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = version compl\u00e8te xjc "2.2.8-b01-b28"
+Driver.FullVersion = version compl\u00E8te xjc "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_it.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_it.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_it.properties Fri Aug 23 09:57:21 2013 +0100
@@ -96,17 +96,17 @@
Driver.FailedToGenerateCode = Produzione del codice non riuscita.
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant
-Driver.FilePrologComment = Questo file \u00e8 stato generato dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, v2.2.8-b01 \nVedere http://java.sun.com/xml/jaxb \nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione dello schema di origine. \nGenerato il: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant
+Driver.FilePrologComment = Questo file \u00e8 stato generato dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, v2.2.8-b20130806.1801 \nVedere http://java.sun.com/xml/jaxb \nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione dello schema di origine. \nGenerato il: {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = versione completa xjc "2.2.8-b01-b28"
+Driver.FullVersion = versione completa xjc "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties Fri Aug 23 09:57:21 2013 +0100
@@ -96,17 +96,17 @@
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
-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 \nhttp://java.sun.com/xml/jaxb \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 \n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002 \n\u751f\u6210\u65e5: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant
+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 \nhttp://java.sun.com/xml/jaxb \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 \n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002 \n\u751f\u6210\u65e5: {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = xjc\u30d5\u30eb\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3"2.2.8-b01-b28"
+Driver.FullVersion = xjc\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties Fri Aug 23 09:57:21 2013 +0100
@@ -96,17 +96,17 @@
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
-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. \nhttp://java.sun.com/xml/jaxb \ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c \uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 \uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant
+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. \nhttp://java.sun.com/xml/jaxb \ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c \uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 \uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n
-Driver.Version = XJC 2.2.8-b01
+Driver.Version = XJC 2.2.8-b20130806.1801
-Driver.FullVersion = XJC \uc815\uc2dd \ubc84\uc804 "2.2.8-b01-b28"
+Driver.FullVersion = XJC \uC815\uC2DD \uBC84\uC804 "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties Fri Aug 23 09:57:21 2013 +0100
@@ -96,17 +96,17 @@
Driver.FailedToGenerateCode = Falha ao produzir o c\u00f3digo.
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant
-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 http://java.sun.com/xml/jaxb \nTodas as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant
+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 http://java.sun.com/xml/jaxb \nTodas as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = vers\u00e3o completa de xjc "2.2.8-b01-b28"
+Driver.FullVersion = vers\u00E3o completa de xjc "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties Fri Aug 23 09:57:21 2013 +0100
@@ -96,17 +96,17 @@
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
-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 http://java.sun.com/xml/jaxb \n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, \u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant
+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 http://java.sun.com/xml/jaxb \n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, \u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4: {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = xjc \u5b8c\u6574\u7248\u672c "2.2.8-b01-b28"
+Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties Fri Aug 23 09:57:21 2013 +0100
@@ -96,17 +96,17 @@
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
-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 http://java.sun.com/xml/jaxb \n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, \u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931. \n\u7522\u751f\u6642\u9593: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant
+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 http://java.sun.com/xml/jaxb \n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, \u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931. \n\u7522\u751f\u6642\u9593: {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = xjc \u5b8c\u6574\u7248\u672c "2.2.8-b01-b28"
+Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
import javax.xml.XMLConstants;
import org.xml.sax.SAXException;
+import static com.sun.xml.internal.bind.v2.util.XmlFactory.allowFileAccess;
+
/**
* Wraps a JAXP {@link Schema} object and lazily instantiate it.
*
@@ -59,7 +61,7 @@
try {
// do not disable secure processing - these are well-known schemas
SchemaFactory sf = XmlFactory.createSchemaFactory(XMLConstants.W3C_XML_SCHEMA_NS_URI, false);
- schema = sf.newSchema(source);
+ schema = allowFileAccess(sf, false).newSchema(source);
} catch (SAXException e) {
// we make sure that the schema is correct before we ship.
throw new AssertionError(e);
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import javax.xml.bind.annotation.XmlAccessorOrder;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlAccessorOrderWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import javax.xml.bind.annotation.XmlAccessorType;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlAccessorTypeWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlAnyAttribute;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlAnyAttributeWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlAnyElementWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlAttachmentRef;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlAttachmentRefWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlAttribute;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlAttributeWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlElementDeclWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlElementRefWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlElementRefs;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlElementRefsWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlElementWrapper;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlElementWrapperWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlElementWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlElements;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlElementsWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlEnumValue;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlEnumValueWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlEnumWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlIDREF;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlIDREFWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlID;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlIDWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlInlineBinaryData;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlInlineBinaryDataWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlJavaTypeAdapterWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlList;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlListWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlMimeType;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlMimeTypeWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlMixed;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlMixedWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlNs;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlNsWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlRegistry;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlRegistryWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlRootElement;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlRootElementWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlSchemaTypeWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlSchemaTypes;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlSchemaTypesWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import javax.xml.bind.annotation.XmlSchema;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlSchemaWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlSeeAlsoWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlTransient;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlTransientWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlTypeWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlValue;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface XmlValueWriter
extends JAnnotationWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties Fri Aug 23 09:57:21 2013 +0100
@@ -26,7 +26,7 @@
METHOD_COLLISION = \
The "{0}" method is defined on both "{1}" and "{2}" and is causing a collision.
-# {0} - enumeration constant value (but something that couldn?t be translated to a valid java identifier e.g. starting special character, number, ..) e.g. Cannot derive a valid Java identifier from "5.6.0". Specify a customization to change the name.
+# {0} - enumeration constant value (but something that couldn�t be translated to a valid java identifier e.g. starting special character, number, ..) e.g. Cannot derive a valid Java identifier from "5.6.0". Specify a customization to change the name.
ERR_UNUSABLE_NAME = \
Cannot derive a valid Java identifier from "{0}". Specify a customization to change the name.
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,7 @@
import java.util.Collection;
import java.util.Map;
+import javax.xml.XMLConstants;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
@@ -298,7 +299,7 @@
// this is anonymous type. can't have @XmlSchemaType
return false;
- if(!typeName.getNamespaceURI().equals(WellKnownNamespace.XML_SCHEMA))
+ if(!XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(typeName.getNamespaceURI()))
// if we put application-defined type name, it will be undefined
// by the time we generate a schema.
return false;
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeRef.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeRef.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeRef.java Fri Aug 23 09:57:21 2013 +0100
@@ -25,6 +25,7 @@
package com.sun.tools.internal.xjc.model;
+import javax.xml.XMLConstants;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
@@ -34,6 +35,7 @@
import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
import com.sun.xml.internal.bind.v2.model.core.TypeRef;
import com.sun.xml.internal.bind.v2.runtime.RuntimeUtil;
+import com.sun.xml.internal.xsom.XSType;
import com.sun.xml.internal.xsom.XmlString;
import com.sun.xml.internal.xsom.XSElementDecl;
import com.sun.istack.internal.Nullable;
@@ -74,11 +76,34 @@
}
public static QName getSimpleTypeName(XSElementDecl decl) {
- if(decl==null) return null;
- QName typeName = null;
- if(decl.getType().isSimpleType())
- typeName = BGMBuilder.getName(decl.getType());
- return typeName;
+ if(decl==null || !decl.getType().isSimpleType())
+ return null; // null if not simple type
+ return resolveSimpleTypeName(decl.getType());
+ }
+
+ /**
+ * Recursively search for type name.
+ *
+ * This is needed to find correct type for refs like:
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ * @param declType given type
+ * @return simpleTypeName or null
+ */
+ private static QName resolveSimpleTypeName(XSType declType) {
+ QName name = BGMBuilder.getName(declType);
+ if (name != null && !XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(name.getNamespaceURI()))
+ return resolveSimpleTypeName(declType.getBaseType());
+ else
+ return name;
}
public CTypeRef(CNonElement type, QName elementName, QName typeName, boolean nillable, XmlString defaultValue) {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/model/package-info.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/package-info.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/package-info.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,3 @@
*
*/
package com.sun.tools.internal.xjc.model;
-
-import com.sun.xml.internal.xsom.XSComponent;
-
-import org.xml.sax.Locator;
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java Fri Aug 23 09:57:21 2013 +0100
@@ -25,29 +25,27 @@
package com.sun.tools.internal.xjc.reader.internalizer;
-import java.io.IOException;
-import java.io.File;
-import java.net.URI;
-import java.net.URISyntaxException;
-
import com.sun.istack.internal.SAXParseException2;
-
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.XMLFilterImpl;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
/**
* XMLFilter that finds references to other schema files from
* SAX events.
- *
+ *
* This implementation is a base implementation for typical case
* where we just need to look for a particular attribute which
* contains an URL to another schema file.
*
- * @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
*/
public abstract class AbstractReferenceFinderImpl extends XMLFilterImpl {
@@ -61,12 +59,9 @@
* IF the given element contains a reference to an external resource,
* return its URL.
*
- * @param nsURI
- * Namespace URI of the current element
- * @param localName
- * Local name of the current element
- * @return
- * It's OK to return a relative URL.
+ * @param nsURI Namespace URI of the current element
+ * @param localName Local name of the current element
+ * @return It's OK to return a relative URL.
*/
protected abstract String findExternalResource(String nsURI, String localName, Attributes atts);
@@ -83,16 +78,21 @@
// absolutize URL.
String lsi = locator.getSystemId();
String ref;
- if (lsi.startsWith("jar:")) {
- int bangIdx = lsi.indexOf('!');
- if (bangIdx > 0) {
- ref = lsi.substring(0, bangIdx + 1)
- + new URI(lsi.substring(bangIdx + 1)).resolve(new URI(relativeRef)).toString();
+ URI relRefURI = new URI(relativeRef);
+ if (relRefURI.isAbsolute())
+ ref = relativeRef;
+ else {
+ if (lsi.startsWith("jar:")) {
+ int bangIdx = lsi.indexOf('!');
+ if (bangIdx > 0) {
+ ref = lsi.substring(0, bangIdx + 1)
+ + new URI(lsi.substring(bangIdx + 1)).resolve(new URI(relativeRef)).toString();
+ } else {
+ ref = relativeRef;
+ }
} else {
- ref = relativeRef;
+ ref = new URI(lsi).resolve(new URI(relativeRef)).toString();
}
- } else {
- ref = new URI(lsi).resolve(new URI(relativeRef)).toString();
}
// then parse this schema as well,
@@ -121,6 +121,7 @@
throw spe;
}
}
+
private Locator locator;
@Override
@@ -128,4 +129,4 @@
super.setDocumentLocator(locator);
this.locator = locator;
}
-};
+}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java Fri Aug 23 09:57:21 2013 +0100
@@ -25,18 +25,21 @@
package com.sun.tools.internal.xjc.reader.internalizer;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.XMLStreamReaderToContentHandler;
+import com.sun.tools.internal.xjc.ErrorReceiver;
+import com.sun.tools.internal.xjc.Options;
+import com.sun.tools.internal.xjc.reader.Const;
+import com.sun.tools.internal.xjc.util.ErrorReceiverFilter;
+import com.sun.xml.internal.bind.marshaller.DataWriter;
+import com.sun.xml.internal.bind.v2.util.XmlFactory;
+import com.sun.xml.internal.xsom.parser.JAXPParser;
+import com.sun.xml.internal.xsom.parser.XMLParser;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.*;
+import org.xml.sax.helpers.XMLFilterImpl;
-import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -51,27 +54,13 @@
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.sax.SAXSource;
import javax.xml.validation.SchemaFactory;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.util.*;
-import com.sun.istack.internal.NotNull;
-import com.sun.istack.internal.XMLStreamReaderToContentHandler;
-import com.sun.tools.internal.xjc.ErrorReceiver;
-import com.sun.tools.internal.xjc.Options;
-import com.sun.tools.internal.xjc.reader.Const;
-import com.sun.tools.internal.xjc.util.ErrorReceiverFilter;
-import com.sun.xml.internal.bind.marshaller.DataWriter;
-import com.sun.xml.internal.bind.v2.util.XmlFactory;
-import com.sun.xml.internal.xsom.parser.JAXPParser;
-import com.sun.xml.internal.xsom.parser.XMLParser;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLFilterImpl;
+import static com.sun.xml.internal.bind.v2.util.XmlFactory.allowFileAccess;
+import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
/**
@@ -471,7 +460,7 @@
}
try {
- sf.newSchema(sources.toArray(new SAXSource[0]));
+ allowFileAccess(sf, options.disableXmlSecurity).newSchema(sources.toArray(new SAXSource[0]));
} catch (SAXException e) {
// error should have been reported.
} catch (RuntimeException re) {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/Util.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/Util.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/Util.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,7 +30,7 @@
/**
* @author Kohsuke Kawaguchi
*/
-public abstract class Util {
+public final class Util {
private Util() {} // no instanciation
/**
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,8 @@
NO_DEFAULT_CONSTRUCTOR_IN_INNER_CLASS, // 1 arg
INVALID_TYPE_IN_MAP, // 0args
INVALID_JAXP_IMPLEMENTATION, // 1 arg
+ JAXP_SUPPORTED_PROPERTY, // 1 arg
+ JAXP_UNSUPPORTED_PROPERTY, // 1 arg
;
private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName());
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.properties
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.properties Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -50,3 +50,9 @@
INVALID_JAXP_IMPLEMENTATION = \
You are running with invalid JAXP api or implementation. JAXP api/implementation of version 1.3.1 (included in JDK6) or higher is required. In case you are using ant, make sure ant 1.7.0 or higher is used - older versions of ant contain JAXP api/impl version 1.2 (in xml-apis.jar). If you want to keep using older ant versions, you have to configure it to use higher the JAXP api/impl versions.
+
+JAXP_SUPPORTED_PROPERTY =\
+ Property "{0}" is supported and has been successfully set by used JAXP implementation.
+
+JAXP_UNSUPPORTED_PROPERTY =\
+ Property "{0}" is not supported by used JAXP implementation.
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java Fri Aug 23 09:57:21 2013 +0100
@@ -25,7 +25,10 @@
package com.sun.xml.internal.bind.v2.model.annotation;
-
+/**
+ * Auto-generated, do not edit.
+ *
+ */
class Init {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlAttribute;
+
+/**
+ * Auto-generated, do not edit.
+ *
+ */
final class XmlAttributeQuick
extends Quick
implements XmlAttribute
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlElementDecl;
+
+/**
+ * Auto-generated, do not edit.
+ *
+ */
final class XmlElementDeclQuick
extends Quick
implements XmlElementDecl
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlElement;
+
+/**
+ * Auto-generated, do not edit.
+ *
+ */
final class XmlElementQuick
extends Quick
implements XmlElement
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlElementRef;
+
+/**
+ * Auto-generated, do not edit.
+ *
+ */
final class XmlElementRefQuick
extends Quick
implements XmlElementRef
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
+
+/**
+ * Auto-generated, do not edit.
+ *
+ */
final class XmlElementRefsQuick
extends Quick
implements XmlElementRefs
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlEnum;
+
+/**
+ * Auto-generated, do not edit.
+ *
+ */
final class XmlEnumQuick
extends Quick
implements XmlEnum
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Auto-generated, do not edit.
+ *
+ */
final class XmlRootElementQuick
extends Quick
implements XmlRootElement
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,6 +30,11 @@
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlSchema;
+
+/**
+ * Auto-generated, do not edit.
+ *
+ */
final class XmlSchemaQuick
extends Quick
implements XmlSchema
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlSchemaType;
+
+/**
+ * Auto-generated, do not edit.
+ *
+ */
final class XmlSchemaTypeQuick
extends Quick
implements XmlSchemaType
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlTransient;
+
+/**
+ * Auto-generated, do not edit.
+ *
+ */
final class XmlTransientQuick
extends Quick
implements XmlTransient
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Auto-generated, do not edit.
+ *
+ */
final class XmlTypeQuick
extends Quick
implements XmlType
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlValue;
+
+/**
+ * Auto-generated, do not edit.
+ *
+ */
final class XmlValueQuick
extends Quick
implements XmlValue
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/package-info.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/package-info.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/package-info.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -59,10 +59,6 @@
@XmlSchema(namespace="http://jaxb.dev.java.net/xjc/model",elementFormDefault=QUALIFIED)
package com.sun.xml.internal.bind.v2.model.core;
-import java.lang.reflect.Type;
-import java.lang.reflect.Method;
-import java.lang.reflect.Field;
-
import javax.xml.bind.annotation.XmlSchema;
import static javax.xml.bind.annotation.XmlNsForm.QUALIFIED;
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java Fri Aug 23 09:57:21 2013 +0100
@@ -91,6 +91,9 @@
import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
import com.sun.xml.internal.bind.v2.util.ByteArrayOutputStreamEx;
import com.sun.xml.internal.bind.v2.util.DataSourceSource;
+import java.util.logging.Logger;
+import com.sun.xml.internal.bind.Util;
+import java.util.logging.Level;
import org.xml.sax.SAXException;
@@ -105,6 +108,8 @@
public abstract class RuntimeBuiltinLeafInfoImpl extends BuiltinLeafInfoImpl
implements RuntimeBuiltinLeafInfo, Transducer {
+ private static final Logger logger = Util.getClassLogger();
+
private RuntimeBuiltinLeafInfoImpl(Class type, QName... typeNames) {
super(type, typeNames);
LEAVES.put(type,this);
@@ -196,6 +201,7 @@
public static final List> builtinBeanInfos;
public static final String MAP_ANYURI_TO_URI = "mapAnyUriToUri";
+ public static final String USE_OLD_GMONTH_MAPPING = "jaxb.ri.useOldGmonthMapping";
static {
@@ -960,7 +966,14 @@
m.put(DatatypeConstants.DATETIME, "%Y-%M-%DT%h:%m:%s"+ "%z");
m.put(DatatypeConstants.DATE, "%Y-%M-%D" +"%z");
m.put(DatatypeConstants.TIME, "%h:%m:%s"+ "%z");
- m.put(DatatypeConstants.GMONTH, "--%M--%z");
+ if (System.getProperty(USE_OLD_GMONTH_MAPPING) == null) {
+ m.put(DatatypeConstants.GMONTH, "--%M%z"); // E2-12 Error. http://www.w3.org/2001/05/xmlschema-errata#e2-12
+ } else { // backw. compatibility
+ if (logger.isLoggable(Level.FINE)) {
+ logger.log(Level.FINE, "Old GMonth mapping used.");
+ }
+ m.put(DatatypeConstants.GMONTH, "--%M--%z");
+ }
m.put(DatatypeConstants.GDAY, "---%D" + "%z");
m.put(DatatypeConstants.GYEAR, "%Y" + "%z");
m.put(DatatypeConstants.GYEARMONTH, "%Y-%M" + "%z");
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/package-info.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/package-info.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/package-info.java Fri Aug 23 09:57:21 2013 +0100
@@ -180,7 +180,3 @@
* @ArchitectureDocument
*/
package com.sun.xml.internal.bind.v2;
-
-import javax.xml.bind.JAXBContext;
-
-import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java Fri Aug 23 09:57:21 2013 +0100
@@ -88,13 +88,11 @@
private OnWire adaptM(Marshaller m,InMemory v) throws JAXBException {
XMLSerializer serializer = ((MarshallerImpl)m).serializer;
- serializer.setThreadAffinity();
serializer.pushCoordinator();
try {
return _adaptM(serializer, v);
} finally {
serializer.popCoordinator();
- serializer.resetThreadAffinity();
}
}
@@ -132,7 +130,6 @@
private @NotNull InMemory adaptU(Unmarshaller _u, OnWire v) throws JAXBException {
UnmarshallerImpl u = (UnmarshallerImpl) _u;
XmlAdapter a = u.coordinator.getAdapter(adapter);
- u.coordinator.setThreadAffinity();
u.coordinator.pushCoordinator();
try {
return a.unmarshal(v);
@@ -140,7 +137,6 @@
throw new UnmarshalException(e);
} finally {
u.coordinator.popCoordinator();
- u.coordinator.resetThreadAffinity();
}
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java Fri Aug 23 09:57:21 2013 +0100
@@ -94,75 +94,37 @@
return adapters.containsKey(type);
}
+ // this much is necessary to avoid calling get and set twice when we push.
+ private static final ThreadLocal activeTable = new ThreadLocal();
+
/**
* The {@link Coordinator} in charge before this {@link Coordinator}.
*/
- private Object old;
-
- /**
- * A 'pointer' to a {@link Coordinator} that keeps track of the currently active {@link Coordinator}.
- * Having this improves the runtime performance.
- */
- private Object[] table;
-
- /**
- * When we set {@link #table} to null, record who did it.
- * This is for trouble-shooting a possible concurrency issue reported at:
- * http://forums.java.net/jive/thread.jspa?threadID=15132
- */
- public Exception guyWhoSetTheTableToNull;
-
- /**
- * Associates this {@link Coordinator} with the current thread.
- * Should be called at the very beginning of the episode.
- */
- protected final void setThreadAffinity() {
- table = activeTable.get();
- assert table!=null;
- }
-
- /**
- * 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;
- }
+ private Coordinator old;
/**
* Called whenever an execution flow enters the realm of this {@link Coordinator}.
*/
protected final void pushCoordinator() {
- old = table[0];
- table[0] = this;
+ old = activeTable.get();
+ activeTable.set(this);
}
/**
* Called whenever an execution flow exits the realm of this {@link Coordinator}.
*/
protected final void popCoordinator() {
- assert table[0]==this;
- table[0] = old;
+ if (old != null)
+ activeTable.set(old);
+ else
+ activeTable.remove();
old = null; // avoid memory leak
}
public static Coordinator _getInstance() {
- return (Coordinator) activeTable.get()[0];
+ return activeTable.get();
}
- // this much is necessary to avoid calling get and set twice when we push.
- private static final ThreadLocal activeTable = new ThreadLocal() {
- @Override
- public Object[] initialValue() {
- return new Object[1];
- }
- };
-
//
//
// ErrorHandler implementation
@@ -207,13 +169,4 @@
throw saxException;
}
}
-
- public static boolean debugTableNPE;
-
- static {
- try {
- debugTableNPE = Boolean.getBoolean(Coordinator.class.getName()+".debugTableNPE");
- } catch (SecurityException t) {
- }
- }
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java Fri Aug 23 09:57:21 2013 +0100
@@ -812,7 +812,6 @@
* Similar to 'schemaLocation' but this one works for xsi:noNamespaceSchemaLocation
*/
public void startDocument(XmlOutput out,boolean fragment,String schemaLocation,String noNsSchemaLocation) throws IOException, SAXException, XMLStreamException {
- setThreadAffinity();
pushCoordinator();
nsContext.reset();
nse = nsContext.getCurrent();
@@ -841,7 +840,6 @@
out = null;
clearCurrentProperty();
popCoordinator();
- resetThreadAffinity();
}
/**
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,10 +30,13 @@
/**
* {@link Lister} for primitive type arrays.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * B y t e ArrayLister is used as the master to generate the rest of the
- * lister classes. Do not modify the generated copies.
+ * B y t e ArrayLister is used as the master to generate the rest of the
+ * lister classes. Do not modify the generated copies.
+ *
*/
final class PrimitiveArrayListerBoolean extends Lister {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,10 +30,13 @@
/**
* {@link Lister} for primitive type arrays.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * B y t e ArrayLister is used as the master to generate the rest of the
- * lister classes. Do not modify the generated copies.
+ * B y t e ArrayLister is used as the master to generate the rest of the
+ * lister classes. Do not modify the generated copies.
+ *
*/
final class PrimitiveArrayListerCharacter extends Lister {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,10 +30,13 @@
/**
* {@link Lister} for primitive type arrays.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * B y t e ArrayLister is used as the master to generate the rest of the
- * lister classes. Do not modify the generated copies.
+ * B y t e ArrayLister is used as the master to generate the rest of the
+ * lister classes. Do not modify the generated copies.
+ *
*/
final class PrimitiveArrayListerDouble extends Lister {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,10 +30,13 @@
/**
* {@link Lister} for primitive type arrays.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * B y t e ArrayLister is used as the master to generate the rest of the
- * lister classes. Do not modify the generated copies.
+ * B y t e ArrayLister is used as the master to generate the rest of the
+ * lister classes. Do not modify the generated copies.
+ *
*/
final class PrimitiveArrayListerFloat extends Lister {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,10 +30,13 @@
/**
* {@link Lister} for primitive type arrays.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * B y t e ArrayLister is used as the master to generate the rest of the
- * lister classes. Do not modify the generated copies.
+ * B y t e ArrayLister is used as the master to generate the rest of the
+ * lister classes. Do not modify the generated copies.
+ *
*/
final class PrimitiveArrayListerInteger extends Lister {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,10 +30,13 @@
/**
* {@link Lister} for primitive type arrays.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * B y t e ArrayLister is used as the master to generate the rest of the
- * lister classes. Do not modify the generated copies.
+ * B y t e ArrayLister is used as the master to generate the rest of the
+ * lister classes. Do not modify the generated copies.
+ *
*/
final class PrimitiveArrayListerLong extends Lister {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,10 +30,13 @@
/**
* {@link Lister} for primitive type arrays.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * B y t e ArrayLister is used as the master to generate the rest of the
- * lister classes. Do not modify the generated copies.
+ * B y t e ArrayLister is used as the master to generate the rest of the
+ * lister classes. Do not modify the generated copies.
+ *
*/
final class PrimitiveArrayListerShort extends Lister {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean fields.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the FieldAccessors are generated from FieldAccessor_B y t e
- *
+ * All the FieldAccessors are generated from FieldAccessor_B y t e
+ *
* @author Kohsuke Kawaguchi
*/
public class FieldAccessor_Boolean extends Accessor {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for char fields.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the FieldAccessors are generated from FieldAccessor_B y t e
- *
+ * All the FieldAccessors are generated from FieldAccessor_B y t e
+ *
* @author Kohsuke Kawaguchi
*/
public class FieldAccessor_Character extends Accessor {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for double fields.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the FieldAccessors are generated from FieldAccessor_B y t e
- *
+ * All the FieldAccessors are generated from FieldAccessor_B y t e
+ *
* @author Kohsuke Kawaguchi
*/
public class FieldAccessor_Double extends Accessor {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for float fields.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the FieldAccessors are generated from FieldAccessor_B y t e
- *
+ * All the FieldAccessors are generated from FieldAccessor_B y t e
+ *
* @author Kohsuke Kawaguchi
*/
public class FieldAccessor_Float extends Accessor {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for int fields.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the FieldAccessors are generated from FieldAccessor_B y t e
- *
+ * All the FieldAccessors are generated from FieldAccessor_B y t e
+ *
* @author Kohsuke Kawaguchi
*/
public class FieldAccessor_Integer extends Accessor {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for long fields.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the FieldAccessors are generated from FieldAccessor_B y t e
- *
+ * All the FieldAccessors are generated from FieldAccessor_B y t e
+ *
* @author Kohsuke Kawaguchi
*/
public class FieldAccessor_Long extends Accessor {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for short fields.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the FieldAccessors are generated from FieldAccessor_B y t e
- *
+ * All the FieldAccessors are generated from FieldAccessor_B y t e
+ *
* @author Kohsuke Kawaguchi
*/
public class FieldAccessor_Short extends Accessor {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean getter/setter.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the MethodAccessors are generated from MethodAccessor_B y t e
- *
+ * All the MethodAccessors are generated from MethodAccessor_B y t e
+ *
* @author Kohsuke Kawaguchi
*/
public class MethodAccessor_Boolean extends Accessor {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean getter/setter.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the MethodAccessors are generated from MethodAccessor_B y t e
- *
+ * All the MethodAccessors are generated from MethodAccessor_B y t e
+ *
* @author Kohsuke Kawaguchi
*/
public class MethodAccessor_Character extends Accessor {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean getter/setter.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the MethodAccessors are generated from MethodAccessor_B y t e
- *
+ * All the MethodAccessors are generated from MethodAccessor_B y t e
+ *
* @author Kohsuke Kawaguchi
*/
public class MethodAccessor_Double extends Accessor {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean getter/setter.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the MethodAccessors are generated from MethodAccessor_B y t e
- *
+ * All the MethodAccessors are generated from MethodAccessor_B y t e
+ *
* @author Kohsuke Kawaguchi
*/
public class MethodAccessor_Float extends Accessor {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean getter/setter.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the MethodAccessors are generated from MethodAccessor_B y t e
- *
+ * All the MethodAccessors are generated from MethodAccessor_B y t e
+ *
* @author Kohsuke Kawaguchi
*/
public class MethodAccessor_Integer extends Accessor {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean getter/setter.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the MethodAccessors are generated from MethodAccessor_B y t e
- *
+ * All the MethodAccessors are generated from MethodAccessor_B y t e
+ *
* @author Kohsuke Kawaguchi
*/
public class MethodAccessor_Long extends Accessor {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean getter/setter.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the MethodAccessors are generated from MethodAccessor_B y t e
- *
+ * All the MethodAccessors are generated from MethodAccessor_B y t e
+ *
* @author Kohsuke Kawaguchi
*/
public class MethodAccessor_Short extends Accessor {
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java Fri Aug 23 09:57:21 2013 +0100
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a double field.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
- *
+ * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
+ *
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java Fri Aug 23 09:57:21 2013 +0100
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a float field.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
- *
+ * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
+ *
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java Fri Aug 23 09:57:21 2013 +0100
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a long field.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
- *
+ * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
+ *
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java Fri Aug 23 09:57:21 2013 +0100
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a short field.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
- *
+ * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
+ *
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java Fri Aug 23 09:57:21 2013 +0100
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a boolean field.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
- *
+ * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
+ *
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java Fri Aug 23 09:57:21 2013 +0100
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a double field.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
- *
+ * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
+ *
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java Fri Aug 23 09:57:21 2013 +0100
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a float field.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
- *
+ * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
+ *
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java Fri Aug 23 09:57:21 2013 +0100
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a long field.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
- *
+ * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
+ *
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java Fri Aug 23 09:57:21 2013 +0100
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a short field.
- *
+ *
+ * Auto-generated, do not edit.
+ *
*
- * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
- *
+ * All the TransducedAccessor_field are generated from TransducedAccessor_field_B y t e
+ *
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java Fri Aug 23 09:57:21 2013 +0100
@@ -94,11 +94,15 @@
@SuppressWarnings({"StringEquality"})
protected final void reportUnexpectedChildElement(TagName ea, boolean canRecover) throws SAXException {
- if(canRecover && !UnmarshallingContext.getInstance().parent.hasEventHandler())
+ if (canRecover) {
// this error happens particurly often (when input documents contain a lot of unexpected elements to be ignored),
// so don't bother computing all the messages and etc if we know that
// there's no event handler to receive the error in the end. See #286
- return;
+ UnmarshallingContext context = UnmarshallingContext.getInstance();
+ if (!context.parent.hasEventHandler() // is somebody listening?
+ || !context.shouldErrorBeReported()) // should we report error?
+ return;
+ }
if(ea.uri!=ea.uri.intern() || ea.local!=ea.local.intern())
reportError(Messages.UNINTERNED_STRINGS.format(), canRecover );
else
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java Fri Aug 23 09:57:21 2013 +0100
@@ -40,6 +40,7 @@
UNRECOGNIZED_TYPE_NAME_MAYBE, // 2 args
UNABLE_TO_CREATE_MAP, // 1 arg
UNINTERNED_STRINGS, // no args
+ ERRORS_LIMIT_EXCEEDED, // no arg
;
private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName());
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties Fri Aug 23 09:57:21 2013 +0100
@@ -50,3 +50,7 @@
UNINTERNED_STRINGS = \
Namespace URIs and local names to the unmarshaller needs to be interned.
+
+# user have to set Logger.getLogger("com.sun.xml.internal.bind").setLevel(Level.FINEST)
+ERRORS_LIMIT_EXCEEDED = \
+ Errors limit exceeded. To receive all errors set 'com.sun.xml.internal.bind' logger to FINEST level.
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,14 @@
package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
+import com.sun.xml.internal.bind.Util;
import javax.xml.bind.JAXBException;
import javax.xml.bind.UnmarshallerHandler;
import com.sun.xml.internal.bind.WhiteSpaceProcessor;
import com.sun.xml.internal.bind.v2.runtime.ClassBeanInfoImpl;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
@@ -44,6 +47,8 @@
private LocatorEx loc;
+ private static final Logger logger = Util.getClassLogger();
+
/**
* SAX may fire consecutive characters event, but we don't allow it.
* so use this buffer to perform buffering.
@@ -56,6 +61,7 @@
private static final class TagNameImpl extends TagName {
String qname;
+ @Override
public String getQname() {
return qname;
}
@@ -76,6 +82,7 @@
this.loc = externalLocator;
}
+ @Override
public Object getResult() throws JAXBException, IllegalStateException {
return context.getResult();
}
@@ -84,6 +91,7 @@
return context;
}
+ @Override
public void setDocumentLocator(final Locator locator) {
if(loc!=null)
return; // we already have an external locator. ignore.
@@ -91,23 +99,43 @@
this.loc = new LocatorExWrapper(locator);
}
+ @Override
public void startDocument() throws SAXException {
+ if (logger.isLoggable(Level.FINER)) {
+ logger.log(Level.FINER, "SAXConnector.startDocument");
+ }
next.startDocument(loc,null);
}
+ @Override
public void endDocument() throws SAXException {
+ if (logger.isLoggable(Level.FINER)) {
+ logger.log(Level.FINER, "SAXConnector.endDocument");
+ }
next.endDocument();
}
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException {
+ if (logger.isLoggable(Level.FINER)) {
+ logger.log(Level.FINER, "SAXConnector.startPrefixMapping: {0}:{1}", new Object[]{prefix, uri});
+ }
next.startPrefixMapping(prefix,uri);
}
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {
+ if (logger.isLoggable(Level.FINER)) {
+ logger.log(Level.FINER, "SAXConnector.endPrefixMapping: {0}", new Object[]{prefix});
+ }
next.endPrefixMapping(prefix);
}
+ @Override
public void startElement(String uri, String local, String qname, Attributes atts) throws SAXException {
+ if (logger.isLoggable(Level.FINER)) {
+ logger.log(Level.FINER, "SAXConnector.startElement: {0}:{1}:{2}, attrs: {3}", new Object[]{uri, local, qname, atts});
+ }
// work gracefully with misconfigured parsers that don't support namespaces
if( uri==null || uri.length()==0 )
uri="";
@@ -135,7 +163,11 @@
next.startElement(tagName);
}
+ @Override
public void endElement(String uri, String localName, String qName) throws SAXException {
+ if (logger.isLoggable(Level.FINER)) {
+ logger.log(Level.FINER, "SAXConnector.startElement: {0}:{1}:{2}", new Object[]{uri, localName, qName});
+ }
processText(false);
tagName.uri = uri;
tagName.local = localName;
@@ -144,19 +176,29 @@
}
+ @Override
public final void characters( char[] buf, int start, int len ) {
+ if (logger.isLoggable(Level.FINEST)) {
+ logger.log(Level.FINEST, "SAXConnector.characters: {0}", buf);
+ }
if( predictor.expectText() )
buffer.append(buf,start,len);
}
+ @Override
public final void ignorableWhitespace( char[] buf, int start, int len ) {
+ if (logger.isLoggable(Level.FINEST)) {
+ logger.log(Level.FINEST, "SAXConnector.characters{0}", buf);
+ }
characters(buf,start,len);
}
+ @Override
public void processingInstruction(String target, String data) {
// nop
}
+ @Override
public void skippedEntity(String name) {
// nop
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.xml.XMLConstants;
import javax.xml.bind.JAXBElement;
@@ -51,6 +53,7 @@
import com.sun.istack.internal.Nullable;
import com.sun.istack.internal.SAXParseException2;
import com.sun.xml.internal.bind.IDResolver;
+import com.sun.xml.internal.bind.Util;
import com.sun.xml.internal.bind.api.AccessorException;
import com.sun.xml.internal.bind.api.ClassResolver;
import com.sun.xml.internal.bind.unmarshaller.InfosetScanner;
@@ -59,6 +62,8 @@
import com.sun.xml.internal.bind.v2.runtime.Coordinator;
import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
import com.sun.xml.internal.bind.v2.runtime.JaxBeanInfo;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
@@ -76,6 +81,8 @@
public final class UnmarshallingContext extends Coordinator
implements NamespaceContext, ValidationEventHandler, ErrorHandler, XmlVisitor, XmlVisitor.TextPredictor {
+ private static final Logger logger = Logger.getLogger(UnmarshallingContext.class.getName());
+
/**
* Root state.
*/
@@ -177,6 +184,14 @@
public @Nullable ClassLoader classLoader;
/**
+ * The variable introduced to avoid reporting n^10 similar errors.
+ * After error is reported counter is decremented. When it became 0 - errors should not be reported any more.
+ *
+ * volatile is required to ensure that concurrent threads will see changed value
+ */
+ private static volatile int errorsCounter = 10;
+
+ /**
* State information for each element.
*/
public final class State {
@@ -260,21 +275,32 @@
return UnmarshallingContext.this;
}
+ @SuppressWarnings("LeakingThisInConstructor")
private State(State prev) {
this.prev = prev;
- if(prev!=null)
+ if (prev!=null) {
prev.next = this;
+ }
}
private void push() {
- if(next==null)
+ if (logger.isLoggable(Level.FINEST)) {
+ logger.log(Level.FINEST, "State.push");
+ }
+ if (next==null) {
+ assert current == this;
allocateMoreStates();
+ }
+ nil = false;
State n = next;
n.numNsDecl = nsLen;
current = n;
}
private void pop() {
+ if (logger.isLoggable(Level.FINEST)) {
+ logger.log(Level.FINEST, "State.pop");
+ }
assert prev!=null;
loader = null;
nil = false;
@@ -381,8 +407,9 @@
assert current.next==null;
State s = current;
- for( int i=0; i<8; i++ )
+ for (int i=0; i<8; i++) {
s = new State(s);
+ }
}
public void clearStates() {
@@ -436,6 +463,7 @@
}
}
+ @Override
public void startDocument(LocatorEx locator, NamespaceContext nsContext) throws SAXException {
if(locator!=null)
this.locator = locator;
@@ -449,8 +477,6 @@
isUnmarshalInProgress = true;
nsLen=0;
- setThreadAffinity();
-
if(expectedType!=null)
root.loader = EXPECTED_TYPE_ROOT_LOADER;
else
@@ -459,6 +485,7 @@
idResolver.startDocument(this);
}
+ @Override
public void startElement(TagName tagName) throws SAXException {
pushCoordinator();
try {
@@ -486,6 +513,7 @@
current.loader.startElement(current,tagName);
}
+ @Override
public void text(CharSequence pcdata) throws SAXException {
State cur = current;
pushCoordinator();
@@ -502,6 +530,7 @@
}
}
+ @Override
public final void endElement(TagName tagName) throws SAXException {
pushCoordinator();
try {
@@ -526,6 +555,7 @@
}
}
+ @Override
public void endDocument() throws SAXException {
runPatchers();
idResolver.endDocument();
@@ -537,14 +567,13 @@
// at the successful completion, scope must be all closed
assert root==current;
-
- resetThreadAffinity();
}
/**
* You should be always calling this through {@link TextPredictor}.
*/
@Deprecated
+ @Override
public boolean expectText() {
return current.loader.expectText;
}
@@ -553,10 +582,12 @@
* You should be always getting {@link TextPredictor} from {@link XmlVisitor}.
*/
@Deprecated
+ @Override
public TextPredictor getPredictor() {
return this;
}
+ @Override
public UnmarshallingContext getContext() {
return this;
}
@@ -650,6 +681,7 @@
event.getLinkedException() ) );
}
+ @Override
public boolean handleEvent(ValidationEvent event) {
try {
// if the handler says "abort", we will not return the object.
@@ -680,6 +712,7 @@
handleEvent(new ValidationEventImpl(ValidationEvent.ERROR,msg,locator.getLocation()));
}
+ @Override
protected ValidationEventLocator getLocation() {
return locator.getLocation();
}
@@ -801,6 +834,7 @@
private String[] nsBind = new String[16];
private int nsLen=0;
+ @Override
public void startPrefixMapping( String prefix, String uri ) {
if(nsBind.length==nsLen) {
// expand the buffer
@@ -811,6 +845,7 @@
nsBind[nsLen++] = prefix;
nsBind[nsLen++] = uri;
}
+ @Override
public void endPrefixMapping( String prefix ) {
nsLen-=2;
}
@@ -868,6 +903,7 @@
// NamespaceContext2 implementation
//
+ @Override
public Iterator getPrefixes(String uri) {
// TODO: could be implemented much faster
// wrap it into unmodifiable list so that the remove method
@@ -899,6 +935,7 @@
return a;
}
+ @Override
public String getPrefix(String uri) {
if( uri==null )
throw new IllegalArgumentException();
@@ -919,6 +956,7 @@
return null;
}
+ @Override
public String getNamespaceURI(String prefix) {
if (prefix == null)
throw new IllegalArgumentException();
@@ -1059,6 +1097,7 @@
return getInstance().getJAXBContext().getValidRootNames();
}
+ @Override
public void receive(State state, Object o) {
if(state.backup!=null) {
((JAXBElement)state.backup).setValue(o);
@@ -1095,6 +1134,7 @@
state.loader = new XsiNilLoader(context.expectedType.getLoader(null,true));
}
+ @Override
public void receive(State state, Object o) {
JAXBElement e = (JAXBElement)state.target;
e.setValue(o);
@@ -1233,4 +1273,27 @@
return null;
}
+ /**
+ * Based on current {@link Logger} {@link Level} and errorCounter value determines if error should be reported.
+ *
+ * If the method called and return true it is expected that error will be reported. And that's why
+ * errorCounter is automatically decremented during the check.
+ *
+ * NOT THREAD SAFE!!! In case of heave concurrency access several additional errors could be reported. It's not expected to be the
+ * problem. Otherwise add synchronization here.
+ *
+ * @return true in case if {@link Level#FINEST} is set OR we haven't exceed errors reporting limit.
+ */
+ public boolean shouldErrorBeReported() throws SAXException {
+ if (logger.isLoggable(Level.FINEST))
+ return true;
+
+ if (errorsCounter >= 0) {
+ --errorsCounter;
+ if (errorsCounter == 0) // it's possible to miss this because of concurrency. If required add synchronization here
+ handleEvent(new ValidationEventImpl(ValidationEvent.WARNING, Messages.ERRORS_LIMIT_EXCEEDED.format(),
+ getLocator().getLocation(), null), true);
+ }
+ return errorsCounter >= 0;
+ }
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java Fri Aug 23 09:57:21 2013 +0100
@@ -92,12 +92,15 @@
return defaultBeanInfo;
beanInfo = context.getJAXBContext().getGlobalType(type);
- if(beanInfo==null) {
- String nearest = context.getJAXBContext().getNearestTypeName(type);
- if(nearest!=null)
- reportError(Messages.UNRECOGNIZED_TYPE_NAME_MAYBE.format(type,nearest),true);
- else
- reportError(Messages.UNRECOGNIZED_TYPE_NAME.format(type),true);
+ if(beanInfo==null) { // let's report an error
+ if (context.parent.hasEventHandler() // is somebody listening?
+ && context.shouldErrorBeReported()) { // should we report error?
+ String nearest = context.getJAXBContext().getNearestTypeName(type);
+ if(nearest!=null)
+ reportError(Messages.UNRECOGNIZED_TYPE_NAME_MAYBE.format(type,nearest),true);
+ else
+ reportError(Messages.UNRECOGNIZED_TYPE_NAME.format(type),true);
+ }
}
// TODO: resurrect the following check
// else
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface Annotated
extends TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("annotation")
public interface Annotation
extends TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("any")
public interface Any
extends Occurs, Wildcard, TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("appinfo")
public interface Appinfo
extends TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface AttrDecls
extends TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface AttributeType
extends SimpleTypeHost, TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("complexContent")
public interface ComplexContent
extends Annotated, TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("extension")
public interface ComplexExtension
extends AttrDecls, ExtensionType, TypeDefParticle, TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,6 +30,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("restriction")
public interface ComplexRestriction
extends Annotated, AttrDecls, TypeDefParticle, TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("complexType")
public interface ComplexType
extends Annotated, ComplexTypeModel, TypedXmlWriter
@@ -36,17 +41,17 @@
@XmlAttribute("final")
+ public ComplexType _final(String[] value);
+
+ @XmlAttribute("final")
public ComplexType _final(String value);
- @XmlAttribute("final")
- public ComplexType _final(String[] value);
+ @XmlAttribute
+ public ComplexType block(String[] value);
@XmlAttribute
public ComplexType block(String value);
- @XmlAttribute
- public ComplexType block(String[] value);
-
@XmlAttribute("abstract")
public ComplexType _abstract(boolean value);
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface ComplexTypeHost
extends TypeHost, TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface ComplexTypeModel
extends AttrDecls, TypeDefParticle, TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("documentation")
public interface Documentation
extends TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface Element
extends Annotated, ComplexTypeHost, FixedOrDefault, SimpleTypeHost, TypedXmlWriter
{
@@ -38,10 +43,10 @@
public Element type(QName value);
@XmlAttribute
- public Element block(String value);
+ public Element block(String[] value);
@XmlAttribute
- public Element block(String[] value);
+ public Element block(String value);
@XmlAttribute
public Element nillable(boolean value);
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java Fri Aug 23 09:57:21 2013 +0100
@@ -27,6 +27,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface ExplicitGroup
extends Annotated, NestedParticle, Occurs, TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface ExtensionType
extends Annotated, TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface FixedOrDefault
extends TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("import")
public interface Import
extends Annotated, TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,6 +30,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("list")
public interface List
extends Annotated, SimpleTypeHost, TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,6 +30,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("attribute")
public interface LocalAttribute
extends Annotated, AttributeType, FixedOrDefault, TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,6 +30,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("element")
public interface LocalElement
extends Element, Occurs, TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface NestedParticle
extends TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface NoFixedFacet
extends Annotated, TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface Occurs
extends TypedXmlWriter
{
@@ -37,9 +42,9 @@
public Occurs minOccurs(int value);
@XmlAttribute
- public Occurs maxOccurs(int value);
+ public Occurs maxOccurs(String value);
@XmlAttribute
- public Occurs maxOccurs(String value);
+ public Occurs maxOccurs(int value);
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java Fri Aug 23 09:57:21 2013 +0100
@@ -27,6 +27,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface Redefinable
extends ComplexTypeHost, SimpleTypeHost, TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("schema")
public interface Schema
extends SchemaTop, TypedXmlWriter
@@ -57,18 +62,18 @@
public Schema attributeFormDefault(String value);
@XmlAttribute
+ public Schema blockDefault(String[] value);
+
+ @XmlAttribute
public Schema blockDefault(String value);
@XmlAttribute
- public Schema blockDefault(String[] value);
+ public Schema finalDefault(String[] value);
@XmlAttribute
public Schema finalDefault(String value);
@XmlAttribute
- public Schema finalDefault(String[] value);
-
- @XmlAttribute
public Schema version(String value);
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface SchemaTop
extends Redefinable, TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("simpleContent")
public interface SimpleContent
extends Annotated, TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface SimpleDerivation
extends TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("extension")
public interface SimpleExtension
extends AttrDecls, ExtensionType, TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("restriction")
public interface SimpleRestriction
extends Annotated, AttrDecls, SimpleRestrictionModel, TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,6 +30,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface SimpleRestrictionModel
extends SimpleTypeHost, TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("simpleType")
public interface SimpleType
extends Annotated, SimpleDerivation, TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface SimpleTypeHost
extends TypeHost, TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java Fri Aug 23 09:57:21 2013 +0100
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("attribute")
public interface TopLevelAttribute
extends Annotated, AttributeType, FixedOrDefault, TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,6 +30,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("element")
public interface TopLevelElement
extends Element, TypedXmlWriter
@@ -37,10 +42,10 @@
@XmlAttribute("final")
- public TopLevelElement _final(String value);
+ public TopLevelElement _final(String[] value);
@XmlAttribute("final")
- public TopLevelElement _final(String[] value);
+ public TopLevelElement _final(String value);
@XmlAttribute("abstract")
public TopLevelElement _abstract(boolean value);
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface TypeDefParticle
extends TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java Fri Aug 23 09:57:21 2013 +0100
@@ -27,6 +27,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface TypeHost
extends TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java Fri Aug 23 09:57:21 2013 +0100
@@ -30,6 +30,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
@XmlElement("union")
public interface Union
extends Annotated, SimpleTypeHost, TypedXmlWriter
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java Fri Aug 23 09:57:21 2013 +0100
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+/**
+ *
+ * Auto-generated, do not edit.
+ *
+ */
public interface Wildcard
extends Annotated, TypedXmlWriter
{
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/EditDistance.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/EditDistance.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/EditDistance.java Fri Aug 23 09:57:21 2013 +0100
@@ -25,8 +25,10 @@
package com.sun.xml.internal.bind.v2.util;
+import java.util.AbstractMap;
+import java.util.Arrays;
import java.util.Collection;
-import java.util.Arrays;
+import java.util.WeakHashMap;
/**
* Computes the string edit distance.
@@ -41,13 +43,29 @@
public class EditDistance {
/**
+ * Weak results cache to avoid additional computations.
+ * Because of high complexity caching is required.
+ */
+ private static final WeakHashMap, Integer> CACHE = new WeakHashMap, Integer>();
+
+ /**
* Computes the edit distance between two strings.
*
*
* The complexity is O(nm) where n=a.length() and m=b.length().
*/
public static int editDistance( String a, String b ) {
- return new EditDistance(a,b).calc();
+ // let's check cache
+ AbstractMap.SimpleEntry entry = new AbstractMap.SimpleEntry(a, b); // using this class to avoid creation of my own which will handle PAIR of values
+ Integer result = null;
+ if (CACHE.containsKey(entry))
+ result = CACHE.get(entry); // looks like we have it
+
+ if (result == null) {
+ result = new EditDistance(a, b).calc();
+ CACHE.put(entry, result); // cache the result
+ }
+ return result;
}
/**
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,8 @@
import javax.xml.validation.SchemaFactory;
import javax.xml.xpath.XPathFactory;
import javax.xml.xpath.XPathFactoryConfigurationException;
+
+import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
@@ -49,6 +51,9 @@
*/
public class XmlFactory {
+ // not in older JDK, so must be duplicated here, otherwise javax.xml.XMLConstants should be used
+ public static final String ACCESS_EXTERNAL_SCHEMA = "http://javax.xml.XMLConstants/property/accessExternalSchema";
+
private static final Logger LOGGER = Logger.getLogger(XmlFactory.class.getName());
/**
@@ -186,4 +191,22 @@
}
}
+ public static SchemaFactory allowFileAccess(SchemaFactory sf, boolean disableSecureProcessing) {
+
+ // if feature secure processing enabled, nothing to do, file is allowed,
+ // or user is able to control access by standard JAXP mechanisms
+ if (disableSecureProcessing) {
+ return sf;
+ }
+
+ try {
+ sf.setProperty(ACCESS_EXTERNAL_SCHEMA, "file");
+ LOGGER.log(Level.FINE, Messages.JAXP_SUPPORTED_PROPERTY.format(ACCESS_EXTERNAL_SCHEMA));
+ } catch (SAXException ignored) {
+ // nothing to do; support depends on version JDK or SAX implementation
+ LOGGER.log(Level.CONFIG, Messages.JAXP_UNSUPPORTED_PROPERTY.format(ACCESS_EXTERNAL_SCHEMA), ignored);
+ }
+ return sf;
+ }
+
}
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDEventListener.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDEventListener.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDEventListener.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@
* @author David Brownell
* @author Janet Koenig
* @author Kohsuke KAWAGUCHI
- * @version $Id: DTDParser.java,v 1.2 2009-04-16 15:25:49 snajper Exp $
+ * @version $Id: DTDParser.java,v 1.2 2009/04/16 15:25:49 snajper Exp $
*/
public class DTDParser {
public final static String TYPE_CDATA = "CDATA";
@@ -215,25 +215,25 @@
*/
public void parse(String uri)
throws IOException, SAXException {
- InputSource inSource;
+ InputSource in;
init();
// System.out.println ("parse (\"" + uri + "\")");
- inSource = resolver.resolveEntity(null, uri);
+ in = resolver.resolveEntity(null, uri);
// If custom resolver punts resolution to parser, handle it ...
- if (inSource == null) {
- inSource = Resolver.createInputSource(new java.net.URL(uri), false);
+ if (in == null) {
+ in = Resolver.createInputSource(new java.net.URL(uri), false);
// ... or if custom resolver doesn't correctly construct the
// input entity, patch it up enough so relative URIs work, and
// issue a warning to minimize later confusion.
- } else if (inSource.getSystemId() == null) {
+ } else if (in.getSystemId() == null) {
warning("P-065", null);
- inSource.setSystemId(uri);
+ in.setSystemId(uri);
}
- parseInternal(inSource);
+ parseInternal(in);
}
// makes sure the parser is reset to "before a document"
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EndOfInputException.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EndOfInputException.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EndOfInputException.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EntityDecl.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EntityDecl.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EntityDecl.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/ExternalEntity.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/ExternalEntity.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/ExternalEntity.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InputEntity.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InputEntity.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InputEntity.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InternalEntity.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InternalEntity.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InternalEntity.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/MessageCatalog.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/MessageCatalog.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/MessageCatalog.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/Resolver.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/Resolver.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/Resolver.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlChars.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlChars.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlChars.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlNames.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlNames.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlNames.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlReader.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlReader.java Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlReader.java Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,7 @@
//
/**
- * Constructs the reader from an input stream, auto-detecting
+ * Constructs the reader from an input stream, autodetecting
* the encoding to use according to the heuristic specified
* in the XML 1.0 recommendation.
*
@@ -104,7 +104,7 @@
*
* @param in the input stream from which the reader is constructed
* @param encoding the IETF standard name of the encoding to use;
- * if null, auto-detection is used.
+ * if null, autodetection is used.
* @throws IOException on error, including unrecognized encoding
*/
public static Reader createReader(InputStream in, String encoding)
diff -r 6cdc6ed98780 -r b99d7e355d4b src/share/jaxws_classes/com/sun/xml/internal/dtdparser/package.html
--- a/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/package.html Thu Aug 08 10:10:38 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/package.html Fri Aug 23 09:57:21 2013 +0100
@@ -1,5 +1,5 @@