--- a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/logging/Logger.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/logging/Logger.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -37,7 +37,7 @@
* The class also makes sure that logger names of each Metro subsystem are consistent
* with each other.
*
- * @author Marek Potociar <marek.potociar at sun.com>
+ * @author Marek Potociar
* @author Fabian Ritzmann
*/
public class Logger {
@@ -335,7 +335,7 @@
/**
* Method logs {@code exception}'s message as a {@code SEVERE} logging level
* message.
- * <p/>
+ * <p>
* If {@code cause} parameter is not {@code null}, it is logged as well and
* {@code exception} original cause is initialized with instance referenced
* by {@code cause} parameter.
@@ -363,7 +363,7 @@
/**
* Method logs {@code exception}'s message as a {@code SEVERE} logging level
* message.
- * <p/>
+ * <p>
* If {@code logCause} parameter is {@code true}, {@code exception}'s original
* cause is logged as well (if exists). This may be used in cases when
* {@code exception}'s class provides constructor to initialize the original
@@ -408,7 +408,7 @@
/**
* Method logs {@code exception}'s message at the logging level specified by the
* {@code level} argument.
- * <p/>
+ * <p>
* If {@code cause} parameter is not {@code null}, it is logged as well and
* {@code exception} original cause is initialized with instance referenced
* by {@code cause} parameter.
@@ -437,7 +437,7 @@
/**
* Method logs {@code exception}'s message at the logging level specified by the
* {@code level} argument.
- * <p/>
+ * <p>
* If {@code logCause} parameter is {@code true}, {@code exception}'s original
* cause is logged as well (if exists). This may be used in cases when
* {@code exception}'s class provides constructor to initialize the original
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,8 +48,6 @@
* @param field the field within the class to be accessed.
* @param readOnly the isStatic value of the field's modifier.
* @return Accessor the accessor for this field
- *
- * @throws JAXBException reports failures of the method.
*/
public Accessor createFieldAccessor(Class bean, Field field, boolean readOnly) {
return readOnly
@@ -65,8 +63,6 @@
* @param readOnly the isStatic value of the field's modifier.
* @param supressWarning supress security warning about accessing fields through reflection
* @return Accessor the accessor for this field
- *
- * @throws JAXBException reports failures of the method.
*/
public Accessor createFieldAccessor(Class bean, Field field, boolean readOnly, boolean supressWarning) {
return readOnly
@@ -81,8 +77,6 @@
* @param getter the getter method to be accessed. The value can be null.
* @param setter the setter method to be accessed. The value can be null.
* @return Accessor the accessor for these methods
- *
- * @throws JAXBException reports failures of the method.
*/
public Accessor createPropertyAccessor(Class bean, Method getter, Method setter) {
if (getter == null) {
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -81,7 +81,7 @@
}
/**
- * Faster but less robust String->int conversion.
+ * Faster but less robust {@code String->int} conversion.
*
* Note that:
* <ol>
@@ -115,7 +115,7 @@
}
public static long _parseLong(CharSequence s) {
- return Long.valueOf(removeOptionalPlus(WhiteSpaceProcessor.trim(s)).toString());
+ return Long.parseLong(removeOptionalPlus(WhiteSpaceProcessor.trim(s)).toString());
}
public static short _parseShort(CharSequence s) {
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -270,12 +270,12 @@
* add element declarations to the generate schema.
* For example, if the JAX-RPC passes in the following entry:
*
- * {foo}bar -> DeclaredType for java.lang.String
+ * {@code {foo}bar -> DeclaredType for java.lang.String}
*
* then JAXB generates the following element declaration (in the schema
* document for the namespace "foo")"
*
- * <xs:element name="bar" type="xs:string" />
+ * {@code <xs:element name="bar" type="xs:string" />}
*
* This can be used for generating schema components necessary for WSDL.
*
@@ -436,7 +436,7 @@
* to put additional JAXB type references into the {@link JAXBContext}.
*
* <p>
- * The value of the property is {@link Collection}<{@link TypeReference}>.
+ * The value of the property is {@link Collection}{@code <}{@link TypeReference}{@code >}.
* Those {@link TypeReference}s can then be used to create {@link Bridge}s.
*
* <p>
@@ -453,7 +453,6 @@
* to enable the c14n marshalling support in the {@link JAXBContext}.
*
* Boolean
- * @see C14nSupport_ArchitectureDocument
* @since 2.0 EA2
*/
public static final String CANONICALIZATION_SUPPORT = "com.sun.xml.internal.bind.c14n";
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -78,15 +78,15 @@
*
* <p>This code will produce the following document:</p>
*
- * <pre>
- * <?xml version="1.0" standalone="yes"?>
+ * <pre>{@code
+ * <?xml version="1.0" standalone="yes"?>
*
- * <Person>
- * <name>Jane Smith</name>
- * <date-of-birth>1965-05-23</date-of-birth>
- * <citizenship>US</citizenship>
- * </Person>
- * </pre>
+ * <Person>
+ * <name>Jane Smith</name>
+ * <date-of-birth>1965-05-23</date-of-birth>
+ * <citizenship>US</citizenship>
+ * </Person>
+ * }</pre>
*
* <p>This class inherits from {@link XMLWriter},
* and provides all of the same support for Namespaces.</p>
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -44,7 +44,7 @@
// - don't remove any existing method.
/**
- * Implemented by the user application to determine URI -> prefix
+ * Implemented by the user application to determine URI {@code ->} prefix
* mapping.
*
* This is considered as an interface, though it's implemented
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -91,11 +91,11 @@
*
* <p>The resulting document will look like this:</p>
*
- * <pre>
- * <?xml version="1.0" standalone="yes"?>
+ * <pre>{@code
+ * <?xml version="1.0" standalone="yes"?>
*
- * <greeting>Hello, world!</greeting>
- * </pre>
+ * <greeting>Hello, world!</greeting>
+ * }</pre>
*
* <p>In fact, there is an even simpler convenience method,
* <var>dataElement</var>, designed for writing elements that
@@ -125,9 +125,9 @@
*
* <p>you will end up with</p>
*
- * <pre>
- * <item>1</item><item>3</item><item>3</item>
- * </pre>
+ * <pre>{@code
+ * <item>1</item><item>3</item><item>3</item>
+ * }</pre>
*
* <p>You need to invoke one of the <var>characters</var> methods
* explicitly to add newlines or indentation. Alternatively, you
@@ -154,11 +154,11 @@
*
* <p>The resulting document will look like this:</p>
*
- * <pre>
- * <?xml version="1.0" standalone="yes"?>
+ * <pre>{@code
+ * <?xml version="1.0" standalone="yes"?>
*
- * <_NS1:foo xmlns:_NS1="http://www.foo.com/ns/"/>
- * </pre>
+ * <_NS1:foo xmlns:_NS1="http://www.foo.com/ns/"/>
+ * }</pre>
*
* <p>In many cases, document authors will prefer to choose their
* own prefixes rather than using the (ugly) default names. The
@@ -175,11 +175,11 @@
*
* <p>The resulting document will look like this:</p>
*
- * <pre>
- * <?xml version="1.0" standalone="yes"?>
+ * <pre>{@code
+ * <?xml version="1.0" standalone="yes"?>
*
- * <foo:foo xmlns:foo="http://www.foo.com/ns/"/>
- * </pre>
+ * <foo:foo xmlns:foo="http://www.foo.com/ns/"/>
+ * }</pre>
*
* <p>The default Namespace simply uses an empty string as the prefix:</p>
*
@@ -192,28 +192,28 @@
*
* <p>The resulting document will look like this:</p>
*
- * <pre>
- * <?xml version="1.0" standalone="yes"?>
+ * <pre>{@code
+ * <?xml version="1.0" standalone="yes"?>
*
- * <foo xmlns="http://www.foo.com/ns/"/>
- * </pre>
+ * <foo xmlns="http://www.foo.com/ns/"/>
+ * }</pre>
*
* <p>By default, the XML writer will not declare a Namespace until
* it is actually used. Sometimes, this approach will create
* a large number of Namespace declarations, as in the following
* example:</p>
*
- * <pre>
- * <xml version="1.0" standalone="yes"?>
+ * <pre>{@code
+ * <xml version="1.0" standalone="yes"?>
*
- * <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- * <rdf:Description about="http://www.foo.com/ids/books/12345">
- * <dc:title xmlns:dc="http://www.purl.org/dc/">A Dark Night</dc:title>
- * <dc:creator xmlns:dc="http://www.purl.org/dc/">Jane Smith</dc:title>
- * <dc:date xmlns:dc="http://www.purl.org/dc/">2000-09-09</dc:title>
- * </rdf:Description>
- * </rdf:RDF>
- * </pre>
+ * <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ * <rdf:Description about="http://www.foo.com/ids/books/12345">
+ * <dc:title xmlns:dc="http://www.purl.org/dc/">A Dark Night</dc:title>
+ * <dc:creator xmlns:dc="http://www.purl.org/dc/">Jane Smith</dc:title>
+ * <dc:date xmlns:dc="http://www.purl.org/dc/">2000-09-09</dc:title>
+ * </rdf:Description>
+ * </rdf:RDF>
+ * }</pre>
*
* <p>The "rdf" prefix is declared only once, because the RDF Namespace
* is used by the root element and can be inherited by all of its
@@ -230,18 +230,18 @@
* though it's not needed there, and can be inherited by its
* descendants:</p>
*
- * <pre>
- * <xml version="1.0" standalone="yes"?>
+ * <pre>{@code
+ * <xml version="1.0" standalone="yes"?>
*
- * <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ * <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
* xmlns:dc="http://www.purl.org/dc/">
- * <rdf:Description about="http://www.foo.com/ids/books/12345">
- * <dc:title>A Dark Night</dc:title>
- * <dc:creator>Jane Smith</dc:title>
- * <dc:date>2000-09-09</dc:title>
- * </rdf:Description>
- * </rdf:RDF>
- * </pre>
+ * <rdf:Description about="http://www.foo.com/ids/books/12345">
+ * <dc:title>A Dark Night</dc:title>
+ * <dc:creator>Jane Smith</dc:title>
+ * <dc:date>2000-09-09</dc:title>
+ * </rdf:Description>
+ * </rdf:RDF>
+ * }</pre>
*
* <p>This approach is also useful for declaring Namespace prefixes
* that be used by qualified names appearing in attribute values or
@@ -372,7 +372,7 @@
/**
* Set whether the writer should print out the XML declaration
- * (<?xml version='1.0' ... ?>).
+ * ({@code <?xml version='1.0' ... ?>}).
* <p>
* This option is set to true by default.
*/
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, 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
@@ -87,25 +87,16 @@
if(consRef!=null)
cons = consRef.get();
if(cons==null) {
- cons = AccessController.doPrivileged(new PrivilegedAction<Constructor<T>>() {
- @Override
- public Constructor<T> run() {
- try {
- return clazz.getDeclaredConstructor(emptyClass);
- } catch (NoSuchMethodException e) {
- logger.log(Level.INFO,"No default constructor found on "+clazz,e);
- NoSuchMethodError exp;
- if(clazz.getDeclaringClass()!=null && !Modifier.isStatic(clazz.getModifiers())) {
- exp = new NoSuchMethodError(Messages.NO_DEFAULT_CONSTRUCTOR_IN_INNER_CLASS
- .format(clazz.getName()));
- } else {
- exp = new NoSuchMethodError(e.getMessage());
- }
- exp.initCause(e);
- throw exp;
+ if (System.getSecurityManager() == null) {
+ cons = tryGetDeclaredConstructor(clazz);
+ } else {
+ cons = AccessController.doPrivileged(new PrivilegedAction<Constructor<T>>() {
+ @Override
+ public Constructor<T> run() {
+ return tryGetDeclaredConstructor(clazz);
}
- }
- });
+ });
+ }
int classMod = clazz.getModifiers();
@@ -126,6 +117,23 @@
return cons.newInstance(emptyObject);
}
+ private static <T> Constructor<T> tryGetDeclaredConstructor(Class<T> clazz) {
+ try {
+ return clazz.getDeclaredConstructor((Class<T>[])emptyClass);
+ } catch (NoSuchMethodException e) {
+ logger.log(Level.INFO,"No default constructor found on "+clazz,e);
+ NoSuchMethodError exp;
+ if(clazz.getDeclaringClass()!=null && !Modifier.isStatic(clazz.getModifiers())) {
+ exp = new NoSuchMethodError(Messages.NO_DEFAULT_CONSTRUCTOR_IN_INNER_CLASS
+ .format(clazz.getName()));
+ } else {
+ exp = new NoSuchMethodError(e.getMessage());
+ }
+ exp.initCause(e);
+ throw exp;
+ }
+ }
+
/**
* The same as {@link #create0} but with an error handling to make
* the instantiation error fatal.
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -174,7 +174,7 @@
* @param retainPropertyInfo
* @return
* @throws JAXBException
- * @deprecated use createContext(Class[] classes, Map<String,Object> properties) method instead
+ * @deprecated use {@code createContext(Class[] classes, Map<String,Object> properties)} method instead
*/
@Deprecated
public static JAXBRIContext createContext( Class[] classes,
@@ -201,7 +201,7 @@
* @param improvedXsiTypeHandling
* @return
* @throws JAXBException
- * @deprecated use createContext( Class[] classes, Map<String,Object> properties) method instead
+ * @deprecated use {@code createContext( Class[] classes, Map<String,Object> properties)} method instead
*/
@Deprecated
public static JAXBRIContext createContext( Class[] classes,
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,24 +38,18 @@
/**
* @deprecated Use javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI instead;
- * @return
- * @throws CloneNotSupportedException
*/
@Deprecated()
public static final String XML_SCHEMA = XMLConstants.W3C_XML_SCHEMA_NS_URI;
/**
* @deprecated Use javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI instead
- * @return
- * @throws CloneNotSupportedException
*/
@Deprecated()
public static final String XML_SCHEMA_INSTANCE = XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI;
/**
* @deprecated Use javax.xml.XMLConstants.XML_NS_URI instead;
- * @return
- * @throws CloneNotSupportedException
*/
@Deprecated()
public static final String XML_NAMESPACE_URI = XMLConstants.XML_NS_URI;
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -72,7 +72,7 @@
T getContentInMemoryType();
/**
- * Returns the representation for {@link JAXBElement}<<i>contentInMemoryType</i>>.
+ * Returns the representation for {@link JAXBElement}<i>{@code <contentInMemoryType>}</i>.
*
* <p>
* This returns the signature in Java and thus isn't affected by the adapter.
@@ -80,7 +80,7 @@
T getType();
/**
- * @inheritDoc
+ * {@inheritDoc}
*
* {@link ElementInfo} can only substitute {@link ElementInfo}.
*/
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -51,14 +51,14 @@
* However, in a general case an element property can be heterogeneous,
* meaning you can put different types in it, each with a different tag name
* (and a few other settings.)
- * <pre>
+ * <pre><code>
* // list can contain String or Integer.
- * @XmlElements({
- * @XmlElement(name="a",type=String.class),
- * @XmlElement(name="b",type=Integer.class),
- * }) {@code
- * List<Object> abc;
- * }</pre>
+ * {@literal @}XmlElements({
+ * {@literal @}XmlElement(name="a",type=String.class),
+ * {@literal @}XmlElement(name="b",type=Integer.class),
+ * })
+ * {@literal List<Object>} abc;
+ * </code></pre>
* <p>
* In this case this method returns a list of two {@link TypeRef}s.
*
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -33,7 +33,8 @@
* Represents the information in a class with {@link XmlRegistry} annotaion.
*
* <p>
- * This interface is only meant to be used as a return type from {@link com.sun.xml.internal.bind.v2.model.impl.ModelBuilder}.
+ * This interface is only meant to be used as a return type from
+ * {@link com.sun.xml.internal.bind.v2.model.impl.ModelBuilder}.
*
* @author Kohsuke Kawaguchi
*/
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,25 +36,25 @@
* The meaning of parameterizations are as follows:
*
* <dl>
- * <dt><b>T</b>
+ * <dt><b>T</b></dt>
* <dd>Represents an use of type, such as {@code int}, {@code Foo[]}, or {@code List<Foo>}.
- * Corresponds to {@link Type}.
- *
- * <dt><b>C</b>
+ * Corresponds to {@link java.lang.reflect.Type}.</dd>
+*
+ * <dt><b>C</b></dt>
* <dd>Represents a declaration of a type (that is, class, interface, enum, or annotation.)
* This doesn't include {@code int}, {@code Foo[]}, or {@code List<Foo>}, because
* they don't have corresponding declarations.
- * Corresponds to {@link Class} (roughly).
+ * Corresponds to {@link java.lang.Class} (roughly).</dd>
*
- * <dt><b>F</b>
+ * <dt><b>F</b></dt>
* <dd>Represents a field.
- * Corresponds to {@link Field}.
+ * Corresponds to {@link java.lang.reflect.Field}.</dd>
*
- * <dt><b>M</b>
+ * <dt><b>M</b></dt>
* <dd>Represents a method.
- * Corresponds to {@link Method}.
+ * Corresponds to {@link java.lang.reflect.Method}.</dd>
*
- * <dt>
+ * </dl>
*/
@XmlSchema(namespace="http://jaxb.dev.java.net/xjc/model",elementFormDefault=QUALIFIED)
package com.sun.xml.internal.bind.v2.model.core;
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -419,7 +419,7 @@
}
/**
- * This hook is used by {@link RuntimeClassInfoImpl} to look for {@link XmlLocation}.
+ * This hook is used by {@link RuntimeClassInfoImpl} to look for {@link com.sun.xml.internal.bind.annotation.XmlLocation}.
*/
protected void checkFieldXmlLocation(F f) {
}
@@ -1245,7 +1245,7 @@
}
/**
- * Called after all the {@link TypeInfo}s are collected into the {@link #owner}.
+ * Called after all the {@link com.sun.xml.internal.bind.v2.model.core.TypeInfo}s are collected into the {@link #owner}.
*/
@Override
/*package*/ void link() {
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
package com.sun.xml.internal.bind.v2.model.impl;
+import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
+
/**
* {@link PropertyInfo} that allows to add additional elements to the collection.
*
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -33,6 +33,7 @@
import javax.xml.namespace.QName;
import com.sun.xml.internal.bind.v2.model.core.ClassInfo;
+import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
import com.sun.xml.internal.bind.annotation.XmlLocation;
@@ -58,7 +59,7 @@
* unoptimized accessor.
* non-null iff {@link #hasAttributeWildcard()}==true.
*
- * @see Accessor#optimize()
+ * @see Accessor#optimize(JAXBContextImpl)
*/
<BeanT> Accessor<BeanT,Map<QName,String>> getAttributeWildcard();
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
import java.util.Collection;
import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
+import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
/**
@@ -58,7 +59,7 @@
* @return
* never null.
*
- * @see Accessor#optimize()
+ * @see Accessor#optimize(JAXBContextImpl)
*/
Accessor getAccessor();
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/package-info.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/package-info.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,7 @@
*
* <h1>Overview</h1>
* <p>
- * This module provides code that implements {@link JAXBContext}.
+ * This module provides code that implements {@link javax.xml.bind.JAXBContext}.
* Roughly speaking the runtime works like this:
*
* <ol>
@@ -37,7 +37,7 @@
* <li>There's a set of classes that constitute the unmarshaller and marshaller.
* Each class represents a small portion, and they are composed to perform
* the operations.
- * <li>{@link JAXBContextImpl} builds itself by reading the model and
+ * <li>{@link com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl} builds itself by reading the model and
* composing unmarshallers and marshallers.
* </ol>
*
@@ -68,7 +68,7 @@
* packages of the binding model.
*
* <div>
- * <img src="doc-files/packages.png"/>
+ * <img src="doc-files/packages.png" alt="">
* </div>
*
* <p>
@@ -109,13 +109,13 @@
* For more details, see the javadoc of each component.
*
* <div>
- * <img src="doc-files/j2s_architecture.gif"/>
+ * <img src="doc-files/j2s_architecture.gif" alt="">
* </div>
*
* <b><i>TODO: link to classes from above pictures</i></b>
*
*
- * <h3>Evolution Rules</h3>
+ * <h2>Evolution Rules</h2>
* None of the class in this package or below should be directly
* referenced by the generated code. Hence they can be changed freely
* from versions to versions.
@@ -125,7 +125,7 @@
*
* <h1>Performance Characteristics</h1>
* <p>
- * Model construction happens inside {@link JAXBContext#newInstance(Class[])}.
+ * Model construction happens inside {@link javax.xml.bind.JAXBContext#newInstance(Class[])}.
* It's desirable for this step to be fast and consume less memory,
* but it's not too performance sensitive.
*
@@ -139,44 +139,8 @@
*
* <h1>Bootstrap Sequence</h1>
* <p>
- * The following picture illustrates how the {@link JAXBContext#newInstance(Class[])} method
+ * The following picture illustrates how the {@link javax.xml.bind.JAXBContext#newInstance(Class[])} method
* triggers activities.
*
- * {@SequenceDiagram
- boxwid=1.2;
-
- pobject(U,"user");
- object(A,"JAXB API");
- object(CF,"ContextFactory");
- pobject(JC);
- step();
-
- message(U,A,"JAXBContext.newInstance()");
- active(A);
- message(A,A,"locate JAXB RI 2.0");
- active(A);
- step();
- inactive(A);
-
- message(A,CF,"createContext");
- active(CF);
-
- create_message(CF,JC,"c:JAXBContextImpl");
- active(JC);
-
- message(JC,JC,"build runtime model");
- message(JC,JC,"build JaxBeanInfos");
- inactive(JC);
-
- rmessage(A,U,"return c");
- inactive(CF);
- inactive(A);
-
- complete(JC);
- complete(CF);
- complete(A);
- * }
- *
- * @ArchitectureDocument
*/
package com.sun.xml.internal.bind.v2;
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -66,7 +66,7 @@
private final Map<Object,Entry<XmlNode>> byPeer = new IdentityHashMap<Object,Entry<XmlNode>>();
private final Set<XmlNode> usedNodes = new HashSet<XmlNode>();
- /** Records the new element<->inner peer association. */
+ /** Records the new {@code element <->inner} peer association. */
public void addInner( XmlNode element, Object inner ) {
Entry<XmlNode> e = byElement.get(element);
if(e!=null) {
@@ -90,7 +90,7 @@
}
}
- /** Records the new element<->outer peer association. */
+ /** Records the new {@code element <-> outer} peer association. */
public void addOuter( XmlNode element, Object outer ) {
Entry<XmlNode> e = byElement.get(element);
if(e!=null) {
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -78,6 +78,9 @@
import com.sun.xml.internal.bind.v2.util.FatalAdapter;
import java.net.URISyntaxException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
@@ -95,6 +98,8 @@
*/
public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractMarshallerImpl implements ValidationEventHandler
{
+ private static final Logger LOGGER = Logger.getLogger(MarshallerImpl.class.getName());
+
/** Indentation string. Default is four whitespaces. */
private String indent = " ";
@@ -327,12 +332,14 @@
toBeFlushed.flush();
} catch (IOException e) {
// ignore
+ LOGGER.log(Level.SEVERE, e.getMessage(), e);
}
if(toBeClosed!=null)
try {
toBeClosed.close();
} catch (IOException e) {
// ignore
+ LOGGER.log(Level.SEVERE, e.getMessage(), e);
}
toBeFlushed = null;
toBeClosed = null;
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -30,7 +30,7 @@
import com.sun.istack.internal.NotNull;
/**
- * Maintains namespace<->prefix bindings.
+ * Maintains {@code namespace <-> prefix} bindings.
*
* <p>
* This interface extends {@link NamespaceContext} and provides
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -53,7 +53,7 @@
* Map from {@link Class} objects representing primitive types
* to {@link Class} objects representing their boxed types.
* <p>
- * e.g., int -> Integer.
+ * e.g., {@code int -> Integer}.
*/
public static final Map<Class,Class> boxToPrimitive;
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,7 +38,6 @@
/**
* {@link XmlOutput} that generates canonical XML.
*
- * @see com.sun.xml.internal.bind.api.C14nSupport_ArchitectureDocument
* @author Kohsuke Kawaguchi
*/
public class C14nXmlOutput extends UTF8XmlOutput {
@@ -68,7 +67,6 @@
* (AKA attribute wildcard.)
*
* As long as this map is empty, there's no need for sorting.
- * see {@link com.sun.xml.internal.bind.api.C14nSupport_ArchitectureDocument} for more details.
*/
private final FinalArrayList<DynamicAttribute> otherAttributes = new FinalArrayList<DynamicAttribute>();
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
import org.xml.sax.SAXException;
/**
- * {@link XmlOutput} for {@link LowLevelStAXDocumentSerializer}.
+ * {@link XmlOutput} for {@link StAXDocumentSerializer}.
* <p>
* This class is responsible for managing the indexing of elements, attributes
* and local names that are known to JAXB by way of the JAXBContext (generated
@@ -99,7 +99,7 @@
/**
* Create a new set of tables for a JAXB context.
* <p>
- * @param content the JAXB context.
+ * @param context the JAXB context.
* @param initialIndexOffset the initial index offset to calculate
* the maximum possible index
*
@@ -124,7 +124,7 @@
/**
* Clear or reset the tables.
* <p>
- * @param initialIndexOffset the initial index offset to calculate
+ * @param intialIndexOffset the initial index offset to calculate
* the maximum possible index
*/
public void clearOrResetTables(int intialIndexOffset) {
@@ -202,7 +202,7 @@
* Holder of JAXB contexts -> tables.
* <p>
* An instance will be registered with the
- * {@link LowLevelStAXDocumentSerializer}.
+ * {@link StAXDocumentSerializer}.
*/
final static class AppData implements VocabularyApplicationData {
final Map<JAXBContext, TablesPerJAXBContext> contexts =
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -366,8 +366,8 @@
* This model of namespace declarations maintain the following invariants.
*
* <ul>
- * <li>If a non-empty prefix is declared, it will never be reassigned to different namespace URIs.
- * <li>
+ * <li>If a non-empty prefix is declared, it will never be reassigned to different namespace URIs.</li>
+ * </ul>
*/
public final class Element {
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -78,9 +78,9 @@
protected int octetBufferIndex;
/**
- * Set to true to indicate that we need to write '>'
+ * Set to true to indicate that we need to write {@code '>'}
* to close a start tag. Deferring the write of this char
- * allows us to write "/>" for empty elements.
+ * allows us to write {@code "/>"} for empty elements.
*/
protected boolean closeStartTagPending = false;
@@ -129,7 +129,7 @@
}
/**
- * Writes '>' to close the start tag, if necessary.
+ * Writes {@code '>'} to close the start tag, if necessary.
*/
protected final void closeStartTag() throws IOException {
if(closeStartTagPending) {
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -158,7 +158,7 @@
*
* @param value
* this string can contain characters that might need escaping
- * (such as '&' or '>')
+ * (such as {@code '&' or '>'})
* @param needsSeparatingWhitespace
*/
public void text( String value, boolean needsSeparatingWhitespace ) throws IOException, SAXException, XMLStreamException;
@@ -168,7 +168,7 @@
*
* @param value
* this string can contain characters that might need escaping
- * (such as '&' or '>')
+ * (such as {@code '&' or '>'})
* @param needsSeparatingWhitespace
*/
public void text( Pcdata value, boolean needsSeparatingWhitespace ) throws IOException, SAXException, XMLStreamException;
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -56,13 +56,13 @@
/**
* Accesses a particular property of a bean.
- * <p/>
- * <p/>
+ * <p>
+ * <p>
* This interface encapsulates the access to the actual data store.
* The intention is to generate implementations for a particular bean
* and a property to improve the performance.
- * <p/>
- * <p/>
+ * <p>
+ * <p>
* Accessor can be used as a receiver. Upon receiving an object
* it sets that to the field.
*
@@ -119,7 +119,7 @@
/**
* Sets the value without adapting the value.
- * <p/>
+ * <p>
* This ugly entry point is only used by JAX-WS.
* See {@link JAXBRIContext#getElementPropertyAccessor}
*/
@@ -129,7 +129,7 @@
/**
* Returns true if this accessor wraps an adapter.
- * <p/>
+ * <p>
* This method needs to be used with care, but it helps some optimization.
*/
public boolean isAdapted() {
@@ -138,7 +138,7 @@
/**
* Sets the value without adapting the value.
- * <p/>
+ * <p>
* This ugly entry point is only used by JAX-WS.
* See {@link JAXBRIContext#getElementPropertyAccessor}
*/
@@ -394,8 +394,8 @@
/**
* A version of {@link GetterSetterReflection} that doesn't have any setter.
- * <p/>
- * <p/>
+ * <p>
+ * <p>
* This provides a user-friendly error message.
*/
public static class GetterOnlyReflection<BeanT, ValueT> extends GetterSetterReflection<BeanT, ValueT> {
@@ -411,8 +411,8 @@
/**
* A version of {@link GetterSetterReflection} thaat doesn't have any getter.
- * <p/>
- * <p/>
+ * <p>
+ * <p>
* This provides a user-friendly error message.
*/
public static class SetterOnlyReflection<BeanT, ValueT> extends GetterSetterReflection<BeanT, ValueT> {
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -33,7 +33,8 @@
import org.w3c.dom.Node;
/**
- * Object that returns the current location that the {@link XmlVisitor} is parsing.
+ * Object that returns the current location that the {@link com.sun.xml.internal.bind.v2.runtime.unmarshaller.XmlVisitor}
+ * is parsing.
*
* @author Kohsuke Kawaguchi
*/
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -66,6 +66,7 @@
import java.util.logging.Logger;
import org.xml.sax.ErrorHandler;
+import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.LocatorImpl;
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -145,7 +145,7 @@
* <p>
* If this method returns true, all the whitespaces are considered significant
* and thus need to be reported as a {@link XmlVisitor#text} event. Furthermore,
- * if the element has no children (like <foo/>), then it has to be reported
+ * if the element has no children (like {@code <foo/>}), then it has to be reported
* an empty {@link XmlVisitor#text} event.
*/
boolean expectText();
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -75,12 +75,13 @@
/**
* Calculate the normalized form of the given uriPath.
- *
- * For example:
+ * <p>
+ * For example: <pre>{@code
* /a/b/c/ -> /a/b/c/
* /a/b/c -> /a/b/
* /a/ -> /a/
* /a -> /
+ * }</pre>
*
* @param uriPath path of a URI (as returned by java.net.URI#getPath()
* @return the normalized uri path
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/CleanUpExecutorFactory.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/CleanUpExecutorFactory.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -37,6 +37,8 @@
public static CleanUpExecutorFactory newInstance() {
try {
return (CleanUpExecutorFactory) FactoryFinder.find(DEFAULT_PROPERTY_NAME);
+ } catch (RuntimeException e) {
+ return null;
} catch (Exception e) {
return null;
}
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DecodingException.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DecodingException.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -39,9 +39,12 @@
public final class DecodingException extends IOException {
/**
- * Constructor
+ * Constructs a {@code DecodingException} with the specified detail message.
+ *
+ * @param message
+ * The detail message
*/
- public DecodingException(String s) {
- super(s);
+ public DecodingException(String message) {
+ super(message);
}
}
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FactoryFinder.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FactoryFinder.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -70,11 +71,7 @@
String factoryClassName;
BufferedReader rd = null;
try {
- try {
- rd = new BufferedReader(new InputStreamReader(is, "UTF-8"));
- } catch (java.io.UnsupportedEncodingException e) {
- rd = new BufferedReader(new InputStreamReader(is));
- }
+ rd = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
try {
factoryClassName = rd.readLine();
} catch (IOException x) {
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -37,6 +37,9 @@
* @author Kohsuke Kawaguchi
*/
final class FinalArrayList<T> extends ArrayList<T> {
+
+ private static final long serialVersionUID = 7996571518730043311L;
+
public FinalArrayList(int initialCapacity) {
super(initialCapacity);
}
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -119,11 +119,12 @@
}
/**
- * @param dir
+ * @param directory
+ * temp directory
*/
- public final void setDir(String dir) {
- if (tempDir == null && dir != null && !dir.equals("")) {
- tempDir = new File(dir);
+ public final void setDir(String directory) {
+ if (tempDir == null && directory != null && !directory.equals("")) {
+ tempDir = new File(directory);
}
}
@@ -143,7 +144,9 @@
LOGGER.log(Level.INFO, "File {0} was not deleted", tempFile.getAbsolutePath());
}
}
- } catch(Exception ioe) {
+ } catch(RuntimeException e) {
+ memoryThreshold = -1L; // whole attachment will be in-memory
+ } catch(Exception e) {
memoryThreshold = -1L; // whole attachment will be in-memory
}
}
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java Thu Nov 05 13:43:17 2015 -0800
@@ -62,7 +62,10 @@
private final Map<String, MIMEPart> partsMap = new HashMap<String, MIMEPart>();
/**
- * @see MIMEMessage(InputStream, String, MIMEConfig)
+ * @see #MIMEMessage(InputStream, String, MIMEConfig)
+ *
+ * @param in MIME message stream
+ * @param boundary the separator for parts(pass it without --)
*/
public MIMEMessage(InputStream in, String boundary) {
this(in, boundary, new MIMEConfig());
@@ -131,7 +134,7 @@
* do the validation, the message needs to be parsed. The parsing of the
* message is done lazily and is done while reading the bytes of the part.
*
- * @param contentId Content-ID of the part, expects Content-ID without <, >
+ * @param contentId Content-ID of the part, expects Content-ID without {@code <, >}
* @return attachemnt part
*/
public MIMEPart getPart(String contentId) {
@@ -177,8 +180,8 @@
/**
* Closes all parsed {@link com.sun.xml.internal.org.jvnet.mimepull.MIMEPart parts}.
* This method is safe to call even if parsing of message failed.
- * <p/>
- * Does not throw {@link com.sun.xml.internal.org.jvnet.mimepull.MIMEParsingException} if an
+ *
+ * <p> Does not throw {@link com.sun.xml.internal.org.jvnet.mimepull.MIMEParsingException} if an
* error occurred during closing a MIME part. The exception (if any) is
* still logged.
*/
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -123,6 +123,11 @@
@Override
public MIMEEvent next() {
+
+ if (parsed) {
+ throw new NoSuchElementException();
+ }
+
switch(state) {
case START_MESSAGE :
if (LOGGER.isLoggable(Level.FINER)) {LOGGER.log(Level.FINER, "MIMEParser state={0}", STATE.START_MESSAGE);}
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
package com.sun.xml.internal.org.jvnet.mimepull;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
import java.util.concurrent.TimeUnit;
import java.io.File;
@@ -133,10 +136,12 @@
refList.remove(this);
try {
raf.close();
- boolean renamed = file.renameTo(f);
+ Path target = Files.move(file.toPath(), f.toPath(), StandardCopyOption.REPLACE_EXISTING);
+ boolean renamed = f.toPath().equals(target);
if (!renamed) {
if (LOGGER.isLoggable(Level.INFO)) {
- LOGGER.log(Level.INFO, "File {0} was not moved to {1}", new Object[] {file.getAbsolutePath(), f.getAbsolutePath()});
+ throw new MIMEParsingException("File " + file.getAbsolutePath() +
+ " was not moved to " + f.getAbsolutePath());
}
}
} catch(IOException ioe) {
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/util/XMLStreamReaderToXMLStreamWriter.java Thu Nov 05 13:43:17 2015 -0800
@@ -210,7 +210,7 @@
int nsCount = in.getNamespaceCount();
for (int i = 0; i < nsCount; i++) {
out.writeNamespace(
- in.getNamespacePrefix(i),
+ fixNull(in.getNamespacePrefix(i)), //StAX reader will return null for default NS
fixNull(in.getNamespaceURI(i))); // zephyr doesn't like null, I don't know what is correct, so just fix null to "" for now
}
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -91,7 +91,7 @@
}
/**
- * Defines additional user object -> string conversion logic.
+ * Defines additional user object {@code ->} string conversion logic.
*
* <p>
* Applications can add their own {@link DatatypeWriter} so that
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -43,7 +43,7 @@
private ResultFactory() {}
/**
- * Factory method for producing {@link XmlSerializer) from {@link javax.xml.transform.Result}.
+ * Factory method for producing {@link XmlSerializer} from {@link javax.xml.transform.Result}.
*
* This method supports {@link javax.xml.transform.sax.SAXResult},
* {@link javax.xml.transform.stream.StreamResult}, and {@link javax.xml.transform.dom.DOMResult}.
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -94,7 +94,7 @@
* <p>The resulting document will look like this:</p>
*
* <pre>{@code
- * <?xml version="1.0" standalone="yes"?>
+ * <?xml version="1.0" standalone="yes"?>
*
* <greeting>Hello, world!</greeting>
* }</pre>
@@ -168,7 +168,7 @@
*
* <ol>
* <li>the qualified name</li>
- * <li>the {@link #setPrefix setPrefix} method.</li>
+ * <li>the {@link #startPrefixMapping(String, String)} method.</li>
* </ol>
*
* <p>Whenever the XML writer finds a new Namespace URI, it checks
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java Thu Nov 05 13:43:17 2015 -0800
@@ -372,8 +372,8 @@
* @throws MarshalException
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
- * {@code Marshaller} is unable to marshal {@code obj} (or any
- * object reachable from {@code obj}). See <a href="#elementMarshalling">
+ * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
+ * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
@@ -394,8 +394,8 @@
* @throws MarshalException
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
- * {@code Marshaller} is unable to marshal {@code obj} (or any
- * object reachable from {@code obj}). See <a href="#elementMarshalling">
+ * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
+ * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
@@ -416,8 +416,8 @@
* @throws MarshalException
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
- * {@code Marshaller} is unable to marshal {@code obj} (or any
- * object reachable from {@code obj}). See <a href="#elementMarshalling">
+ * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
+ * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
@@ -439,8 +439,8 @@
* @throws MarshalException
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
- * {@code Marshaller} is unable to marshal {@code obj} (or any
- * object reachable from {@code obj}). See <a href="#elementMarshalling">
+ * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
+ * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
@@ -461,8 +461,8 @@
* @throws MarshalException
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
- * {@code Marshaller} is unable to marshal {@code obj} (or any
- * object reachable from {@code obj}). See <a href="#elementMarshalling">
+ * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
+ * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
@@ -510,8 +510,8 @@
* @throws MarshalException
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
- * {@code Marshaller} is unable to marshal {@code obj} (or any
- * object reachable from {@code obj}). See <a href="#elementMarshalling">
+ * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
+ * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
@@ -534,8 +534,8 @@
* @throws MarshalException
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
- * {@code Marshaller} is unable to marshal {@code obj} (or any
- * object reachable from {@code obj}). See <a href="#elementMarshalling">
+ * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
+ * object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
* Marshalling a JAXB element</a>.
* @throws IllegalArgumentException
* If any of the method parameters are null
--- a/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/MessageContextFactory.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal/api/message/MessageContextFactory.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,8 @@
{
private static final MessageContextFactory DEFAULT = new com.sun.xml.internal.ws.api.message.MessageContextFactory(new WebServiceFeature[0]);
+ protected com.sun.xml.internal.ws.api.message.saaj.SAAJFactory saajFactory = null;
+
protected abstract MessageContextFactory newFactory(WebServiceFeature ... f);
public abstract MessageContext createContext();
@@ -127,4 +129,8 @@
private static interface Creator {
public MessageContext create(MessageContextFactory f);
}
+
+ public void setSAAJFactory(com.sun.xml.internal.ws.api.message.saaj.SAAJFactory saajFactory) {
+ this.saajFactory = saajFactory;
+ }
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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,9 +50,7 @@
class HttpSOAPConnection extends SOAPConnection {
public static final String vmVendor = SAAJUtil.getSystemProperty("java.vendor.url");
- private static final String sunVmVendor = "http://java.sun.com/";
private static final String ibmVmVendor = "http://www.ibm.com/";
- private static final boolean isSunVM = sunVmVendor.equals(vmVendor) ? true: false;
private static final boolean isIBMVM = ibmVmVendor.equals(vmVendor) ? true : false;
private static final String JAXM_URLENDPOINT="javax.xml.messaging.URLEndpoint";
@@ -95,7 +93,7 @@
throw new SOAPExceptionImpl("Connection is closed");
}
- Class urlEndpointClass = null;
+ Class<?> urlEndpointClass = null;
ClassLoader loader = Thread.currentThread().getContextClassLoader();
try {
if (loader != null) {
@@ -198,7 +196,7 @@
MimeHeaders headers = message.getMimeHeaders();
- Iterator it = headers.getAllHeaders();
+ Iterator<?> it = headers.getAllHeaders();
boolean hasAuth = false; // true if we find explicit Auth header
while (it.hasNext()) {
MimeHeader header = (MimeHeader) it.next();
@@ -209,7 +207,7 @@
header.getName(),
header.getValue());
else {
- StringBuffer concat = new StringBuffer();
+ StringBuilder concat = new StringBuilder();
int i = 0;
while (i < values.length) {
if (i != 0)
@@ -355,7 +353,7 @@
log.severe("SAAJ0011.p2p.get.already.closed.conn");
throw new SOAPExceptionImpl("Connection is closed");
}
- Class urlEndpointClass = null;
+ Class<?> urlEndpointClass = null;
try {
urlEndpointClass = Class.forName("javax.xml.messaging.URLEndpoint");
@@ -441,7 +439,7 @@
httpConnection.setDoOutput(true);
httpConnection.setDoInput(true);
httpConnection.setUseCaches(false);
- httpConnection.setFollowRedirects(true);
+ httpConnection.setInstanceFollowRedirects(true);
httpConnection.connect();
@@ -591,7 +589,7 @@
log.log(Level.FINE, "SAAJ0054.p2p.set.providers",
new String[] { pkgs });
try {
- Class c = Class.forName(SSL_PROVIDER);
+ Class<?> c = Class.forName(SSL_PROVIDER);
Provider p = (Provider) c.newInstance();
Security.addProvider(p);
if (log.isLoggable(Level.FINE))
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -121,7 +121,7 @@
return super.getMessage();
Exception n = next;
String s = super.getMessage();
- StringBuffer sb = new StringBuffer(s == null ? "" : s);
+ StringBuilder sb = new StringBuilder(s == null ? "" : s);
while (n != null) {
sb.append(";\n nested exception is:\n\t");
if (n instanceof MessagingException) {
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -705,7 +705,7 @@
String bnd = "--" + contentType.getParameter("boundary");
for (int i = 0; i < parts.size(); i++) {
OutputUtil.writeln(bnd, os); // put out boundary
- ((MimeBodyPart)parts.get(i)).writeTo(os);
+ parts.get(i).writeTo(os);
OutputUtil.writeln(os); // put out empty line
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -169,7 +169,7 @@
if (list == null)
return disposition;
- StringBuffer sb = new StringBuffer(disposition);
+ StringBuilder sb = new StringBuilder(disposition);
// append the parameter list
// use the length of the string buffer + the length of
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -204,7 +204,7 @@
if (primaryType == null || subType == null) // need both
return null;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(primaryType).append('/').append(subType);
if (list != null)
// Http Binding section of the "SOAP with attachments" specification says,
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -346,7 +346,7 @@
* quoted string.
*/
private static String filterToken(String s, int start, int end) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
char c;
boolean gotEscape = false;
boolean gotCR = false;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -73,12 +73,12 @@
*/
public final class InternetHeaders {
- private final FinalArrayList headers = new FinalArrayList();
+ private final FinalArrayList<hdr> headers = new FinalArrayList<hdr>();
/**
* Lazily cerated view of header lines (Strings).
*/
- private List headerValueView;
+ private List<String> headerValueView;
/**
* Create an empty InternetHeaders object.
@@ -119,7 +119,7 @@
LineInputStream lis = new LineInputStream(is);
String prevline = null; // the previous header line, as a string
// a buffer to accumulate the header in, when we know it's needed
- StringBuffer lineBuffer = new StringBuffer();
+ StringBuilder lineBuffer = new StringBuilder();
try {
//while ((line = lis.readLine()) != null) {
@@ -161,11 +161,11 @@
*/
public String[] getHeader(String name) {
// XXX - should we just step through in index order?
- FinalArrayList v = new FinalArrayList(); // accumulate return values
+ FinalArrayList<String> v = new FinalArrayList<String>(); // accumulate return values
int len = headers.size();
for( int i=0; i<len; i++ ) {
- hdr h = (hdr) headers.get(i);
+ hdr h = headers.get(i);
if (name.equalsIgnoreCase(h.name)) {
v.add(h.getValue());
}
@@ -173,7 +173,7 @@
if (v.size() == 0)
return (null);
// convert Vector to an array for return
- return (String[]) v.toArray(new String[v.size()]);
+ return v.toArray(new String[v.size()]);
}
/**
@@ -197,7 +197,7 @@
if ((s.length == 1) || delimiter == null)
return s[0];
- StringBuffer r = new StringBuffer(s[0]);
+ StringBuilder r = new StringBuilder(s[0]);
for (int i = 1; i < s.length; i++) {
r.append(delimiter);
r.append(s[i]);
@@ -219,7 +219,7 @@
boolean found = false;
for (int i = 0; i < headers.size(); i++) {
- hdr h = (hdr) headers.get(i);
+ hdr h = headers.get(i);
if (name.equalsIgnoreCase(h.name)) {
if (!found) {
int j;
@@ -252,7 +252,7 @@
public void addHeader(String name, String value) {
int pos = headers.size();
for (int i = headers.size() - 1; i >= 0; i--) {
- hdr h = (hdr) headers.get(i);
+ hdr h = headers.get(i);
if (name.equalsIgnoreCase(h.name)) {
headers.add(i + 1, new hdr(name, value));
return;
@@ -271,7 +271,7 @@
*/
public void removeHeader(String name) {
for (int i = 0; i < headers.size(); i++) {
- hdr h = (hdr) headers.get(i);
+ hdr h = headers.get(i);
if (name.equalsIgnoreCase(h.name)) {
headers.remove(i);
i--; // have to look at i again
@@ -285,7 +285,7 @@
*
* @return Header objects
*/
- public FinalArrayList getAllHeaders() {
+ public FinalArrayList<hdr> getAllHeaders() {
return headers; // conceptually it should be read-only, but for performance reason I'm not wrapping it here
}
@@ -302,7 +302,7 @@
try {
char c = line.charAt(0);
if (c == ' ' || c == '\t') {
- hdr h = (hdr) headers.get(headers.size() - 1);
+ hdr h = headers.get(headers.size() - 1);
h.line += "\r\n" + line;
} else
headers.add(new hdr(line));
@@ -317,11 +317,11 @@
/**
* Return all the header lines as a collection
*/
- public List getAllHeaderLines() {
+ public List<String> getAllHeaderLines() {
if(headerValueView==null)
- headerValueView = new AbstractList() {
- public Object get(int index) {
- return ((hdr)headers.get(index)).line;
+ headerValueView = new AbstractList<String>() {
+ public String get(int index) {
+ return headers.get(index).line;
}
public int size() {
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -37,8 +37,6 @@
import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
import com.sun.xml.internal.messaging.saaj.util.FinalArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.activation.DataHandler;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -526,7 +524,7 @@
// Tokenize the header to obtain the Language-tags (skip comments)
HeaderTokenizer h = new HeaderTokenizer(s, HeaderTokenizer.MIME);
- FinalArrayList v = new FinalArrayList();
+ FinalArrayList<String> v = new FinalArrayList<String>();
HeaderTokenizer.Token tk;
int tkType;
@@ -544,7 +542,7 @@
if (v.size() == 0)
return null;
- return (String[])v.toArray(new String[v.size()]);
+ return v.toArray(new String[v.size()]);
}
/**
@@ -554,7 +552,7 @@
* @param languages array of language tags
*/
public void setContentLanguage(String[] languages) {
- StringBuffer sb = new StringBuffer(languages[0]);
+ StringBuilder sb = new StringBuilder(languages[0]);
for (int i = 1; i < languages.length; i++)
sb.append(',').append(languages[i]);
setHeader("Content-Language", sb.toString());
@@ -943,10 +941,10 @@
throws IOException, MessagingException {
// First, write out the header
- List hdrLines = headers.getAllHeaderLines();
+ List<String> hdrLines = headers.getAllHeaderLines();
int sz = hdrLines.size();
for( int i=0; i<sz; i++ )
- OutputUtil.writeln((String)hdrLines.get(i),os);
+ OutputUtil.writeln(hdrLines.get(i),os);
// The CRLF separator between header and content
OutputUtil.writeln(os);
@@ -1043,7 +1041,7 @@
* Return all the headers from this Message as an Enumeration of
* Header objects.
*/
- public FinalArrayList getAllHeaders() {
+ public FinalArrayList<hdr> getAllHeaders() {
return headers.getAllHeaders();
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -93,7 +93,7 @@
/**
* Vector of MimeBodyPart objects.
*/
- protected FinalArrayList parts = new FinalArrayList(); // Holds BodyParts
+ protected FinalArrayList<MimeBodyPart> parts = new FinalArrayList<MimeBodyPart>(); // Holds BodyParts
/**
* This field specifies the content-type of this multipart
@@ -212,7 +212,7 @@
if (parts == null)
throw new IndexOutOfBoundsException("No such BodyPart");
- return (MimeBodyPart)parts.get(index);
+ return parts.get(index);
}
/**
@@ -259,7 +259,7 @@
*/
protected void updateHeaders() throws MessagingException {
for (int i = 0; i < parts.size(); i++)
- ((MimeBodyPart)parts.get(i)).updateHeaders();
+ parts.get(i).updateHeaders();
}
/**
@@ -596,7 +596,7 @@
if (parts == null)
throw new IndexOutOfBoundsException("No such BodyPart");
- MimeBodyPart part = (MimeBodyPart)parts.get(index);
+ MimeBodyPart part = parts.get(index);
parts.remove(index);
part.setParent(null);
}
@@ -609,7 +609,7 @@
*/
public synchronized void addBodyPart(MimeBodyPart part) {
if (parts == null)
- parts = new FinalArrayList();
+ parts = new FinalArrayList<MimeBodyPart>();
parts.add(part);
part.setParent(this);
@@ -627,7 +627,7 @@
*/
public synchronized void addBodyPart(MimeBodyPart part, int index) {
if (parts == null)
- parts = new FinalArrayList();
+ parts = new FinalArrayList<MimeBodyPart>();
parts.add(index,part);
part.setParent(this);
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -31,7 +31,6 @@
import java.io.InputStream;
import java.util.List;
import javax.activation.DataSource;
-import javax.xml.soap.AttachmentPart;
import com.sun.xml.internal.org.jvnet.mimepull.MIMEConfig;
import com.sun.xml.internal.org.jvnet.mimepull.MIMEMessage;
import com.sun.xml.internal.org.jvnet.mimepull.MIMEPart;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -510,8 +510,8 @@
// Encoded words found. Start decoding ...
st = new StringTokenizer(etext, lwsp, true);
- StringBuffer sb = new StringBuffer(); // decode buffer
- StringBuffer wsb = new StringBuffer(); // white space buffer
+ StringBuilder sb = new StringBuilder(); // decode buffer
+ StringBuilder wsb = new StringBuilder(); // white space buffer
boolean prevWasEncoded = false;
while (st.hasMoreTokens()) {
@@ -648,7 +648,7 @@
throw new UnsupportedEncodingException(
"Unknown transfer encoding: " + encoding);
- StringBuffer outb = new StringBuffer(); // the output buffer
+ StringBuilder outb = new StringBuilder(); // the output buffer
doEncode(string, b64, jcharset,
// As per RFC 2047, size of an encoded string should not
// exceed 75 bytes.
@@ -662,7 +662,7 @@
private static void doEncode(String string, boolean b64,
String jcharset, int avail, String prefix,
- boolean first, boolean encodingWord, StringBuffer buf)
+ boolean first, boolean encodingWord, StringBuilder buf)
throws UnsupportedEncodingException {
// First find out what the length of the encoded version of
@@ -812,7 +812,7 @@
private static String decodeInnerWords(String word)
throws UnsupportedEncodingException {
int start = 0, i;
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
while ((i = word.indexOf("=?", start)) >= 0) {
buf.append(word.substring(start, i));
int end = word.indexOf("?=", i);
@@ -862,7 +862,7 @@
char c = word.charAt(i);
if (c == '"' || c == '\\' || c == '\r' || c == '\n') {
// need to escape them and then quote the whole string
- StringBuffer sb = new StringBuffer(len + 3);
+ StringBuilder sb = new StringBuilder(len + 3);
sb.append('"');
sb.append(word.substring(0, i));
int lastc = 0;
@@ -885,7 +885,7 @@
}
if (needQuoting) {
- StringBuffer sb = new StringBuffer(len + 2);
+ StringBuilder sb = new StringBuilder(len + 2);
sb.append('"').append(word).append('"');
return sb.toString();
} else
@@ -927,7 +927,7 @@
return s;
// have to actually fold the string
- StringBuffer sb = new StringBuffer(s.length() + 4);
+ StringBuilder sb = new StringBuilder(s.length() + 4);
char lastc = 0;
while (used + s.length() > 76) {
int lastspace = -1;
@@ -969,7 +969,7 @@
if (!foldText)
return s;
- StringBuffer sb = null;
+ StringBuilder sb = null;
int i;
while ((i = indexOfAny(s, "\r\n")) >= 0) {
int start = i;
@@ -986,7 +986,7 @@
while (i < l && ((c = s.charAt(i)) == ' ' || c == '\t'))
i++;
if (sb == null)
- sb = new StringBuffer(s.length());
+ sb = new StringBuilder(s.length());
if (start != 0) {
sb.append(s.substring(0, start));
sb.append(' ');
@@ -996,14 +996,14 @@
}
// it's not a continuation line, just leave it in
if (sb == null)
- sb = new StringBuffer(s.length());
+ sb = new StringBuilder(s.length());
sb.append(s.substring(0, i));
s = s.substring(i);
} else {
// there's a backslash at "start - 1"
// strip it out, but leave in the line break
if (sb == null)
- sb = new StringBuffer(s.length());
+ sb = new StringBuilder(s.length());
sb.append(s.substring(0, start - 1));
sb.append(s.substring(start, i));
s = s.substring(i);
@@ -1051,7 +1051,7 @@
// no mapping table, or charset parameter is null
return charset;
- String alias = (String)mime2java.get(charset.toLowerCase());
+ String alias = mime2java.get(charset.toLowerCase());
return alias == null ? charset : alias;
}
@@ -1073,7 +1073,7 @@
// no mapping table or charset param is null
return charset;
- String alias = (String)java2mime.get(charset.toLowerCase());
+ String alias = java2mime.get(charset.toLowerCase());
return alias == null ? charset : alias;
}
@@ -1140,12 +1140,12 @@
// Tables to map MIME charset names to Java names and vice versa.
// XXX - Should eventually use J2SE 1.4 java.nio.charset.Charset
- private static Hashtable mime2java;
- private static Hashtable java2mime;
+ private static Hashtable<String, String> mime2java;
+ private static Hashtable<String, String> java2mime;
static {
- java2mime = new Hashtable(40);
- mime2java = new Hashtable(10);
+ java2mime = new Hashtable<String, String>(40);
+ mime2java = new Hashtable<String, String>(10);
try {
// Use this class's classloader to load the mapping file
@@ -1229,7 +1229,7 @@
}
}
- private static void loadMappings(LineInputStream is, Hashtable table) {
+ private static void loadMappings(LineInputStream is, Hashtable<String, String> table) {
String currLine;
while (true) {
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -44,16 +44,16 @@
public final class ParameterList {
- private final HashMap list;
+ private final HashMap<String, String> list;
/**
* No-arg Constructor.
*/
public ParameterList() {
- this.list = new HashMap();
+ this.list = new HashMap<String, String>();
}
- private ParameterList(HashMap m) {
+ private ParameterList(HashMap<String, String> m) {
this.list = m;
}
@@ -73,7 +73,7 @@
int type;
String name;
- list = new HashMap();
+ list = new HashMap<String, String>();
while (true) {
tk = h.next();
type = tk.getType();
@@ -130,7 +130,7 @@
* present.
*/
public String get(String name) {
- return (String)list.get(name.trim().toLowerCase());
+ return list.get(name.trim().toLowerCase());
}
/**
@@ -160,7 +160,7 @@
*
* @return Enumeration of all parameter names in this list.
*/
- public Iterator getNames() {
+ public Iterator<String> getNames() {
return list.keySet().iterator();
}
@@ -190,13 +190,13 @@
* @return String
*/
public String toString(int used) {
- StringBuffer sb = new StringBuffer();
- Iterator itr = list.entrySet().iterator();
+ StringBuilder sb = new StringBuilder();
+ Iterator<Map.Entry<String, String>> itr = list.entrySet().iterator();
while (itr.hasNext()) {
- Map.Entry e = (Map.Entry)itr.next();
- String name = (String)e.getKey();
- String value = quote((String)e.getValue());
+ Map.Entry<String, String> e = itr.next();
+ String name = e.getKey();
+ String value = quote(e.getValue());
sb.append("; ");
used += 2;
int len = name.length() + value.length() + 1;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,7 @@
* and the current time (in milliseconds).
*/
public static String getUniqueBoundaryValue() {
- StringBuffer s = new StringBuffer();
+ StringBuilder s = new StringBuilder();
// Unique string is ----=_Part_<part>_<hashcode>.<currentTime>
s.append("----=_Part_").append(part++).append("_").
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,8 +31,6 @@
package com.sun.xml.internal.messaging.saaj.packaging.mime.util;
-import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
-
import java.io.OutputStream;
import java.io.IOException;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java Thu Nov 05 13:43:17 2015 -0800
@@ -70,9 +70,8 @@
}
private static ClassLoader getContextClassLoader() {
- return (ClassLoader)
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
ClassLoader cl = null;
try {
cl = Thread.currentThread().getContextClassLoader();
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java Thu Nov 05 13:43:17 2015 -0800
@@ -32,6 +32,7 @@
import com.sun.xml.internal.messaging.saaj.util.ParserPool;
import com.sun.xml.internal.messaging.saaj.util.RejectDoctypeSaxFilter;
import com.sun.xml.internal.messaging.saaj.util.transform.EfficientStreamingTransformer;
+
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
@@ -46,6 +47,9 @@
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stax.StAXSource;
import javax.xml.transform.stream.StreamSource;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.logging.Logger;
/**
@@ -53,6 +57,8 @@
* underlying implementations.
*/
public class EnvelopeFactory {
+ private static final String SAX_PARSER_POOL_SIZE_PROP_NAME = "com.sun.xml.internal.messaging.saaj.soap.saxParserPoolSize";
+ private static final int DEFAULT_SAX_PARSER_POOL_SIZE = 5;
protected static final Logger
log = Logger.getLogger(LogDomainConstants.SOAP_DOMAIN,
@@ -62,9 +68,22 @@
new ContextClassloaderLocal<ParserPool>() {
@Override
protected ParserPool initialValue() throws Exception {
- return new ParserPool(5);
+ Integer poolSize = AccessController.doPrivileged(
+ new PrivilegedAction<Integer>() {
+ @Override
+ public Integer run() {
+ try {
+ return Integer.getInteger(
+ SAX_PARSER_POOL_SIZE_PROP_NAME,
+ DEFAULT_SAX_PARSER_POOL_SIZE);
+ } catch (SecurityException se) {
+ return DEFAULT_SAX_PARSER_POOL_SIZE;
+ }
+ }
+ });
+ return new ParserPool(poolSize);
}
- };
+ };
public static Envelope createEnvelope(Source src, SOAPPartImpl soapPart)
throws SOAPException
@@ -132,51 +151,55 @@
}
private static Envelope parseEnvelopeSax(Source src, SOAPPartImpl soapPart)
throws SOAPException {
- // Insert SAX filter to disallow Document Type Declarations since
- // they are not legal in SOAP
SAXParser saxParser = null;
- if (src instanceof StreamSource) {
- try {
- saxParser = parserPool.get().get();
- } catch (Exception e) {
- log.severe("SAAJ0601.util.newSAXParser.exception");
- throw new SOAPExceptionImpl(
- "Couldn't get a SAX parser while constructing a envelope",
- e);
- }
- InputSource is = SAXSource.sourceToInputSource(src);
- if (is.getEncoding()== null && soapPart.getSourceCharsetEncoding() != null) {
- is.setEncoding(soapPart.getSourceCharsetEncoding());
- }
- XMLReader rejectFilter;
- try {
- rejectFilter = new RejectDoctypeSaxFilter(saxParser);
- } catch (Exception ex) {
- log.severe("SAAJ0510.soap.cannot.create.envelope");
- throw new SOAPExceptionImpl(
- "Unable to create envelope from given source: ",
- ex);
- }
- src = new SAXSource(rejectFilter, is);
- }
+ try {
+ // Insert SAX filter to disallow Document Type Declarations since
+ // they are not legal in SOAP
- try {
- Transformer transformer =
- EfficientStreamingTransformer.newTransformer();
- DOMResult result = new DOMResult(soapPart);
- transformer.transform(src, result);
+ if (src instanceof StreamSource) {
+ try {
+ saxParser = parserPool.get().get();
+ } catch (Exception e) {
+ log.severe("SAAJ0601.util.newSAXParser.exception");
+ throw new SOAPExceptionImpl(
+ "Couldn't get a SAX parser while constructing a envelope",
+ e);
+ }
+ InputSource is = SAXSource.sourceToInputSource(src);
+ if (is.getEncoding()== null && soapPart.getSourceCharsetEncoding() != null) {
+ is.setEncoding(soapPart.getSourceCharsetEncoding());
+ }
+ XMLReader rejectFilter;
+ try {
+ rejectFilter = new RejectDoctypeSaxFilter(saxParser);
+ } catch (Exception ex) {
+ log.severe("SAAJ0510.soap.cannot.create.envelope");
+ throw new SOAPExceptionImpl(
+ "Unable to create envelope from given source: ",
+ ex);
+ }
+ src = new SAXSource(rejectFilter, is);
+ }
- Envelope env = (Envelope) soapPart.getEnvelope();
- return env;
- } catch (Exception ex) {
- if (ex instanceof SOAPVersionMismatchException) {
- throw (SOAPVersionMismatchException) ex;
- }
- log.severe("SAAJ0511.soap.cannot.create.envelope");
- throw new SOAPExceptionImpl(
- "Unable to create envelope from given source: ",
- ex);
+ try {
+ Transformer transformer =
+ EfficientStreamingTransformer.newTransformer();
+ DOMResult result = new DOMResult(soapPart);
+ transformer.transform(src, result);
+
+ Envelope env = (Envelope) soapPart.getEnvelope();
+ return env;
+ } catch (Exception ex) {
+ if (ex instanceof SOAPVersionMismatchException) {
+ throw (SOAPVersionMismatchException) ex;
+ }
+ log.severe("SAAJ0511.soap.cannot.create.envelope");
+ throw new SOAPExceptionImpl(
+ "Unable to create envelope from given source: ",
+ ex);
+ }
} finally {
+ //no matter what condition occurs, always return the parser to the pool
if (saxParser != null) {
parserPool.get().returnParser(saxParser);
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -131,9 +131,9 @@
+ obj.getClass().toString());
}
ImageWriter writer = null;
- Iterator i = ImageIO.getImageWritersByMIMEType(type);
+ Iterator<ImageWriter> i = ImageIO.getImageWritersByMIMEType(type);
if (i.hasNext()) {
- writer = (ImageWriter)i.next();
+ writer = i.next();
}
if (writer != null) {
ImageOutputStream stream = null;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -83,7 +83,7 @@
protected MimeHeaders headers;
protected ContentType contentType;
protected SOAPPartImpl soapPartImpl;
- protected FinalArrayList attachments;
+ protected FinalArrayList<AttachmentPart> attachments;
protected boolean saved = false;
protected byte[] messageBytes;
protected int messageByteCount;
@@ -855,7 +855,7 @@
throw new RuntimeException(e);
}
if (attachments == null)
- attachments = new FinalArrayList();
+ attachments = new FinalArrayList<AttachmentPart>();
attachments.add(attachment);
@@ -887,15 +887,15 @@
headers.setHeader("Content-Type", ct.toString());
}
- private class MimeMatchingIterator implements Iterator {
+ private class MimeMatchingIterator implements Iterator<AttachmentPart> {
public MimeMatchingIterator(MimeHeaders headers) {
this.headers = headers;
this.iter = attachments.iterator();
}
- private Iterator iter;
+ private Iterator<AttachmentPart> iter;
private MimeHeaders headers;
- private Object nextAttachment;
+ private AttachmentPart nextAttachment;
public boolean hasNext() {
if (nextAttachment == null)
@@ -903,9 +903,9 @@
return nextAttachment != null;
}
- public Object next() {
+ public AttachmentPart next() {
if (nextAttachment != null) {
- Object ret = nextAttachment;
+ AttachmentPart ret = nextAttachment;
nextAttachment = null;
return ret;
}
@@ -916,7 +916,7 @@
return null;
}
- Object nextMatch() {
+ AttachmentPart nextMatch() {
while (iter.hasNext()) {
AttachmentPartImpl ap = (AttachmentPartImpl) iter.next();
if (ap.hasAllHeaders(headers))
@@ -951,12 +951,12 @@
if (attachments == null)
return ;
- Iterator it = new MimeMatchingIterator(headers);
+ Iterator<AttachmentPart> it = new MimeMatchingIterator(headers);
while (it.hasNext()) {
int index = attachments.indexOf(it.next());
attachments.set(index, null);
}
- FinalArrayList f = new FinalArrayList();
+ FinalArrayList<AttachmentPart> f = new FinalArrayList<AttachmentPart>();
for (int i = 0; i < attachments.size(); i++) {
if (attachments.get(i) != null) {
f.add(attachments.get(i));
@@ -1066,7 +1066,7 @@
}
private String convertToSingleLine(String contentType) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (int i = 0; i < contentType.length(); i ++) {
char c = contentType.charAt(i);
if (c != '\r' && c != '\n' && c != '\t')
@@ -1098,7 +1098,7 @@
headerAndBody = new BMMimeMultipart();
headerAndBody.addBodyPart(mimeSoapPart);
if (attachments != null) {
- for (Iterator eachAttachment = attachments.iterator();
+ for (Iterator<AttachmentPart> eachAttachment = attachments.iterator();
eachAttachment.hasNext();) {
headerAndBody.addBodyPart(
((AttachmentPartImpl) eachAttachment.next())
@@ -1424,7 +1424,7 @@
}
if (attachments == null)
- attachments = new FinalArrayList();
+ attachments = new FinalArrayList<AttachmentPart>();
int count = multiPart.getCount();
for (int i=0; i < count; i++ ) {
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
import javax.xml.soap.*;
import com.sun.xml.internal.messaging.saaj.soap.impl.ElementFactory;
-import com.sun.xml.internal.messaging.saaj.soap.impl.ElementImpl;
import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
import com.sun.xml.internal.messaging.saaj.util.*;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 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
@@ -27,6 +27,7 @@
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPException;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -76,7 +77,7 @@
public String getPayloadAttributeValue(String attName) {
if (lazySource.isPayloadStreamReader()) {
XMLStreamReader reader = lazySource.readPayload();
- if (reader.getEventType() == reader.START_ELEMENT) {
+ if (reader.getEventType() == XMLStreamConstants.START_ELEMENT) {
return reader.getAttributeValue(null, attName);
}
}
@@ -87,7 +88,7 @@
public String getPayloadAttributeValue(QName attName) {
if (lazySource.isPayloadStreamReader()) {
XMLStreamReader reader = lazySource.readPayload();
- if (reader.getEventType() == reader.START_ELEMENT) {
+ if (reader.getEventType() == XMLStreamConstants.START_ELEMENT) {
return reader.getAttributeValue(attName.getNamespaceURI(), attName.getLocalPart());
}
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 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
@@ -27,6 +27,7 @@
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPException;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
import com.sun.xml.internal.org.jvnet.staxex.util.XMLStreamReaderToXMLStreamWriter;
@@ -65,14 +66,14 @@
}
public QName getPayloadQName() {
- return (in.getEventType() == in.START_ELEMENT) ? in.getName() : null;
+ return (in.getEventType() == XMLStreamConstants.START_ELEMENT) ? in.getName() : null;
}
public String getPayloadAttributeValue(String attName) {
- return (in.getEventType() == in.START_ELEMENT) ? in.getAttributeValue(null, attName) : null;
+ return (in.getEventType() == XMLStreamConstants.START_ELEMENT) ? in.getAttributeValue(null, attName) : null;
}
public String getPayloadAttributeValue(QName attName) {
- return (in.getEventType() == in.START_ELEMENT) ? in.getAttributeValue(attName.getNamespaceURI(), attName.getLocalPart()) : null;
+ return (in.getEventType() == XMLStreamConstants.START_ELEMENT) ? in.getAttributeValue(attName.getNamespaceURI(), attName.getLocalPart()) : null;
}
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
import javax.activation.*;
import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.MimeUtility;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.util.ASCIIUtility;
import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.ContentType;
/**
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
*/
public class XmlDataContentHandler implements DataContentHandler {
public static final String STR_SRC = "javax.xml.transform.stream.StreamSource";
- private static Class streamSourceClass = null;
+ private static Class<?> streamSourceClass = null;
public XmlDataContentHandler() throws ClassNotFoundException {
if (streamSourceClass == null) {
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,9 @@
*/
package com.sun.xml.internal.messaging.saaj.soap.dynamic;
-import java.io.IOException;
-import java.io.InputStream;
import javax.xml.soap.*;
-import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
import com.sun.xml.internal.messaging.saaj.soap.MessageFactoryImpl;
public class SOAPMessageFactoryDynamicImpl extends MessageFactoryImpl {
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -131,7 +131,7 @@
}
protected SOAPElement findFault() {
- Iterator eachChild = getChildElementNodes();
+ Iterator<Node> eachChild = getChildElementNodes();
while (eachChild.hasNext()) {
SOAPElement child = (SOAPElement) eachChild.next();
if (isFault(child)) {
@@ -247,7 +247,7 @@
org.w3c.dom.Node replacingNode = ownerDoc.importNode(docFrag, true);
// Adding replacingNode at the last of the children list of body
addNode(replacingNode);
- Iterator i =
+ Iterator<Node> i =
getChildElements(NameImpl.copyElementName(rootElement));
// Return the child element with the required name which is at the
// end of the list
@@ -284,7 +284,7 @@
public Document extractContentAsDocument() throws SOAPException {
- Iterator eachChild = getChildElements();
+ Iterator<Node> eachChild = getChildElements();
javax.xml.soap.Node firstBodyElement = null;
while (eachChild.hasNext() &&
@@ -314,8 +314,7 @@
Document document = null;
try {
- DocumentBuilderFactory factory =
- new com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
DocumentBuilder builder = factory.newDocumentBuilder();
document = builder.newDocument();
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -77,8 +77,8 @@
}
public Iterator getDetailEntries() {
- return new Iterator() {
- Iterator eachNode = getChildElementNodes();
+ return new Iterator<SOAPElement>() {
+ Iterator<org.w3c.dom.Node> eachNode = getChildElementNodes();
SOAPElement next = null;
SOAPElement last = null;
@@ -95,7 +95,7 @@
return next != null;
}
- public Object next() {
+ public SOAPElement next() {
if (!hasNext()) {
throw new NoSuchElementException();
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -162,8 +162,8 @@
!(currentAncestor instanceof Document)) {
if (currentAncestor instanceof ElementImpl) {
+ /*
QName name = ((ElementImpl) currentAncestor).getElementQName();
- /*
if (prefix.equals(name.getPrefix())) {
String uri = name.getNamespaceURI();
if ("".equals(uri)) {
@@ -339,7 +339,7 @@
log.severe("SAAJ0158.impl.version.mismatch.fault");
throw new SOAPExceptionImpl("SOAP Version mismatch encountered when trying to add SOAPFault to SOAPBody");
}
- Iterator it = this.getChildElements();
+ Iterator<Node> it = this.getChildElements();
if (it.hasNext()) {
log.severe("SAAJ0156.impl.adding.fault.error");
throw new SOAPExceptionImpl("Cannot add SOAPFault as a child of a non-Empty SOAPBody");
@@ -450,7 +450,7 @@
}
protected SOAPElement findAndConvertChildElement(NameImpl name) {
- Iterator eachChild = getChildElementNodes();
+ Iterator<Node> eachChild = getChildElementNodes();
while (eachChild.hasNext()) {
SOAPElement child = (SOAPElement) eachChild.next();
if (child.getElementName().equals(name)) {
@@ -560,10 +560,10 @@
}
public Iterator getAllAttributes() {
- Iterator i = getAllAttributesFrom(this);
- ArrayList list = new ArrayList();
+ Iterator<Name> i = getAllAttributesFrom(this);
+ ArrayList<Name> list = new ArrayList<Name>();
while (i.hasNext()) {
- Name name = (Name) i.next();
+ Name name = i.next();
if (!"xmlns".equalsIgnoreCase(name.getPrefix()))
list.add(name);
}
@@ -571,10 +571,10 @@
}
public Iterator getAllAttributesAsQNames() {
- Iterator i = getAllAttributesFrom(this);
- ArrayList list = new ArrayList();
+ Iterator<Name> i = getAllAttributesFrom(this);
+ ArrayList<QName> list = new ArrayList<QName>();
while (i.hasNext()) {
- Name name = (Name) i.next();
+ Name name = i.next();
if (!"xmlns".equalsIgnoreCase(name.getPrefix())) {
list.add(NameImpl.convertToQName(name));
}
@@ -591,8 +591,8 @@
return doGetNamespacePrefixes(true);
}
- protected Iterator doGetNamespacePrefixes(final boolean deep) {
- return new Iterator() {
+ protected Iterator<String> doGetNamespacePrefixes(final boolean deep) {
+ return new Iterator<String>() {
String next = null;
String last = null;
NamespaceContextIterator eachNamespace =
@@ -613,7 +613,7 @@
return next != null;
}
- public Object next() {
+ public String next() {
findNext();
if (next == null) {
throw new NoSuchElementException();
@@ -676,7 +676,7 @@
return true;
}
- public Iterator getChildElements() {
+ public Iterator<Node> getChildElements() {
return getChildElementsFrom(this);
}
@@ -694,15 +694,15 @@
Element element,
ElementImpl copy) {
- Iterator eachAttribute = getAllAttributesFrom(element);
+ Iterator<Name> eachAttribute = getAllAttributesFrom(element);
while (eachAttribute.hasNext()) {
- Name name = (Name) eachAttribute.next();
+ Name name = eachAttribute.next();
copy.addAttributeBare(name, getAttributeValueFrom(element, name));
}
- Iterator eachChild = getChildElementsFrom(element);
+ Iterator<Node> eachChild = getChildElementsFrom(element);
while (eachChild.hasNext()) {
- Node nextChild = (Node) eachChild.next();
+ Node nextChild = eachChild.next();
copy.insertBefore(nextChild, null);
}
@@ -714,16 +714,16 @@
return copy;
}
- protected Iterator getChildElementNodes() {
- return new Iterator() {
- Iterator eachNode = getChildElements();
+ protected Iterator<Node> getChildElementNodes() {
+ return new Iterator<Node>() {
+ Iterator<Node> eachNode = getChildElements();
Node next = null;
Node last = null;
public boolean hasNext() {
if (next == null) {
while (eachNode.hasNext()) {
- Node node = (Node) eachNode.next();
+ Node node = eachNode.next();
if (node instanceof SOAPElement) {
next = node;
break;
@@ -733,7 +733,7 @@
return next != null;
}
- public Object next() {
+ public Node next() {
if (hasNext()) {
last = next;
next = null;
@@ -761,16 +761,16 @@
return getChildElements(qname.getNamespaceURI(), qname.getLocalPart());
}
- private Iterator getChildElements(final String nameUri, final String nameLocal) {
- return new Iterator() {
- Iterator eachElement = getChildElementNodes();
+ private Iterator<Node> getChildElements(final String nameUri, final String nameLocal) {
+ return new Iterator<Node>() {
+ Iterator<Node> eachElement = getChildElementNodes();
Node next = null;
Node last = null;
public boolean hasNext() {
if (next == null) {
while (eachElement.hasNext()) {
- Node element = (Node) eachElement.next();
+ Node element = eachElement.next();
String elementUri = element.getNamespaceURI();
elementUri = elementUri == null ? "" : elementUri;
String elementName = element.getLocalName();
@@ -784,7 +784,7 @@
return next != null;
}
- public Object next() {
+ public Node next() {
if (!hasNext()) {
throw new NoSuchElementException();
}
@@ -894,7 +894,7 @@
}
protected javax.xml.soap.Node getValueNode() {
- Iterator i = getChildElements();
+ Iterator<Node> i = getChildElements();
while (i.hasNext()) {
javax.xml.soap.Node n = (javax.xml.soap.Node) i.next();
if (n.getNodeType() == org.w3c.dom.Node.TEXT_NODE ||
@@ -1054,10 +1054,10 @@
return null;
}
- protected static Iterator getAllAttributesFrom(final Element element) {
+ protected static Iterator<Name> getAllAttributesFrom(final Element element) {
final NamedNodeMap attributes = element.getAttributes();
- return new Iterator() {
+ return new Iterator<Name>() {
int attributesLength = attributes.getLength();
int attributeIndex = 0;
String currentName;
@@ -1066,7 +1066,7 @@
return attributeIndex < attributesLength;
}
- public Object next() {
+ public Name next() {
if (!hasNext()) {
throw new NoSuchElementException();
}
@@ -1133,8 +1133,8 @@
return attribute == null ? null : attribute.getValue();
}
- protected static Iterator getChildElementsFrom(final Element element) {
- return new Iterator() {
+ protected static Iterator<Node> getChildElementsFrom(final Element element) {
+ return new Iterator<Node>() {
Node next = element.getFirstChild();
Node nextNext = null;
Node last = null;
@@ -1150,7 +1150,7 @@
return next != null;
}
- public Object next() {
+ public Node next() {
if (hasNext()) {
last = next;
next = null;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -248,10 +248,6 @@
this.xmlDecl = value;
}
- private String getOmitXmlDecl() {
- return this.omitXmlDecl;
- }
-
public void setCharsetEncoding(String value) {
charset = value;
}
@@ -309,7 +305,6 @@
else {
try {
// Run transform and generate FI output from content
- Source source = getContent();
Transformer transformer = EfficientStreamingTransformer.newTransformer();
transformer.transform(getContent(),
FastInfosetReflection.FastInfosetResult_new(out));
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -32,7 +32,6 @@
import javax.xml.soap.*;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocument;
@@ -116,7 +115,7 @@
return getHeaderElementsForActor(actor, true, false);
}
- protected Iterator getHeaderElementsForActor(
+ protected Iterator<SOAPHeaderElement> getHeaderElementsForActor(
String actor,
boolean detach,
boolean mustUnderstand) {
@@ -127,15 +126,15 @@
return getHeaderElements(actor, detach, mustUnderstand);
}
- protected Iterator getHeaderElements(
+ protected Iterator<SOAPHeaderElement> getHeaderElements(
String actor,
boolean detach,
boolean mustUnderstand) {
- List elementList = new ArrayList();
+ List<SOAPHeaderElement> elementList = new ArrayList<SOAPHeaderElement>();
- Iterator eachChild = getChildElements();
+ Iterator<org.w3c.dom.Node> eachChild = getChildElements();
- Object currentChild = iterate(eachChild);
+ org.w3c.dom.Node currentChild = iterate(eachChild);
while (currentChild != null) {
if (!(currentChild instanceof SOAPHeaderElement)) {
currentChild = iterate(eachChild);
@@ -173,7 +172,7 @@
return elementList.listIterator();
}
- private Object iterate(Iterator each) {
+ private <T> T iterate(Iterator<T> each) {
return each.hasNext() ? each.next() : null;
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,11 +36,9 @@
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPFaultElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPConstants;
import javax.xml.soap.Name;
-import javax.xml.soap.Name;
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocument;
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,6 @@
*/
package com.sun.xml.internal.messaging.saaj.soap.ver1_1;
-import java.util.List;
-import java.util.Iterator;
import java.util.logging.Level;
import java.util.logging.Logger;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -29,7 +29,6 @@
*/
package com.sun.xml.internal.messaging.saaj.soap.ver1_1;
-import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.soap.SOAPConstants;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
package com.sun.xml.internal.messaging.saaj.soap.ver1_2;
import java.util.logging.Logger;
-import java.util.Locale;
import javax.xml.namespace.QName;
import javax.xml.soap.*;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -146,7 +146,7 @@
findReasonElement();
Iterator eachTextElement =
this.faultStringElement.getChildElements(textName);
- List texts = new ArrayList();
+ List<String> texts = new ArrayList<String>();
while (eachTextElement.hasNext()) {
SOAPElement textElement = (SOAPElement) eachTextElement.next();
Locale thisLocale = getLocale(textElement);
@@ -235,7 +235,7 @@
findReasonElement();
Iterator eachTextElement =
this.faultStringElement.getChildElements(textName);
- List localeSet = new ArrayList();
+ List<Locale> localeSet = new ArrayList<Locale>();
while (eachTextElement.hasNext()) {
SOAPElement textElement = (SOAPElement) eachTextElement.next();
Locale thisLocale = getLocale(textElement);
@@ -435,7 +435,7 @@
public Iterator getFaultSubcodes() {
if (this.faultCodeElement == null)
findFaultCodeElement();
- final List subcodeList = new ArrayList();
+ final List<QName> subcodeList = new ArrayList<QName>();
SOAPElement currentCodeElement = this.faultCodeElement;
Iterator subcodeElements =
currentCodeElement.getChildElements(subcodeName);
@@ -449,14 +449,14 @@
subcodeElements = currentCodeElement.getChildElements(subcodeName);
}
//return subcodeList.iterator();
- return new Iterator() {
- Iterator subCodeIter = subcodeList.iterator();
+ return new Iterator<QName>() {
+ Iterator<QName> subCodeIter = subcodeList.iterator();
public boolean hasNext() {
return subCodeIter.hasNext();
}
- public Object next() {
+ public QName next() {
return subCodeIter.next();
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,6 @@
*/
package com.sun.xml.internal.messaging.saaj.soap.ver1_2;
-import java.util.List;
-import java.util.Iterator;
import java.util.logging.Logger;
import java.util.logging.Level;
@@ -40,7 +38,6 @@
import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocument;
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
-import com.sun.xml.internal.messaging.saaj.soap.impl.HeaderElementImpl;
import com.sun.xml.internal.messaging.saaj.soap.impl.HeaderImpl;
import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,6 @@
*/
package com.sun.xml.internal.messaging.saaj.soap.ver1_2;
-import java.util.logging.Logger;
-
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPElement;
@@ -42,10 +40,6 @@
public class HeaderElement1_2Impl extends HeaderElementImpl {
- private static final Logger log =
- Logger.getLogger(HeaderElement1_2Impl.class.getName(),
- "com.sun.xml.internal.messaging.saaj.soap.ver1_2.LocalStrings");
-
public HeaderElement1_2Impl(SOAPDocumentImpl ownerDoc, Name qname) {
super(ownerDoc, qname);
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -29,7 +29,6 @@
*/
package com.sun.xml.internal.messaging.saaj.soap.ver1_2;
-import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.soap.SOAPConstants;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@
static private final int TWENTYFOURBITGROUP = 24;
static private final int EIGHTBIT = 8;
static private final int SIXTEENBIT = 16;
- static private final int SIXBIT = 6;
static private final int FOURBYTE = 4;
@@ -244,7 +243,7 @@
public static String base64Decode( String orig ) {
char chars[]=orig.toCharArray();
- StringBuffer sb=new StringBuffer();
+ StringBuilder sb=new StringBuilder();
int i=0;
int shift = 0; // # of excess bits stored in accum
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
- * 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.xml.internal.messaging.saaj.util;
-
-import java.io.CharArrayReader;
-
-// This class just gives access to the underlying buffer without copying.
-
-public class CharReader extends CharArrayReader {
- public CharReader(char buf[], int length) {
- super(buf, 0, length);
- }
-
- public CharReader(char buf[], int offset, int length) {
- super(buf, offset, length);
- }
-
- public char[] getChars() {
- return buf;
- }
-
- public int getCount() {
- return count;
- }
-}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
- * 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.xml.internal.messaging.saaj.util;
-
-import java.io.CharArrayWriter;
-
-// This class just gives access to the underlying buffer without copying.
-
-public class CharWriter extends CharArrayWriter {
- public CharWriter () {
- super();
- }
-
- public CharWriter(int size) {
- super(size);
- }
-
- public char[] getChars() {
- return buf;
- }
-
- public int getCount() {
- return count;
- }
-}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
/**
* FI DOMDocumentParser constructor using reflection.
*/
- static Constructor fiDOMDocumentParser_new;
+ static Constructor<?> fiDOMDocumentParser_new;
/**
* FI <code>DOMDocumentParser.parse()</code> method via reflection.
@@ -54,7 +54,7 @@
/**
* FI DOMDocumentSerializer constructor using reflection.
*/
- static Constructor fiDOMDocumentSerializer_new;
+ static Constructor<?> fiDOMDocumentSerializer_new;
/**
* FI <code>FastInfosetSource.serialize(Document)</code> method via reflection.
@@ -69,12 +69,12 @@
/**
* FI FastInfosetSource constructor using reflection.
*/
- static Class fiFastInfosetSource_class;
+ static Class<?> fiFastInfosetSource_class;
/**
* FI FastInfosetSource constructor using reflection.
*/
- static Constructor fiFastInfosetSource_new;
+ static Constructor<?> fiFastInfosetSource_new;
/**
* FI <code>FastInfosetSource.getInputStream()</code> method via reflection.
@@ -89,7 +89,7 @@
/**
* FI FastInfosetResult constructor using reflection.
*/
- static Constructor fiFastInfosetResult_new;
+ static Constructor<?> fiFastInfosetResult_new;
/**
* FI <code>FastInfosetResult.getOutputSTream()</code> method via reflection.
@@ -98,7 +98,7 @@
static {
try {
- Class clazz = Class.forName("com.sun.xml.internal.fastinfoset.dom.DOMDocumentParser");
+ Class<?> clazz = Class.forName("com.sun.xml.internal.fastinfoset.dom.DOMDocumentParser");
fiDOMDocumentParser_new = clazz.getConstructor((Class[]) null);
fiDOMDocumentParser_parse = clazz.getMethod("parse",
new Class[] { org.w3c.dom.Document.class, java.io.InputStream.class });
@@ -179,7 +179,7 @@
"com.sun.xml.internal.org.jvnet.fastinfoset.FastInfosetSource");
}
- public static Class getFastInfosetSource_class() {
+ public static Class<?> getFastInfosetSource_class() {
if (fiFastInfosetSource_class == null) {
throw new RuntimeException("Unable to locate Fast Infoset implementation");
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
* {@link ArrayList} with a final marker to help JIT.
* @author Kohsuke Kawaguchi
*/
-public final class FinalArrayList extends ArrayList {
+public final class FinalArrayList<E> extends ArrayList<E> {
public FinalArrayList(int initialCapacity) {
super(initialCapacity);
}
@@ -40,7 +40,7 @@
public FinalArrayList() {
}
- public FinalArrayList(Collection collection) {
+ public FinalArrayList(Collection<? extends E> collection) {
super(collection);
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -65,14 +65,14 @@
this.reader = rdr;
return;
}
- CharWriter cout = new CharWriter();
+ CharArrayWriter cout = new CharArrayWriter();
char[] temp = new char[1024];
int len;
while (-1 != (len = rdr.read(temp)))
cout.write(temp, 0, len);
- this.reader = new CharReader(cout.getChars(), cout.getCount());
+ this.reader = new CharArrayReader(cout.toCharArray(), 0, cout.size());
}
public InputStream getInputStream() {
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,8 @@
* string and fragment) that may constitute a URI.
* <p>
* Parsing of a URI specification is done according to the URI
-* syntax described in RFC 2396
-* <http://www.ietf.org/rfc/rfc2396.txt?number=2396>. Every URI consists
-* of a scheme, followed by a colon (':'), followed by a scheme-specific
+* syntax described in <a href="http://www.ietf.org/rfc/rfc2396.txt?number=2396">RFC 2396</a>.
+* Every URI consists of a scheme, followed by a colon (':'), followed by a scheme-specific
* part. For URIs that follow the "generic URI" syntax, the scheme-
* specific part begins with two slashes ("//") and may be followed
* by an authority segment (comprised of user information, host, and
@@ -129,8 +128,6 @@
/** If specified, stores the fragment for this URI; otherwise null */
private String m_fragment = null;
- private static boolean DEBUG = false;
-
/**
* Construct a new and uninitialized URI.
*/
@@ -725,7 +722,7 @@
* @return the scheme-specific part for this URI
*/
public String getSchemeSpecificPart() {
- StringBuffer schemespec = new StringBuffer();
+ StringBuilder schemespec = new StringBuilder();
if (m_userinfo != null || m_host != null || m_port != -1) {
schemespec.append("//");
@@ -805,7 +802,7 @@
*/
public String getPath(boolean p_includeQueryString,
boolean p_includeFragment) {
- StringBuffer pathString = new StringBuffer(m_path);
+ StringBuilder pathString = new StringBuilder(m_path);
if (p_includeQueryString && m_queryString != null) {
pathString.append('?');
@@ -1148,7 +1145,7 @@
* @return the URI string specification
*/
public String toString() {
- StringBuffer uriSpecString = new StringBuffer();
+ StringBuilder uriSpecString = new StringBuilder();
if (m_scheme != null) {
uriSpecString.append(m_scheme);
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
* represent.
*/
public static String decode(String s) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
int i=0;
while (i<s.length()) {
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -76,10 +76,8 @@
{
int c = 0;
int index = 0;
- char[] aChar = new char[65535];
- StringBuffer xmlDeclStr = new StringBuffer();
+ StringBuilder xmlDeclStr = new StringBuilder();
while ((c = m_pushbackReader.read()) != -1) {
- aChar[index] = (char)c;
xmlDeclStr.append((char)c);
index++;
if (c == '>') {
@@ -104,7 +102,7 @@
// no XML decl
if (!utf16 && !utf8) {
- m_pushbackReader.unread(aChar, 0, len);
+ m_pushbackReader.unread(decl.toCharArray(), 0, len);
return;
}
m_hasHeader = true;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java Thu Nov 05 13:43:17 2015 -0800
@@ -315,12 +315,12 @@
return currentElement.lookupPrefix(namespaceURI);
}
public Iterator getPrefixes(final String namespaceURI) {
- return new Iterator() {
+ return new Iterator<String>() {
String prefix = getPrefix(namespaceURI);
public boolean hasNext() {
return (prefix != null);
}
- public Object next() {
+ public String next() {
if (!hasNext()) throw new java.util.NoSuchElementException();
String next = prefix;
prefix = null;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java Thu Nov 05 13:43:17 2015 -0800
@@ -115,12 +115,12 @@
return currentElement.lookupPrefix(namespaceURI);
}
public Iterator getPrefixes(final String namespaceURI) {
- return new Iterator() {
+ return new Iterator<String>() {
String prefix = getPrefix(namespaceURI);
public boolean hasNext() {
return (prefix != null);
}
- public Object next() {
+ public String next() {
if (prefix == null) throw new java.util.NoSuchElementException();
String next = prefix;
prefix = null;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -81,7 +81,7 @@
* if the implementation understood the transport but it is not correct,
* this exception can be thrown to abort the creation with error.
* No further {@link BindingIDFactory} will be consulted, and
- * {@link BindingID#create(String, SOAPVersion)} will throw the exception.
+ * {@link #create(String, SOAPVersion)} will throw the exception.
*/
public @Nullable BindingID create(@NotNull String transport, @NotNull SOAPVersion soapVersion) throws WebServiceException {
return null;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageContextFactory.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageContextFactory.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -95,6 +95,7 @@
public com.oracle.webservices.internal.api.message.MessageContext createContext(SOAPMessage soap) {
throwIfIllegalMessageArgument(soap);
+ if (saajFactory!= null) return packet(saajFactory.createMessage(soap));
return packet(Messages.create(soap));
}
@@ -162,6 +163,7 @@
if (mf != null) {
p.setMtomFeature(mf);
}
+ p.setSAAJFactory(saajFactory);
return p;
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -1514,4 +1514,12 @@
public void setFastInfosetDisabled(boolean b) {
isFastInfosetDisabled = b;
}
+
+ private com.sun.xml.internal.ws.api.message.saaj.SAAJFactory saajFactory;
+ public com.sun.xml.internal.ws.api.message.saaj.SAAJFactory getSAAJFactory() {
+ return saajFactory;
+ }
+ public void setSAAJFactory(com.sun.xml.internal.ws.api.message.saaj.SAAJFactory saajFactory) {
+ this.saajFactory = saajFactory;
+ }
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJFactory.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJFactory.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -157,6 +157,11 @@
* @throws SOAPException if SAAJ processing fails
*/
public static SOAPMessage read(SOAPVersion soapVersion, Message message, Packet packet) throws SOAPException {
+ SAAJFactory saajfac = packet.getSAAJFactory();
+ if (saajfac != null) {
+ SOAPMessage msg = saajfac.readAsSOAPMessage(soapVersion, message, packet);
+ if (msg != null) return msg;
+ }
for (SAAJFactory s : ServiceFinder.find(SAAJFactory.class)) {
SOAPMessage msg = s.readAsSOAPMessage(soapVersion, message, packet);
if (msg != null)
@@ -173,6 +178,11 @@
* @throws SOAPException if SAAJ processing fails
*/
public static SAAJMessage read(Packet packet) throws SOAPException {
+ SAAJFactory saajfac = packet.getSAAJFactory();
+ if (saajfac != null) {
+ SAAJMessage msg = saajfac.readAsSAAJ(packet);
+ if (msg != null) return msg;
+ }
// Use the Component from the Packet if it exists. Note the logic
// in the ServiceFinder is such that find(Class) is not equivalent
// to find (Class, null), so the ternary operator is needed.
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,6 @@
* opaque method invocation {@link Work#execute}, allowing the use of
* {@code finally} block.
*
- *
* @author Kohsuke Kawaguchi
*/
public interface FiberContextSwitchInterceptor {
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -194,10 +194,11 @@
* of this class needs to be aware of that.
*/
public static void recycle(XMLStreamReader r) {
+ /* the XMLStreamReaderFactory recycle becomes expenisve in the threadLocal get operation.
get().doRecycle(r);
if (r instanceof RecycleAware) {
((RecycleAware)r).onRecycled();
- }
+ }*/
}
// implementations
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/package-info.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/package-info.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -143,7 +143,6 @@
* <LI><P>{@link com.sun.xml.internal.bind.api.Bridge#unmarshal(BridgeContext, XMLStreamReader) Object Bridge.unmarshal(BridgeContext, XMLStreamReader)}</P>
* </UL>
*
- * @ArchitectureDocument
**/
package com.sun.xml.internal.ws.client;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/db/DatabindingImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -84,7 +84,9 @@
modeler.setClassLoader(config.getClassLoader());
seiModel = modeler.buildRuntimeModel();
WSDLPort wsdlport = config.getWsdlPort();
- packetFactory = new MessageContextFactory(seiModel.getWSBinding().getFeatures());
+ Object facProp = config.properties().get("com.sun.xml.internal.ws.api.message.MessageContextFactory");
+ packetFactory = (facProp != null && facProp instanceof MessageContextFactory)? (MessageContextFactory)facProp :
+ new MessageContextFactory(seiModel.getWSBinding().getFeatures());
clientConfig = isClientConfig(config);
if (clientConfig) {
initStubHandlers();
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/package-info.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/package-info.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,6 @@
*
* </dl>
*
- * @ArchitectureDocument
**/
package com.sun.xml.internal.ws;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -221,9 +221,9 @@
}
private static void fail(final Class service, final String msg, final Throwable cause)
- throws ServiceConfigurationError {
+ throws ServiceConfigurationError {
final ServiceConfigurationError sce
- = new ServiceConfigurationError(LocalizationMessages.WSP_0025_SPI_FAIL_SERVICE_MSG(service.getName(), msg));
+ = new ServiceConfigurationError(LocalizationMessages.WSP_0025_SPI_FAIL_SERVICE_MSG(service.getName(), msg));
if (null != cause) {
sce.initCause(cause);
}
@@ -237,7 +237,7 @@
}*/
private static void fail(final Class service, final URL u, final int line, final String msg, final Throwable cause)
- throws ServiceConfigurationError {
+ throws ServiceConfigurationError {
fail(service, LocalizationMessages.WSP_0024_SPI_FAIL_SERVICE_URL_LINE_MSG(u , line, msg), cause);
}
@@ -248,7 +248,7 @@
*/
private static int parseLine(final Class service, final URL u, final BufferedReader r, final int lc,
final List<String> names, final Set<String> returned)
- throws IOException, ServiceConfigurationError {
+ throws IOException, ServiceConfigurationError {
String ln = r.readLine();
if (ln == null) {
return -1;
@@ -293,7 +293,7 @@
*/
@SuppressWarnings({"StatementWithEmptyBody"})
private static Iterator<String> parse(Class service, URL u, Set<String> returned)
- throws ServiceConfigurationError {
+ throws ServiceConfigurationError {
InputStream in = null;
BufferedReader r = null;
ArrayList<String> names = new ArrayList<String>();
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/package-info.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/package-info.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -134,7 +134,6 @@
* <LI><P>{@link com.sun.xml.internal.bind.api.Bridge#unmarshal(BridgeContext, XMLStreamReader) Object Bridge.unmarshal(BridgeContext, XMLStreamReader)}</P>
* </UL>
*
- * @ArchitectureDocument
**/
package com.sun.xml.internal.ws.server;
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java Thu Nov 05 13:43:17 2015 -0800
@@ -250,7 +250,6 @@
* and {@link Marshaller#setProperty(String, Object)}
* to enable the c14n marshalling support in the {@link JAXBContext}.
*
- * @see C14nSupport_ArchitectureDocument
* @since 2.0 EA2
*/
public static final String CANONICALIZATION_SUPPORT = "com.sun.xml.internal.bind.c14n";
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContextFactory.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContextFactory.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
package com.sun.xml.internal.ws.spi.db;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.logging.Level;
@@ -156,17 +157,9 @@
+ " based on '" + JAXB_CONTEXT_FACTORY_PROPERTY
+ "' System property");
} else {
- // Find a default provider. Note we always ensure the list
- // is always non-empty.
- for (BindingContextFactory factory : factories()) {
- if (LOGGER.isLoggable(Level.FINE))
- LOGGER.log(Level.FINE,
- "Using SPI-determined databindng mode: "
- + factory.getClass().getName());
- // Special case: no name lookup used.
- return factory.newContext(bi);
- }
-
+ // Find a default provider. Note we always ensure the list is always non-empty.
+ BindingContext factory = getBindingContextFromSpi(factories(), bi);
+ if (factory != null) return factory;
// Should never get here as the list is non-empty.
LOGGER.log(Level.SEVERE, "No Binding Context Factories found.");
throw new DatabindingException("No Binding Context Factories found.");
@@ -178,7 +171,63 @@
throw new DatabindingException("Unknown Databinding mode: " + mode);
}
- static public boolean isContextSupported(Object o) {
+ /**
+ * Creates JAXB bindingContext with one of the provided factories.
+ * To filter appropriate factory {@link BindingContextFactory#isFor(String)} method is used.
+ * Currently known 2 appropriate factories: JAXB RI and MOXY.
+ * In case no suitable factory is found we are trying to create context with any given factory.
+ *
+ * @param factories given collection of factories.
+ * @param bindingInfo will be used to create bindingContext.
+ * @return Created context or null. Null will be returned if we were not able to create context with any given factory.
+ */
+ private static BindingContext getBindingContextFromSpi(List<BindingContextFactory> factories, BindingInfo bindingInfo) {
+ List<BindingContextFactory> fallback = new ArrayList<BindingContextFactory>();
+ BindingContext result;
+ for (BindingContextFactory factory : factories) {
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Found SPI-determined databindng mode: " + factory.getClass().getName());
+ }
+ if (factory.isFor("org.eclipse.persistence.jaxb") || factory.isFor("com.sun.xml.internal.bind.v2.runtime")) { // filter (JAXB RI || MOXy) implementation
+ result = factory.newContext(bindingInfo);
+ if (result != null) {
+ return result;
+ }
+ } else {
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Skipped -> not JAXB.");
+ }
+ fallback.add(factory);
+ }
+ }
+ for (BindingContextFactory factory : fallback) {
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Fallback. Creating from: " + factory.getClass().getName());
+ }
+ result = getContextOrNullIfError(factory, bindingInfo);
+ if (result != null) {
+ return result;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Factory creates new context bases on provided bindingInfo.
+ * @param factory given factory.
+ * @param bindingInfo to be used to create context.
+ * @return Created context or null. Null will be returned if an error happened during the creation process.
+ */
+ private static BindingContext getContextOrNullIfError(BindingContextFactory factory, BindingInfo bindingInfo) {
+ try {
+ return factory.newContext(bindingInfo);
+ } catch (Exception e) {
+ LOGGER.log(Level.WARNING, e.getMessage(), e);
+ return null;
+ }
+ }
+
+ static public boolean isContextSupported(Object o) {
if (o == null) return false;
String pkgName = o.getClass().getPackage().getName();
for (BindingContextFactory f: factories()) if (f.isFor(pkgName)) return true;
@@ -199,50 +248,4 @@
static public BindingContext getBindingContext(Marshaller m) {
return getJAXBFactory(m).getContext(m);
}
-
- /**
- * Creates a new {@link BindingContext}.
- *
- * <p>
- * {@link JAXBContext#newInstance(Class[]) JAXBContext.newInstance()} methods may
- * return other JAXB providers that are not compatible with the JAX-RPC RI.
- * This method guarantees that the JAX-WS RI will finds the JAXB RI.
- *
- * @param classes
- * Classes to be bound. See {@link JAXBContext#newInstance(Class[])} for the meaning.
- * @param typeRefs
- * See {@link #TYPE_REFERENCES} for the meaning of this parameter.
- * Can be null.
- * @param subclassReplacements
- * See {@link #SUBCLASS_REPLACEMENTS} for the meaning of this parameter.
- * Can be null.
- * @param defaultNamespaceRemap
- * See {@link #DEFAULT_NAMESPACE_REMAP} for the meaning of this parameter.
- * Can be null (and should be null for ordinary use of JAXB.)
- * @param c14nSupport
- * See {@link #CANONICALIZATION_SUPPORT} for the meaning of this parameter.
- * @param ar
- * See {@link #ANNOTATION_READER} for the meaning of this parameter.
- * Can be null.
- * @since JAXB 2.1 EA2
- */
-// public static BindingContext newInstance(@NotNull Class[] classes,
-// @Nullable Collection<TypeInfo> typeRefs,
-// @Nullable Map<Class,Class> subclassReplacements,
-// @Nullable String defaultNamespaceRemap, boolean c14nSupport,
-// @Nullable RuntimeAnnotationReader ar) throws JAXBException {
-// return ContextFactory.createContext(classes, typeRefs, subclassReplacements,
-// defaultNamespaceRemap, c14nSupport, ar, false, false, false);
-// }
-//
-// /**
-// * @deprecated
-// * Compatibility with older versions.
-// */
-// public static BindingContext newInstance(@NotNull Class[] classes,
-// @Nullable Collection<TypeInfo> typeRefs,
-// @Nullable String defaultNamespaceRemap, boolean c14nSupport ) throws JAXBException {
-// return newInstance(classes,typeRefs, Collections.<Class,Class>emptyMap(),
-// defaultNamespaceRemap,c14nSupport,null);
-// }
}
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, 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
@@ -521,7 +521,7 @@
String systemId = e.getValue();
String ns = e.getKey();
sb.append("<xsd:import schemaLocation='").append(systemId).append("'");
- if (!"".equals(ns)) {
+ if (ns != null && !("".equals(ns))) {
sb.append(" namespace='").append(ns).append("'");
}
sb.append("/>\n");
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, 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.11-b150402.1412
-build-version=JAX-WS RI 2.2.11-b150402.1412
-major-version=2.2.11
-svn-revision=f923291dedcf386c5f408263984a99d7cedf0012
+build-id=2.3.0-SNAPSHOT
+build-version=JAX-WS RI 2.3.0-SNAPSHOT
+major-version=2.3.0
+svn-revision=ffaa49e66cc05e1bb2ddc103076a340dad5df997
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/package.html Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!--
- Copyright (c) 1993, 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
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation. Oracle designates this
- particular file as subject to the "Classpath" exception as provided
- by Oracle in the LICENSE file that accompanied this code.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<head>
-
- <title></title>
-
-</head>
- <body bgcolor="white">
- Provides the API for creating and building SOAP messages. This package
- is defined in the <i>SOAP with Attachments API for Java<sup><font
- size="-2">TM</font></sup> (SAAJ) 1.3</i> specification.
-<p> The API in the <code>javax.xml.soap</code> package allows you to do the
- following: </p>
-
-<ul>
- <li>create a point-to-point connection to a specified endpoint </li>
- <li>create a SOAP message </li>
- <li>create an XML fragment </li>
- <li>add content to the header of a SOAP message </li>
- <li>add content to the body of a SOAP message </li>
- <li>create attachment parts and add content to them </li>
- <li>access/add/modify parts of a SOAP message </li>
- <li>create/add/modify SOAP fault information </li>
- <li>extract content from a SOAP message </li>
- <li>send a SOAP request-response message </li>
-
-</ul>
-
-<p> <!-- <h2>Package Specification</h2> --> <!-- The SAAJ 1.1 specification gives an overview of the -->
- <!-- <code>javax.xml.soap</code> package and --> <!-- explains how its classes and interfaces work. -->
- <!-- <ul> --> <!-- <li><a href="http://java.sun.com/xml/downloads/jaxm.html"> -->
- <!-- SAAJ 1.1 Specification</a> --> <!-- </ul> --> <!-- <h2>Related Documentation</h2> -->
- <!-- For overviews, tutorials, examples, guides, and tool documentation, please see: -->
- <!-- <ul> --> <!-- <li><a href="../../../../tutorial/doc/JAXM.html">JAXM Tutorial</a> -->
- <!-- <li><a href="../../../../jaxm/index.html">JAXM Reference Implementation (RI) -->
- <!-- Documentation</a> --> <!-- </ul> --> </p>
-In addition the APIs in the <code>javax.xml.soap</code> package extend
-their counterparts in the <code>org.w3c.dom</code> package. This means that
-the <code>SOAPPart</code> of a <code>SOAPMessage</code> is also a DOM Level
-2 <code>Document</code>, and can be manipulated as such by applications,
-tools and libraries that use DOM (see http://www.w3.org/DOM/ for more information).
-It is important to note that, while it is possible to use DOM APIs to add
-ordinary DOM nodes to a SAAJ tree, the SAAJ APIs are still required to return
-SAAJ types when examining or manipulating the tree. In order to accomplish
-this the SAAJ APIs (specifically {@link javax.xml.soap.SOAPElement#getChildElements()})
-are allowed to silently replace objects that are incorrectly typed relative
-to SAAJ requirements with equivalent objects of the required type. These
-replacements must never cause the logical structure of the tree to change,
-so from the perspective of the DOM APIs the tree will remain unchanged. However,
-the physical composition of the tree will have changed so that references
-to the nodes that were replaced will refer to nodes that are no longer a
-part of the tree. The SAAJ APIs are not allowed to make these replacements
-if they are not required so the replacement objects will never subsequently
-be silently replaced by future calls to the SAAJ API.
-<p>
-What this means in
-practical terms is that an application that starts to use SAAJ APIs on a
-tree after manipulating it using DOM APIs must assume that the tree has been
-translated into an all SAAJ tree and that any references to objects within
-the tree that were obtained using DOM APIs are no longer valid. Switching
-from SAAJ APIs to DOM APIs is not allowed to cause invalid references and
-neither is using SAAJ APIs exclusively. It is only switching from using DOM
-APIs on a particular SAAJ tree to using SAAJ APIs that causes the risk of
-invalid references.<br>
-
-</body>
-</html>
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/FactoryFinder.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/FactoryFinder.java Thu Nov 05 13:43:17 2015 -0800
@@ -125,7 +125,7 @@
path = Paths.get(JAVA_HOME, "lib", "jaxws.properties");
}
- if (!Files.exists(path)) {
+ if (Files.exists(path)) {
Properties props = new Properties();
try (InputStream inStream = Files.newInputStream(path)) {
props.load(inStream);
@@ -137,8 +137,7 @@
} catch (Exception ignored) {
logger.log(Level.SEVERE, "Error reading JAX-WS configuration from [" + path +
"] file. Check it is accessible and has correct format.", ignored);
- }
- return null;
+ } return null;
}
private static final String OSGI_SERVICE_LOADER_CLASS_NAME = "com.sun.org.glassfish.hk2.osgiresourcelocator.ServiceLoader";
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationUse.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationUse.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -293,11 +293,10 @@
* Adds a member value pair to this annotation
* This can be used for e.g to specify
* <pre>
- * @XmlCollectionItem(type=Integer.class);
- * <pre>
- * For adding a value of Class<? extends Annotation>
- * @link
- * #annotationParam(java.lang.String, java.lang.Class<? extends java.lang.annotation.Annotation>)
+ * {@code @XmlCollectionItem(type=Integer.class);}
+ * </pre>
+ * For adding a value of {@code Class<? extends Annotation>}
+ * {@link #annotationParam(java.lang.String, java.lang.Class)}
* @param name
* The simple name for this annotation param
*
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -304,7 +304,7 @@
* Substitutes the type variables with their actual arguments.
*
* <p>
- * For example, when this class is Map<String,Map<V>>,
+ * For example, when this class is {@code Map<String,Map<V>>},
* (where V then doing
* substituteParams( V, Integer ) returns a {@link JClass}
* for {@code Map<String,Map<Integer>>}.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpr.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpr.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -273,7 +273,7 @@
* <p>
* This method can be used as a short-cut to create a JExpression.
* For example, instead of <code>_a.gt(_b)</code>, you can write
- * it as: <code>JExpr.direct("a>b")</code>.
+ * it as: {@code JExpr.direct("a>b")}.
*
* <p>
* Be warned that there is a danger in using this method,
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -97,12 +97,12 @@
JExpression shl(JExpression right);
/**
- * Returns "[this]>>[right]"
+ * Returns "{@code [this]>>[right]}"
*/
JExpression shr(JExpression right);
/**
- * Returns "[this]>>>[right]"
+ * Returns "{@code [this]>>>[right]}"
*/
JExpression shrz(JExpression right);
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JJavaName.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JJavaName.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/package-info.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/package-info.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,25 +35,6 @@
* then writing it out as text files that is Java source files.
* The AST looks like this:
*
- * {@DotDiagram
- digraph G {
- cls1 [label="JDefinedClass"];
- cls2 [label="JDefinedClass"];
- JCodeModel -> cls1 [label="generated class"];
- JCodeModel -> cls2 [label="generated class"];
-
- m1 [label="JMethod"];
- m2 [label="JMethod"];
-
- cls1 -> m1;
- cls1 -> m2;
- cls1 -> JField;
-
- m1 -> JVar [label="method parameter"];
- m1 -> JBlock [label="code"];
- }
- * }
- *
* <p>
* You bulid this tree mostly from top-down. So, you first create
* a new {@link JDefinedClass} from {@link JCodeModel}, then you
@@ -107,7 +88,6 @@
* pre-encoding tokens (like 'public') to the target encoding,
* and consider exploting the subtree equivalence.
*
- * @ArchitectureDocument
*/
package com.sun.codemodel.internal;
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ConfigReader.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ConfigReader.java Thu Nov 05 13:43:17 2015 -0800
@@ -181,7 +181,7 @@
/**
* Lazily parsed schema for the binding file.
*/
- private static SchemaCache configSchema = new SchemaCache("config.xsd", Config.class);
+ private static SchemaCache configSchema = new SchemaCache("config.xsd", Config.class, true);
/**
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-UNEXPECTED_NGCC_TOKEN = \
- Unexpected {0} appears at line {1} column {2}
-
-BASEDIR_DOESNT_EXIST = \
- Non-existent directory: {0}
-
-VERSION = \
- schemagen 2.2.12-b150331.1824
-
-FULLVERSION = \
- schemagen full version "2.2.12-b150331.1824"
-
-USAGE = \
-Usage: schemagen [-options ...] <java files> \n\
-Options: \n\
-\ \ \ \ -d <path> : specify where to place processor and javac generated class files\n\
-\ \ \ \ -cp <path> : specify where to find user specified files\n\
-\ \ \ \ -classpath <path> : specify where to find user specified files\n\
-\ \ \ \ -encoding <encoding> : specify encoding to be used for annotation processing/javac invocation \n\
-\ \ \ \ -episode <file> : generate episode file for separate compilation\n\
-\ \ \ \ -disableXmlSecurity : disables XML security features for usage on xml parsing apis \n\
-\ \ \ \ -version : display version information\n\
-\ \ \ \ -fullversion : display full version information\n\
-\ \ \ \ -help : display this usage message
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_de.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-UNEXPECTED_NGCC_TOKEN = Nicht erkanntes {0} in Zeile {1} Spalte {2}
-
-BASEDIR_DOESNT_EXIST = Nicht vorhandenes Verzeichnis: {0}
-
-VERSION = schemagen 2.2.12-b150331.1824
-
-FULLVERSION = schemagen vollst\u00E4ndige Version "2.2.12-b150331.1824"
-
-USAGE = Verwendung: schemagen [-options ...] <java files> \nOptionen: \n\\ \\ \\ \\ -d <path> : Gibt an, wo die von Prozessor und javac generierten Klassendateien gespeichert werden sollen\n\\ \\ \\ \\ -cp <path> : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -classpath <path> : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -encoding <encoding> : Gibt die Codierung f\u00FCr die Annotationsverarbeitung/den javac-Aufruf an \n\\ \\ \\ \\ -episode <file> : Generiert Episodendatei f\u00FCr separate Kompilierung\n\\ \\ \\ \\ -version : Zeigt Versionsinformation an\n\\ \\ \\ \\ -fullversion : Zeigt vollst\u00E4ndige Versionsinformationen an\n\\ \\ \\ \\ -help : Zeigt diese Verwendungsmeldung an
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_es.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-UNEXPECTED_NGCC_TOKEN = Aparece un {0} inesperado en la l\u00EDnea {1} y la columna {2}
-
-BASEDIR_DOESNT_EXIST = Directorio no existente: {0}
-
-VERSION = schemagen 2.2.12-b150331.1824
-
-FULLVERSION = versi\u00F3n completa de schemagen "2.2.12-b150331.1824"
-
-USAGE = Sintaxis: schemagen [-options ...] <archivos java> \nOpciones: \n\\ \\ \\ \\ -d <ruta de acceso> : especifique d\u00F3nde se colocan los archivos de clase generados por javac y el procesador\n\\ \\ \\ \\ -cp <ruta de acceso> : especifique d\u00F3nde se encuentran los archivos especificados por el usuario\n\\ \\ \\ \\ -encoding <codificaci\u00F3n> : especifique la codificaci\u00F3n que se va a utilizar para el procesamiento de anotaciones/llamada de javac\n\\ \\ \\ \\ -episode <archivo> : genera un archivo de episodio para una compilaci\u00F3n diferente\n\\ \\ \\ \\ -version : muestra la informaci\u00F3n de la versi\u00F3n\n\\ \\ \\ \\ -fullversion : muestra la informaci\u00F3n completa de la versi\u00F3n\n\\ \\ \\ \\ -help : muestra este mensaje de sintaxis
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-UNEXPECTED_NGCC_TOKEN = Un \u00E9l\u00E9ment {0} inattendu appara\u00EEt \u00E0 la ligne {1}, colonne {2}
-
-BASEDIR_DOESNT_EXIST = R\u00E9pertoire {0} inexistant
-
-VERSION = schemagen 2.2.12-b150331.1824
-
-FULLVERSION = version compl\u00E8te de schemagen "2.2.12-b150331.1824"
-
-USAGE = Syntaxe : schemagen [-options ...] <java files> \nOptions : \n\ \ \ \ -d <path> : indiquez o\u00F9 placer les fichiers de classe g\u00E9n\u00E9r\u00E9s par le processeur et le compilateur javac\n\ \ \ \ -cp <path> : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -classpath <path> : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -encoding <encoding> : indiquez l'encodage \u00E0 utiliser pour l'appel de javac/traitement de l'annotation \n\ \ \ \ -episode <file> : g\u00E9n\u00E9rez un fichier d'\u00E9pisode pour la compilation s\u00E9par\u00E9e\n\ \ \ \ -version : affichez les informations de version\n\ \ \ \ -fullversion : affichez les informations compl\u00E8tes de version\n\ \ \ \ -help : affichez ce message de syntaxe
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_it.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-UNEXPECTED_NGCC_TOKEN = {0} imprevisto visualizzato sulla riga {1} colonna {2}
-
-BASEDIR_DOESNT_EXIST = Directory non esistente: {0}
-
-VERSION = schemagen 2.2.12-b150331.1824
-
-FULLVERSION = versione completa schemagen "2.2.12-b150331.1824"
-
-USAGE = Uso: schemagen [-options ...] <java files> \nOpzioni: \n\ \ \ \ -d <path> : specifica dove posizionare il processore e i file della classe generata javac\n\ \ \ \ -cp <path> : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -classpath <path> : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -encoding <encoding> : specifica la codifica da usare per l'elaborazione dell'annotazione/richiamo javac \n\ \ \ \ -episode <file> : genera il file di episodio per la compilazione separata\n\ \ \ \ -version : visualizza le informazioni sulla versione\n\ \ \ \ -fullversion : visualizza le informazioni sulla versione completa\n\ \ \ \ -help : visualizza questo messaggio sull'uso
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-UNEXPECTED_NGCC_TOKEN = \u4E88\u671F\u3057\u306A\u3044{0}\u304C\u884C{1}\u3001\u5217{2}\u306B\u3042\u308A\u307E\u3059
-
-BASEDIR_DOESNT_EXIST = \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
-
-VERSION = schemagen 2.2.12-b150331.1824
-
-FULLVERSION = schemagen\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.12-b150331.1824"
-
-USAGE = \u4F7F\u7528\u65B9\u6CD5: schemagen [-options ...] <java files> \n\u30AA\u30D7\u30B7\u30E7\u30F3: \n\ \ \ \ -d <path> : \u30D7\u30ED\u30BB\u30C3\u30B5\u304A\u3088\u3073javac\u304C\u751F\u6210\u3057\u305F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u7F6E\u304F\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -cp <path> : \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -classpath <path> : \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -encoding <encoding> : \u6CE8\u91C8\u51E6\u7406/javac\u547C\u51FA\u3057\u306B\u4F7F\u7528\u3059\u308B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -episode <file> : \u30B3\u30F3\u30D1\u30A4\u30EB\u3054\u3068\u306B\u30A8\u30D4\u30BD\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3057\u307E\u3059\n\ \ \ \ -version : \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -fullversion : \u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -help : \u3053\u306E\u4F7F\u7528\u4F8B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-UNEXPECTED_NGCC_TOKEN = \uC608\uC0C1\uCE58 \uC54A\uC740 {0}\uC774(\uAC00) {1}\uD589 {2}\uC5F4\uC5D0 \uB098\uD0C0\uB0A9\uB2C8\uB2E4.
-
-BASEDIR_DOESNT_EXIST = \uC874\uC7AC\uD558\uC9C0 \uC54A\uB294 \uB514\uB809\uD1A0\uB9AC: {0}
-
-VERSION = schemagen 2.2.12-b150331.1824
-
-FULLVERSION = schemagen \uC815\uC2DD \uBC84\uC804 "2.2.12-b150331.1824"
-
-USAGE = \uC0AC\uC6A9\uBC95: schemagen [-options ...] <java files> \n\uC635\uC158: \n\ \ \ \ -d <path> : \uD504\uB85C\uC138\uC11C \uBC0F javac\uC5D0\uC11C \uC0DD\uC131\uD55C \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uBC30\uCE58\uD560 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -cp <path> : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -classpath <path> : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -encoding <encoding> : \uC8FC\uC11D \uCC98\uB9AC/javac \uD638\uCD9C\uC5D0 \uC0AC\uC6A9\uD560 \uC778\uCF54\uB529\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4. \n\ \ \ \ -episode <file> : \uBCC4\uB3C4 \uCEF4\uD30C\uC77C\uC744 \uC704\uD574 episode \uD30C\uC77C\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n\ \ \ \ -version : \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -fullversion : \uC815\uC2DD \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -help : \uC774 \uC0AC\uC6A9\uBC95 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-UNEXPECTED_NGCC_TOKEN = {0} inesperado aparece na linha {1} coluna {2}
-
-BASEDIR_DOESNT_EXIST = Diret\u00F3rio n\u00E3o existente: {0}
-
-VERSION = gera\u00E7\u00E3o do esquema 2.2.12-b150331.1824
-
-FULLVERSION = vers\u00E3o completa da gera\u00E7\u00E3o do esquema "2.2.12-b150331.1824"
-
-USAGE = Uso: gera\u00E7\u00E3o do esquema [-options ...] <java files> \nOp\u00E7\u00F5es: \n\\ \\ \\ \\ -d <path> : especificar onde colocar o processador e os arquivos da classe gerados por javac\n\\ \\ \\ \\ -cp <path> : especificar onde localizar arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -classpath <path> : especificar onde localizar os arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -encoding <encoding> : especificar codifica\u00E7\u00E3o a ser usada para processamento de anota\u00E7\u00E3o/chamada javac \n\\ \\ \\ \\ -episode <file> : gerar arquivo do epis\u00F3dio para compila\u00E7\u00E3o separada\n\\ \\ \\ \\ -version : exibir informa\u00E7\u00F5es da vers\u00E3o\n\\ \\ \\ \\ -fullversion : exibir informa\u00E7\u00F5es da vers\u00E3o completa\n\\ \\ \\ \\ -help : exibir esta mensagem de uso
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-UNEXPECTED_NGCC_TOKEN = \u5728\u7B2C {1} \u884C, \u7B2C {2} \u5217\u51FA\u73B0\u610F\u5916\u7684{0}
-
-BASEDIR_DOESNT_EXIST = \u4E0D\u5B58\u5728\u7684\u76EE\u5F55: {0}
-
-VERSION = schemagen 2.2.12-b150331.1824
-
-FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.12-b150331.1824"
-
-USAGE = \u7528\u6CD5: schemagen [-options ...] <java files> \n\u9009\u9879: \n\ \ \ \ -d <path> : \u6307\u5B9A\u653E\u7F6E\u5904\u7406\u7A0B\u5E8F\u548C javac \u751F\u6210\u7684\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -cp <path> : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -classpath <path> : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -encoding <encoding> : \u6307\u5B9A\u7528\u4E8E\u6CE8\u91CA\u5904\u7406/javac \u8C03\u7528\u7684\u7F16\u7801\n\ \ \ \ -episode <file> : \u751F\u6210\u7247\u6BB5\u6587\u4EF6\u4EE5\u4F9B\u5355\u72EC\u7F16\u8BD1\n\ \ \ \ -version : \u663E\u793A\u7248\u672C\u4FE1\u606F\n\ \ \ \ -fullversion : \u663E\u793A\u5B8C\u6574\u7684\u7248\u672C\u4FE1\u606F\n\ \ \ \ -help : \u663E\u793A\u6B64\u7528\u6CD5\u6D88\u606F
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-UNEXPECTED_NGCC_TOKEN = \u672A\u9810\u671F\u7684 {0} \u986F\u793A\u65BC\u884C {1} \u8CC7\u6599\u6B04 {2}
-
-BASEDIR_DOESNT_EXIST = \u4E0D\u5B58\u5728\u7684\u76EE\u9304: {0}
-
-VERSION = schemagen 2.2.12-b150331.1824
-
-FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.12-b150331.1824"
-
-USAGE = \u7528\u6CD5: schemagen [-options ...] <java files> \n\u9078\u9805: \n\\ \\ \\ \\ -d <path> : \u6307\u5B9A\u8655\u7406\u5668\u4EE5\u53CA javac \u7522\u751F\u7684\u985E\u5225\u6A94\u6848\u653E\u7F6E\u4F4D\u7F6E\n\\ \\ \\ \\ -cp <path> : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -classpath <path> : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -encoding <encoding> : \u6307\u5B9A\u8981\u7528\u65BC\u8A3B\u89E3\u8655\u7406/javac \u547C\u53EB\u7684\u7DE8\u78BC \n\\ \\ \\ \\ -episode <file> : \u7522\u751F\u7368\u7ACB\u7DE8\u8B6F\u7684\u4E8B\u4EF6 (episode) \u6A94\u6848\n\\ \\ \\ \\ -version : \u986F\u793A\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -fullversion : \u986F\u793A\u5B8C\u6574\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -help : \u986F\u793A\u6B64\u7528\u6CD5\u8A0A\u606F
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java Thu Nov 05 13:43:17 2015 -0800
@@ -46,7 +46,6 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
@@ -250,8 +249,8 @@
r.setEpisodeFile(episode);
task.setProcessors(Collections.singleton(r));
boolean res = task.call();
- //Print messages generated by compiler
- for (Diagnostic<? extends JavaFileObject> d : diagnostics.getDiagnostics()) {
+ //Print compiler generated messages
+ for( Diagnostic<? extends JavaFileObject> d : diagnostics.getDiagnostics() ) {
System.err.println(d.toString());
}
return res;
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Const.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Const.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,8 @@
/**
* Name of the annotation processing command-line option to take user-specified config files.
- * <p/>
- * <p/>
+ * <p>
+ * <p>
* It can take multiple file names separately by {@link File#pathSeparator}.
*/
CONFIG_FILE_OPTION("jaxb.config"),
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-NON_EXISTENT_FILE = \
- Directory "{0}" doesn't exist.
-
-UNRECOGNIZED_PARAMETER = \
- Unrecognized option {0} is not valid.
-
-OPERAND_MISSING = \
- Option "{0}" is missing an operand.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_de.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-NON_EXISTENT_FILE = Verzeichnis "{0}" ist nicht vorhanden.
-
-UNRECOGNIZED_PARAMETER = Unbekannte Option {0} ist nicht g\u00FCltig.
-
-OPERAND_MISSING = In Option "{0}" fehlt ein Operand.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_es.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-NON_EXISTENT_FILE = El directorio "{0}" no existe.
-
-UNRECOGNIZED_PARAMETER = La opci\u00F3n no reconocida {0} no es v\u00E1lida.
-
-OPERAND_MISSING = A la opci\u00F3n "{0}" le falta un operando.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_fr.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-NON_EXISTENT_FILE = Le r\u00E9pertoire "{0}" n''existe pas.
-
-UNRECOGNIZED_PARAMETER = L''option {0} non reconnue n''est pas valide.
-
-OPERAND_MISSING = Un op\u00E9rande est manquant dans l''option "{0}".
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_it.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-NON_EXISTENT_FILE = La directory "{0}" non esiste.
-
-UNRECOGNIZED_PARAMETER = L''opzione non riconosciuta {0} non \u00E8 valida.
-
-OPERAND_MISSING = Operando mancante nell''opzione "{0}".
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_ja.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-NON_EXISTENT_FILE = \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA"{0}"\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
-
-UNRECOGNIZED_PARAMETER = \u8A8D\u8B58\u3055\u308C\u306A\u3044\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306F\u7121\u52B9\u3067\u3059\u3002
-
-OPERAND_MISSING = \u30AA\u30D7\u30B7\u30E7\u30F3"{0}"\u306B\u30AA\u30DA\u30E9\u30F3\u30C9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_ko.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-NON_EXISTENT_FILE = "{0}" \uB514\uB809\uD1A0\uB9AC\uAC00 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-
-UNRECOGNIZED_PARAMETER = \uC778\uC2DD\uD560 \uC218 \uC5C6\uB294 \uC635\uC158 {0}\uC740(\uB294) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-
-OPERAND_MISSING = "{0}" \uC635\uC158\uC5D0 \uD53C\uC5F0\uC0B0\uC790\uAC00 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_pt_BR.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-NON_EXISTENT_FILE = O diret\u00F3rio "{0}" n\u00E3o existe.
-
-UNRECOGNIZED_PARAMETER = A op\u00E7\u00E3o {0} n\u00E3o reconhecida \u00E9 inv\u00E1lida.
-
-OPERAND_MISSING = A op\u00E7\u00E3o "{0}" n\u00E3o encontrou um operando.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_CN.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-NON_EXISTENT_FILE = \u76EE\u5F55 "{0}" \u4E0D\u5B58\u5728\u3002
-
-UNRECOGNIZED_PARAMETER = \u65E0\u6CD5\u8BC6\u522B\u7684\u9009\u9879{0}, \u8BE5\u9009\u9879\u65E0\u6548\u3002
-
-OPERAND_MISSING = \u9009\u9879 "{0}" \u7F3A\u5C11\u64CD\u4F5C\u6570\u3002
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/MessageBundle_zh_TW.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-NON_EXISTENT_FILE = \u76EE\u9304 "{0}" \u4E0D\u5B58\u5728.
-
-UNRECOGNIZED_PARAMETER = \u7121\u6CD5\u8FA8\u8B58\u7684\u9078\u9805 {0} \u7121\u6548.
-
-OPERAND_MISSING = \u9078\u9805 "{0}" \u907A\u6F0F\u904B\u7B97\u5143.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,6 +50,7 @@
* <li>manage mapping between namespace URIs and prefixes.
*
* <li>TODO: provide support for interleaving.
+ * </ol>
* <p><b>
* Auto-generated, do not edit.
* </b></p>
@@ -70,7 +71,7 @@
* or the reset method is called. You can't replace the root
* handler while parsing is in progress.
* <p>
- * Usually a generated class that corresponds to the <start>
+ * Usually a generated class that corresponds to the {@code <start>}
* pattern will be used as the root handler, but any NGCCHandler
* can be a root handler.
*
@@ -242,7 +243,7 @@
redirectionDepth++;
} else {
processPendingText(true);
- // System.out.println("startElement:"+localname+"->"+_attrStack.size());
+ // System.out.println("startElement:"+localname+"->"+_attrStack.size());
currentHandler.enterElement(uri, localname, qname, atts);
}
}
@@ -263,7 +264,7 @@
* consumes the enterElement event.
*/
public void onEnterElementConsumed(
- String uri, String localName, String qname,Attributes atts) throws SAXException {
+ String uri, String localName, String qname,Attributes atts) throws SAXException {
attStack.push(currentAtts=new AttributesImpl(atts));
nsEffectiveStack.push( new Integer(nsEffectivePtr) );
nsEffectivePtr = namespaces.size();
@@ -394,25 +395,25 @@
//
public void sendEnterAttribute( int threadId,
- String uri, String local, String qname) throws SAXException {
+ String uri, String local, String qname) throws SAXException {
currentHandler.enterAttribute(uri,local,qname);
}
public void sendEnterElement( int threadId,
- String uri, String local, String qname, Attributes atts) throws SAXException {
+ String uri, String local, String qname, Attributes atts) throws SAXException {
currentHandler.enterElement(uri,local,qname,atts);
}
public void sendLeaveAttribute( int threadId,
- String uri, String local, String qname) throws SAXException {
+ String uri, String local, String qname) throws SAXException {
currentHandler.leaveAttribute(uri,local,qname);
}
public void sendLeaveElement( int threadId,
- String uri, String local, String qname) throws SAXException {
+ String uri, String local, String qname) throws SAXException {
currentHandler.leaveElement(uri,local,qname);
}
@@ -450,7 +451,7 @@
* simulate the startElement event for the new ContentHandler.
*/
public void redirectSubtree( ContentHandler child,
- String uri, String local, String qname ) throws SAXException {
+ String uri, String local, String qname ) throws SAXException {
redirect = child;
redirect.setDocumentLocator(locator);
@@ -461,8 +462,8 @@
// modified to report active bindings only.
for( int i=0; i<namespaces.size(); i+=2 )
redirect.startPrefixMapping(
- (String)namespaces.get(i),
- (String)namespaces.get(i+1)
+ (String)namespaces.get(i),
+ (String)namespaces.get(i+1)
);
redirect.startElement(uri,local,qname,currentAtts);
@@ -517,21 +518,21 @@
}
-// error reporting
+ // error reporting
protected void unexpectedX(String token) throws SAXException {
throw new SAXParseException(MessageFormat.format(
- "Unexpected {0} appears at line {1} column {2}",
- new Object[]{
- token,
- new Integer(getLocator().getLineNumber()),
- new Integer(getLocator().getColumnNumber()) }),
- getLocator());
+ "Unexpected {0} appears at line {1} column {2}",
+ new Object[]{
+ token,
+ new Integer(getLocator().getLineNumber()),
+ new Integer(getLocator().getColumnNumber()) }),
+ getLocator());
}
-//
+ //
//
// trace functions
//
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties Thu Nov 05 13:43:17 2015 -0800
@@ -169,20 +169,20 @@
Driver.FailedToGenerateCode = \
Failed to produce code.
-# DO NOT localize the 2.2.12-b150331.1824 string - it is a token for an mvn <properties filter>
+# DO NOT localize the 2.3.0-SNAPSHOT string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = \
- This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.12-b150331.1824 \n\
- See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\
+ This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0-SNAPSHOT \n\
+ See <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \n\
Any modifications to this file will be lost upon recompilation of the source schema. \n\
Generated on: {0} \n
Driver.Version = \
- xjc 2.2.12-b150331.1824
+ xjc 2.3.0-SNAPSHOT
Driver.FullVersion = \
- xjc full version "2.2.12-b150331.1824"
+ xjc full version "2.3.0-SNAPSHOT"
-Driver.BuildID = 2.2.12-b150331.1824
+Driver.BuildID = 2.3.0-SNAPSHOT
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties Thu Nov 05 13:43:17 2015 -0800
@@ -127,14 +127,14 @@
Driver.FailedToGenerateCode = Code konnte nicht erzeugt werden.
-# DO NOT localize the 2.2.12-b150331.1824 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.12-b150331.1824 generiert \nSiehe <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. \nGeneriert: {0} \n
+# DO NOT localize the 2.3.0-SNAPSHOT string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0-SNAPSHOT generiert \nSiehe <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. \nGeneriert: {0} \n
-Driver.Version = xjc 2.2.12-b150331.1824
+Driver.Version = xjc 2.3.0-SNAPSHOT
-Driver.FullVersion = xjc vollst\u00E4ndige Version "2.2.12-b150331.1824"
+Driver.FullVersion = xjc vollst\u00E4ndige Version "2.3.0-SNAPSHOT"
-Driver.BuildID = 2.2.12-b150331.1824
+Driver.BuildID = 2.3.0-SNAPSHOT
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties Thu Nov 05 13:43:17 2015 -0800
@@ -127,14 +127,14 @@
Driver.FailedToGenerateCode = Fallo al producir c\u00f3digo.
-# DO NOT localize the 2.2.12-b150331.1824 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = Este archivo ha sido generado por la arquitectura JavaTM para la implantaci\u00f3n de la referencia de enlace (JAXB) XML v2.2.12-b150331.1824 \nVisite <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nTodas las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a compilar el esquema de origen. \nGenerado el: {0} \n
+# DO NOT localize the 2.3.0-SNAPSHOT string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = Este archivo ha sido generado por la arquitectura JavaTM para la implantaci\u00f3n de la referencia de enlace (JAXB) XML v2.3.0-SNAPSHOT \nVisite <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \nTodas las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a compilar el esquema de origen. \nGenerado el: {0} \n
-Driver.Version = xjc 2.2.12-b150331.1824
+Driver.Version = xjc 2.3.0-SNAPSHOT
-Driver.FullVersion = versi\u00F3n completa de xjc "2.2.12-b150331.1824"
+Driver.FullVersion = versi\u00F3n completa de xjc "2.3.0-SNAPSHOT"
-Driver.BuildID = 2.2.12-b150331.1824
+Driver.BuildID = 2.3.0-SNAPSHOT
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties Thu Nov 05 13:43:17 2015 -0800
@@ -131,14 +131,14 @@
Driver.FailedToGenerateCode = Echec de la production du code.
-# DO NOT localize the 2.2.12-b150331.1824 string - it is a token for an mvn <properties filter>
-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.12-b150331.1824 \nVoir <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nToute modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n
+# DO NOT localize the 2.3.0-SNAPSHOT string - it is a token for an mvn <properties filter>
+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.3.0-SNAPSHOT \nVoir <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \nToute modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n
-Driver.Version = xjc 2.2.12-b150331.1824
+Driver.Version = xjc 2.3.0-SNAPSHOT
-Driver.FullVersion = version compl\u00E8te xjc "2.2.12-b150331.1824"
+Driver.FullVersion = version compl\u00E8te xjc "2.3.0-SNAPSHOT"
-Driver.BuildID = 2.2.12-b150331.1824
+Driver.BuildID = 2.3.0-SNAPSHOT
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties Thu Nov 05 13:43:17 2015 -0800
@@ -127,14 +127,14 @@
Driver.FailedToGenerateCode = Produzione del codice non riuscita.
-# DO NOT localize the 2.2.12-b150331.1824 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = Questo file \u00e8 stato generato dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, v2.2.12-b150331.1824 \nVedere <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione dello schema di origine. \nGenerato il: {0} \n
+# DO NOT localize the 2.3.0-SNAPSHOT string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = Questo file \u00e8 stato generato dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, v2.3.0-SNAPSHOT \nVedere <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione dello schema di origine. \nGenerato il: {0} \n
-Driver.Version = xjc 2.2.12-b150331.1824
+Driver.Version = xjc 2.3.0-SNAPSHOT
-Driver.FullVersion = versione completa xjc "2.2.12-b150331.1824"
+Driver.FullVersion = versione completa xjc "2.3.0-SNAPSHOT"
-Driver.BuildID = 2.2.12-b150331.1824
+Driver.BuildID = 2.3.0-SNAPSHOT
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties Thu Nov 05 13:43:17 2015 -0800
@@ -127,14 +127,14 @@
Driver.FailedToGenerateCode = \u30b3\u30fc\u30c9\u306e\u751f\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-# DO NOT localize the 2.2.12-b150331.1824 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = \u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001JavaTM Architecture for XML Binding(JAXB) Reference Implementation\u3001v2.2.12-b150331.1824\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u307e\u3057\u305f \n<a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 \n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002 \n\u751f\u6210\u65e5: {0} \n
+# DO NOT localize the 2.3.0-SNAPSHOT string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = \u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001JavaTM Architecture for XML Binding(JAXB) Reference Implementation\u3001v2.3.0-SNAPSHOT\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u307e\u3057\u305f \n<a href="https://jaxb.java.net/">https://jaxb.java.net/</a>\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 \n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002 \n\u751f\u6210\u65e5: {0} \n
-Driver.Version = xjc 2.2.12-b150331.1824
+Driver.Version = xjc 2.3.0-SNAPSHOT
-Driver.FullVersion = xjc\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.12-b150331.1824"
+Driver.FullVersion = xjc\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.3.0-SNAPSHOT"
-Driver.BuildID = 2.2.12-b150331.1824
+Driver.BuildID = 2.3.0-SNAPSHOT
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties Thu Nov 05 13:43:17 2015 -0800
@@ -127,14 +127,14 @@
Driver.FailedToGenerateCode = \ucf54\ub4dc \uc0dd\uc131\uc744 \uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4.
-# DO NOT localize the 2.2.12-b150331.1824 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = \uc774 \ud30c\uc77c\uc740 JAXB(JavaTM Architecture for XML Binding) \ucc38\uc870 \uad6c\ud604 2.2.12-b150331.1824 \ubc84\uc804\uc744 \ud1b5\ud574 \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \n<a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c \uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 \uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n
+# DO NOT localize the 2.3.0-SNAPSHOT string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = \uc774 \ud30c\uc77c\uc740 JAXB(JavaTM Architecture for XML Binding) \ucc38\uc870 \uad6c\ud604 2.3.0-SNAPSHOT \ubc84\uc804\uc744 \ud1b5\ud574 \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \n<a href="https://jaxb.java.net/">https://jaxb.java.net/</a>\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c \uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 \uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n
-Driver.Version = XJC 2.2.12-b150331.1824
+Driver.Version = XJC 2.3.0-SNAPSHOT
-Driver.FullVersion = XJC \uC815\uC2DD \uBC84\uC804 "2.2.12-b150331.1824"
+Driver.FullVersion = XJC \uC815\uC2DD \uBC84\uC804 "2.3.0-SNAPSHOT"
-Driver.BuildID = 2.2.12-b150331.1824
+Driver.BuildID = 2.3.0-SNAPSHOT
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties Thu Nov 05 13:43:17 2015 -0800
@@ -127,14 +127,14 @@
Driver.FailedToGenerateCode = Falha ao produzir o c\u00f3digo.
-# DO NOT localize the 2.2.12-b150331.1824 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = Este arquivo foi gerado pela Arquitetura JavaTM para Implementa\u00e7\u00e3o de Refer\u00eancia (JAXB) de Bind XML, v2.2.12-b150331.1824 \nConsulte <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nTodas as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n
+# DO NOT localize the 2.3.0-SNAPSHOT string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = Este arquivo foi gerado pela Arquitetura JavaTM para Implementa\u00e7\u00e3o de Refer\u00eancia (JAXB) de Bind XML, v2.3.0-SNAPSHOT \nConsulte <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \nTodas as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n
-Driver.Version = xjc 2.2.12-b150331.1824
+Driver.Version = xjc 2.3.0-SNAPSHOT
-Driver.FullVersion = vers\u00E3o completa de xjc "2.2.12-b150331.1824"
+Driver.FullVersion = vers\u00E3o completa de xjc "2.3.0-SNAPSHOT"
-Driver.BuildID = 2.2.12-b150331.1824
+Driver.BuildID = 2.3.0-SNAPSHOT
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties Thu Nov 05 13:43:17 2015 -0800
@@ -131,14 +131,14 @@
Driver.FailedToGenerateCode = \u65e0\u6cd5\u751f\u6210\u4ee3\u7801\u3002
-# DO NOT localize the 2.2.12-b150331.1824 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = \u6b64\u6587\u4ef6\u662f\u7531 JavaTM Architecture for XML Binding (JAXB) \u5f15\u7528\u5b9e\u73b0 v2.2.12-b150331.1824 \u751f\u6210\u7684\n\u8bf7\u8bbf\u95ee <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, \u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4: {0} \n
+# DO NOT localize the 2.3.0-SNAPSHOT string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = \u6b64\u6587\u4ef6\u662f\u7531 JavaTM Architecture for XML Binding (JAXB) \u5f15\u7528\u5b9e\u73b0 v2.3.0-SNAPSHOT \u751f\u6210\u7684\n\u8bf7\u8bbf\u95ee <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, \u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4: {0} \n
-Driver.Version = xjc 2.2.12-b150331.1824
+Driver.Version = xjc 2.3.0-SNAPSHOT
-Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.12-b150331.1824"
+Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.3.0-SNAPSHOT"
-Driver.BuildID = 2.2.12-b150331.1824
+Driver.BuildID = 2.3.0-SNAPSHOT
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties Thu Nov 05 13:43:17 2015 -0800
@@ -127,14 +127,14 @@
Driver.FailedToGenerateCode = \u7121\u6cd5\u7522\u751f\u7a0b\u5f0f\u78bc.
-# DO NOT localize the 2.2.12-b150331.1824 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = \u6b64\u6a94\u6848\u662f\u7531 JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.12-b150331.1824 \u6240\u7522\u751f \n\u8acb\u53c3\u95b1 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, \u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931. \n\u7522\u751f\u6642\u9593: {0} \n
+# DO NOT localize the 2.3.0-SNAPSHOT string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = \u6b64\u6a94\u6848\u662f\u7531 JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0-SNAPSHOT \u6240\u7522\u751f \n\u8acb\u53c3\u95b1 <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, \u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931. \n\u7522\u751f\u6642\u9593: {0} \n
-Driver.Version = xjc 2.2.12-b150331.1824
+Driver.Version = xjc 2.3.0-SNAPSHOT
-Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.12-b150331.1824"
+Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.3.0-SNAPSHOT"
-Driver.BuildID = 2.2.12-b150331.1824
+Driver.BuildID = 2.3.0-SNAPSHOT
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ModelLoader.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/ModelLoader.java Thu Nov 05 13:43:17 2015 -0800
@@ -38,6 +38,8 @@
import com.sun.tools.internal.xjc.reader.internalizer.InternalizationLogic;
import com.sun.tools.internal.xjc.reader.internalizer.SCDBasedBindingSet;
import com.sun.tools.internal.xjc.reader.internalizer.VersionChecker;
+import com.sun.tools.internal.xjc.reader.relaxng.RELAXNGCompiler;
+import com.sun.tools.internal.xjc.reader.relaxng.RELAXNGInternalizationLogic;
import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder;
import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.AnnotationParserFactoryImpl;
import com.sun.tools.internal.xjc.reader.xmlschema.parser.CustomizationContextChecker;
@@ -52,6 +54,15 @@
import com.sun.xml.internal.xsom.parser.XSOMParser;
import javax.xml.XMLConstants;
+import com.sun.xml.internal.rngom.ast.builder.SchemaBuilder;
+import com.sun.xml.internal.rngom.ast.util.CheckingSchemaBuilder;
+import com.sun.xml.internal.rngom.digested.DPattern;
+import com.sun.xml.internal.rngom.digested.DSchemaBuilderImpl;
+import com.sun.xml.internal.rngom.parse.IllegalSchemaException;
+import com.sun.xml.internal.rngom.parse.Parseable;
+import com.sun.xml.internal.rngom.parse.compact.CompactParseable;
+import com.sun.xml.internal.rngom.parse.xml.SAXParseable;
+import com.sun.xml.internal.rngom.xml.sax.XMLReaderCreator;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -337,7 +348,7 @@
/**
* Parses a set of schemas inside a WSDL file.
*
- * A WSDL file may contain multiple <xsd:schema> elements.
+ * A WSDL file may contain multiple {@code <xsd:schema>} elements.
*/
private XSSchemaSet loadWSDL()
throws SAXException {
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Plugin.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Plugin.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -96,7 +96,7 @@
* Since options can appear in no particular order,
* XJC allows sub-options of a plugin to show up before
* the option that activates a plugin (one that's returned
- * by {@link #getOptionName().)
+ * by {@link #getOptionName()}.
*
* But nevertheless a {@link Plugin} needs to be activated
* to participate in further processing.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -33,7 +33,7 @@
/**
* {@link JAXBModel} that exposes additional information available
- * only for the java->schema direction.
+ * only for the {@code java -> schema} direction.
*
* @author Kohsuke Kawaguchi
*/
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Mapping.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/Mapping.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -63,7 +63,7 @@
* Returns the fully-qualified name of the java class for the type of this element.
*
* TODO: does this method returns the name of the wrapper bean when it's qualified
- * for the wrapper style? Seems no (consider <xs:element name='foo' type='xs:long' />),
+ * for the wrapper style? Seems no (consider {@code <xs:element name='foo' type='xs:long' />}),
* but then how does JAX-RPC captures that bean?
*
* @return
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -39,7 +39,7 @@
/**
* {@link JAXBModel} that exposes additional information available
- * only for the schema->java direction.
+ * only for the {@code schema -> java} direction.
*
* @author Kohsuke Kawaguchi
*/
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -53,10 +53,10 @@
* method to get the compiled {@link JAXBModel} object.
*
*
- * <h2>Tips: namespace URI -> package customization</h2>
+ * <h2>Tips: namespace URI {@code -> } package customization</h2>
* <p>
* The caller can feed the following synthesized schema
- * to achive the namespace URI -> Java package customization:
+ * to achive the namespace URI {@code -> } Java package customization:
* <pre>{@code
* <schema targetNamespace="xml.namespace.uri"
* xmlns="http://www.w3.org/2001/XMLSchema"
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/XJC.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/XJC.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
}
/**
- * Computes the namespace URI -> package name conversion
+ * Computes the namespace {@code URI -> package name} conversion
* as specified by the JAXB spec.
*
* @param namespaceUri
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.internal.xjc.api.util;
-
-import javax.tools.StandardLocation;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-
-import com.sun.codemodel.internal.CodeWriter;
-import com.sun.codemodel.internal.JPackage;
-import javax.annotation.processing.Filer;
-
-import static javax.tools.StandardLocation.CLASS_PATH;
-import static javax.tools.StandardLocation.SOURCE_PATH;
-
-/**
- * {@link CodeWriter} that generates source code to {@link Filer}.
- *
- * @author Kohsuke Kawaguchi
- */
-public final class FilerCodeWriter extends CodeWriter {
-
- private final Filer filer;
-
- public FilerCodeWriter(Filer filer) {
- this.filer = filer;
- }
-
- public OutputStream openBinary(JPackage pkg, String fileName) throws IOException {
- StandardLocation loc;
- if(fileName.endsWith(".java")) {
- // Annotation Processing doesn't do the proper Unicode escaping on Java source files,
- // so we can't rely on Filer.createSourceFile.
- loc = SOURCE_PATH;
- } else {
- // put non-Java files directly to the output folder
- loc = CLASS_PATH;
- }
- return filer.createResource(loc, pkg.name(), fileName).openOutputStream();
- }
-
- public Writer openSource(JPackage pkg, String fileName) throws IOException {
- String name;
- if(pkg.isUnnamed())
- name = fileName;
- else
- name = pkg.name()+'.'+fileName;
-
- name = name.substring(0,name.length()-5); // strip ".java"
-
- return filer.createSourceFile(name).openWriter();
- }
-
- public void close() {
- ; // noop
- }
-}
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages.java Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.internal.xjc.api.util;
-
-
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
-
-/**
- * Message resources
- */
-enum Messages {
- TOOLS_JAR_NOT_FOUND, // 1 arg
- ;
-
- private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName());
-
- public String toString() {
- return format();
- }
-
- public String format( Object... args ) {
- return MessageFormat.format( rb.getString(name()), args );
- }
-}
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-TOOLS_JAR_NOT_FOUND = \
- JDK''s tools.jar was not found in {0}. Usually this means you are running JRE, not JDK. Please use the java command in JDK 5.0 or later (not JRE.)
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_de.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-TOOLS_JAR_NOT_FOUND = Die tools.jar von JDK wurde in {0} nicht gefunden. Im Allgemeinen bedeutet dies, dass Sie JRE und nicht JDK ausf\u00FChren. Verwenden Sie den java-Befehl in JDK 5.0 oder h\u00F6her (nicht JRE.)
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_es.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-TOOLS_JAR_NOT_FOUND = No se ha encontrado el archivo tools.jar de JDK en {0}. Normalmente, esto significa que est\u00E1 ejecutando JRE, no JDK. Utilice el comando java en JDK 5.0 o posterior (no JRE).
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_fr.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-TOOLS_JAR_NOT_FOUND = Le fichier tools.jar de JDK est introuvable dans {0}. G\u00E9n\u00E9ralement, cela signifie que vous ex\u00E9cutez JRE, et non JDK. Utilisez la commande Java dans JDK version 5.0 ou sup\u00E9rieure (et non JRE).
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_it.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-TOOLS_JAR_NOT_FOUND = tools.jar di JDK non trovato in {0}. In genere ci\u00F2 significa che si sta eseguendo JRE e non JDK. Usare il comando java JDK 5.0 o versione successiva (non JRE).
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_ja.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-TOOLS_JAR_NOT_FOUND = JDK\u306Etools.jar\u304C{0}\u306B\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u901A\u5E38\u3001\u3053\u308C\u306FJDK\u3067\u306F\u306A\u304FJRE\u3092\u5B9F\u884C\u3057\u3066\u3044\u308B\u3053\u3068\u3092\u610F\u5473\u3057\u307E\u3059\u3002(JRE\u3067\u306F\u306A\u304F)JDK 5.0\u4EE5\u4E0A\u306Ejava\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_ko.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-TOOLS_JAR_NOT_FOUND = JDK\uC758 tools.jar\uC744 {0}\uC5D0\uC11C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC77C\uBC18\uC801\uC73C\uB85C JDK\uAC00 \uC544\uB2CC JRE\uB97C \uC2E4\uD589 \uC911\uC778 \uACBD\uC6B0 \uC774 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD569\uB2C8\uB2E4. JRE\uAC00 \uC544\uB2CC JDK 5.0 \uB610\uB294 \uC774\uD6C4 \uBC84\uC804\uC5D0\uC11C java \uBA85\uB839\uC744 \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_pt_BR.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-TOOLS_JAR_NOT_FOUND = tools.jar de JDK n\u00E3o foi encontrado em {0}. Geralmente, isso significa que voc\u00EA est\u00E1 executando JRE, n\u00E3o JDK. Use o comando java no JDK 5.0 ou posterior (n\u00E3o JRE).
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_zh_CN.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-TOOLS_JAR_NOT_FOUND = \u5728{0}\u4E2D\u672A\u627E\u5230 JDK \u7684 tools.jar\u3002\u901A\u5E38\u8FD9\u610F\u5473\u7740\u60A8\u8FD0\u884C\u7684\u662F JRE, \u800C\u4E0D\u662F JDK\u3002\u8BF7\u5728 JDK 5.0 \u6216\u66F4\u9AD8\u7248\u672C (\u800C\u4E0D\u662F JRE) \u4E2D\u4F7F\u7528 java \u547D\u4EE4\u3002
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/Messages_zh_TW.properties Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-TOOLS_JAR_NOT_FOUND = \u5728 {0} \u4E2D\u627E\u4E0D\u5230 JDK \u7684 tools.jar. \u9019\u901A\u5E38\u8868\u793A\u60A8\u6240\u57F7\u884C\u7684\u662F JRE, \u800C\u975E JDK. \u8ACB\u4F7F\u7528 JDK 5.0 \u6216\u66F4\u65B0\u7248\u672C (\u975E JRE) \u4E2D\u7684 Java \u547D\u4EE4.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/util/package.html Thu Nov 05 08:15:39 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-<!--
- Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation. Oracle designates this
- particular file as subject to the "Classpath" exception as provided
- by Oracle in the LICENSE file that accompanied this code.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html><body>
-
-
- Utility code shared between JAXB and JAX-WS
-</body></html>
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -77,7 +77,7 @@
* <p>
* Null if no default
*
- * @see #calcDefaultValues().
+ * @see #calcDefaultValues()
*/
public String getMostUsedNamespaceURI() {
return mostUsedNamespaceURI;
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -60,7 +60,7 @@
*
* <p>
* As an NType, it represents the Java representation of this element
- * (either JAXBElement<T> or Foo).
+ * (either {@code JAXBElement<T>} or Foo).
*
* @author Kohsuke Kawaguchi
*/
@@ -70,7 +70,7 @@
private final QName tagName;
/**
- * Represents {@code JAXBElement<ContentType>}.
+ * Represents {@code JAXBElement<ContentType>}.
*/
private NType type;
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -53,8 +53,7 @@
* The structure of the generated class needs to precisely
* follow the JAXB spec.
*
- * @author
- * <a href="mailto:kohsuke.kawaguchi@sun.com">Kohsuke KAWAGUCHI</a>
+ * @author Kohsuke KAWAGUCHI
*/
public final class CEnumLeafInfo implements EnumLeafInfo<NType,NClass>, NClass, CNonElement
{
@@ -83,7 +82,7 @@
*
* <p>
* To parse XML into a constant, we use the base type
- * to do lexical -> value, then use a map to pick up the right one.
+ * to do {@code lexical -> value}, then use a map to pick up the right one.
*
* <p>
* Hence this also represents the type of the Java value.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -30,6 +30,8 @@
import java.util.Map;
import javax.xml.XMLConstants;
+import javax.xml.bind.annotation.XmlInlineBinaryData;
+import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
@@ -37,6 +39,7 @@
import com.sun.codemodel.internal.JClass;
import com.sun.codemodel.internal.JJavaName;
import com.sun.codemodel.internal.JType;
+import com.sun.tools.internal.xjc.Plugin;
import com.sun.tools.internal.xjc.generator.bean.field.FieldRenderer;
import com.sun.tools.internal.xjc.model.nav.NClass;
import com.sun.tools.internal.xjc.model.nav.NType;
@@ -46,6 +49,7 @@
import com.sun.xml.internal.bind.v2.runtime.RuntimeUtil;
import com.sun.xml.internal.xsom.XSComponent;
+import org.xml.sax.ErrorHandler;
import org.xml.sax.Locator;
/**
@@ -81,7 +85,7 @@
public String javadoc="";
/**
- * Property with {@link @XmlInlineBinaryData}.
+ * Property annotated with {@link javax.xml.bind.annotation.XmlInlineBinaryData}.
*/
public boolean inlineBinaryData;
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -223,7 +223,7 @@
/**
* Creates a {@link NType} representation for a parameterized type
- * {@code RawType<ParamType1,ParamType2,...> }.
+ * {@code RawType<ParamType1,ParamType2,...> }.
*/
public static NType createParameterizedType( NClass rawType, NType... args ) {
return new NParameterizedType(rawType,args);
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/package-info.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/package-info.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -43,15 +43,15 @@
*
* <dl>
* <dt>Source location information
- * <dd>{@link Locator} object that can be used to tell where the model components
+ * <dd>{@link org.xml.sax.Locator} object that can be used to tell where the model components
* are created from in terms of the source file. Useful for error reporting.
*
* <dt>Source schema component
- * <dd>{@link XSComponent} object from which the model components are created from.
- * See {@link CCustomizable#getSchemaComponent()} for example.
+ * <dd>{@link com.sun.xml.internal.xsom.XSComponent} object from which the model components are created from.
+ * See {@link com.sun.tools.internal.xjc.model.CCustomizable#getSchemaComponent()} for example.
*
* <dt>Plugin customizations
- * <dd>See {@link CCustomizable}.
+ * <dd>See {@link com.sun.tools.internal.xjc.model.CCustomizable}.
* </dl>
*/
package com.sun.tools.internal.xjc.model;
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/package-info.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/package-info.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,28 +29,6 @@
* <p>
* This module contains the code that implements the schema compiler 'XJC'.
*
- *
- * <h2>XJC Architecture Diagram</h2>
- * {@DotDiagram
- digraph G {
- rankdir=TB;
-
- // data
- node [shape=box]; // style=filled,color=lightpink];
- schema -> "DOM forest" [label="DOMForest.parse()"];
- "DOM forest" -> "schema OM" [label="SOM specific parser"];
- "schema OM" -> model [label="language specific builder"];
-
- model -> codeModel [label="BeanGenerator.generate()"];
- codeModel -> "Java source files" [label="JCodeModel.build()"];
- model -> outline [label="BeanGenerator.generate()"];
-
- edge [style=dotted,label="associate"]
- outline -> codeModel;
- outline -> model;
- }
- * }
- *
* <h2>Overview</h2>
* <p>
* XJC consists of the following major components.
@@ -78,13 +56,5 @@
* and CodeModel.
* </dl>
*
- * {@DotDiagram
- * digraph G {
- * rankdir = LR;
- * schema -> reader -> model -> backend -> outline;
- * }
- * }
- *
- * @ArchitectureDocument
*/
package com.sun.tools.internal.xjc;
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Const.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/Const.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,7 +59,7 @@
* Attribute name of the expected media type.
*
* @see WellKnownNamespace#XML_MIME_URI
- * @see http://www.w3.org/TR/xml-media-types/
+ * @see <a href="http://www.w3.org/TR/xml-media-types/">http://www.w3.org/TR/xml-media-types/</a>
*/
public static final String EXPECTED_CONTENT_TYPES = "expectedContentTypes";
}
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -33,11 +33,11 @@
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
-/** <attribute> declaration in the binding file. */
+/** {@code <attribute>} declaration in the binding file. */
public class BIAttribute
{
/**
- * Wraps a given <attribute> element.
+ * Wraps a given {@code <attribute>} element.
* <p>
* Should be created only from {@link BIElement}.
*/
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,7 +35,7 @@
import org.xml.sax.Locator;
/**
- * <constructor> declaration in the binding file.
+ * {@code <constructor>} declaration in the binding file.
*
* <p>
* Since JAXB will generate both interfaces and implementations,
@@ -64,7 +64,7 @@
throw new AssertionError("this error should be catched by the validator");
}
- /** <constructor> element in the source binding file. */
+ /** {@code <constructor>} element in the source binding file. */
private final Element dom;
/** properties specified by @properties. */
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -34,7 +34,7 @@
import org.w3c.dom.Element;
/**
- * Particles in the <content> declaration in the binding file.
+ * Particles in the {@code <content>} declaration in the binding file.
*
*/
public class BIContent
@@ -100,7 +100,7 @@
/**
* Gets the type of this property, if any.
* <p>
- * <element-ref> particle doesn't have the type.
+ * {@code <element-ref>} particle doesn't have the type.
*
* @return
* null if none is specified.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,7 @@
import com.sun.tools.internal.xjc.model.TypeUse;
/**
- * conversion declaration (<conversion> and <enumeration>).
+ * conversion declaration ({@code <conversion> and <enumeration>}).
*/
public interface BIConversion
{
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,12 +40,12 @@
/**
- * <element> declaration in the binding file.
+ * {@code <element>} declaration in the binding file.
*/
public final class BIElement
{
/**
- * Wraps a given <element> element in the binding file.
+ * Wraps a given {@code <element>} element in the binding file.
*
* <p>
* Should be created only from {@link BindInfo}.
@@ -122,7 +122,7 @@
/** The parent {@link BindInfo} object to which this object belongs. */
final BindInfo parent;
- /** <element> element which this object is wrapping. */
+ /** {@code <element>} element which this object is wrapping. */
private final Element e;
/**
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -39,17 +39,17 @@
import org.w3c.dom.Element;
/**
- * <enumeration> declaration in the binding file.
+ * {@code <enumeration>} declaration in the binding file.
*/
public final class BIEnumeration implements BIConversion
{
- /** Creates an object from <enumeration> declaration. */
+ /** Creates an object from {@code <enumeration>} declaration. */
private BIEnumeration( Element _e, TypeUse _xducer ) {
this.e = _e;
this.xducer = _xducer;
}
- /** <enumeration> element in DOM. */
+ /** {@code <enumeration>} element in DOM. */
private final Element e;
private final TypeUse xducer;
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -31,7 +31,7 @@
import org.xml.sax.Locator;
/**
- * <interface> declaration in the binding file.
+ * {@code <interface>} declaration in the binding file.
*/
public final class BIInterface
{
@@ -47,7 +47,7 @@
fields = new String[0];
}
- /** <interface> element in the binding file. */
+ /** {@code <interface>} element in the binding file. */
private final Element dom;
/** Name of the generated Java interface. */
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,13 +57,13 @@
import org.xml.sax.SAXException;
/**
- * <conversion> declaration in the binding file.
+ * {@code <conversion>} declaration in the binding file.
* This declaration declares a conversion by user-specified methods.
*/
public class BIUserConversion implements BIConversion
{
/**
- * Wraps a given <conversion> element in the binding file.
+ * Wraps a given {@code <conversion>} element in the binding file.
*/
BIUserConversion( BindInfo bi, Element _e ) {
this.owner = bi;
@@ -104,7 +104,7 @@
/** The owner {@link BindInfo} object to which this object belongs. */
private final BindInfo owner;
- /** <conversion> element which this object is wrapping. */
+ /** {@code <conversion>} element which this object is wrapping. */
private final Element e;
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java Thu Nov 05 13:43:17 2015 -0800
@@ -289,7 +289,7 @@
/**
* Lazily parsed schema for the binding file.
*/
- private static SchemaCache bindingFileSchema = new SchemaCache("bindingfile.xsd", BindInfo.class);
+ private static final SchemaCache bindingFileSchema = new SchemaCache("bindingfile.xsd", BindInfo.class, true);
/**
* Parses an InputSource into dom4j Document.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,7 +40,7 @@
/**
* XMLFilter that finds references to other schema files from
* SAX events.
- * <p/>
+ * <p>
* This implementation is a base implementation for typical case
* where we just need to look for a particular attribute which
* contains an URL to another schema file.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,7 +40,7 @@
* Builds DOM while keeping the location information.
*
* <p>
- * This class also looks for outer most <jaxb:bindings>
+ * This class also looks for outer most {@code <jaxb:bindings>}
* customizations.
*
* @author
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -30,6 +30,7 @@
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.reader.xmlschema.parser.SchemaConstraintChecker;
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;
@@ -83,7 +84,7 @@
* Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
*/
public final class DOMForest {
- /** actual data storage map<SystemId,Document>. */
+ /** actual data storage {@code map<SystemId,Document>}. */
private final Map<String,Document> core = new HashMap<String,Document>();
/**
@@ -100,7 +101,7 @@
/** Stores location information for all the trees in this forest. */
public final LocatorTable locatorTable = new LocatorTable();
- /** Stores all the outer-most <jaxb:bindings> customizations. */
+ /** Stores all the outer-most {@code <jaxb:bindings>} customizations. */
public final Set<Element> outerMostBindings = new HashSet<Element>();
/** Used to resolve references to other schema documents. */
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -71,7 +71,7 @@
* The owner DOMForest object. Probably useful only
* to obtain context information, such as error handler.
* @param bindings
- * <jaxb:bindings> element or a customization element.
+ * {@code <jaxb:bindings>} element or a customization element.
* @return
* true if it's OK, false if not.
*/
@@ -82,7 +82,7 @@
*
* <p>
* For example, in XML Schema, target nodes can be any schema
- * element but it is always the <xsd:appinfo> element that
+ * element but it is always the {@code <xsd:appinfo>} element that
* receives customization.
*
* @param target
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -79,7 +79,7 @@
private final XPath xpath;
/**
- * Internalize all <jaxb:bindings> customizations in the given forest.
+ * Internalize all {@code <jaxb:bindings>} customizations in the given forest.
*
* @return
* if the SCD support is enabled, the return bindings need to be applied
@@ -142,32 +142,6 @@
}
/**
- * Validates attributes of a <jaxb:bindings> element.
- */
- private void validate( Element bindings ) {
- NamedNodeMap atts = bindings.getAttributes();
- for( int i=0; i<atts.getLength(); i++ ) {
- Attr a = (Attr)atts.item(i);
- if( a.getNamespaceURI()!=null )
- continue; // all foreign namespace OK.
- if( a.getLocalName().equals("node") )
- continue;
- if( a.getLocalName().equals("schemaLocation"))
- continue;
- if( a.getLocalName().equals("scd") )
- continue;
-
- // enhancements
- if( a.getLocalName().equals("required") ) //
- continue;
- if( a.getLocalName().equals("multiple") ) //
- continue;
-
- // TODO: flag error for this undefined attribute
- }
- }
-
- /**
* Determines the target node of the "bindings" element
* by using the inherited target node, then put
* the result into the "result" map and the "scd" map.
@@ -177,7 +151,7 @@
* the user starts specifying targets via SCD (in that case
* this inherited target is just not going to be used.)
* @param inheritedSCD
- * If the ancestor <bindings> node specifies @scd to
+ * If the ancestor {@code <bindings>} node specifies @scd to
* specify the target via SCD, then this parameter represents that context.
*/
private void buildTargetNodeMap( Element bindings, @NotNull Node inheritedTarget,
@@ -187,7 +161,8 @@
Node target = inheritedTarget;
ArrayList<Node> targetMultiple = null;
- validate(bindings); // validate this node
+ // validate this node ?
+ // validate(bindings);
boolean required = true;
boolean multiple = false;
@@ -441,11 +416,11 @@
* Moves the "decl" node under the "target" node.
*
* @param decl
- * A JAXB customization element (e.g., <jaxb:class>)
+ * A JAXB customization element (e.g., {@code <jaxb:class>})
*
* @param target
* XML Schema element under which the declaration should move.
- * For example, <xs:element>
+ * For example, {@code <xs:element>}
*/
private void moveUnder( Element decl, Element target ) {
Element realTarget = forest.logic.refineTarget(target);
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
package com.sun.tools.internal.xjc.reader.relaxng;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -44,11 +45,11 @@
* Datatype library's namespace URI.
*/
public final String nsUri;
-
- private final Map<String,TypeUse> types = new HashMap<String,TypeUse>();
+ private final Map<String,TypeUse> types;
- public DatatypeLib(String nsUri) {
+ public DatatypeLib(String nsUri, Map<String,TypeUse> types) {
this.nsUri = nsUri;
+ this.types = Collections.unmodifiableMap(types);
}
/**
@@ -61,16 +62,21 @@
/**
* Datatype library for the built-in type.
*/
- public static final DatatypeLib BUILTIN = new DatatypeLib("");
+ public static final DatatypeLib BUILTIN;
/**
* Datatype library for XML Schema datatypes.
*/
- public static final DatatypeLib XMLSCHEMA = new DatatypeLib(WellKnownNamespaces.XML_SCHEMA_DATATYPES);
+ public static final DatatypeLib XMLSCHEMA =
+ new DatatypeLib(
+ WellKnownNamespaces.XML_SCHEMA_DATATYPES,
+ SimpleTypeBuilder.builtinConversions);
static {
- BUILTIN.types.put("token",CBuiltinLeafInfo.TOKEN);
- BUILTIN.types.put("string",CBuiltinLeafInfo.STRING);
- XMLSCHEMA.types.putAll(SimpleTypeBuilder.builtinConversions);
+ Map<String,TypeUse> builtinTypes = new HashMap<>();
+ builtinTypes.put("token", CBuiltinLeafInfo.TOKEN);
+ builtinTypes.put("string", CBuiltinLeafInfo.STRING);
+
+ BUILTIN = new DatatypeLib("", builtinTypes);
}
}
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -43,7 +43,7 @@
public class RELAXNGInternalizationLogic implements InternalizationLogic {
/**
- * This filter looks for <xs:import> and <xs:include>
+ * This filter looks for {@code <xs:import>} and {@code <xs:include>}
* and parses those documents referenced by them.
*/
private static final class ReferenceFinder extends AbstractReferenceFinderImpl {
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -76,7 +76,7 @@
/**
* Root of the XML Schema binder.
*
- * <div><img src="doc-files/binding_chart.png"/></div>
+ * <div><img src="doc-files/binding_chart.png" alt=""></div>
*
* @author Kohsuke Kawaguchi
*/
@@ -261,7 +261,7 @@
/**
- * Name converter that implements "XML->Java name conversion"
+ * Name converter that implements "{@code XML -> Java} name conversion"
* as specified in the spec.
*
* This object abstracts the detail that we use different name
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -75,7 +75,7 @@
import org.xml.sax.Locator;
/**
- * Default classBinder implementation. Honors <jaxb:class> customizations
+ * Default classBinder implementation. Honors {@code <jaxb:class>} customizations
* and default bindings.
*/
final class DefaultClassBinder implements ClassBinder
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -140,7 +140,7 @@
private XSSimpleType initiatingType;
/** {@link TypeUse}s for the built-in types. Read-only. */
- public static final Map<String,TypeUse> builtinConversions = new HashMap<String,TypeUse>();
+ public static final Map<String,TypeUse> builtinConversions;
/**
@@ -418,7 +418,7 @@
/**
* Returns true if a type-safe enum should be created from
- * the given simple type by default without an explicit <jaxb:enum> customization.
+ * the given simple type by default without an explicit {@code <jaxb:enum>} customization.
*/
private boolean shouldBeMappedToTypeSafeEnumByDefault( XSRestrictionSimpleType type ) {
@@ -876,7 +876,7 @@
// note that although xs:token and xs:normalizedString are not
// specified in the spec, they need to be here because they
// have different whitespace normalization semantics.
- Map<String,TypeUse> m = builtinConversions;
+ Map<String,TypeUse> m = new HashMap<String,TypeUse>();
// TODO: this is so dumb
m.put("string", CBuiltinLeafInfo.STRING);
@@ -911,6 +911,8 @@
m.put("normalizedString",CBuiltinLeafInfo.NORMALIZED_STRING);
m.put("ID", CBuiltinLeafInfo.ID);
m.put("IDREF", CBuiltinLeafInfo.IDREF);
+
+ builtinConversions = Collections.unmodifiableMap(m);
// TODO: handling dateTime, time, and date type
// String[] names = {
// "date", "dateTime", "time", "hexBinary" };
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -115,7 +115,7 @@
}
/**
- * User-specified <javaType> customization.
+ * User-specified {@code <javaType>} customization.
*
* The parse/print methods are allowed to be null,
* and their default values are determined based on the
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -82,8 +82,8 @@
}
/**
- * Gets the map that contains XML value->BIEnumMember pairs.
- * This table is built from <enumMember> customizations.
+ * Gets the map that contains {@code XML value -> BIEnumMember} pairs.
+ * This table is built from {@code <enumMember>} customizations.
*
* Always return non-null.
*/
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -71,7 +71,7 @@
/**
- * Gets the name converter that will govern the XML->Java
+ * Gets the name converter that will govern the {@code XML -> Java}
* name conversion process for this compilation.
*
* <p>
@@ -258,14 +258,14 @@
private BISerializable serializable = null;
/**
- * If <xjc:superClass> extension is specified,
+ * If {@code <xjc:superClass>} extension is specified,
* returns the specified root class. Otherwise null.
*/
@XmlElement(namespace=Const.XJC_EXTENSION_URI)
ClassNameBean superClass = null;
/**
- * If <xjc:superInterface> extension is specified,
+ * If {@code <xjc:superInterface>} extension is specified,
* returns the specified root class. Otherwise null.
*/
@XmlElement(namespace=Const.XJC_EXTENSION_URI)
@@ -488,7 +488,7 @@
}
/**
- * Global <jaxb:javaType>.
+ * Global {@code <jaxb:javaType>}.
*/
static final class GlobalStandardConversion extends BIConversion.User {
@XmlAttribute
@@ -512,7 +512,7 @@
}
/**
- * Global <xjc:javaType>.
+ * Global {@code <xjc:javaType>}.
*/
static final class GlobalVendorConversion extends BIConversion.UserAdapter {
@XmlAttribute
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
import com.sun.xml.internal.xsom.XSComponent;
/**
- * Generates {@link @XmlInlineBinaryData}.
+ * Generates {@link XmlInlineBinaryData}.
*
* @author Kohsuke Kawaguchi
*/
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -81,7 +81,7 @@
/**
* If false, it means not to generate any classes from this namespace.
* No ObjectFactory, no classes (the only way to bind them is by using
- * <jaxb:class ref="..."/>)
+ * {@code <jaxb:class ref="..."/>})
*/
@XmlAttribute(name="map")
public boolean map = true;
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -33,7 +33,7 @@
/**
* Compatibility with 1.0.
*
- * Read <xjc:dom> as <jaxb:dom>.
+ * Read {@code <xjc:dom> as <jaxb:dom>}.
*
* @author Kohsuke Kawaguchi
*/
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java Thu Nov 05 13:43:17 2015 -0800
@@ -79,7 +79,7 @@
private Locator location;
/**
- * Documentation taken from <xs:documentation>s.
+ * Documentation taken from {@code <xs:documentation>s}.
*/
@XmlElement(namespace=WellKnownNamespace.XML_SCHEMA)
private Documentation documentation;
@@ -212,7 +212,7 @@
}
/**
- * Gets the documentation parsed from <xs:documentation>s.
+ * Gets the documentation parsed from {@code <xs:documentation>}s.
* The returned collection is to be added to {@link JDocComment#append(Object)}.
* @return maybe null.
*/
@@ -353,5 +353,5 @@
/**
* Lazily parsed schema for the binding file.
*/
- public static SchemaCache bindingFileSchema = new SchemaCache("binding.xsd", BindInfo.class, true);
+ public static final SchemaCache bindingFileSchema = new SchemaCache("binding.xsd", BindInfo.class, true);
}
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -45,7 +45,7 @@
;
/**
- * The mode will change to this when there's <jaxb:enum> customization.
+ * The mode will change to this when there's {@code <jaxb:enum>} customization.
*/
public EnumMemberMode getModeWithEnum() {
if(this==SKIP) return ERROR;
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -45,8 +45,8 @@
* Checks if binding declarations are placed where they are allowed.
*
* <p>
- * For example, if a <jaxb:property> customization is given under
- * the <xs:simpleContent> element, this class raises an error.
+ * For example, if a {@code <jaxb:property>} customization is given under
+ * the {@code <xs:simpleContent>} element, this class raises an error.
*
* <p>
* our main checkpoint of misplaced customizations are in BGMBuilder.
@@ -60,7 +60,7 @@
*
* <p>
* For example, a property customization is allowed on a complex type
- * schema component, but it's only allowed on the <complexType>
+ * schema component, but it's only allowed on the {@code <complexType>}
* element. The spec team informed us that they would consider resolving
* this discrepancy in favor of RI, but meanwhile we need to detect
* errors correctly.
@@ -94,9 +94,9 @@
* of that type.
*
* <p>
- * For simple types, customizations are allowed only under the <xs:simpleType>
+ * For simple types, customizations are allowed only under the {@code <xs:simpleType>}
* element, and for complex types they are allowed only under the
- * <xs:cimplexType> element.
+ * {@code <xs:cimplexType>} element.
*
* <p>
* So the bottom line is that it would be suffice if we just make sure
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
/**
* Checks XML Schema XML representation constraints and
* schema component constraints by using JAXP 1.3 validation framework.
- * <p/>
+ * <p>
*
* @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
* @author Ryan Shoemaker (ryan.shoemaker@sun.com)
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -45,7 +45,7 @@
public class XMLSchemaInternalizationLogic implements InternalizationLogic {
/**
- * This filter looks for <xs:import> and <xs:include>
+ * This filter looks for {@code <xs:import> and <xs:include>}
* and parses those documents referenced by them.
*/
private static final class ReferenceFinder extends AbstractReferenceFinderImpl {
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDEventListener.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDEventListener.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -94,7 +94,7 @@
/**
* Receive notification of an external parsed general entity
* declaration event.
- * <p/>
+ * <p>
* <p>If a system identifier is present, and it is a relative URL, the
* parser will have resolved it fully before passing it through this
* method to a listener.</p>
@@ -127,7 +127,7 @@
/**
* Receive notification of an external parameter entity declaration
* event.
- * <p/>
+ * <p>
* <p>If a system identifier is present, and it is a relative URL, the
* parser will have resolved it fully before passing it through this
* method to a listener.</p>
@@ -164,7 +164,7 @@
/**
* Receive notification that a comment has been read.
- * <p/>
+ * <p>
* <P> Note that processing instructions are the mechanism designed
* to hold information for consumption by applications, not comments.
* XML systems may rely on applications being able to access information
@@ -179,17 +179,17 @@
/**
* Receive notification of character data.
- * <p/>
+ * <p>
* <p>The Parser will call this method to report each chunk of
* character data. SAX parsers may return all contiguous character
* data in a single chunk, or they may split it into several
* chunks; however, all of the characters in any single event
* must come from the same external entity, so that the Locator
* provides useful information.</p>
- * <p/>
+ * <p>
* <p>The application must not attempt to read from the array
* outside of the specified range.</p>
- * <p/>
+ * <p>
* <p>Note that some parsers will report whitespace using the
* ignorableWhitespace() method rather than this one (validating
* parsers must do so).</p>
@@ -206,18 +206,18 @@
/**
* Receive notification of ignorable whitespace in element content.
- * <p/>
+ * <p>
* <p>Validating Parsers must use this method to report each chunk
* of ignorable whitespace (see the W3C XML 1.0 recommendation,
* section 2.10): non-validating parsers may also use this method
* if they are capable of parsing and using content models.</p>
- * <p/>
+ * <p>
* <p>SAX parsers may return all contiguous whitespace in a single
* chunk, or they may split it into several chunks; however, all of
* the characters in any single event must come from the same
* external entity, so that the Locator provides useful
* information.</p>
- * <p/>
+ * <p>
* <p>The application must not attempt to read from the array
* outside of the specified range.</p>
*
@@ -279,7 +279,7 @@
* this elemen has child content model. The actual content model will
* be reported by childElement, startModelGroup, endModelGroup, and
* connector methods. Possible call sequences are:
- * <p/>
+ * <p>
* START := MODEL_GROUP
* MODEL_GROUP := startModelGroup TOKEN (connector TOKEN)* endModelGroup
* TOKEN := childElement
@@ -300,8 +300,8 @@
/**
* For each entry in an ATTLIST declaration,
* this event will be fired.
- * <p/>
- * <p/>
+ * <p>
+ * <p>
* DTD allows the same attributes to be declared more than
* once, and in that case the first one wins. I think
* this method will be only fired for the first one,
@@ -329,11 +329,9 @@
/**
* Connectors in one model group is guaranteed to be the same.
- * <p/>
- * <p/>
+ * <p>
+ * <p>
* IOW, you'll never see an event sequence like (a|b,c)
- *
- * @return {@link #CHOICE} or {@link #SEQUENCE}.
*/
public void connector(short connectorType) throws SAXException;
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, 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,28 +38,31 @@
import java.util.Locale;
import java.util.Set;
import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
* This implements parsing of XML 1.0 DTDs.
- * <p/>
- * This conforms to the portion of the XML 1.0 specification related
- * to the external DTD subset.
- * <p/>
- * For multi-language applications (such as web servers using XML
- * processing to create dynamic content), a method supports choosing
- * a locale for parser diagnostics which is both understood by the
- * message recipient and supported by the parser.
- * <p/>
- * This parser produces a stream of parse events. It supports some
- * features (exposing comments, CDATA sections, and entity references)
- * which are not required to be reported by conformant XML processors.
+ * <p>
+ * This conforms to the portion of the XML 1.0 specification related to the
+ * external DTD subset.
+ * <p>
+ * For multi-language applications (such as web servers using XML processing to
+ * create dynamic content), a method supports choosing a locale for parser
+ * diagnostics which is both understood by the message recipient and supported
+ * by the parser.
+ * <p>
+ * This parser produces a stream of parse events. It supports some features
+ * (exposing comments, CDATA sections, and entity references) which are not
+ * required to be reported by conformant XML processors.
*
* @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";
public final static String TYPE_ID = "ID";
public final static String TYPE_IDREF = "IDREF";
@@ -70,47 +73,39 @@
public final static String TYPE_NMTOKENS = "NMTOKENS";
public final static String TYPE_NOTATION = "NOTATION";
public final static String TYPE_ENUMERATION = "ENUMERATION";
-
-
// stack of input entities being merged
private InputEntity in;
-
// temporaries reused during parsing
private StringBuffer strTmp;
- private char nameTmp [];
+ private char nameTmp[];
private NameCache nameCache;
- private char charTmp [] = new char[2];
-
+ private char charTmp[] = new char[2];
// temporary DTD parsing state
private boolean doLexicalPE;
-
// DTD state, used during parsing
// private SimpleHashtable elements = new SimpleHashtable (47);
protected final Set declaredElements = new java.util.HashSet();
private SimpleHashtable params = new SimpleHashtable(7);
-
// exposed to package-private subclass
Hashtable notations = new Hashtable(7);
SimpleHashtable entities = new SimpleHashtable(17);
-
private SimpleHashtable ids = new SimpleHashtable();
-
// listeners for DTD parsing events
private DTDEventListener dtdHandler;
-
private EntityResolver resolver;
private Locale locale;
-
// string constants -- use these copies so "==" works
// package private
static final String strANY = "ANY";
static final String strEMPTY = "EMPTY";
+ private static final Logger LOGGER = Logger.getLogger(DTDParser.class.getName());
+
/**
* Used by applications to request locale for diagnostics.
*
- * @param l The locale to use, or null to use system defaults
- * (which may include only message IDs).
+ * @param l The locale to use, or null to use system defaults (which may
+ * include only message IDs).
*/
public void setLocale(Locale l) throws SAXException {
@@ -129,20 +124,19 @@
}
/**
- * Chooses a client locale to use for diagnostics, using the first
- * language specified in the list that is supported by this parser.
- * That locale is then set using <a href="#setLocale(java.util.Locale)">
- * setLocale()</a>. Such a list could be provided by a variety of user
- * preference mechanisms, including the HTTP <em>Accept-Language</em>
- * header field.
+ * Chooses a client locale to use for diagnostics, using the first language
+ * specified in the list that is supported by this parser. That locale is
+ * then set using <a href="#setLocale(java.util.Locale)"> setLocale()</a>.
+ * Such a list could be provided by a variety of user preference mechanisms,
+ * including the HTTP <em>Accept-Language</em> header field.
*
* @param languages Array of language specifiers, ordered with the most
- * preferable one at the front. For example, "en-ca" then "fr-ca",
- * followed by "zh_CN". Both RFC 1766 and Java styles are supported.
+ * preferable one at the front. For example, "en-ca" then "fr-ca", followed
+ * by "zh_CN". Both RFC 1766 and Java styles are supported.
* @return The chosen locale, or null.
* @see MessageCatalog
*/
- public Locale chooseLocale(String languages [])
+ public Locale chooseLocale(String languages[])
throws SAXException {
Locale l = messages.chooseLocale(languages);
@@ -174,24 +168,29 @@
*/
public void setDtdHandler(DTDEventListener handler) {
dtdHandler = handler;
- if (handler != null)
+ if (handler != null) {
handler.setDocumentLocator(new Locator() {
+ @Override
public String getPublicId() {
return DTDParser.this.getPublicId();
}
+ @Override
public String getSystemId() {
return DTDParser.this.getSystemId();
}
+ @Override
public int getLineNumber() {
return DTDParser.this.getLineNumber();
}
+ @Override
public int getColumnNumber() {
return DTDParser.this.getColumnNumber();
}
});
+ }
}
/**
@@ -215,25 +214,25 @@
*/
public void parse(String uri)
throws IOException, SAXException {
- InputSource in;
+ InputSource inSource;
init();
// System.out.println ("parse (\"" + uri + "\")");
- in = resolver.resolveEntity(null, uri);
+ inSource = resolver.resolveEntity(null, uri);
// If custom resolver punts resolution to parser, handle it ...
- if (in == null) {
- in = Resolver.createInputSource(new java.net.URL(uri), false);
+ if (inSource == null) {
+ inSource = 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 (in.getSystemId() == null) {
+ } else if (inSource.getSystemId() == null) {
warning("P-065", null);
- in.setSystemId(uri);
+ inSource.setSystemId(uri);
}
- parseInternal(in);
+ parseInternal(inSource);
}
// makes sure the parser is reset to "before a document"
@@ -263,12 +262,15 @@
builtin("quot", "\"");
builtin("apos", "'");
- if (locale == null)
+ if (locale == null) {
locale = Locale.getDefault();
- if (resolver == null)
+ }
+ if (resolver == null) {
resolver = new Resolver();
- if (dtdHandler == null)
+ }
+ if (dtdHandler == null) {
dtdHandler = new DTDHandlerBase();
+ }
}
private void builtin(String entityName, String entityValue) {
@@ -277,7 +279,6 @@
entities.put(entityName, entity);
}
-
////////////////////////////////////////////////////////////////
//
// parsing is by recursive descent, code roughly
@@ -289,13 +290,13 @@
// relatively easy to get diagnostics that make sense.
//
////////////////////////////////////////////////////////////////
-
-
+ @SuppressWarnings("CallToThreadDumpStack")
private void parseInternal(InputSource input)
throws IOException, SAXException {
- if (input == null)
+ if (input == null) {
fatal("P-000");
+ }
try {
in = InputEntity.getInputEntity(dtdHandler, locale);
@@ -312,8 +313,7 @@
externalParameterEntity(externalSubset);
if (!in.isEOF()) {
- fatal("P-001", new Object[]
- {Integer.toHexString(((int) getc()))});
+ fatal("P-001", new Object[]{Integer.toHexString(((int) getc()))});
}
afterRoot();
dtdHandler.endDTD();
@@ -329,10 +329,7 @@
fatal("P-003", null);
}
} catch (RuntimeException e) {
- // Don't discard location that triggered the exception
- // ## Should properly wrap exception
- System.err.print("Internal DTD parser error: "); // ##
- e.printStackTrace();
+ LOGGER.log(Level.SEVERE, "Internal DTD parser error.", e);
throw new SAXParseException(e.getMessage() != null
? e.getMessage() : e.getClass().getName(),
getPublicId(), getSystemId(),
@@ -368,24 +365,22 @@
// references, and only now can we know if they're all resolved.
for (Enumeration e = ids.keys();
- e.hasMoreElements();
- ) {
+ e.hasMoreElements();) {
String id = (String) e.nextElement();
Boolean value = (Boolean) ids.get(id);
- if (Boolean.FALSE == value)
+ if (Boolean.FALSE.equals(value)) {
error("V-024", new Object[]{id});
+ }
}
}
-
// role is for diagnostics
private void whitespace(String roleId)
throws IOException, SAXException {
// [3] S ::= (#x20 | #x9 | #xd | #xa)+
if (!maybeWhitespace()) {
- fatal("P-004", new Object[]
- {messages.getMessage(locale, roleId)});
+ fatal("P-004", new Object[]{messages.getMessage(locale, roleId)});
}
}
@@ -393,8 +388,9 @@
private boolean maybeWhitespace()
throws IOException, SAXException {
- if (!doLexicalPE)
+ if (!doLexicalPE) {
return in.maybeWhitespace();
+ }
// see getc() for the PE logic -- this lets us splice
// expansions of PEs in "anywhere". getc() has smarts,
@@ -418,8 +414,9 @@
// this gracefully ends things when we stop playing
// with internal parameters. caller should have a
// grammar rule allowing whitespace at end of entity.
- if (in.isEOF() && !in.isInternal())
+ if (in.isEOF() && !in.isInternal()) {
return saw;
+ }
c = getc();
}
ungetc();
@@ -452,8 +449,9 @@
// [7] Nmtoken ::= (Namechar)+
char c = getc();
- if (!XmlChars.isNameChar(c))
- fatal("P-006", new Object[]{new Character(c)});
+ if (!XmlChars.isNameChar(c)) {
+ fatal("P-006", new Object[]{Character.valueOf(c)});
+ }
return nameCharString(c).name;
}
@@ -461,18 +459,18 @@
// internal references) so we can't use strTmp; it's also
// a hotspot for CPU and memory in the parser (called at least
// once for each element) so this has been optimized a bit.
-
private NameCacheEntry nameCharString(char c)
throws IOException, SAXException {
int i = 1;
nameTmp[0] = c;
- for (; ;) {
- if ((c = in.getNameChar()) == 0)
+ for (;;) {
+ if ((c = in.getNameChar()) == 0) {
break;
+ }
if (i >= nameTmp.length) {
- char tmp [] = new char[nameTmp.length + 10];
+ char tmp[] = new char[nameTmp.length + 10];
System.arraycopy(nameTmp, 0, tmp, 0, nameTmp.length);
nameTmp = tmp;
}
@@ -490,6 +488,7 @@
// or else partially normalized attribute value (the first bit
// of 3.3.3's spec, without the "if not CDATA" bits).
//
+ @SuppressWarnings("UnusedAssignment")
private void parseLiteral(boolean isEntityValue)
throws IOException, SAXException {
@@ -516,7 +515,7 @@
// scan, allowing entity push/pop wherever ...
// expanded entities can't terminate the literal!
- for (; ;) {
+ for (;;) {
if (in != source && in.isEOF()) {
// we don't report end of parsed entities
// within attributes (no SAX hooks)
@@ -547,20 +546,22 @@
}
expandEntityInLiteral(entityName, entities, isEntityValue);
-
// character references are always included immediately
- } else if ((c = getc()) == '#') {
+ } else if ((getc()) == '#') {
int tmp = parseCharNumber();
if (tmp > 0xffff) {
tmp = surrogatesToCharTmp(tmp);
strTmp.append(charTmp[0]);
- if (tmp == 2)
+ if (tmp == 2) {
strTmp.append(charTmp[1]);
- } else
+ }
+ } else {
strTmp.append((char) tmp);
- } else
+ }
+ } else {
fatal("P-009");
+ }
continue;
}
@@ -573,8 +574,9 @@
nextChar(';', "F-021", entityName);
expandEntityInLiteral(entityName, params, isEntityValue);
continue;
- } else
+ } else {
fatal("P-011");
+ }
}
// For attribute values ...
@@ -586,8 +588,9 @@
}
// "<" not legal in parsed literals ...
- if (c == '<')
+ if (c == '<') {
fatal("P-012");
+ }
}
strTmp.append(c);
@@ -597,7 +600,7 @@
// does a SINGLE expansion of the entity (often reparsed later)
private void expandEntityInLiteral(String name, SimpleHashtable table,
- boolean isEntityValue)
+ boolean isEntityValue)
throws IOException, SAXException {
Object entity = table.get(name);
@@ -607,8 +610,10 @@
pushReader(value.buf, name, !value.isPE);
} else if (entity instanceof ExternalEntity) {
- if (!isEntityValue) // must be a PE ...
+ if (!isEntityValue) // must be a PE ...
+ {
fatal("P-013", new Object[]{name});
+ }
// XXX if this returns false ...
pushReader((ExternalEntity) entity);
@@ -625,32 +630,31 @@
// [11] SystemLiteral ::= ('"' [^"]* '"') | ("'" [^']* "'")
// for PUBLIC and SYSTEM literals, also "<?xml ...type='literal'?>'
-
// NOTE: XML spec should explicitly say that PE ref syntax is
// ignored in PIs, comments, SystemLiterals, and Pubid Literal
// values ... can't process the XML spec's own DTD without doing
// that for comments.
-
private String getQuotedString(String type, String extra)
throws IOException, SAXException {
// use in.getc to bypass PE processing
char quote = in.getc();
- if (quote != '\'' && quote != '"')
+ if (quote != '\'' && quote != '"') {
fatal("P-015", new Object[]{
- messages.getMessage(locale, type, new Object[]{extra})
- });
+ messages.getMessage(locale, type, new Object[]{extra})
+ });
+ }
char c;
strTmp = new StringBuffer();
- while ((c = in.getc()) != quote)
+ while ((c = in.getc()) != quote) {
strTmp.append((char) c);
+ }
return strTmp.toString();
}
-
private String parsePublicId() throws IOException, SAXException {
// [12] PubidLiteral ::= ('"' PubidChar* '"') | ("'" PubidChar* "'")
@@ -660,8 +664,9 @@
char c = retval.charAt(i);
if (" \r\n-'()+,./:=?;!*#@$_%0123456789".indexOf(c) == -1
&& !(c >= 'A' && c <= 'Z')
- && !(c >= 'a' && c <= 'z'))
- fatal("P-016", new Object[]{new Character(c)});
+ && !(c >= 'a' && c <= 'z')) {
+ fatal("P-016", new Object[]{Character.valueOf(c)});
+ }
}
strTmp = new StringBuffer();
strTmp.append(retval);
@@ -670,44 +675,47 @@
// [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*)
// handled by: InputEntity.parsedContent()
-
private boolean maybeComment(boolean skipStart)
throws IOException, SAXException {
// [15] Comment ::= '<!--'
// ( (Char - '-') | ('-' (Char - '-'))*
// '-->'
- if (!in.peek(skipStart ? "!--" : "<!--", null))
+ if (!in.peek(skipStart ? "!--" : "<!--", null)) {
return false;
+ }
boolean savedLexicalPE = doLexicalPE;
boolean saveCommentText;
doLexicalPE = false;
saveCommentText = false;
- if (saveCommentText)
+ if (saveCommentText) {
strTmp = new StringBuffer();
+ }
oneComment:
- for (; ;) {
+ for (;;) {
try {
// bypass PE expansion, but permit PEs
// to complete ... valid docs won't care.
- for (; ;) {
+ for (;;) {
int c = getc();
if (c == '-') {
c = getc();
if (c != '-') {
- if (saveCommentText)
+ if (saveCommentText) {
strTmp.append('-');
+ }
ungetc();
continue;
}
nextChar('>', "F-022", null);
break oneComment;
}
- if (saveCommentText)
+ if (saveCommentText) {
strTmp.append((char) c);
+ }
}
} catch (EndOfInputException e) {
//
@@ -723,8 +731,9 @@
}
}
doLexicalPE = savedLexicalPE;
- if (saveCommentText)
+ if (saveCommentText) {
dtdHandler.comment(strTmp.toString());
+ }
return true;
}
@@ -737,8 +746,9 @@
// [17] PITarget ::= Name - (('X'|'x')('M'|'m')('L'|'l')
boolean savedLexicalPE = doLexicalPE;
- if (!in.peek(skipStart ? "?" : "<?", null))
+ if (!in.peek(skipStart ? "?" : "<?", null)) {
return false;
+ }
doLexicalPE = false;
String target = maybeGetName();
@@ -756,12 +766,13 @@
if (maybeWhitespace()) {
strTmp = new StringBuffer();
try {
- for (; ;) {
+ for (;;) {
// use in.getc to bypass PE processing
char c = in.getc();
//Reached the end of PI.
- if (c == '?' && in.peekc('>'))
+ if (c == '?' && in.peekc('>')) {
break;
+ }
strTmp.append(c);
}
} catch (EndOfInputException e) {
@@ -785,7 +796,6 @@
// [21] CDEnd ::= ']]>'
//
// ... handled by InputEntity.unparsedContent()
-
// collapsing several rules together ...
// simpler than attribute literals -- no reference parsing!
private String maybeReadAttribute(String name, boolean must)
@@ -829,8 +839,9 @@
// [26] versionNum ::= ([a-zA-Z0-9_.:]| '-')+
- if (must && value == null)
+ if (must && value == null) {
fatal("P-025", new Object[]{versionNum});
+ }
if (value != null) {
int length = value.length();
for (int i = 0; i < length; i++) {
@@ -839,13 +850,14 @@
|| c == '_' || c == '.'
|| (c >= 'a' && c <= 'z')
|| (c >= 'A' && c <= 'Z')
- || c == ':' || c == '-')
- )
+ || c == ':' || c == '-')) {
fatal("P-026", new Object[]{value});
+ }
}
}
- if (value != null && !value.equals(versionNum))
+ if (value != null && !value.equals(versionNum)) {
error("P-027", new Object[]{versionNum, value});
+ }
}
// common code used by most markup declarations
@@ -857,9 +869,9 @@
whitespace(roleId);
name = maybeGetName();
- if (name == null)
- fatal("P-005", new Object[]
- {messages.getMessage(locale, roleId)});
+ if (name == null) {
+ fatal("P-005", new Object[]{messages.getMessage(locale, roleId)});
+ }
return name;
}
@@ -875,7 +887,6 @@
|| maybePI(false)
|| maybeComment(false);
}
-
private static final String XmlLang = "xml:lang";
private boolean isXmlLang(String value) {
@@ -893,168 +904,169 @@
int nextSuffix;
char c;
- if (value.length() < 2)
+ if (value.length() < 2) {
return false;
+ }
c = value.charAt(1);
if (c == '-') { // IANA, or user, code
c = value.charAt(0);
- if (!(c == 'i' || c == 'I' || c == 'x' || c == 'X'))
+ if (!(c == 'i' || c == 'I' || c == 'x' || c == 'X')) {
return false;
+ }
nextSuffix = 1;
} else if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
// 2 letter ISO code, or error
c = value.charAt(0);
- if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')))
+ if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))) {
return false;
+ }
nextSuffix = 2;
- } else
+ } else {
return false;
+ }
// here "suffix" ::= '-' [a-zA-Z]+ suffix*
while (nextSuffix < value.length()) {
c = value.charAt(nextSuffix);
- if (c != '-')
+ if (c != '-') {
break;
+ }
while (++nextSuffix < value.length()) {
c = value.charAt(nextSuffix);
- if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')))
+ if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))) {
break;
+ }
}
}
return value.length() == nextSuffix && c != '-';
}
-
//
// CHAPTER 3: Logical Structures
//
+ /**
+ * To validate, subclassers should at this time make sure that values are of
+ * the declared types:<UL> <LI> ID and IDREF(S) values are Names <LI>
+ * NMTOKEN(S) are Nmtokens <LI> ENUMERATION values match one of the tokens
+ * <LI> NOTATION values match a notation name <LI> ENTITIY(IES) values match
+ * an unparsed external entity </UL>
+ * <p>
+ * <P> Separately, make sure IDREF values match some ID provided in the
+ * document (in the afterRoot method).
+ */
+ /* void validateAttributeSyntax (Attribute attr, String value)
+ throws DTDParseException {
+ // ID, IDREF(S) ... values are Names
+ if (Attribute.ID == attr.type()) {
+ if (!XmlNames.isName (value))
+ error ("V-025", new Object [] { value });
- /**
- * To validate, subclassers should at this time make sure that
- * values are of the declared types:<UL>
- * <LI> ID and IDREF(S) values are Names
- * <LI> NMTOKEN(S) are Nmtokens
- * <LI> ENUMERATION values match one of the tokens
- * <LI> NOTATION values match a notation name
- * <LI> ENTITIY(IES) values match an unparsed external entity
- * </UL>
- * <p/>
- * <P> Separately, make sure IDREF values match some ID
- * provided in the document (in the afterRoot method).
- */
-/* void validateAttributeSyntax (Attribute attr, String value)
- throws DTDParseException {
- // ID, IDREF(S) ... values are Names
- if (Attribute.ID == attr.type()) {
- if (!XmlNames.isName (value))
- error ("V-025", new Object [] { value });
+ Boolean b = (Boolean) ids.getNonInterned (value);
+ if (b == null || b.equals (Boolean.FALSE))
+ ids.put (value.intern (), Boolean.TRUE);
+ else
+ error ("V-026", new Object [] { value });
- Boolean b = (Boolean) ids.getNonInterned (value);
- if (b == null || b.equals (Boolean.FALSE))
- ids.put (value.intern (), Boolean.TRUE);
- else
- error ("V-026", new Object [] { value });
+ } else if (Attribute.IDREF == attr.type()) {
+ if (!XmlNames.isName (value))
+ error ("V-027", new Object [] { value });
- } else if (Attribute.IDREF == attr.type()) {
- if (!XmlNames.isName (value))
- error ("V-027", new Object [] { value });
-
- Boolean b = (Boolean) ids.getNonInterned (value);
- if (b == null)
- ids.put (value.intern (), Boolean.FALSE);
+ Boolean b = (Boolean) ids.getNonInterned (value);
+ if (b == null)
+ ids.put (value.intern (), Boolean.FALSE);
- } else if (Attribute.IDREFS == attr.type()) {
- StringTokenizer tokenizer = new StringTokenizer (value);
- Boolean b;
- boolean sawValue = false;
+ } else if (Attribute.IDREFS == attr.type()) {
+ StringTokenizer tokenizer = new StringTokenizer (value);
+ Boolean b;
+ boolean sawValue = false;
- while (tokenizer.hasMoreTokens ()) {
- value = tokenizer.nextToken ();
- if (!XmlNames.isName (value))
- error ("V-027", new Object [] { value });
- b = (Boolean) ids.getNonInterned (value);
- if (b == null)
- ids.put (value.intern (), Boolean.FALSE);
- sawValue = true;
- }
- if (!sawValue)
- error ("V-039", null);
+ while (tokenizer.hasMoreTokens ()) {
+ value = tokenizer.nextToken ();
+ if (!XmlNames.isName (value))
+ error ("V-027", new Object [] { value });
+ b = (Boolean) ids.getNonInterned (value);
+ if (b == null)
+ ids.put (value.intern (), Boolean.FALSE);
+ sawValue = true;
+ }
+ if (!sawValue)
+ error ("V-039", null);
- // NMTOKEN(S) ... values are Nmtoken(s)
- } else if (Attribute.NMTOKEN == attr.type()) {
- if (!XmlNames.isNmtoken (value))
- error ("V-028", new Object [] { value });
+ // NMTOKEN(S) ... values are Nmtoken(s)
+ } else if (Attribute.NMTOKEN == attr.type()) {
+ if (!XmlNames.isNmtoken (value))
+ error ("V-028", new Object [] { value });
- } else if (Attribute.NMTOKENS == attr.type()) {
- StringTokenizer tokenizer = new StringTokenizer (value);
- boolean sawValue = false;
+ } else if (Attribute.NMTOKENS == attr.type()) {
+ StringTokenizer tokenizer = new StringTokenizer (value);
+ boolean sawValue = false;
- while (tokenizer.hasMoreTokens ()) {
- value = tokenizer.nextToken ();
- if (!XmlNames.isNmtoken (value))
- error ("V-028", new Object [] { value });
- sawValue = true;
- }
- if (!sawValue)
- error ("V-032", null);
+ while (tokenizer.hasMoreTokens ()) {
+ value = tokenizer.nextToken ();
+ if (!XmlNames.isNmtoken (value))
+ error ("V-028", new Object [] { value });
+ sawValue = true;
+ }
+ if (!sawValue)
+ error ("V-032", null);
- // ENUMERATION ... values match one of the tokens
- } else if (Attribute.ENUMERATION == attr.type()) {
- for (int i = 0; i < attr.values().length; i++)
- if (value.equals (attr.values()[i]))
- return;
- error ("V-029", new Object [] { value });
+ // ENUMERATION ... values match one of the tokens
+ } else if (Attribute.ENUMERATION == attr.type()) {
+ for (int i = 0; i < attr.values().length; i++)
+ if (value.equals (attr.values()[i]))
+ return;
+ error ("V-029", new Object [] { value });
- // NOTATION values match a notation name
- } else if (Attribute.NOTATION == attr.type()) {
- //
- // XXX XML 1.0 spec should probably list references to
- // externally defined notations in standalone docs as
- // validity errors. Ditto externally defined unparsed
- // entities; neither should show up in attributes, else
- // one needs to read the external declarations in order
- // to make sense of the document (exactly what tagging
- // a doc as "standalone" intends you won't need to do).
- //
- for (int i = 0; i < attr.values().length; i++)
- if (value.equals (attr.values()[i]))
- return;
- error ("V-030", new Object [] { value });
+ // NOTATION values match a notation name
+ } else if (Attribute.NOTATION == attr.type()) {
+ //
+ // XXX XML 1.0 spec should probably list references to
+ // externally defined notations in standalone docs as
+ // validity errors. Ditto externally defined unparsed
+ // entities; neither should show up in attributes, else
+ // one needs to read the external declarations in order
+ // to make sense of the document (exactly what tagging
+ // a doc as "standalone" intends you won't need to do).
+ //
+ for (int i = 0; i < attr.values().length; i++)
+ if (value.equals (attr.values()[i]))
+ return;
+ error ("V-030", new Object [] { value });
- // ENTITY(IES) values match an unparsed entity(ies)
- } else if (Attribute.ENTITY == attr.type()) {
- // see note above re standalone
- if (!isUnparsedEntity (value))
- error ("V-031", new Object [] { value });
+ // ENTITY(IES) values match an unparsed entity(ies)
+ } else if (Attribute.ENTITY == attr.type()) {
+ // see note above re standalone
+ if (!isUnparsedEntity (value))
+ error ("V-031", new Object [] { value });
- } else if (Attribute.ENTITIES == attr.type()) {
- StringTokenizer tokenizer = new StringTokenizer (value);
- boolean sawValue = false;
+ } else if (Attribute.ENTITIES == attr.type()) {
+ StringTokenizer tokenizer = new StringTokenizer (value);
+ boolean sawValue = false;
- while (tokenizer.hasMoreTokens ()) {
- value = tokenizer.nextToken ();
- // see note above re standalone
- if (!isUnparsedEntity (value))
- error ("V-031", new Object [] { value });
- sawValue = true;
- }
- if (!sawValue)
- error ("V-040", null);
+ while (tokenizer.hasMoreTokens ()) {
+ value = tokenizer.nextToken ();
+ // see note above re standalone
+ if (!isUnparsedEntity (value))
+ error ("V-031", new Object [] { value });
+ sawValue = true;
+ }
+ if (!sawValue)
+ error ("V-040", null);
- } else if (Attribute.CDATA != attr.type())
- throw new InternalError (attr.type());
- }
-*/
-/*
- private boolean isUnparsedEntity (String name)
- {
- Object e = entities.getNonInterned (name);
- if (e == null || !(e instanceof ExternalEntity))
- return false;
- return ((ExternalEntity)e).notation != null;
- }
-*/
+ } else if (Attribute.CDATA != attr.type())
+ throw new InternalError (attr.type());
+ }
+ */
+ /*
+ private boolean isUnparsedEntity (String name)
+ {
+ Object e = entities.getNonInterned (name);
+ if (e == null || !(e instanceof ExternalEntity))
+ return false;
+ return ((ExternalEntity)e).notation != null;
+ }
+ */
private boolean maybeElementDecl()
throws IOException, SAXException {
@@ -1062,8 +1074,9 @@
// [46] contentspec ::= 'EMPTY' | 'ANY' | Mixed | children
InputEntity start = peekDeclaration("!ELEMENT");
- if (start == null)
+ if (start == null) {
return false;
+ }
// n.b. for content models where inter-element whitespace is
// ignorable, we mark that fact here.
@@ -1071,20 +1084,20 @@
// Element element = (Element) elements.get (name);
// boolean declEffective = false;
-/*
- if (element != null) {
- if (element.contentModel() != null) {
- error ("V-012", new Object [] { name });
- } // else <!ATTLIST name ...> came first
- } else {
- element = new Element(name);
- elements.put (element.name(), element);
- declEffective = true;
- }
-*/
- if (declaredElements.contains(name))
+ /*
+ if (element != null) {
+ if (element.contentModel() != null) {
+ error ("V-012", new Object [] { name });
+ } // else <!ATTLIST name ...> came first
+ } else {
+ element = new Element(name);
+ elements.put (element.name(), element);
+ declEffective = true;
+ }
+ */
+ if (declaredElements.contains(name)) {
error("V-012", new Object[]{name});
- else {
+ } else {
declaredElements.add(name);
// declEffective = true;
}
@@ -1105,10 +1118,12 @@
maybeWhitespace();
char c = getc();
- if (c != '>')
- fatal("P-036", new Object[]{name, new Character(c)});
- if (start != in)
+ if (c != '>') {
+ fatal("P-036", new Object[]{name, Character.valueOf(c)});
+ }
+ if (start != in) {
error("V-013", null);
+ }
/// dtdHandler.elementDecl(element);
@@ -1119,7 +1134,6 @@
// it's an efficient natural way to express such things, and
// libraries often interpret them. No whitespace in the
// model we store, though!
-
/**
* returns content model type.
*/
@@ -1186,10 +1200,11 @@
getcps(elementName, next);
/// getFrequency(); <- this looks like a bug
///<-
- } else
- fatal((type == 0) ? "P-039" :
- ((type == ',') ? "P-037" : "P-038"),
- new Object[]{new Character(getc())});
+ } else {
+ fatal((type == 0) ? "P-039"
+ : ((type == ',') ? "P-037" : "P-038"),
+ new Object[]{Character.valueOf(getc())});
+ }
maybeWhitespace();
if (decided) {
@@ -1209,21 +1224,21 @@
} else {
fatal((type == 0) ? "P-041" : "P-040",
new Object[]{
- new Character(c),
- new Character(type)
+ Character.valueOf(c),
+ Character.valueOf(type)
});
}
} else {
type = getc();
switch (type) {
- case '|':
- case ',':
- reportConnector(type);
- break;
- default:
+ case '|':
+ case ',':
+ reportConnector(type);
+ break;
+ default:
// retval = temp;
- ungetc();
- continue;
+ ungetc();
+ continue;
}
// retval = (ContentModel)current;
decided = true;
@@ -1233,8 +1248,9 @@
maybeWhitespace();
} while (!peek(")"));
- if (in != start)
+ if (in != start) {
error("V-014", new Object[]{elementName});
+ }
strTmp.append(')');
dtdHandler.endModelGroup(getFrequency());
@@ -1243,14 +1259,14 @@
private void reportConnector(char type) throws SAXException {
switch (type) {
- case '|':
- dtdHandler.connector(DTDEventListener.CHOICE); ///<-
- return;
- case ',':
- dtdHandler.connector(DTDEventListener.SEQUENCE); ///<-
- return;
- default:
- throw new Error(); //assertion failed.
+ case '|':
+ dtdHandler.connector(DTDEventListener.CHOICE); ///<-
+ return;
+ case ',':
+ dtdHandler.connector(DTDEventListener.SEQUENCE); ///<-
+ return;
+ default:
+ throw new Error(); //assertion failed.
}
}
@@ -1286,8 +1302,9 @@
// | '(' S? '#PCDATA' S? ')'
maybeWhitespace();
if (peek("\u0029*") || peek("\u0029")) {
- if (in != start)
+ if (in != start) {
error("V-014", new Object[]{elementName});
+ }
strTmp.append(')');
// element.setContentModel(new StringModel(StringModelType.PCDATA));
return;
@@ -1305,9 +1322,9 @@
doLexicalPE = true;
name = maybeGetName();
- if (name == null)
- fatal("P-042", new Object[]
- {elementName, Integer.toHexString(getc())});
+ if (name == null) {
+ fatal("P-042", new Object[]{elementName, Integer.toHexString(getc())});
+ }
if (l.contains(name)) {
error("V-015", new Object[]{name});
} else {
@@ -1318,11 +1335,13 @@
maybeWhitespace();
}
- if (!peek("\u0029*")) // right paren
- fatal("P-043", new Object[]
- {elementName, new Character(getc())});
- if (in != start)
+ if (!peek("\u0029*")) // right paren
+ {
+ fatal("P-043", new Object[]{elementName, Character.valueOf(getc())});
+ }
+ if (in != start) {
error("V-014", new Object[]{elementName});
+ }
strTmp.append(')');
// ChoiceModel cm = new ChoiceModel((Collection)l);
// cm.setRepeat(Repeat.ZERO_OR_MORE);
@@ -1335,8 +1354,9 @@
// [52] AttlistDecl ::= '<!ATTLIST' S Name AttDef* S? '>'
InputEntity start = peekDeclaration("!ATTLIST");
- if (start == null)
+ if (start == null) {
return false;
+ }
String elementName = getMarkupDeclname("F-016", true);
// Element element = (Element) elements.get (name);
@@ -1361,15 +1381,16 @@
nextChar(';', "F-021", entityName);
whitespace("F-021");
continue;
- } else
+ } else {
fatal("P-011");
+ }
}
ungetc();
// look for attribute name otherwise
String attName = maybeGetName();
if (attName == null) {
- fatal("P-044", new Object[]{new Character(getc())});
+ fatal("P-044", new Object[]{Character.valueOf(getc())});
}
whitespace("F-001");
@@ -1382,36 +1403,34 @@
// so that "==" may be used (faster)
// [55] StringType ::= 'CDATA'
- if (peek(TYPE_CDATA))
-/// a.setType(Attribute.CDATA);
+ if (peek(TYPE_CDATA)) /// a.setType(Attribute.CDATA);
+ {
typeName = TYPE_CDATA;
-
- // [56] TokenizedType ::= 'ID' | 'IDREF' | 'IDREFS'
+ } // [56] TokenizedType ::= 'ID' | 'IDREF' | 'IDREFS'
// | 'ENTITY' | 'ENTITIES'
// | 'NMTOKEN' | 'NMTOKENS'
// n.b. if "IDREFS" is there, both "ID" and "IDREF"
// match peekahead ... so this order matters!
- else if (peek(TYPE_IDREFS))
+ else if (peek(TYPE_IDREFS)) {
typeName = TYPE_IDREFS;
- else if (peek(TYPE_IDREF))
+ } else if (peek(TYPE_IDREF)) {
typeName = TYPE_IDREF;
- else if (peek(TYPE_ID)) {
+ } else if (peek(TYPE_ID)) {
typeName = TYPE_ID;
// TODO: should implement this error check?
/// if (element.id() != null) {
/// error ("V-016", new Object [] { element.id() });
/// } else
/// element.setId(name);
- } else if (peek(TYPE_ENTITY))
+ } else if (peek(TYPE_ENTITY)) {
typeName = TYPE_ENTITY;
- else if (peek(TYPE_ENTITIES))
+ } else if (peek(TYPE_ENTITIES)) {
typeName = TYPE_ENTITIES;
- else if (peek(TYPE_NMTOKENS))
+ } else if (peek(TYPE_NMTOKENS)) {
typeName = TYPE_NMTOKENS;
- else if (peek(TYPE_NMTOKEN))
+ } else if (peek(TYPE_NMTOKEN)) {
typeName = TYPE_NMTOKEN;
-
- // [57] EnumeratedType ::= NotationType | Enumeration
+ } // [57] EnumeratedType ::= NotationType | Enumeration
// [58] NotationType ::= 'NOTATION' S '(' S? Name
// (S? '|' S? Name)* S? ')'
else if (peek(TYPE_NOTATION)) {
@@ -1423,15 +1442,18 @@
values = new Vector();
do {
String name;
- if ((name = maybeGetName()) == null)
+ if ((name = maybeGetName()) == null) {
fatal("P-068");
+ }
// permit deferred declarations
- if (notations.get(name) == null)
+ if (notations.get(name) == null) {
notations.put(name, name);
+ }
values.addElement(name);
maybeWhitespace();
- if (peek("|"))
+ if (peek("|")) {
maybeWhitespace();
+ }
} while (!peek(")"));
/// a.setValues(new String [v.size ()]);
/// for (int i = 0; i < v.size (); i++)
@@ -1451,15 +1473,16 @@
/// v.addElement (name);
values.addElement(name);
maybeWhitespace();
- if (peek("|"))
+ if (peek("|")) {
maybeWhitespace();
+ }
} while (!peek(")"));
/// a.setValues(new String [v.size ()]);
/// for (int i = 0; i < v.size (); i++)
/// a.setValue(i, (String)v.elementAt(i));
} else {
fatal("P-045",
- new Object[]{attName, new Character(getc())});
+ new Object[]{attName, Character.valueOf(getc())});
typeName = null;
}
@@ -1469,13 +1492,14 @@
// [60] DefaultDecl ::= '#REQUIRED' | '#IMPLIED'
// | (('#FIXED' S)? AttValue)
whitespace("F-003");
- if (peek("#REQUIRED"))
+ if (peek("#REQUIRED")) {
attributeUse = DTDEventListener.USE_REQUIRED;
-/// a.setIsRequired(true);
+ } /// a.setIsRequired(true);
else if (peek("#FIXED")) {
/// if (a.type() == Attribute.ID)
- if (typeName == TYPE_ID)
+ if (typeName == TYPE_ID) {
error("V-017", new Object[]{attName});
+ }
/// a.setIsFixed(true);
attributeUse = DTDEventListener.USE_FIXED;
whitespace("F-004");
@@ -1485,10 +1509,11 @@
/// else
/// a.setDefaultValue(strTmp.toString());
- if (typeName == TYPE_CDATA)
+ if (typeName == TYPE_CDATA) {
defaultValue = normalize(false);
- else
+ } else {
defaultValue = strTmp.toString();
+ }
// TODO: implement this check
/// if (a.type() != Attribute.CDATA)
@@ -1497,17 +1522,19 @@
attributeUse = DTDEventListener.USE_IMPLIED;
/// if (a.type() == Attribute.ID)
- if (typeName == TYPE_ID)
+ if (typeName == TYPE_ID) {
error("V-018", new Object[]{attName});
+ }
parseLiteral(false);
/// if (a.type() != Attribute.CDATA)
/// a.setDefaultValue(normalize(false));
/// else
/// a.setDefaultValue(strTmp.toString());
- if (typeName == TYPE_CDATA)
+ if (typeName == TYPE_CDATA) {
defaultValue = normalize(false);
- else
+ } else {
defaultValue = strTmp.toString();
+ }
// TODO: implement this check
/// if (a.type() != Attribute.CDATA)
@@ -1519,8 +1546,9 @@
if (XmlLang.equals(attName)
&& defaultValue/* a.defaultValue()*/ != null
- && !isXmlLang(defaultValue/*a.defaultValue()*/))
+ && !isXmlLang(defaultValue/*a.defaultValue()*/)) {
error("P-033", new Object[]{defaultValue /*a.defaultValue()*/});
+ }
// TODO: isn't it an error to specify the same attribute twice?
/// if (!element.attributes().contains(a)) {
@@ -1528,12 +1556,13 @@
/// dtdHandler.attributeDecl(a);
/// }
- String[] v = (values != null) ? (String[]) values.toArray(new String[0]) : null;
+ String[] v = (values != null) ? (String[]) values.toArray(new String[values.size()]) : null;
dtdHandler.attributeDecl(elementName, attName, typeName, v, attributeUse, defaultValue);
maybeWhitespace();
}
- if (start != in)
+ if (start != in) {
error("V-013", null);
+ }
return true;
}
@@ -1551,7 +1580,6 @@
if (s != s2) {
s = s2;
- s2 = null;
didStrip = true;
}
strTmp = new StringBuffer();
@@ -1562,14 +1590,16 @@
continue;
}
strTmp.append(' ');
- while (++i < s.length() && XmlChars.isSpace(s.charAt(i)))
+ while (++i < s.length() && XmlChars.isSpace(s.charAt(i))) {
didStrip = true;
+ }
i--;
}
- if (didStrip)
+ if (didStrip) {
return strTmp.toString();
- else
+ } else {
return s;
+ }
}
private boolean maybeConditionalSect()
@@ -1577,39 +1607,46 @@
// [61] conditionalSect ::= includeSect | ignoreSect
- if (!peek("<!["))
+ if (!peek("<![")) {
return false;
+ }
String keyword;
InputEntity start = in;
maybeWhitespace();
- if ((keyword = maybeGetName()) == null)
+ if ((keyword = maybeGetName()) == null) {
fatal("P-046");
+ }
maybeWhitespace();
nextChar('[', "F-030", null);
// [62] includeSect ::= '<![' S? 'INCLUDE' S? '['
// extSubsetDecl ']]>'
if ("INCLUDE".equals(keyword)) {
- for (; ;) {
- while (in.isEOF() && in != start)
+ for (;;) {
+ while (in.isEOF() && in != start) {
in = in.pop();
+ }
if (in.isEOF()) {
error("V-020", null);
}
- if (peek("]]>"))
+ if (peek("]]>")) {
break;
+ }
doLexicalPE = false;
- if (maybeWhitespace())
+ if (maybeWhitespace()) {
continue;
- if (maybePEReference())
+ }
+ if (maybePEReference()) {
continue;
+ }
doLexicalPE = true;
- if (maybeMarkupDecl() || maybeConditionalSect())
+ if (maybeMarkupDecl() || maybeConditionalSect()) {
continue;
+ }
fatal("P-047");
}
@@ -1626,24 +1663,26 @@
while (nestlevel > 0) {
char c = getc(); // will pop input entities
if (c == '<') {
- if (peek("!["))
+ if (peek("![")) {
nestlevel++;
+ }
} else if (c == ']') {
- if (peek("]>"))
+ if (peek("]>")) {
nestlevel--;
- } else
+ }
+ } else {
continue;
+ }
}
- } else
+ } else {
fatal("P-048", new Object[]{keyword});
+ }
return true;
}
-
//
// CHAPTER 4: Physical Structures
//
-
// parse decimal or hex numeric character reference
private int parseCharNumber()
throws IOException, SAXException {
@@ -1654,19 +1693,20 @@
// n.b. we ignore overflow ...
if (getc() != 'x') {
ungetc();
- for (; ;) {
+ for (;;) {
c = getc();
if (c >= '0' && c <= '9') {
retval *= 10;
retval += (c - '0');
continue;
}
- if (c == ';')
+ if (c == ';') {
return retval;
+ }
fatal("P-049");
}
- } else
- for (; ;) {
+ } else {
+ for (;;) {
c = getc();
if (c >= '0' && c <= '9') {
retval <<= 4;
@@ -1683,10 +1723,12 @@
retval += 10 + (c - 'A');
continue;
}
- if (c == ';')
+ if (c == ';') {
return retval;
+ }
fatal("P-050");
}
+ }
}
// parameter is a UCS-4 character ... i.e. not just 16 bit UNICODE,
@@ -1719,14 +1761,16 @@
// a LEXICAL version; see getc() and doLexicalPE.
// [69] PEReference ::= '%' Name ';'
- if (!in.peekc('%'))
+ if (!in.peekc('%')) {
return false;
+ }
String name = maybeGetName();
Object entity;
- if (name == null)
+ if (name == null) {
fatal("P-011");
+ }
nextChar(';', "F-021", name);
entity = params.get(name);
@@ -1755,8 +1799,9 @@
//
InputEntity start = peekDeclaration("!ENTITY");
- if (start == null)
+ if (start == null) {
return false;
+ }
String entityName;
SimpleHashtable defns;
@@ -1775,8 +1820,9 @@
if (in.peekc('%')) {
whitespace("F-006");
defns = params;
- } else
+ } else {
defns = entities;
+ }
ungetc(); // leave some whitespace
doLexicalPE = true;
@@ -1792,12 +1838,13 @@
// non-parameter entities.
//
doStore = (defns.get(entityName) == null);
- if (!doStore && defns == entities)
+ if (!doStore && defns == entities) {
warning("P-054", new Object[]{entityName});
+ }
// internal entities
if (externalId == null) {
- char value [];
+ char value[];
InternalEntity entity;
doLexicalPE = false; // "ab%bar;cd" -maybe-> "abcd"
@@ -1805,15 +1852,16 @@
doLexicalPE = true;
if (doStore) {
value = new char[strTmp.length()];
- if (value.length != 0)
+ if (value.length != 0) {
strTmp.getChars(0, value.length, value, 0);
+ }
entity = new InternalEntity(entityName, value);
entity.isPE = (defns == params);
- entity.isFromInternalSubset = false;
defns.put(entityName, entity);
- if (defns == entities)
+ if (defns == entities) {
dtdHandler.internalGeneralEntityDecl(entityName,
new String(value));
+ }
}
// external entities (including unparsed)
@@ -1825,27 +1873,29 @@
// flag undeclared notation for checking after
// the DTD is fully processed
- if (notations.get(externalId.notation) == null)
+ if (notations.get(externalId.notation) == null) {
notations.put(externalId.notation, Boolean.TRUE);
+ }
}
externalId.name = entityName;
externalId.isPE = (defns == params);
- externalId.isFromInternalSubset = false;
if (doStore) {
defns.put(entityName, externalId);
- if (externalId.notation != null)
+ if (externalId.notation != null) {
dtdHandler.unparsedEntityDecl(entityName,
externalId.publicId, externalId.systemId,
externalId.notation);
- else if (defns == entities)
+ } else if (defns == entities) {
dtdHandler.externalGeneralEntityDecl(entityName,
externalId.publicId, externalId.systemId);
+ }
}
}
maybeWhitespace();
nextChar('>', "F-031", entityName);
- if (start != in)
+ if (start != in) {
error("V-013", null);
+ }
return true;
}
@@ -1860,8 +1910,9 @@
if (peek("PUBLIC")) {
whitespace("F-009");
temp = parsePublicId();
- } else if (!peek("SYSTEM"))
+ } else if (!peek("SYSTEM")) {
return null;
+ }
retval = new ExternalEntity(in);
retval.publicId = temp;
@@ -1887,14 +1938,16 @@
String baseURI;
baseURI = in.getSystemId();
- if (baseURI == null)
+ if (baseURI == null) {
fatal("P-055", new Object[]{uri});
- if (uri.length() == 0)
+ }
+ if (uri.length() == 0) {
uri = ".";
+ }
baseURI = baseURI.substring(0, baseURI.lastIndexOf('/') + 1);
- if (uri.charAt(0) != '/')
+ if (uri.charAt(0) != '/') {
uri = baseURI + uri;
- else {
+ } else {
// XXX slashes at the beginning of a relative URI are
// a special case we don't handle.
throw new InternalError();
@@ -1904,8 +1957,9 @@
// since all URIs must handle it the same.
}
// check for fragment ID in URI
- if (uri.indexOf('#') != -1)
+ if (uri.indexOf('#') != -1) {
error("P-056", new Object[]{uri});
+ }
return uri;
}
@@ -1917,8 +1971,9 @@
readVersion(false, "1.0");
readEncoding(true);
maybeWhitespace();
- if (!peek("?>"))
+ if (!peek("?>")) {
fatal("P-057");
+ }
}
}
@@ -1952,18 +2007,22 @@
continue;
}
doLexicalPE = false;
- if (maybeWhitespace())
+ if (maybeWhitespace()) {
continue;
- if (maybePEReference())
+ }
+ if (maybePEReference()) {
continue;
+ }
doLexicalPE = true;
- if (maybeMarkupDecl() || maybeConditionalSect())
+ if (maybeMarkupDecl() || maybeConditionalSect()) {
continue;
+ }
break;
}
// if (in != pe) throw new InternalError("who popped my PE?");
- if (!pe.isEOF())
+ if (!pe.isEOF()) {
fatal("P-059", new Object[]{in.getName()});
+ }
}
private void readEncoding(boolean must)
@@ -1972,21 +2031,23 @@
// [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')*
String name = maybeReadAttribute("encoding", must);
- if (name == null)
+ if (name == null) {
return;
+ }
for (int i = 0; i < name.length(); i++) {
char c = name.charAt(i);
if ((c >= 'A' && c <= 'Z')
- || (c >= 'a' && c <= 'z'))
+ || (c >= 'a' && c <= 'z')) {
continue;
+ }
if (i != 0
&& ((c >= '0' && c <= '9')
|| c == '-'
|| c == '_'
- || c == '.'
- ))
+ || c == '.')) {
continue;
- fatal("P-060", new Object[]{new Character(c)});
+ }
+ fatal("P-060", new Object[]{Character.valueOf(c)});
}
//
@@ -2001,8 +2062,9 @@
String currentEncoding = in.getEncoding();
if (currentEncoding != null
- && !name.equalsIgnoreCase(currentEncoding))
+ && !name.equalsIgnoreCase(currentEncoding)) {
warning("P-061", new Object[]{name, currentEncoding});
+ }
}
private boolean maybeNotationDecl()
@@ -2013,8 +2075,9 @@
// [83] PublicID ::= 'PUBLIC' S PubidLiteral
InputEntity start = peekDeclaration("!NOTATION");
- if (start == null)
+ if (start == null) {
return false;
+ }
String name = getMarkupDeclname("F-019", false);
ExternalEntity entity = new ExternalEntity(in);
@@ -2024,28 +2087,31 @@
whitespace("F-009");
entity.publicId = parsePublicId();
if (maybeWhitespace()) {
- if (!peek(">"))
+ if (!peek(">")) {
entity.systemId = parseSystemId();
- else
+ } else {
ungetc();
+ }
}
} else if (peek("SYSTEM")) {
whitespace("F-008");
entity.systemId = parseSystemId();
- } else
+ } else {
fatal("P-062");
+ }
maybeWhitespace();
nextChar('>', "F-032", name);
- if (start != in)
+ if (start != in) {
error("V-013", null);
- if (entity.systemId != null && entity.systemId.indexOf('#') != -1)
+ }
+ if (entity.systemId != null && entity.systemId.indexOf('#') != -1) {
error("P-056", new Object[]{entity.systemId});
+ }
Object value = notations.get(name);
- if (value != null && value instanceof ExternalEntity)
+ if (value != null && value instanceof ExternalEntity) {
warning("P-063", new Object[]{name});
-
- else {
+ } else {
notations.put(name, entity);
dtdHandler.notationDecl(name, entity.publicId,
entity.systemId);
@@ -2053,13 +2119,11 @@
return true;
}
-
////////////////////////////////////////////////////////////////
//
// UTILITIES
//
////////////////////////////////////////////////////////////////
-
private char getc() throws IOException, SAXException {
if (!doLexicalPE) {
@@ -2086,9 +2150,9 @@
char c;
while (in.isEOF()) {
- if (in.isInternal() || (doLexicalPE && !in.isDocument()))
+ if (in.isInternal() || (doLexicalPE && !in.isDocument())) {
in = in.pop();
- else {
+ } else {
fatal("P-064", new Object[]{in.getName()});
}
}
@@ -2097,25 +2161,27 @@
String name = maybeGetName();
Object entity;
- if (name == null)
+ if (name == null) {
fatal("P-011");
+ }
nextChar(';', "F-021", name);
entity = params.get(name);
// push a magic "entity" before and after the
// real one, so ungetc() behaves uniformly
pushReader(" ".toCharArray(), null, false);
- if (entity instanceof InternalEntity)
+ if (entity instanceof InternalEntity) {
pushReader(((InternalEntity) entity).buf, name, false);
- else if (entity instanceof ExternalEntity)
- // PEs can't be unparsed!
+ } else if (entity instanceof ExternalEntity) // PEs can't be unparsed!
// XXX if this returns false ...
+ {
pushReader((ExternalEntity) entity);
- else if (entity == null)
- // see note in maybePEReference re making this be nonfatal.
+ } else if (entity == null) // see note in maybePEReference re making this be nonfatal.
+ {
fatal("V-022");
- else
+ } else {
throw new InternalError();
+ }
pushReader(" ".toCharArray(), null, false);
return in.getc();
}
@@ -2135,17 +2201,18 @@
// Return the entity starting the specified declaration
// (for validating declaration nesting) else null.
-
private InputEntity peekDeclaration(String s)
throws IOException, SAXException {
InputEntity start;
- if (!in.peekc('<'))
+ if (!in.peekc('<')) {
return null;
+ }
start = in;
- if (in.peek(s, null))
+ if (in.peek(s, null)) {
return start;
+ }
in.ungetc();
return null;
}
@@ -2153,17 +2220,17 @@
private void nextChar(char c, String location, String near)
throws IOException, SAXException {
- while (in.isEOF() && !in.isDocument())
+ while (in.isEOF() && !in.isDocument()) {
in = in.pop();
- if (!in.peekc(c))
- fatal("P-008", new Object[]
- {new Character(c),
- messages.getMessage(locale, location),
- (near == null ? "" : ('"' + near + '"'))});
+ }
+ if (!in.peekc(c)) {
+ fatal("P-008", new Object[]{Character.valueOf(c),
+ messages.getMessage(locale, location),
+ (near == null ? "" : ('"' + near + '"'))});
+ }
}
-
- private void pushReader(char buf [], String name, boolean isGeneral)
+ private void pushReader(char buf[], String name, boolean isGeneral)
throws SAXException {
InputEntity r = InputEntity.getInputEntity(dtdHandler, locale);
@@ -2181,8 +2248,9 @@
} catch (IOException e) {
String msg =
"unable to open the external entity from :" + next.systemId;
- if (next.publicId != null)
+ if (next.publicId != null) {
msg += " (public id:" + next.publicId + ")";
+ }
SAXParseException spe = new SAXParseException(msg,
getPublicId(), getSystemId(), getLineNumber(), getColumnNumber(), e);
@@ -2216,8 +2284,7 @@
}
// error handling convenience routines
-
- private void warning(String messageId, Object parameters [])
+ private void warning(String messageId, Object parameters[])
throws SAXException {
SAXParseException e = new SAXParseException(messages.getMessage(locale, messageId, parameters),
@@ -2226,7 +2293,7 @@
dtdHandler.warning(e);
}
- void error(String messageId, Object parameters [])
+ void error(String messageId, Object parameters[])
throws SAXException {
SAXParseException e = new SAXParseException(messages.getMessage(locale, messageId, parameters),
@@ -2240,7 +2307,7 @@
fatal(messageId, null);
}
- private void fatal(String messageId, Object parameters [])
+ private void fatal(String messageId, Object parameters[])
throws SAXException {
SAXParseException e = new SAXParseException(messages.getMessage(locale, messageId, parameters),
@@ -2267,12 +2334,13 @@
// we've yet seen (and be prime). If it's too small, the
// penalty is just excess cache collisions.
//
- NameCacheEntry hashtable [] = new NameCacheEntry[541];
+
+ NameCacheEntry hashtable[] = new NameCacheEntry[541];
//
// Usually we just want to get the 'symbol' for these chars
//
- String lookup(char value [], int len) {
+ String lookup(char value[], int len) {
return lookupEntry(value, len).name;
}
@@ -2282,23 +2350,25 @@
// string, so there's an accessor which exposes them.
// (Mostly for element end tags.)
//
- NameCacheEntry lookupEntry(char value [], int len) {
+ NameCacheEntry lookupEntry(char value[], int len) {
int index = 0;
NameCacheEntry entry;
// hashing to get index
- for (int i = 0; i < len; i++)
+ for (int i = 0; i < len; i++) {
index = index * 31 + value[i];
+ }
index &= 0x7fffffff;
index %= hashtable.length;
// return entry if one's there ...
for (entry = hashtable[index];
- entry != null;
- entry = entry.next) {
- if (entry.matches(value, len))
+ entry != null;
+ entry = entry.next) {
+ if (entry.matches(value, len)) {
return entry;
+ }
}
// else create new one
@@ -2321,16 +2391,18 @@
static class NameCacheEntry {
String name;
- char chars [];
+ char chars[];
NameCacheEntry next;
- boolean matches(char value [], int len) {
-
- if (chars.length != len)
+ boolean matches(char value[], int len) {
+ if (chars == null || chars.length != len) {
return false;
- for (int i = 0; i < len; i++)
- if (value[i] != chars[i])
+ }
+ for (int i = 0; i < len; i++) {
+ if (value[i] != chars[i]) {
return false;
+ }
+ }
return true;
}
}
@@ -2346,5 +2418,4 @@
super(DTDParser.class);
}
}
-
}
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/EntityDecl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/EntityDecl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,5 @@
class EntityDecl {
String name; // <!ENTITY name ... >
- boolean isFromInternalSubset;
boolean isPE;
}
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/InputEntity.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/InputEntity.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,16 +36,17 @@
import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.net.URL;
+import java.util.Arrays;
import java.util.Locale;
/**
* This is how the parser talks to its input entities, of all kinds.
* The entities are in a stack.
- * <p/>
+ * <p>
* <P> For internal entities, the character arrays are referenced here,
* and read from as needed (they're read-only). External entities have
* mutable buffers, that are read into as needed.
- * <p/>
+ * <p>
* <P> <em>Note:</em> This maps CRLF (and CR) to LF without regard for
* whether it's in an external (parsed) entity or not. The XML 1.0 spec
* is inconsistent in explaining EOL handling; this is the sensible way.
@@ -148,11 +149,12 @@
InputStream bytes = in.getByteStream();
if (bytes == null)
- reader = XmlReader.createReader(new URL(in.getSystemId())
- .openStream());
+ if (Boolean.valueOf(System.getProperty("enableExternalEntityProcessing")))
+ reader = XmlReader.createReader(new URL(in.getSystemId()).openStream());
+ else
+ fatal("P-082", new Object[] {in.getSystemId()});
else if (in.getEncoding() != null)
- reader = XmlReader.createReader(in.getByteStream(),
- in.getEncoding());
+ reader = XmlReader.createReader(in.getByteStream(), in.getEncoding());
else
reader = XmlReader.createReader(in.getByteStream());
}
@@ -169,7 +171,7 @@
throws SAXException {
next = stack;
- buf = b;
+ buf = Arrays.copyOf(b, b.length);
finish = b.length;
this.name = name;
this.isPE = isPE;
@@ -384,10 +386,10 @@
/**
* normal content; whitespace in markup may be handled
* specially if the parser uses the content model.
- * <p/>
+ * <p>
* <P> content terminates with markup delimiter characters,
* namely ampersand (&amp;) and left angle bracket (&lt;).
- * <p/>
+ * <p>
* <P> the document handler's characters() method is called
* on all the content found
*/
@@ -547,11 +549,11 @@
/**
- * CDATA -- character data, terminated by "]]>" and optionally
+ * CDATA -- character data, terminated by {@code "]]>"} and optionally
* including unescaped markup delimiters (ampersand and left angle
* bracket). This should otherwise be exactly like character data,
* modulo differences in error report details.
- * <p/>
+ * <p>
* <P> The document handler's characters() or ignorableWhitespace()
* methods are invoked on all the character data found
*
@@ -620,7 +622,7 @@
continue;
if (white) {
- if (whitespaceInvalidMessage != null)
+ if (whitespaceInvalidMessage != null && errHandler != null)
errHandler.error(new SAXParseException(DTDParser.messages.getMessage(locale,
whitespaceInvalidMessage), null));
docHandler.ignorableWhitespace(buf, start,
@@ -659,7 +661,7 @@
}
}
if (white) {
- if (whitespaceInvalidMessage != null)
+ if (whitespaceInvalidMessage != null && errHandler != null)
errHandler.error(new SAXParseException(DTDParser.messages.getMessage(locale,
whitespaceInvalidMessage), null));
docHandler.ignorableWhitespace(buf, start, last - start);
@@ -701,7 +703,7 @@
/**
* whitespace in markup (flagged to app, discardable)
- * <p/>
+ * <p>
* <P> the document handler's ignorableWhitespace() method
* is called on all the whitespace found
*/
@@ -759,7 +761,7 @@
/**
* returns false iff 'next' string isn't as provided,
* else skips that text and returns true.
- * <p/>
+ * <p>
* <P> NOTE: two alternative string representations are
* both passed in, since one is faster.
*/
@@ -810,8 +812,9 @@
// to get rid of the symbol length constraint, since having
// the wrong symbol is a fatal error anyway ...
//
- if (len > buf.length)
- fatal("P-077", new Object[]{new Integer(buf.length)});
+ if (len > buf.length) {
+ fatal("P-077", new Object[]{Integer.valueOf(buf.length)});
+ }
fillbuf();
return peek(next, chars);
@@ -984,7 +987,9 @@
// not continuable ... e.g. WF errors
close();
- errHandler.fatalError(x);
+ if (errHandler != null) {
+ errHandler.fatalError(x);
+ }
throw x;
}
}
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/MessageCatalog.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/MessageCatalog.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, 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
@@ -43,12 +43,12 @@
* for the language used in presenting a message from some package, where
* both user (client) preferences and application (server) support are
* accounted for when choosing locales and formatting messages.
- * <p/>
- * <P> Each package should have a singleton package-private message catalog
+ *
+ * <p>Each package should have a singleton package-private message catalog
* class. This ensures that the correct class loader will always be used to
- * access message resources, and minimizes use of memory: <PRE>
+ * access message resources, and minimizes use of memory:</p><pre>
* package <em>some.package</em>;
- * <p/>
+ *
* // "foo" might be public
* class foo {
* ...
@@ -59,14 +59,14 @@
* }
* ...
* }
- * </PRE>
- * <p/>
- * <P> Messages for a known client could be generated using code
- * something like this: <PRE>
+ * </pre>
+ *
+ * <p> Messages for a known client could be generated using code
+ * something like this:</p><pre>
* String clientLanguages [];
* Locale clientLocale;
* String clientMessage;
- * <p/>
+ *
* // client languages will probably be provided by client,
* // e.g. by an HTTP/1.1 "Accept-Language" header.
* clientLanguages = new String [] { "en-ca", "fr-ca", "ja", "zh" };
@@ -75,27 +75,27 @@
* "fileCount",
* new Object [] { new Integer (numberOfFiles) }
* );
- * </PRE>
- * <p/>
- * <P> At this time, this class does not include functionality permitting
+ * </pre>
+ *
+ * <p> At this time, this class does not include functionality permitting
* messages to be passed around and localized after-the-fact. The consequence
* of this is that the locale for messages must be passed down through layers
* which have no normal reason to support such passdown, or else the system
- * default locale must be used instead of the one the client needs.
- * <p/>
- * <P> <hr> The following guidelines should be used when constructiong
- * multi-language applications: <OL>
- * <p/>
- * <LI> Always use <a href=#chooseLocale>chooseLocale</a> to select the
+ * default locale must be used instead of the one the client needs.</p>
+ *
+ * <p> The following guidelines should be used when constructiong
+ * multi-language applications:</p>
+ * <ol>
+ * <li> Always use <a href=#chooseLocale>chooseLocale</a> to select the
* locale you pass to your <code>getMessage</code> call. This lets your
* applications use IETF standard locale names, and avoids needless
- * use of system defaults.
- * <p/>
- * <LI> The localized messages for a given package should always go in
+ * use of system defaults.</li>
+ *
+ * <li> The localized messages for a given package should always go in
* a separate <em>resources</em> sub-package. There are security
- * implications; see below.
- * <p/>
- * <LI> Make sure that a language name is included in each bundle name,
+ * implications; see below.</li>
+ *
+ * <li> Make sure that a language name is included in each bundle name,
* so that the developer's locale will not be inadvertently used. That
* is, don't create defaults like <em>resources/Messages.properties</em>
* or <em>resources/Messages.class</em>, since ResourceBundle will choose
@@ -103,21 +103,20 @@
* appropriate language for its messages. Your message bundles should
* have names like <em>Messages_en.properties</em> (for the "en", or
* English, language) or <em>Messages_ja.class</em> ("ja" indicates the
- * Japanese language).
- * <p/>
- * <LI> Only use property files for messages in languages which can
+ * Japanese language).</li>
+ *
+ * <li> Only use property files for messages in languages which can
* be limited to the ISO Latin/1 (8859-1) characters supported by the
* property file format. (This is mostly Western European languages.)
* Otherwise, subclass ResourceBundle to provide your messages; it is
- * simplest to subclass <code>java.util.ListResourceBundle</code>.
- * <p/>
- * <LI> Never use another package's message catalog or resource bundles.
+ * simplest to subclass <code>java.util.ListResourceBundle</code>.</li>
+ *
+ * <li> Never use another package's message catalog or resource bundles.
* It should not be possible for a change internal to one package (such
- * as eliminating or improving messages) to break another package.
- * <p/>
- * </OL>
- * <p/>
- * <P> The "resources" sub-package can be treated separately from the
+ * as eliminating or improving messages) to break another package.</li>
+ *</ol>
+ *
+ * <p>The "resources" sub-package can be treated separately from the
* package with which it is associated. That main package may be sealed
* and possibly signed, preventing other software from adding classes to
* the package which would be able to access methods and data which are
@@ -127,7 +126,7 @@
* (text and class files) need to be added to some package. Since they
* should not be added to the main package, the "resources" subpackage is
* used without risking the security or integrity of that main package
- * as distributed in its JAR file.
+ * as distributed in its JAR file.</p>
*
* @author David Brownell
* @version 1.1, 00/08/05
@@ -281,11 +280,11 @@
* languages is supported, a null value is returned. Such a list of
* languages might be provided in an HTTP/1.1 "Accept-Language" header
* field, or through some other content negotiation mechanism.
- * <p/>
- * <P> The language specifiers recognized are RFC 1766 style ("fr" for
+ *
+ * <p> The language specifiers recognized are RFC 1766 style ("fr" for
* all French, "fr-ca" for Canadian French), although only the strict
* ISO subset (two letter language and country specifiers) is currently
- * supported. Java-style locale strings ("fr_CA") are also supported.
+ * supported. Java-style locale strings ("fr_CA") are also supported.</p>
*
* @param languages Array of language specifiers, ordered with the most
* preferable one at the front. For example, "en-ca" then "fr-ca",
@@ -335,7 +334,7 @@
// language code ... if already lowercase, we change nothing
if (len == 2) {
- lang = lang.toLowerCase();
+ lang = lang.toLowerCase(Locale.ENGLISH);
if (lang != languages[i]) {
if (!didClone) {
languages = (String[]) languages.clone();
@@ -437,7 +436,7 @@
* Returns true iff the specified locale has explicit language support.
* For example, the traditional Chinese locale "zh_TW" has such support
* if there are message bundles suffixed with either "zh_TW" or "zh".
- * <p/>
+ *
* <P> This method is used to bypass part of the search path mechanism
* of the <code>ResourceBundle</code> class, specifically the parts which
* force use of default locales and bundles. Such bypassing is required
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/Resolver.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/Resolver.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, 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,52 +35,53 @@
import java.net.URL;
import java.net.URLConnection;
import java.util.Hashtable;
+import java.util.Locale;
/**
* This entity resolver class provides a number of utilities which can help
* managment of external parsed entities in XML. These are commonly used
* to hold markup declarations that are to be used as part of a Document
* Type Declaration (DTD), or to hold text marked up with XML.
- * <p/>
+ * <p>
* <P> Features include: <UL>
- * <p/>
+ *
* <LI> Static factory methods are provided for constructing SAX InputSource
* objects from Files, URLs, or MIME objects. This eliminates a class of
- * error-prone coding in applications.
- * <p/>
- * <LI> Character encodings for XML documents are correctly supported: <UL>
- * <p/>
+ * error-prone coding in applications.</LI>
+ *
+ * <LI> Character encodings for XML documents are correctly supported:<UL>
+ *
* <LI> The encodings defined in the RFCs for MIME content types
* (2046 for general MIME, and 2376 for XML in particular), are
* supported, handling <em>charset=...</em> attributes and accepting
- * content types which are known to be safe for use with XML;
- * <p/>
+ * content types which are known to be safe for use with XML;</LI>
+ *
* <LI> The character encoding autodetection algorithm identified
* in the XML specification is used, and leverages all of
- * the JDK 1.1 (and later) character encoding support.
- * <p/>
+ * the JDK 1.1 (and later) character encoding support.</LI>
+ *
* <LI> The use of MIME typing may optionally be disabled, forcing the
* use of autodetection, to support web servers which don't correctly
* report MIME types for XML. For example, they may report text that
* is encoded in EUC-JP as being US-ASCII text, leading to fatal
- * errors during parsing.
- * <p/>
+ * errors during parsing.</LI>
+ *
* <LI> The InputSource objects returned by this class always
* have a <code>java.io.Reader</code> available as the "character
- * stream" property.
- * <p/>
- * </UL>
- * <p/>
+ * stream" property.</LI>
+ *
+ * </UL></LI>
+ *
* <LI> Catalog entries can map public identifiers to Java resources or
* to local URLs. These are used to reduce network dependencies and loads,
* and will often be used for external DTD components. For example, packages
* shipping DTD files as resources in JAR files can eliminate network traffic
* when accessing them, and sites may provide local caches of common DTDs.
* Note that no particular catalog syntax is supported by this class, only
- * the notion of a set of entries.
- * <p/>
+ * the notion of a set of entries.</LI>
+ *
* </UL>
- * <p/>
+ * <p>
* <P> Subclasses can perform tasks such as supporting new URI schemes for
* URIs which are not URLs, such as URNs (see RFC 2396) or for accessing
* MIME entities which are part of a <em>multipart/related</em> group
@@ -126,7 +127,7 @@
}
/**
- * Returns an input source, using the MIME type information and URL
+ * <p>Returns an input source, using the MIME type information and URL
* scheme to statically determine the correct character encoding if
* possible and otherwise autodetecting it. MIME carefully specifies
* the character encoding defaults, and how attributes of the content
@@ -134,18 +135,18 @@
* (UTF-8 and UTF-16), and includes an XML declaration which can be
* used to internally label most documents encoded using US-ASCII
* supersets (such as Shift_JIS, EUC-JP, ISO-2022-*, ISO-8859-*, and
- * more).
- * <p/>
- * <P> This method can be used to access XML documents which do not
+ * more).</p>
+ *
+ * <p> This method can be used to access XML documents which do not
* have URIs (such as servlet input streams, or most JavaMail message
* entities) and to support access methods such as HTTP POST or PUT.
- * (URLs normally return content using the GET method.)
- * <p/>
- * <P> <em> The caller should set the system ID in order for relative URIs
+ * (URLs normally return content using the GET method.)</p>
+ *
+ * <p> <em> The caller should set the system ID in order for relative URIs
* found in this document to be interpreted correctly.</em> In some cases,
* a custom resolver will need to be used; for example, documents
* may be grouped in a single MIME "multipart/related" bundle, and
- * relative URLs would refer to other documents in that bundle.
+ * relative URLs would refer to other documents in that bundle.</p>
*
* @param contentType The MIME content type for the source for which
* an InputSource is desired, such as <em>text/xml;charset=utf-8</em>.
@@ -166,7 +167,7 @@
if (contentType != null) {
int index;
- contentType = contentType.toLowerCase();
+ contentType = contentType.toLowerCase(Locale.ENGLISH);
index = contentType.indexOf(';');
if (index != -1) {
String attributes;
@@ -295,7 +296,7 @@
* consulted. If no mapping is found there, a catalog mapping names
* to java resources is consulted. Finally, if neither mapping found
* a copy of the entity, the specified URI is used.
- * <p/>
+ * <p>
* <P> When a URI is used, <a href="#createInputSource">
* createInputSource</a> is used to correctly deduce the character
* encoding used by this entity. No MIME type checking is done.
@@ -305,6 +306,7 @@
* @param uri Used when no alternate copy of the entity is found;
* this is the XML "system ID", normally a URI.
*/
+ @Override
public InputSource resolveEntity(String name, String uri)
throws IOException {
InputSource retval;
@@ -312,7 +314,7 @@
InputStream stream;
// prefer explicit URI mappings, then bundled resources...
- if (mappedURI == null && (stream = mapResource(name)) != null) {
+ if (mappedURI == null && (stream = mapResource(name)) != null && id2resource != null) {
uri = "java:resource:" + (String) id2resource.get(name);
retval = new InputSource(XmlReader.createReader(stream));
@@ -423,7 +425,7 @@
* included in XML documents. This mechanism should most typically be
* used for Document Type Definitions (DTDs), where the public IDs are
* formally managed and versioned.
- * <p/>
+ * <p>
* <P> If a mapping to a URI has been provided, that mapping takes
* precedence over this one.
*
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlChars.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlChars.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, 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,7 +47,7 @@
* documents containing only Unicode. (The <code>char</code> datatype
* in the Java Programming Language represents Unicode characters,
* including unpaired surrogates.)
- * <p/>
+ * <p>
* <P> In XML, UCS-4 characters can also be encoded by the use of
* <em>character references</em> such as <b>&#x12345678;</b>, which
* happens to refer to a character that is disallowed in XML documents.
@@ -364,17 +364,6 @@
}
}
- private static boolean isDigit(char c) {
- // [88] Digit ::= ...
-
- //
- // java.lang.Character.isDigit is correct from the XML point
- // of view except that it allows "fullwidth" digits.
- //
- return Character.isDigit(c)
- && !((c >= 0xff10) && (c <= 0xff19));
- }
-
private static boolean isExtender(char c) {
// [89] Extender ::= ...
return c == 0x00b7 || c == 0x02d0 || c == 0x02d1 || c == 0x0387
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlReader.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/XmlReader.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -33,6 +33,7 @@
import java.io.PushbackInputStream;
import java.io.Reader;
import java.util.Hashtable;
+import java.util.Locale;
// NOTE: Add I18N support to this class when JDK gets the ability to
@@ -86,7 +87,7 @@
//
/**
- * Constructs the reader from an input stream, autodetecting
+ * Constructs the reader from an input stream, auto-detecting
* the encoding to use according to the heuristic specified
* in the XML 1.0 recommendation.
*
@@ -104,7 +105,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, autodetection is used.
+ * if null, auto-detection is used.
* @throws IOException on error, including unrecognized encoding
*/
public static Reader createReader(InputStream in, String encoding)
@@ -178,7 +179,7 @@
// returns an encoding name supported by JDK >= 1.1.6
// for some cases required by the XML spec
private static String std2java(String encoding) {
- String temp = encoding.toUpperCase();
+ String temp = encoding.toUpperCase(Locale.ENGLISH);
temp = (String) charsets.get(temp);
return temp != null ? temp : encoding;
}
@@ -321,7 +322,7 @@
// Next must be "l" (and whitespace) else we conclude
// error and choose UTF-8.
//
- if ((c = r.read()) != 'l') {
+ if ((r.read()) != 'l') {
setEncoding(pb, "UTF-8");
return;
}
@@ -758,6 +759,7 @@
super(in);
}
+ @Override
public int read(char buf [], int offset, int len) throws IOException {
int i;
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
@@ -180,6 +180,7 @@
P-080 = Parameter entity references must not appear within \
markup declarations in the internal DTD subset
P-081 = Incomplete Unicode surrogate pair: &#x{0}
+P-082 = External parsing is disabled. Cannot parse URI: {0}
#
# Validation messages, won't normally show up unless validation is
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/Datatype.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/Datatype.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Thai Open Source Software Center Ltd
+ * Copyright (c) 2005, 2010, Thai Open Source Software Center Ltd
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeBuilder.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeBuilder.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Thai Open Source Software Center Ltd
+ * Copyright (c) 2005, 2010, Thai Open Source Software Center Ltd
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeException.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeException.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Thai Open Source Software Center Ltd
+ * Copyright (c) 2005, 2010, Thai Open Source Software Center Ltd
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeLibrary.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeLibrary.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Thai Open Source Software Center Ltd
+ * Copyright (c) 2005, 2010, Thai Open Source Software Center Ltd
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeLibraryFactory.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeLibraryFactory.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Thai Open Source Software Center Ltd
+ * Copyright (c) 2005, 2010, Thai Open Source Software Center Ltd
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeStreamingValidator.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/DatatypeStreamingValidator.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Thai Open Source Software Center Ltd
+ * Copyright (c) 2005, 2010, Thai Open Source Software Center Ltd
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/ValidationContext.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/ValidationContext.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Thai Open Source Software Center Ltd
+ * Copyright (c) 2005, 2010, Thai Open Source Software Center Ltd
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2001, 2015 Thai Open Source Software Center Ltd
+ * Copyright (c) 2001, Thai Open Source Software Center Ltd
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Thai Open Source Software Center Ltd
+ * Copyright (c) 2005, 2010, Thai Open Source Software Center Ltd
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
*
* <p>
* Typical usage would be:
- * <PRE>{@code
+ * <PRE><XMP>
* class MyDatatypeLibrary implements DatatypeLibrary {
* ....
* DatatypeBuilder createDatatypeBuilder( String typeName ) {
@@ -52,7 +52,7 @@
* }
* ....
* }
- * }</PRE>
+ * </XMP></PRE>
*
* @author <a href="mailto:kohsuke.kawaguchi@sun.com">Kohsuke KAWAGUCHI</a>
*/
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/StreamingValidatorImpl.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/org/relaxng/datatype/helpers/StreamingValidatorImpl.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Thai Open Source Software Center Ltd
+ * Copyright (c) 2005, 2010, Thai Open Source Software Center Ltd
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@
*
* <p>
* Typical usage would be:
- * <PRE>{@code
+ * <PRE><XMP>
* class MyDatatype implements Datatype {
* ....
* public DatatypeStreamingValidator createStreamingValidator( ValidationContext context ) {
@@ -54,7 +54,7 @@
* }
* ....
* }
- * }</PRE>
+ * </XMP></PRE>
*
* @author <a href="mailto:kohsuke.kawaguchi@sun.com">Kohsuke KAWAGUCHI</a>
*/
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
* questions.
*/
/*
- * Copyright (C) 2004-2011
+ * Copyright (C) 2004-2015
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -50,8 +50,8 @@
import com.sun.xml.internal.rngom.ast.om.ParsedElementAnnotation;
/**
- * {@link Scope} for <grammar> element that serves as a container
- * of <define>s.
+ * {@link Scope} for {@code <grammar>} element that serves as a container
+ * of {@code <define>}s.
*/
public interface Grammar<
P extends ParsedPattern,
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
* questions.
*/
/*
- * Copyright (C) 2004-2011
+ * Copyright (C) 2004-2015
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -50,7 +50,7 @@
import com.sun.xml.internal.rngom.ast.om.ParsedPattern;
/**
- * The container that can have <define> elements.
+ * The container that can have {@code <define>} elements.
* <p>
* {@link Div}, {@link Grammar}, {@link Include}, or {@link IncludedGrammar}.
*/
@@ -82,7 +82,7 @@
* Called when a pattern is defined.
*
* @param name
- * Name of the pattern. For the definition by a <start/> element,
+ * Name of the pattern. For the definition by a {@code <start/>} element,
* this parameter is the same as {@link #START}.
* to test if it's a named pattern definition or the start pattern definition.
* @param combine
@@ -104,11 +104,11 @@
void topLevelComment(CL comments) throws BuildException;
/**
- * Called when <div> is found.
+ * Called when {@code <div>} is found.
*
* @return
* the returned {@link Div} object will receive callbacks for structures
- * inside the <div> element.
+ * inside the {@code <div>} element.
*/
Div<P,E,L,A,CL> makeDiv();
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
* questions.
*/
/*
- * Copyright (C) 2004-2011
+ * Copyright (C) 2004-2015
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -51,9 +51,9 @@
import com.sun.xml.internal.rngom.parse.Parseable;
/**
- * {@link Scope} for <grammar> element of the <include>d grammar.
+ * {@link Scope} for {@code <grammar>} element of the {@code <include>}d grammar.
* <p>
- * This object builds <define>s in the included grammar that
+ * This object builds {@code <define>}s in the included grammar that
* override the definitions in the original grammar.
*/
public interface IncludedGrammar<
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
* questions.
*/
/*
- * Copyright (C) 2004-2011
+ * Copyright (C) 2004-2015
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
* questions.
*/
/*
- * Copyright (C) 2004-2011
+ * Copyright (C) 2004-2015
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -46,7 +46,7 @@
package com.sun.xml.internal.rngom.digested;
/**
- * <choice> pattern.
+ * {@code <choice>} pattern.
*
* @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DDataPattern.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DDataPattern.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
* questions.
*/
/*
- * Copyright (C) 2004-2012
+ * Copyright (C) 2004-2015
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -138,7 +138,7 @@
}
/**
- * Gets the pattern that reprsents the <except> child of this data pattern.
+ * Gets the pattern that reprsents the {@code <except>} child of this data pattern.
*
* @return null if not exist.
*/
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
* questions.
*/
/*
- * Copyright (C) 2004-2011
+ * Copyright (C) 2004-2015
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -50,7 +50,7 @@
import java.util.Map;
/**
- * <grammar> pattern, which is a collection of named patterns.
+ * {@code <grammar>} pattern, which is a collection of named patterns.
*
* @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
* questions.
*/
/*
- * Copyright (C) 2004-2011
+ * Copyright (C) 2004-2015
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -125,7 +125,7 @@
* Internally, this instance is also used for:
* <ol>
* <li>Used to recover from errors during parsing.
- * <li>Mark element patterns with <notAllowed/> content model.
+ * <li>Mark element patterns with {@code <notAllowed/>} content model.
* </ol>
*/
public static final NameClass NULL = new NullNameClass();
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSchema.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSSchema.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -120,7 +120,7 @@
/**
* Sine an {@link XSSchema} is not necessarily defined in
* one schema document (for example one schema can span across
- * many documents through <xs:include>s.),
+ * many documents through {@code <xs:include>s}.),
* so this method always returns null.
*
* @deprecated
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSTerm.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSTerm.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -39,7 +39,7 @@
* boolean isXXX() {
* return this instanceof XXX;
* }
- * <pre>
+ * </pre>
*
* and a set of cast functions (<code>asXXX</code>), which are
* essentially:
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,7 +50,11 @@
* <li>manage mapping between namespace URIs and prefixes.
*
* <li>TODO: provide support for interleaving.
+ * </ol>
*
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* @version $Id: NGCCRuntime.java,v 1.15 2002/09/29 02:55:48 okajima Exp $
* @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/
@@ -68,7 +72,7 @@
* or the reset method is called. You can't replace the root
* handler while parsing is in progress.
* <p>
- * Usually a generated class that corresponds to the <start>
+ * Usually a generated class that corresponds to the {@code <start>}
* pattern will be used as the root handler, but any NGCCHandler
* can be a root handler.
*
@@ -178,8 +182,8 @@
* }</pre>
*
* Then this first space needs to be ignored (for otherwise, we will
- * end up treating this space as the match to <text/> and won't
- * be able to process <bar>.)
+ * end up treating this space as the match to {@code <text/>} and won't
+ * be able to process {@code <bar>}.)
*
* Now assume the following instance:
* <pre>{@code
@@ -194,7 +198,7 @@
* easy solution is to use the type of next event. If a text is
* followed by a start tag, it follows from the constraint on
* RELAX NG that that text must be either whitespaces or a match
- * to <text/>.
+ * to {@code <text/>}.
*
* <p>
* On the contrary, if a text is followed by a end tag, then it
@@ -209,9 +213,9 @@
* <p>
* TODO: according to the constraint of RELAX NG, if characters
* follow an end tag, then they must be either whitespaces or
- * must match to <text/>.
+ * must match to {@code <text/>}.
*
- * @param possiblyWhitespace
+ * @param ignorable
* True if the buffered character can be ignorabale. False if
* it needs to be consumed.
*/
@@ -240,7 +244,7 @@
redirectionDepth++;
} else {
processPendingText(true);
- // System.out.println("startElement:"+localname+"->"+_attrStack.size());
+ // System.out.println("startElement:"+localname+"->"+_attrStack.size());
currentHandler.enterElement(uri, localname, qname, atts);
}
}
@@ -261,7 +265,7 @@
* consumes the enterElement event.
*/
public void onEnterElementConsumed(
- String uri, String localName, String qname,Attributes atts) throws SAXException {
+ String uri, String localName, String qname,Attributes atts) throws SAXException {
attStack.push(currentAtts=new AttributesImpl(atts));
nsEffectiveStack.push( new Integer(nsEffectivePtr) );
nsEffectivePtr = namespaces.size();
@@ -392,25 +396,25 @@
//
public void sendEnterAttribute( int threadId,
- String uri, String local, String qname) throws SAXException {
+ String uri, String local, String qname) throws SAXException {
currentHandler.enterAttribute(uri,local,qname);
}
public void sendEnterElement( int threadId,
- String uri, String local, String qname, Attributes atts) throws SAXException {
+ String uri, String local, String qname, Attributes atts) throws SAXException {
currentHandler.enterElement(uri,local,qname,atts);
}
public void sendLeaveAttribute( int threadId,
- String uri, String local, String qname) throws SAXException {
+ String uri, String local, String qname) throws SAXException {
currentHandler.leaveAttribute(uri,local,qname);
}
public void sendLeaveElement( int threadId,
- String uri, String local, String qname) throws SAXException {
+ String uri, String local, String qname) throws SAXException {
currentHandler.leaveElement(uri,local,qname);
}
@@ -448,7 +452,7 @@
* simulate the startElement event for the new ContentHandler.
*/
public void redirectSubtree( ContentHandler child,
- String uri, String local, String qname ) throws SAXException {
+ String uri, String local, String qname ) throws SAXException {
redirect = child;
redirect.setDocumentLocator(locator);
@@ -459,8 +463,8 @@
// modified to report active bindings only.
for( int i=0; i<namespaces.size(); i+=2 )
redirect.startPrefixMapping(
- (String)namespaces.get(i),
- (String)namespaces.get(i+1)
+ (String)namespaces.get(i),
+ (String)namespaces.get(i+1)
);
redirect.startElement(uri,local,qname,currentAtts);
@@ -515,21 +519,21 @@
}
-// error reporting
+ // error reporting
protected void unexpectedX(String token) throws SAXException {
throw new SAXParseException(MessageFormat.format(
- "Unexpected {0} appears at line {1} column {2}",
- new Object[]{
- token,
- new Integer(getLocator().getLineNumber()),
- new Integer(getLocator().getColumnNumber()) }),
- getLocator());
+ "Unexpected {0} appears at line {1} column {2}",
+ new Object[]{
+ token,
+ new Integer(getLocator().getLineNumber()),
+ new Integer(getLocator().getColumnNumber()) }),
+ getLocator());
}
-//
+ //
//
// trace functions
//
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -97,7 +97,7 @@
}
/**
- * For each U, apply U->Iterator<T> function and then iterate all
+ * For each U, apply {@code U->Iterator<T>} function and then iterate all
* the resulting T.
*/
public static abstract class Map<T,U> extends ReadOnly<T> {
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -49,7 +49,7 @@
* This constructor calls its super class with the empty string
* to force the "toString" method of parent class "Throwable" to
* print the error message in the form:
- * ParseException: <result of getMessage>
+ * ParseException: {@code <result of getMessage>}
*/
public ParseException(Token currentTokenVal,
int[][] expectedTokenSequencesVal,
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -76,8 +76,8 @@
*
* <h2>Usage of this class</h2>
*
- * <ol> <li>Create a new instance.</li> <li>Call {@link
- * #visit(com.sun.xml.internal.xsom.XSSchemaSet)} function on your schema set.>/li>
+ * <ol> <li>Create a new instance.</li> <li>Call {@link #visit(XSSchemaSet)}
+ * function on your schema set.</li>
* <li>Retrieve the model using {@link #getModel()}. </li></ol>
*
* Every node in the resulting tree is a {@link SchemaTreeTraverser.SchemaTreeNode},
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -30,23 +30,23 @@
import org.xml.sax.ErrorHandler;
/**
- * Used to parse <xs:annotation>.
+ * Used to parse {@code <xs:annotation>}.
*
* @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
*/
public abstract class AnnotationParser {
/**
- * Called every time a new <xs:annotation> element
+ * Called every time a new {@code <xs:annotation>} element
* is found.
*
- * The sub-tree rooted at <xs:annotation> will be
+ * The sub-tree rooted at {@code <xs:annotation>} will be
* sent to this ContentHandler as if it is a whole document.
*
* @param context
* indicates the schema component that owns this annotation.
* Always non-null.
* @param parentElementName
- * local name of the element that contains <xs:annotation>.
+ * local name of the element that contains {@code <xs:annotation>}.
* (e.g., "element", "attribute", ... )
* @param errorHandler
* The error handler that the client application specifies.
@@ -70,7 +70,7 @@
* @param existing
* An annotation object which was returned from another
* AnnotationParser before. Sometimes, one schema component
- * can have multiple <:xs:annotation> elements and
+ * can have multiple {@code <xs:annotation>} elements and
* this parameter is used to merge all those annotations
* together. If there is no existing object, null will be
* passed.
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -215,7 +215,7 @@
}
/**
* Set an entity resolver that is used to resolve things
- * like <xsd:import> and <xsd:include>.
+ * like {@code <xsd:import>} and {@code <xsd:include>}.
*/
public void setEntityResolver( EntityResolver resolver ) {
this.entityResolver = resolver;
@@ -239,7 +239,7 @@
*
* <p>
* For each annotation, new instance of this class will be
- * created and used to parse <xs:annotation>.
+ * created and used to parse {@code <xs:annotation>}.
*/
public void setAnnotationParser( final Class annParser ) {
setAnnotationParser( new AnnotationParserFactory() {
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,12 +47,12 @@
*
* <p>
* If you use this parser factory, you'll get {@link Element} that represents
- * <xs:annotation> from {@link XSAnnotation#getAnnotation()}.
+ * {@code <xs:annotation>} from {@link XSAnnotation#getAnnotation()}.
*
* <p>
- * When multiple <xs:annotation>s are found for the given schema component,
- * you'll see all <xs:appinfo>s and <xs:documentation>s combined under
- * one <xs:annotation> element.
+ * When multiple {@code <xs:annotation>s} are found for the given schema component,
+ * you'll see all {@code <xs:appinfo>s} and {@code <xs:documentation>s} combined under
+ * one {@code <xs:annotation>} element.
*
* @author Kohsuke Kawaguchi
*/
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/package-info.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/package-info.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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,43 +27,6 @@
* <h1>JAX-WS 2.1 Tools</h1>
* This document describes the tools included with JAX-WS 2.0.1.
*
- * {@DotDiagram digraph G {
-// external tools
-AP;
-
-// ANT tasks
-node [style=filled,color=lightyellow];
-"WsGen ANT Task"; "WsImport ANT Task";
-
-// commandline
-node [style=filled,color=lightpink];
-wsgen; wsimport;
-
-// libraries
-node [style=filled,color=lightblue];
-WsimportTool; WsgenTool;"WSAP"; WebServiceAp; WSDLModeler;WSDLParser;SeiGenerator;ServiceGenerator;ExceptionGenerator;"JAXB XJC APIs";CodeModel;
-
-// aps
-# node [style=filled,color=lightpink];
-# "JAX-WS"; tools; runtime; SPI; "Annotation Processor";
-
-"WsGen ANT Task" -> wsgen -> WsgenTool;
-"WsImport ANT Task" -> wsimport -> WsimportTool;
-
-WsgenTool -> Annotation Processing -> WSAP -> WebServiceAp;
-WsimportTool -> WSDLModeler;
-WSDLModeler->WSDLParser;
-WSDLModeler->"JAXB XJC APIs"
-WsimportTool->SeiGenerator->CodeModel;
-WsimportTool->ServiceGenerator->CodeModel;
-WsimportTool->ExceptionGenerator->CodeModel;
-WebServiceAp->CodeModel
-}
- * }
- * <div align=right>
- * <b>Legend:</b> blue: implementation classes, pink: command-line toosl, white: external tool, yellow: ANT tasks
- * </div>
- *
* <h2>ANT Tasks</h2>
<d1>
* <dt>{@link com.sun.tools.internal.ws.ant.AnnotationProcessingTask AnnotationProcessing}
@@ -116,6 +79,5 @@
* idirectly via the {@link com.sun.istack.internal.ws.WSAP WSAP} when invoked by Annotation Processing.
* </d1>
*
- * @ArchitectureDocument
**/
package com.sun.tools.internal.ws;
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, 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.11-b150402.1412
-build-version=JAX-WS RI 2.2.11-b150402.1412
-major-version=2.2.11
-svn-revision=f923291dedcf386c5f408263984a99d7cedf0012
+build-id=2.3.0-SNAPSHOT
+build-version=JAX-WS RI 2.3.0-SNAPSHOT
+major-version=2.3.0
+svn-revision=ffaa49e66cc05e1bb2ddc103076a340dad5df997
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/Options.java Thu Nov 05 08:15:39 2015 -0800
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/Options.java Thu Nov 05 13:43:17 2015 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -176,6 +176,7 @@
public Target target = Target.V2_2;
/**
+ * Type of input schema language. One of the {@code SCHEMA_XXX}
* strictly follow the compatibility rules specified in JAXWS spec
*/
public static final int STRICT = 1;
@@ -188,8 +189,8 @@
/**
* this switch determines how carefully the compiler will follow
- * the compatibility rules in the spec. Either <code>STRICT</code>
- * or <code>EXTENSION</code>.
+ * the compatibility rules in the spec. Either {@code STRICT}
+ * or {@code EXTENSION}.
*/
public int compatibilityMode = STRICT;
@@ -293,7 +294,7 @@
protected void addFile(String arg) throws BadCommandLineException {}
/**
- * Parses an option <code>args[i]</code> and return
+ * Parses an option {@code args[i]} and return
* the number of tokens consumed.
*
* @return