Mercurial > hg > release > icedtea7-forest-2.6 > jaxws
changeset 1340:7c313af4cc5c
Merge jdk7u171-b00
line wrap: on
line diff
--- a/.hgtags Mon Feb 05 22:41:18 2018 +0000 +++ b/.hgtags Tue Feb 06 19:52:58 2018 +0000 @@ -679,3 +679,4 @@ 4f5edec6f3d8b2fb8395f345364d159c90b98cd7 jdk7u161-b00 a22ffaf9f3e8673569d8b16bb00b5b8e90368dc9 jdk7u161-b01 40c37fd3e5cb7ce6c05202b18fb14cc45c2d55e7 icedtea-2.6.12 +674305fbd3c88bb2d438dcf4f47ab702c9b1aa12 jdk7u171-b00
--- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java Mon Feb 05 22:41:18 2018 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java Tue Feb 06 19:52:58 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * 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,22 +25,15 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.*; +import com.sun.xml.internal.xsom.parser.*; - +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class attributeDeclBody extends NGCCHandler { private String name; @@ -430,7 +423,7 @@ break; case 11: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 10; } break;
--- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java Mon Feb 05 22:41:18 2018 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java Tue Feb 06 19:52:58 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * 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,22 +25,14 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.impl.*; import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; +import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; - - +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class attributeGroupDecl extends NGCCHandler { private AnnotationImpl annotation; @@ -391,7 +383,7 @@ break; case 12: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 11; } break;
--- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java Mon Feb 05 22:41:18 2018 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java Tue Feb 06 19:52:58 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * 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,22 +25,17 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.*; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.*; +import com.sun.xml.internal.xsom.parser.*; - +import java.util.Collections; +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class complexType extends NGCCHandler { private Integer finalValue; @@ -1626,7 +1621,7 @@ break; case 70: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 69; } break;
--- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java Mon Feb 05 22:41:18 2018 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java Tue Feb 06 19:52:58 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * 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,22 +25,18 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; + +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.*; +import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; - +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class elementDeclBody extends NGCCHandler { private Integer finalValue; @@ -807,7 +803,7 @@ break; case 22: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 21; } break;
--- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java Mon Feb 05 22:41:18 2018 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java Tue Feb 06 19:52:58 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * 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,22 +25,15 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; +import com.sun.xml.internal.xsom.parser.*; - +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class group extends NGCCHandler { private AnnotationImpl annotation; @@ -377,7 +370,7 @@ break; case 9: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 8; } break;
--- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java Mon Feb 05 22:41:18 2018 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java Tue Feb 06 19:52:58 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * 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,22 +25,18 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.*; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.*; +import com.sun.xml.internal.xsom.parser.*; +import java.util.ArrayList; +import java.util.List; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; class identityConstraint extends NGCCHandler { private String name; @@ -503,7 +499,7 @@ break; case 15: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 14; } break;
--- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java Mon Feb 05 22:41:18 2018 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java Tue Feb 06 19:52:58 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * 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,22 +25,16 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.*; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; +import com.sun.xml.internal.xsom.parser.*; - +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class notation extends NGCCHandler { private String name; @@ -408,7 +402,7 @@ break; case 13: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 12; } break;
--- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java Mon Feb 05 22:41:18 2018 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java Tue Feb 06 19:52:58 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * 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,22 +25,12 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; + +import com.sun.xml.internal.bind.WhiteSpaceProcessor; import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; - - +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; class qname extends NGCCHandler { private String qvalue; @@ -145,7 +135,7 @@ switch($_ngcc_current_state) { case 1: { - qvalue = $value; + qvalue = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 0; } break;
--- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java Mon Feb 05 22:41:18 2018 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java Tue Feb 06 19:52:58 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * 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,22 +25,21 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; + +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.*; +import com.sun.xml.internal.xsom.impl.*; import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; +import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import java.util.StringTokenizer; - +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class simpleType extends NGCCHandler { private AnnotationImpl annotation; @@ -392,7 +391,7 @@ break; case 13: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 12; } break;